From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Sun, 4 Mar 2018 14:53:33 +0200
Subject: Sync Integ to Master

Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74
Issue-ID: SDC-977
Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
---
 .../importNormativeNoHeatAndNormativeTypes.py      | 43 ++++++++++++----------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'catalog-be/src/main/resources/scripts/import/tosca/importNormativeNoHeatAndNormativeTypes.py')

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeNoHeatAndNormativeTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeNoHeatAndNormativeTypes.py
index 64a639c3c8..1061df862c 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeNoHeatAndNormativeTypes.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeNoHeatAndNormativeTypes.py
@@ -17,21 +17,21 @@ from importPolicyTypes import importPolicyTypes
 from importCommon import *
 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>] 	#
-#									 [-v <true|false> | --updateversion=<true|false>]																											#
-#																																		  	   													#			
-# shortest activation (be host = localhost, be port = 8080, user = jh0003): 																				   									#	#												       																																			#
-#		python importNormativeAll.py											 				           																						#
-#																																		       													#	
-#################################################################################################################################################################################################
+#####################################################################################################################################################################################################################################################
+#																																		       																										#
+# Import all users from a given file																										   																										#
+# 																																			   																										#
+# activation :																																   																										#
+#       python importNormativeNoHeatAndNormativeTypes.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): 																				   																						#
+#		python importNormativeNoHeatAndNormativeTypes.py											 				           																														#
+#																																		       																										#
+#####################################################################################################################################################################################################################################################
 
 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()
@@ -57,9 +57,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')
@@ -75,6 +76,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")
@@ -83,7 +86,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)
@@ -100,16 +103,16 @@ 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)
@@ -123,10 +126,10 @@ def main(argv):
 	#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)	
 
-- 
cgit 1.2.3-korg