Sync Integ to Master

[sdc.git] / 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 d45b27e..805d012 100644 (file)
--- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormativeVersionAll.py
@@ -10,7 +10,7 @@ from importCommon import *
 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>] [-v <true|false> | --updateversion=<true|false>]'
+       print sys.argv[0], '[optional -s <scheme> | --scheme=<scheme>, default http] [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>] [-v <true|false> | --updateversion=<true|false>]'
 
 def handleResults(results, updateversion):
        printFrameLine()
@@ -36,9 +36,10 @@ def main(argv):
        debugf = None
        updateversion = 'true'
        importCommon.debugFlag = False 
+       scheme = 'http'
 
        try:
-               opts, args = getopt.getopt(argv,"i:p:u:d:v:h",["ip=","port=","user=","debug=","updateversion="])
+               opts, args = getopt.getopt(argv,"i:p:u:d:v:h:s:",["ip=","port=","user=","debug=","updateversion=","scheme="])
        except getopt.GetoptError:
                usage()
                errorAndExit(2, 'Invalid input')
@@ -54,6 +55,8 @@ def main(argv):
                        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")
@@ -62,7 +65,7 @@ def main(argv):
                        if (arg.lower() == "false" or arg.lower() == "no"):
                                updateversion = 'false'                 
 
-       print 'be host =',beHost,', be port =', bePort,', user =', adminUser, ', debug =', debugf, ', updateversion =', updateversion
+       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)
@@ -79,11 +82,11 @@ def main(argv):
        baseFileLocation = pathdir + "/../../../import/tosca/"
        
        fileLocation = baseFileLocation + "normative-types/"
-       results = importNormativeTypes(beHost, bePort, adminUser, fileLocation, updateversion)
+       results = importNormativeTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion)
        handleResults(results, updateversion)
 
        fileLocation = baseFileLocation + "heat-types/"
-       resultsHeat = importHeatTypes(beHost, bePort, adminUser, fileLocation, updateversion)
+       resultsHeat = importHeatTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion)
        handleResults(resultsHeat, updateversion)
        
        fileLocation = baseFileLocation + "onap-types/"