From 5944b441468500fffa7111b5dea9181461ae1303 Mon Sep 17 00:00:00 2001 From: "k.kedron" Date: Fri, 28 Feb 2020 14:26:07 +0100 Subject: Refactoring the sdc-BE-init python scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adjust to the correct python syntax. Remove not used imports. Also fixed:  - the indents  - checking that all normative imported correctly logic Issue-ID: SDC-2784 Signed-off-by: Krystian Kedron Change-Id: If7edc867f3cb591be157073fbc12b9842b200023 --- .../import/tosca/upgradeNormativeVersionAll.py | 188 +++++++++++---------- 1 file changed, 95 insertions(+), 93 deletions(-) (limited to 'catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py') diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py index 32045513b8..a5e2ebae67 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py @@ -1,100 +1,102 @@ -import pycurl -import sys, getopt, os -from StringIO import StringIO -import json -import copy -import time -from importNormativeTypes import importNormativeTypes -from importHeatTypes import importHeatTypes -from importCommon import * +import os + import importCommon +from importCommon import * +from importHeatTypes import importHeatTypes +from importNormativeTypes import importNormativeTypes +from importOnapTypes import importOnapTypes + def usage(): - print sys.argv[0], '[optional -s | --scheme=, default http] [-i | --ip=] [-p | --port= ] [-u | --user= ] [-d | --debug=] [-v | --updateversion=]' - -def handleResults(results, updateversion): - print_frame_line() - for result in results: - print_name_and_return_code(result[0], result[1]) - print_frame_line() - - responseCodes = [200, 201] - - if(updateversion == 'false'): - responseCodes = [200, 201, 409] - - failedResults = filter(lambda x: x[1] == None or x[1] not in responseCodes, results) - if (len(failedResults) > 0): - error_and_exit(1, None) + print sys.argv[0], \ + '[optional -s | --scheme=, default http] [-i | --ip=] [-p | --port= ] [-u | --user= ] [-d | --debug=] [-v | --updateversion=]' + + +def handleResults(results, update_version): + print_frame_line() + for result in results: + print_name_and_return_code(result[0], result[1]) + print_frame_line() + + response_codes = [200, 201] + + if update_version == 'false': + response_codes = [200, 201, 409] + + failed_results = filter(lambda x: x[1] is None or x[1] not in response_codes, results) + if len(list(failed_results)) > 0: + error_and_exit(1, None) + def main(argv): - print 'Number of arguments:', len(sys.argv), 'arguments.' - - beHost = 'localhost' - bePort = '8080' - adminUser = 'jh0003' - debugf = None - updateversion = 'true' - importCommon.debugFlag = False - scheme = 'http' - - try: - opts, args = getopt.getopt(argv,"i:p:u:d:v:h:s:",["ip=","port=","user=","debug=","updateversion=","scheme="]) - except getopt.GetoptError: - usage() - error_and_exit(2, 'Invalid input') - - for opt, arg in opts: - #print opt, arg - if opt == '-h': - usage() - sys.exit(3) - elif opt in ("-i", "--ip"): - beHost = arg - elif opt in ("-p", "--port"): - bePort = arg - elif opt in ("-u", "--user"): - adminUser = arg - elif opt in ("-s", "--scheme"): - scheme = arg - elif opt in ("-d", "--debug"): - print arg - debugf = bool(arg.lower() == "true" or arg.lower() == "yes") - elif opt in ("-v", "--updateversion"): - print arg - if (arg.lower() == "false" or arg.lower() == "no"): - updateversion = 'false' - - print 'scheme =',scheme,', be host =',beHost,', be port =', bePort,', user =', adminUser, ', debug =', debugf, ', updateversion =', updateversion - - if (debugf != None): - print 'set debug mode to ' + str(debugf) - importCommon.debugFlag = debugf - - if ( beHost == None ): - usage() - sys.exit(3) - - print sys.argv[0] - pathdir = os.path.dirname(os.path.realpath(sys.argv[0])) - debug("path dir =" + pathdir) - - baseFileLocation = pathdir + "/../../../import/tosca/" - - fileLocation = baseFileLocation + "normative-types/" - results = importNormativeTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) - handleResults(results, updateversion) - - fileLocation = baseFileLocation + "heat-types/" - resultsHeat = importHeatTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion) - handleResults(resultsHeat, updateversion) - - fileLocation = baseFileLocation + "onap-types/" - resultsOnap = importOnapTypes(beHost, bePort, adminUser, fileLocation, updateversion) - handleResults(resultsOnap, updateversion) - - error_and_exit(0, None) + print 'Number of arguments:', len(sys.argv), 'arguments.' -if __name__ == "__main__": - main(sys.argv[1:]) + be_host = 'localhost' + be_port = '8080' + admin_user = 'jh0003' + debug_f = None + update_version = 'true' + importCommon.debugFlag = False + scheme = 'http' + + try: + opts, args = getopt.getopt(argv, "i:p:u:d:v:h:s:", + ["ip=", "port=", "user=", "debug=", "updateversion=", "scheme="]) + except getopt.GetoptError: + usage() + error_and_exit(2, 'Invalid input') + + for opt, arg in opts: + # print opt, arg + if opt == '-h': + usage() + sys.exit(3) + elif opt in ("-i", "--ip"): + be_host = arg + elif opt in ("-p", "--port"): + be_port = arg + elif opt in ("-u", "--user"): + admin_user = arg + elif opt in ("-s", "--scheme"): + scheme = arg + elif opt in ("-d", "--debug"): + print arg + debug_f = bool(arg.lower() == "true" or arg.lower() == "yes") + elif opt in ("-v", "--updateversion"): + print arg + if arg.lower() == "false" or arg.lower() == "no": + update_version = 'false' + + print 'scheme =', scheme, ', be host =', be_host, ', be port =', be_port, ', user =', admin_user, ', debug =', debug_f, ', updateversion =', update_version + + if debug_f is not None: + print 'set debug mode to ' + str(debug_f) + importCommon.debugFlag = debug_f + + if be_host is None: + usage() + sys.exit(3) + + print sys.argv[0] + path_dir = os.path.dirname(os.path.realpath(sys.argv[0])) + debug("path dir =" + path_dir) + base_file_location = path_dir + "/../../../import/tosca/" + + file_location = base_file_location + "normative-types/" + results = importNormativeTypes(scheme, be_host, be_port, admin_user, file_location, update_version) + handleResults(results, update_version) + + file_location = base_file_location + "heat-types/" + results_heat = importHeatTypes(scheme, be_host, be_port, admin_user, file_location, update_version) + handleResults(results_heat, update_version) + + file_location = base_file_location + "onap-types/" + results_onap = importOnapTypes(scheme, be_host, be_port, admin_user, file_location, update_version) + handleResults(results_onap, update_version) + + error_and_exit(0, None) + + +if __name__ == "__main__": + main(sys.argv[1:]) -- cgit 1.2.3-korg