aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-be
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-09-28 02:23:00 +0300
committerMichael Lando <ml636r@att.com>2017-09-28 02:23:00 +0300
commit860fe27cfdca42547fc09414133b235f1cc5713f (patch)
tree86a805fefd90c46c15a420cb917a04d8c7fb2894 /catalog-be
parent18c8a1fec198d4343c04a70db370b94e269bd817 (diff)
Fix for normative scripts
Change-Id: Ibd995c092e45aa1aaedbd687dcc39bf6333a4f3a Issue-ID: SDC-410 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-be')
-rw-r--r--catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
index 085467e09a..4d0ec291f5 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
@@ -11,6 +11,7 @@ from importPolicyTypes import importPolicyTypes
from importGroupTypes import importGroupTypes
from importNormativeCapabilities import importNormativeCapabilities
from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType
+from importOnapTypes import importOnapTypes
from importCommon import *
@@ -112,7 +113,11 @@ def main(argv):
resultsHeat = upgradeTypesPerConfigFile(beHost, bePort, adminUser, baseFileLocation, updateversion)
handleResults(resultsHeat, 'false')
-
+
+ fileLocation = baseFileLocation + "onap-types/"
+ resultsHeat = importOnapTypes(beHost, bePort, adminUser, fileLocation, updateversion)
+ handleResults(resultsHeat, updateversion)
+
errorAndExit(0, None)
if __name__ == "__main__":