diff options
Diffstat (limited to 'catalog-be/src/main/resources/scripts/import/tosca/upgradeSolTypes.py')
-rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/upgradeSolTypes.py | 76 |
1 files changed, 37 insertions, 39 deletions
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeSolTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeSolTypes.py index d3e5a4b2da..e9cebfe9a8 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeSolTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeSolTypes.py @@ -1,12 +1,6 @@ -import pycurl -import sys, getopt -from StringIO import StringIO -import json -import copy -from importCommon import * +import yaml + from importNormativeTypes import * -import importCommon -import json ################################################################################################################################################################################################ @@ -20,39 +14,43 @@ import json # python upgradeHeatAndNormativeTypes.py [-f <input file> | --ifile=<input file> ] # # # ################################################################################################################################################################################################ -def upgradeSolTypesPerConfigFile(scheme, beHost, bePort, adminUser, baseDir, updateversion): - responseCodes = [200, 201] - if (updateversion == 'false'): - responseCodes = [200, 201, 409] + + +def upgradeSolTypesPerConfigFile(scheme, be_host, be_port, admin_user, base_dir, update_version): + response_codes = [200, 201] + results = [] + if update_version == 'false': + response_codes = [200, 201, 409] with open("onapTypesToUpgrade.json", 'r') as stream: try: types = json.load(stream) - solTypes = types["sol"] - debug(solTypes) - solFileDir = baseDir + "sol-types/" - debug(solFileDir) - results = [] - for solType in solTypes: - result = createNormativeType(scheme, beHost, bePort, adminUser, solFileDir, solType.encode('ascii', 'ignore'), updateversion) + sol_types = types["sol"] + debug(sol_types) + sol_file_dir = base_dir + "sol-types/" + debug(sol_file_dir) + for solType in sol_types: + result = createNormativeType(scheme, be_host, be_port, admin_user, sol_file_dir, + solType.encode('ascii', 'ignore'), update_version) results.append(result) - if (result[1] == None or result[1] not in responseCodes): + if result[1] is None or result[1] not in response_codes: print "Failed creating sol type " + solType + ". " + str(result[1]) except yaml.YAMLError as exc: print(exc) + return results def main(argv): print 'Number of arguments:', len(sys.argv), 'arguments.' - beHost = 'localhost' - bePort = '8080' - adminUser = 'jh0003' - updateversion = 'true' + be_host = 'localhost' + be_port = '8080' + admin_user = 'jh0003' + update_version = 'true' scheme = 'http' try: - opts, args = getopt.getopt(argv, "i:p:u:v:h:s:", ["ip=", "port=", "user=", "updateversion=","scheme="]) + opts, args = getopt.getopt(argv, "i:p:u:v:h:s:", ["ip=", "port=", "user=", "updateversion=", "scheme="]) except getopt.GetoptError: usage() error_and_exit(2, 'Invalid input') @@ -63,37 +61,38 @@ def main(argv): usage() sys.exit(3) elif opt in ("-i", "--ip"): - beHost = arg + be_host = arg elif opt in ("-p", "--port"): - bePort = arg + be_port = arg elif opt in ("-u", "--user"): - adminUser = arg + admin_user = arg elif opt in ("-s", "--scheme"): scheme = arg elif opt in ("-v", "--updateversion"): - if (arg.lower() == "false" or arg.lower() == "no"): - updateversion = 'false' + if arg.lower() == "false" or arg.lower() == "no": + update_version = 'false' - print 'scheme =',scheme,', be host =',beHost, ', be port =', bePort, ', user =', adminUser + print 'scheme =', scheme, ', be host =', be_host, ', be port =', be_port, ', user =', admin_user - if (beHost == None): + if be_host is None: usage() sys.exit(3) - results = upgradeSolTypesPerConfigFile(scheme, beHost, bePort, adminUser, "../../../import/tosca/", updateversion) + results = upgradeSolTypesPerConfigFile(scheme, be_host, be_port, admin_user, "../../../import/tosca/", + update_version) print "-----------------------------" for result in results: print "{0:20} | {1:6}".format(result[0], result[1]) print "-----------------------------" - responseCodes = [200, 201] + response_codes = [200, 201] - if (updateversion == 'false'): - responseCodes = [200, 201, 409] + if update_version == 'false': + response_codes = [200, 201, 409] - failedNormatives = filter(lambda x: x[1] == None or x[1] not in responseCodes, results) - if (len(failedNormatives) > 0): + failed_normatives = filter(lambda x: x[1] is None or x[1] not in response_codes, results) + if len(list(failed_normatives)) > 0: error_and_exit(1, None) else: error_and_exit(0, None) @@ -101,4 +100,3 @@ def main(argv): if __name__ == "__main__": main(sys.argv[1:]) - |