diff options
Diffstat (limited to 'catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py')
-rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py index b272c2726c..21a477503c 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py @@ -11,7 +11,7 @@ from importPolicyTypes import importPolicyTypes from importGroupTypes import importGroupTypes from importNormativeCapabilities import importNormativeCapabilities from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType -from importOnapTypes import importOnapTypes +from upgradeONAPTypes import upgradeOnapTypesPerConfigFile from importCommon import * @@ -33,15 +33,17 @@ import importCommon def usage(): print sys.argv[0], '[-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>]' -def handleResults(results, updateversion): - printFrameLine() - for result in results: - printNameAndReturnCode(result[0], result[1]) - printFrameLine() +def handleResults(results): + if results is not None: + printFrameLine() + for result in results: + printNameAndReturnCode(result[0], result[1]) + + printFrameLine() - failedResults = filter(lambda x: x[1] == None or x[1] not in [200, 201, 409], results) - if (len(failedResults) > 0): - errorAndExit(1, None) + failedResults = filter(lambda x: x[1] == None or x[1] not in [200, 201, 409], results) + if (len(failedResults) > 0): + errorAndExit(1, None) def main(argv): print 'Number of arguments:', len(sys.argv), 'arguments.' @@ -51,6 +53,7 @@ def main(argv): adminUser = 'jh0003' debugf = None updateversion = 'true' + updateOnapVersion = 'false' importCommon.debugFlag = False scheme = 'http' @@ -115,11 +118,10 @@ def main(argv): time.sleep( 70 ) resultsHeat = upgradeTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseFileLocation, updateversion) - handleResults(resultsHeat, 'false') + handleResults(resultsHeat) - fileLocation = baseFileLocation + "onap-types/" - resultsHeat = importOnapTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) - handleResults(resultsHeat, updateversion) + resultsHeat = upgradeOnapTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseFileLocation, updateOnapVersion) + handleResults(resultsHeat) errorAndExit(0, None) |