aboutsummaryrefslogtreecommitdiffstats
path: root/catalog-be
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2017-09-27 19:53:21 +0300
committerTal Gitelman <tg851x@intl.att.com>2017-09-27 19:53:21 +0300
commit72fa3d877f5f19ea98e803ea912d3baabd8544c8 (patch)
tree790ccd2c122f6f4104eb976b12fbe4a45fda13ac /catalog-be
parent539703511367eaaaac04b0d997ddf8679e224dfb (diff)
Fix for normative scripts
Change-Id: I47b419f4f2c65fa90da3fe1d4ffaf7d59ee86c1c Issue-ID: SDC-410 Signed-off-by: Tal Gitelman <tg851x@intl.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__":