Sync Integ to Master

[sdc.git] / catalog-be / src / main / resources / scripts / import / tosca / importONAPNormativeAll.py

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py b/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py
index 3d7d9a9..eb55bf8 100644 (file)
--- a/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py
@@ -23,7 +23,7 @@ import importCommon
 # Import all users from a given file                                                                                                                                                                                                                                                                                                                   #
 #                                                                                                                                                                                                                                                                                                                                                                                              #               
 # activation :                                                                                                                                                                                                                                                                                                                                                                 #
-#       python importNormativeAll.py [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-u <user userId> | --user=<user userId> ] [-d <true|false> | --debug=<true|false>]    #
+#       python importNormativeAll.py [-s <scheme> | --scheme=<scheme> ] [-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>]                                                                                                                                                                                                                       #
 #                                                                                                                                                                                                                                                                                                                                                                                              #                       
 # shortest activation (be host = localhost, be port = 8080, user = jh0003):                                                                                                                                                                                                                                    #       #                                                                                                                                                                                                                                                                                                                                                                                       #
@@ -32,7 +32,7 @@ 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], '[-s <scheme> | --scheme=<scheme> ] [-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()
@@ -58,6 +58,7 @@ 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="])
@@ -76,6 +77,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")
@@ -84,7 +87,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)
@@ -101,37 +104,37 @@ def main(argv):
        baseFileLocation = pathdir + "/../../../import/tosca/"
 
        fileLocation = baseFileLocation + "data-types/"
-       importDataTypes(beHost, bePort, adminUser, False, fileLocation)
+       importDataTypes(scheme, beHost, bePort, adminUser, False, fileLocation)
 
        print 'sleep until data type cache is updated'
        time.sleep( 70 )
        
        fileLocation = baseFileLocation + "capability-types/"
-       importNormativeCapabilities(beHost, bePort, adminUser, False, fileLocation)
+       importNormativeCapabilities(scheme, beHost, bePort, adminUser, False, fileLocation)
 
        fileLocation = baseFileLocation + "interface-lifecycle-types/"
-       importNormativeInterfaceLifecycleType(beHost, bePort, adminUser, False, fileLocation)   
+       importNormativeInterfaceLifecycleType(scheme, beHost, bePort, adminUser, False, fileLocation)   
 
        fileLocation = baseFileLocation + "categories/"
-       importCategories(beHost, bePort, adminUser, False, fileLocation)
+       importCategories(scheme, beHost, bePort, adminUser, False, fileLocation)
        
        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/"
-       resultsHeat = importOnapTypes(beHost, bePort, adminUser, fileLocation, updateversion)
+       resultsHeat = importOnapTypes(scheme, beHost, bePort, adminUser, fileLocation, updateversion)
        handleResults(resultsHeat, updateversion)
   
        fileLocation = baseFileLocation + "group-types/"
-       importGroupTypes(beHost, bePort, adminUser, False, fileLocation)
+       importGroupTypes(scheme, beHost, bePort, adminUser, False, fileLocation)
        
        fileLocation = baseFileLocation + "policy-types/"
-       importPolicyTypes(beHost, bePort, adminUser, False, fileLocation)
+       importPolicyTypes(scheme, beHost, bePort, adminUser, False, fileLocation)
 
        errorAndExit(0, None)