From 860fe27cfdca42547fc09414133b235f1cc5713f Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Thu, 28 Sep 2017 02:23:00 +0300 Subject: Fix for normative scripts Change-Id: Ibd995c092e45aa1aaedbd687dcc39bf6333a4f3a Issue-ID: SDC-410 Signed-off-by: Michael Lando --- .../src/main/resources/scripts/import/tosca/upgradeNormative.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'catalog-be/src/main') 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__": -- cgit 1.2.3-korg