Final commit to master merge from

Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

6 files changed, 283 insertions, 58 deletions

diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
index c72c2c394f..8b16a72ab3 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py
@@ -42,6 +42,8 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion):
 				  "Generic_Service",
 				  "contrailNetworkRules",
 				  "contrailPort",
+				  "portMirroring",
+				  "serviceProxy",
 				  "contrailV2NetworkRules",
 				  "contrailV2VirtualNetwork",
 				  "securityRules",
@@ -52,9 +54,10 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion):
 				  "contrailV2VLANSubInterface",
 				  "multiFlavorVFC",
 				  "vnfConfiguration",
-				  "underlayVpn",
-				  "overlayTunnel",
-				  "genericNeutronNet"
+				  "extCp2",
+				  "extNeutronCP",
+                  "extContrailCP",
+				  "portMirroringByPolicy"
 				  ]
 		
 	responseCodes = [200, 201]
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll.py b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll.py
index 3d7d9a9bbf..b6e390992e 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importNormativeAll.py
@@ -122,11 +122,7 @@ def main(argv):
 	fileLocation = baseFileLocation + "heat-types/"
 	resultsHeat = importHeatTypes(beHost, bePort, adminUser, fileLocation, updateversion)
 	handleResults(resultsHeat, updateversion)
