diff options
| author |   Michael Lando <ml636r@att.com> | 2018-03-04 14:53:33 +0200 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2018-03-07 13:19:05 +0000 |
| commit | a5445100050e49e83f73424198d73cd72d672a4d (patch) | |
| tree | cacf4df817df31be23e4e790d1dda857bdae061e /catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py | |
| parent | 51157f92c21976cba4914c378aaa3cba49826931 (diff) | |
Sync Integ to Master
Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
Diffstat (limited to 'catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py')
| -rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py index 7315ec0635..5cb0ca3b0c 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py @@ -7,19 +7,19 @@ from importCommon import * from importNormativeTypes import * import importCommon -################################################################################################################################################ -# # -# Import all users from a given file # -# # -# activation : # -# python importUsers.py [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-f <input file> | --ifile=<input file> ] # -# # -# shortest activation (be host = localhost, be port = 8080): # -# python importUsers.py [-f <input file> | --ifile=<input file> ] # -# # -################################################################################################################################################ +################################################################################################################################################################################# +# # +# Import all users from a given file # +# # +# activation : # +# python importUsers.py [-s <scheme> | --scheme=<scheme> ] [-i <be host> | --ip=<be host>] [-p <be port> | --port=<be port> ] [-f <input file> | --ifile=<input file> ] # +# # +# shortest activation (be host = localhost, be port = 8080): # +# python importUsers.py [-f <input file> | --ifile=<input file> ] # +# # +################################################################################################################################################################################# -def upgradeHeatTypes1707(beHost, bePort, adminUser, fileDir, updateversion): +def upgradeHeatTypes1707(scheme, beHost, bePort, adminUser, fileDir, updateversion): heatTypes = [ "volume", "cinderVolume", @@ -49,7 +49,7 @@ def upgradeHeatTypes1707(beHost, bePort, adminUser, fileDir, updateversion): results = [] for heatType in heatTypes: - result = createNormativeType(beHost, bePort, adminUser, fileDir, heatType, updateversion) + result = createNormativeType(scheme, beHost, bePort, adminUser, fileDir, heatType, updateversion) results.append(result) if ( result[1] == None or result[1] not in responseCodes) : print "Failed creating heat type " + heatType + ". " + str(result[1]) @@ -63,9 +63,10 @@ def main(argv): bePort = '8080' adminUser = 'jh0003' updateversion = 'true' - + scheme = 'http' + try: - opts, args = getopt.getopt(argv,"i:p:u:v:h:",["ip=","port=","user=","updateversion="]) + opts, args = getopt.getopt(argv,"i:p:u:v:h:s:",["ip=","port=","user=","updateversion=","scheme="]) except getopt.GetoptError: usage() errorAndExit(2, 'Invalid input') @@ -81,17 +82,19 @@ def main(argv): bePort = arg elif opt in ("-u", "--user"): adminUser = arg + elif opt in ("-s", "--scheme"): + scheme = arg elif opt in ("-v", "--updateversion"): if (arg.lower() == "false" or arg.lower() == "no"): updateversion = 'false' - print 'be host =',beHost,', be port =', bePort,', user =', adminUser + print 'scheme =',scheme,', be host =',beHost,', be port =', bePort,', user =', adminUser if ( beHost == None ): usage() sys.exit(3) - results = upgradeHeatTypes1707(beHost, bePort, adminUser, "../../../import/tosca/heat-types/", updateversion) + results = upgradeHeatTypes1707(scheme, beHost, bePort, adminUser, "../../../import/tosca/heat-types/", updateversion) print "-----------------------------" for result in results: |