-	
-	fileLocation = baseFileLocation + "onap-types/"
-	resultsHeat = importOnapTypes(beHost, bePort, adminUser, fileLocation, updateversion)
-	handleResults(resultsHeat, updateversion)
-  
+
 	fileLocation = baseFileLocation + "group-types/"
 	importGroupTypes(beHost, bePort, adminUser, False, fileLocation)
 	
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py b/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py
new file mode 100644
index 0000000000..3d7d9a9bbf
--- /dev/null
+++ b/catalog-be/src/main/resources/scripts/import/tosca/importONAPNormativeAll.py
@@ -0,0 +1,140 @@
+import pycurl
+import sys, getopt, os
+from StringIO import StringIO
+import json
+import copy
+import time
+#from importNormativeElements import createNormativeElement
+from importNormativeElements import * 
+from importNormativeTypes import importNormativeTypes
+from importHeatTypes import importHeatTypes
+from importOnapTypes import importOnapTypes
+from importNormativeCapabilities import importNormativeCapabilities
+from importCategoryTypes import importCategories
+from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType
+from importDataTypes import importDataTypes
+from importGroupTypes import importGroupTypes
+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											 				           																						#
+#																																		       													#	
+#################################################################################################################################################################################################
+
+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>]'
+
+def handleResults(results, updateversion):
+	printFrameLine()
+	for result in results:
+		printNameAndReturnCode(result[0], result[1])
+	printFrameLine()
+	
+	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):
+		errorAndExit(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 
+
+	try:
+		opts, args = getopt.getopt(argv,"i:p:u:d:v:h",["ip=","port=","user=","debug=","updateversion="])
+	except getopt.GetoptError:
+		usage()
+		errorAndExit(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 ("-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 '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 + "data-types/"
+	importDataTypes(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)
+
+	fileLocation = baseFileLocation + "interface-lifecycle-types/"
+	importNormativeInterfaceLifecycleType(beHost, bePort, adminUser, False, fileLocation)	
+
+	fileLocation = baseFileLocation + "categories/"
+	importCategories(beHost, bePort, adminUser, False, fileLocation)
+	
+	fileLocation = baseFileLocation + "normative-types/"
+	results = importNormativeTypes(beHost, bePort, adminUser, fileLocation, updateversion)
+	handleResults(results, updateversion)
+
+	fileLocation = baseFileLocation + "heat-types/"
+	resultsHeat = importHeatTypes(beHost, bePort, adminUser, fileLocation, updateversion)
+	handleResults(resultsHeat, updateversion)
+	
+	fileLocation = baseFileLocation + "onap-types/"
+	resultsHeat = importOnapTypes(beHost, bePort, adminUser, fileLocation, updateversion)
+	handleResults(resultsHeat, updateversion)
+  
+	fileLocation = baseFileLocation + "group-types/"
+	importGroupTypes(beHost, bePort, adminUser, False, fileLocation)
+	
+	fileLocation = baseFileLocation + "policy-types/"
+	importPolicyTypes(beHost, bePort, adminUser, False, fileLocation)
+
+	errorAndExit(0, None)	
+
+if __name__ == "__main__":
+        main(sys.argv[1:])
+
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json
index c518855860..d239a15c72 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json
+++ b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json
@@ -1,54 +1,20 @@
 {
   "heat": [
-    "globalNetwork",
-    "globalPort",
-    "globalCompute",
-    "volume",
-    "cinderVolume",
-    "contrailVirtualNetwork",
-    "neutronNet",
-    "neutronPort",
-    "novaServer",
-    "extVl",
-    "internalVl",
-    "extCp",
-    "vl",
-    "eline",
-    "abstractSubstitute",
-    "Generic_VFC", 
-    "Generic_VF",
-    "Generic_PNF",
-    "Generic_Service",
-    "contrailNetworkRules",
     "contrailPort",
-    "contrailV2NetworkRules",
-    "contrailV2VirtualNetwork",
-    "securityRules",
-    "contrailAbstractSubstitute",
-    "contrailCompute",
+    "extCp",
     "contrailV2VirtualMachineInterface",
-    "subInterface",
-    "contrailV2VLANSubInterface",
-    "multiFlavorVFC",
-    "vnfConfiguration",
-    "underlayVpn",
-    "overlayTunnel",
-    "genericNeutronNet"
+    "neutronPort",
+    "Generic_PNF",
+    "portMirroring",
+    "Generic_VF",
+	"serviceProxy",
+    "extCp2",
+    "extContrailCP",
+	"vnfConfiguration",
+	"extVl",
+	"multiFlavorVFC",
+	"portMirroringByPolicy"
   ],
   "normative": [
-    "root", 
-    "compute",
-    "softwareComponent",
-    "webServer",
-    "webApplication",
-    "DBMS",
-    "database",
-    "objectStorage",
-    "blockStorage",
-    "containerRuntime",
-    "containerApplication",
-    "loadBalancer",
-    "port",
-    "network"
   ]
 }
\ No newline at end of file
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
index 4d0ec291f5..69a51f41f1 100644
--- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
+++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeNormative.py
@@ -114,10 +114,6 @@ def main(argv):
 	resultsHeat = upgradeTypesPerConfigFile(beHost, bePort, adminUser, baseFileLocation, updateversion)
 	handleResults(resultsHeat, 'false')
 	
-	fileLocation = baseFileLocation + "onap-types/"
-	resultsHeat = importOnapTypes(beHost, bePort, adminUser, fileLocation, updateversion)
-	handleResults(resultsHeat, updateversion)
-	
 	errorAndExit(0, None)
 
 if __name__ == "__main__":
diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py
new file mode 100644
index 0000000000..4d0ec291f5
--- /dev/null
+++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeONAPNormative.py
@@ -0,0 +1,124 @@
+import pycurl
+import sys, getopt, os
+from StringIO import StringIO
+import json
+import copy
+import time
+from importCategoryTypes import importCategories
+from upgradeHeatAndNormativeTypes import upgradeTypesPerConfigFile
+from importDataTypes import importDataTypes
+from importPolicyTypes import importPolicyTypes
+from importGroupTypes import importGroupTypes
+from importNormativeCapabilities import importNormativeCapabilities
+from importNormativeInterfaceLifecycleTypes import importNormativeInterfaceLifecycleType
+from importOnapTypes import importOnapTypes
+
+
+from importCommon import *
+import importCommon
+
+#################################################################################################################################################################################################
+#																																		       													#
+# Upgrades the normative types																										   															#
+# 																																			   													#
+# activation :																																   													#
+#       python upgradeNormative.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>] 		#
+#																																																#
+#																																		  	   													#
+# shortest activation (be host = localhost, be port = 8080, user = jh0003): 																				   									#	#												       																																			#
+#		python upgradeNormative.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>]'
+
+def handleResults(results, updateversion):
+	printFrameLine()
+	for result in results:
+		printNameAndReturnCode(result[0], result[1])
+	printFrameLine()
+
+	failedResults = filter(lambda x: x[1] == None or x[1] not in [200, 201, 409], results)
+	if (len(failedResults) > 0):
+		errorAndExit(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
+
+	try:
+		opts, args = getopt.getopt(argv,"i:p:u:d:h",["ip=","port=","user=","debug="])
+	except getopt.GetoptError:
+		usage()
+		errorAndExit(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 ("-d", "--debug"):
+			print arg
+			debugf = bool(arg.lower() == "true" or arg.lower() == "yes")
+
+	print 'be host =',beHost,', be port =', bePort,', user =', adminUser, ', debug =', debugf
+
+	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 + "categories/"
+	importCategories(beHost, bePort, adminUser, False, fileLocation)
+
+	fileLocation = baseFileLocation + "data-types/"
+	importDataTypes(beHost, bePort, adminUser, False, fileLocation)
+
+	fileLocation = baseFileLocation + "policy-types/"
+	importPolicyTypes(beHost, bePort, adminUser, False, fileLocation)
+
+	fileLocation = baseFileLocation + "group-types/"
+	importGroupTypes(beHost, bePort, adminUser, False, fileLocation)
+
+	fileLocation = baseFileLocation + "capability-types/"
+	importNormativeCapabilities(beHost, bePort, adminUser, False, fileLocation)
+
+	fileLocation = baseFileLocation + "interface-lifecycle-types/"
+	importNormativeInterfaceLifecycleType(beHost, bePort, adminUser, False, fileLocation)
+
+	print 'sleep until data type cache is updated'
+	time.sleep( 70 )
+
+	resultsHeat = upgradeTypesPerConfigFile(beHost, bePort, adminUser, baseFileLocation, updateversion)
+	handleResults(resultsHeat, 'false')
+	
+	fileLocation = baseFileLocation + "onap-types/"
+	resultsHeat = importOnapTypes(beHost, bePort, adminUser, fileLocation, updateversion)
+	handleResults(resultsHeat, updateversion)
+	
+	errorAndExit(0, None)
+
+if __name__ == "__main__":
+        main(sys.argv[1:])