1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

3 files changed, 308 insertions, 0 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForReplaceVnfInfra.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForReplaceVnfInfra.json
new file mode 100644
index 0000000000..9126442ddb
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForReplaceVnfInfra.json
@@ -0,0 +1,93 @@
+{ "serviceResources"    : {
+	"modelInfo"       : {
+		"modelName"          : "MSO Test Network",
+		"modelUuid"          : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e",
+		"modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f",
+		"modelVersion"       : null
+	},
+	"serviceVnfs": [
+		{ "modelInfo"                    : {
+			"modelName"              : "vHNF for DHV Test",
+			"modelUuid"              : "fe6478e5-ea33-3346-ac12-ab121484a3fe",
+			"modelInvariantUuid"     : "ff5256d2-5a33-55df-13ab-12abad84e7ff",
+			"modelVersion"           : "1.0",
+			"modelCustomizationUuid" : "MODEL-ID-1234",
+			"modelInstanceName"      : "vHNF for DHV Test 17"
+			},
+		"toscaNodeType"            : null,
+		"nfFunction"           	: null,
+		"nfType"              		: null,
+		"nfRole"              		: "vSCP",
+		"nfNamingCode"         	: null,
+			"vfModules": [
+				{
+					"modelInfo"               : { 
+						"modelName"              : "VhnfForDhvTest..base_TEST..module-0",
+						"modelUuid"              : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a",
+						"modelInvariantUuid"     : "introvert",
+						"modelVersion"           : "1",
+						"modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787"
+					},		"isBase"                 : true,
+					"vfModuleLabel"          : "base_TEST",
+					"initialCount"           : 1,
+					"hasVolumeGroup"           : true
+				}
+			]
+		}
+		],
+	"serviceNetworks": [
+			{
+			"modelInfo"                : {
+				"modelName"              : "CONTRAIL_BASIC",
+				"modelUuid"              : "fe5be3a6-dbe0-46d6-bcac-44dc841a7edc",
+				"modelInvariantUuid"     : "ab07fbd8-185a-45ac-be45-db3eb02e98d5",
+				"modelVersion"           : null,
+				"modelCustomizationUuid" : "0cb9b26a-9820-48a7-86e5-16c510e993d9",
+				"modelInstanceName"      : "CONTRAIL_BASIC 5"
+		},
+			"toscaNodeType"            : null,
+			"networkType"              : null,
+			"networkTechnology"        : null,
+			"networkRole"              : null,
+			"networkScope"             : null
+		}
+		],
+	"serviceAllottedResources": [
+			{
+			"modelInfo"       : {
+				"modelName"              : "IP_MUX_Demux",
+				"modelUuid"              : "64a1a718-556b-48ce-b3b7-ed3237ccc94f",
+				"modelInvariantUuid"     : "f110ef53-a0a6-4d72-ab91-fd88a835e8c4",
+				"modelVersion"           : "2.0",
+				"modelCustomizationUuid" : "4bab0880-2f06-4aeb-87cb-3734c8e8bf93",
+				"modelInstanceName"      : "Pri_IP_MUX_Demux 1"
+			},
+			"toscaNodeType"              : null,
+			"allottedResourceType"              : "ContrailRoute",
+			"allottedResourceRole"              : null,
+			"providingServiceModelInvariantUuid"              : null,
+			"nfFunction"              : null,
+			"nfType"              : null,
+			"nfRole"              : null,
+			"nfNamingCode"              : null
+		},
+				{
+			"modelInfo"       : {
+				"modelName"              : "Service_Admin",
+				"modelUuid"              : "73501e03-ee76-4509-a8ce-96d2a9f33ee9",
+				"modelInvariantUuid"     : "462edf71-1a3c-487b-bf55-497460ab7de3",
+				"modelVersion"           : "2.0",
+				"modelCustomizationUuid" : "a896ffad-c8f9-404e-a527-7a8d0cc99ce6",
+				"modelInstanceName"      : "Pri_Service_Admin 5"
+			},
+			"toscaNodeType"              : null,
+			"allottedResourceType"              : "SecurityZone",
+			"allottedResourceRole"              : null,
+			"providingServiceModelInvariantUuid"              : null,
+			"nfFunction"              : null,
+			"nfType"              : null,
+			"nfRole"              : null,
+			"nfNamingCode"              : null
+		}
+		]
+	}}
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForUpdateVnfInfra.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForUpdateVnfInfra.json
new file mode 100644
index 0000000000..eac0957fd3
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/getCatalogServiceResourcesDataForUpdateVnfInfra.json
@@ -0,0 +1,105 @@
+{ "serviceResources"    : {

+	"modelInfo"       : {

+		"modelName"          : "MSO Test Network",

+		"modelUuid"          : "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e",

+		"modelInvariantUuid" : "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f",

+		"modelVersion"       : null

+	},

+	"serviceVnfs": [

+		{ "modelInfo"                    : {

+			"modelName"              : "vHNF for DHV Test",

+			"modelUuid"              : "7097d8bb-f6ad-4cf7-866e-6a04c8f1b332",

+			"modelInvariantUuid"     : "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+			"modelVersion"           : "2.0",

+			"modelCustomizationUuid" : "da86dd87-43c5-458c-b226-5315b7be9ad5",

+			"modelInstanceName"      : "vHNF for DHV Test 17"

+			},

+		"toscaNodeType"            : null,

+		"nfFunction"           	: null,

+		"nfType"              		: null,

+		"nfRole"              		: "vSCP",

+		"nfNamingCode"         	: null,

+			"vfModules": [

+				{

+					"modelInfo"               : { 

+						"modelName"              : "VhnfForDhvTest..base_TEST..module-0",

+						"modelUuid"              : "ebc3d18c-3e62-4c24-bcd6-961e98701a0a",

+						"modelInvariantUuid"     : "introvert",

+						"modelVersion"           : "1",

+						"modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a787"

+					},		"isBase"                 : true,

+					"vfModuleLabel"          : "base_TEST",

+					"initialCount"           : 1,

+					"hasVolumeGroup"           : true

+				},

+				{

+					"modelInfo"               : { 

+						"modelName"              : "VhnfForDhvTest..base_TEST..module-1",

+						"modelUuid"              : "ebc3d18c-3e62-4c24-bcd6-961e98701a0b",

+						"modelInvariantUuid"     : "extrovert",

+						"modelVersion"           : "1",

+						"modelCustomizationUuid" : "1740536a-742e-40f5-b9c8-83918849a788"

+					},		"isBase"                 : false,

+					"vfModuleLabel"          : "addon_TEST",

+					"initialCount"           : 1,

+					"hasVolumeGroup"           : true

+				}

+			]

+		}

+		],

+	"serviceNetworks": [

+			{

+			"modelInfo"                : {

+				"modelName"              : "CONTRAIL_BASIC",

+				"modelUuid"              : "fe5be3a6-dbe0-46d6-bcac-44dc841a7edc",

+				"modelInvariantUuid"     : "ab07fbd8-185a-45ac-be45-db3eb02e98d5",

+				"modelVersion"           : null,

+				"modelCustomizationUuid" : "0cb9b26a-9820-48a7-86e5-16c510e993d9",

+				"modelInstanceName"      : "CONTRAIL_BASIC 5"

+		},

+			"toscaNodeType"            : null,

+			"networkType"              : null,

+			"networkTechnology"        : null,

+			"networkRole"              : null,

+			"networkScope"             : null

+		}

+		],

+	"serviceAllottedResources": [

+			{

+			"modelInfo"       : {

+				"modelName"              : "IP_MUX_Demux",

+				"modelUuid"              : "64a1a718-556b-48ce-b3b7-ed3237ccc94f",

+				"modelInvariantUuid"     : "f110ef53-a0a6-4d72-ab91-fd88a835e8c4",

+				"modelVersion"           : "2.0",

+				"modelCustomizationUuid" : "4bab0880-2f06-4aeb-87cb-3734c8e8bf93",

+				"modelInstanceName"      : "Pri_IP_MUX_Demux 1"

+			},

+			"toscaNodeType"              : null,

+			"allottedResourceType"              : "ContrailRoute",

+			"allottedResourceRole"              : null,

+			"providingServiceModelInvariantUuid"              : null,

+			"nfFunction"              : null,

+			"nfType"              : null,

+			"nfRole"              : null,

+			"nfNamingCode"              : null

+		},

+				{

+			"modelInfo"       : {

+				"modelName"              : "Service_Admin",

+				"modelUuid"              : "73501e03-ee76-4509-a8ce-96d2a9f33ee9",

+				"modelInvariantUuid"     : "462edf71-1a3c-487b-bf55-497460ab7de3",

+				"modelVersion"           : "2.0",

+				"modelCustomizationUuid" : "a896ffad-c8f9-404e-a527-7a8d0cc99ce6",

+				"modelInstanceName"      : "Pri_Service_Admin 5"

+			},

+			"toscaNodeType"              : null,

+			"allottedResourceType"              : "SecurityZone",

+			"allottedResourceRole"              : null,

+			"providingServiceModelInvariantUuid"              : null,

+			"nfFunction"              : null,

+			"nfType"              : null,

+			"nfRole"              : null,

+			"nfNamingCode"              : null

+		}

+		]

+	}}
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/serviceDecompositionATMFW.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/serviceDecompositionATMFW.json
new file mode 100644
index 0000000000..94c1152204
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VIPR/serviceDecompositionATMFW.json
@@ -0,0 +1,110 @@
+{

+"serviceResources" : {

+    "modelInfo" : {

+      "modelName" : "CMW_Service",

+      "modelUuid" : "",

+      "modelInvariantId" : "cmw-123-456-789",

+      "modelVersion" : "",

+      "modelCustomizationUuid" : "",

+      "modelInstanceName" : "",

+      "modelCustomizationName" : "",

+      "modelVersionId" : "Cmw_123",

+      "modelType" : ""

+    },

+    "serviceInstanceData" : {

+      "instanceId" : "ff5256d2-5a33-55df-13ab-12abad84e7ff"

+    },

+    "serviceNetworks" : [ {

+      "modelInfo" : {

+        "modelName" : "CONTRAIL30_BASIC",

+        "modelUuid" : "",

+        "modelInvariantId" : "not yet implemented",

+        "modelVersion" : "1.0",

+        "modelCustomizationUuid" : "z_network_123",

+        "modelInstanceName" : "",

+        "modelCustomizationName" : "",

+        "modelVersionId" : "mod-inst-uuid-123",

+        "modelType" : "network"

+      },

+      "instanceData" : { },

+      "networkType" : "CONTRAIL30_BASIC"

+    } ],

+    "serviceVnfs" : [ {

+      "modelInfo" : {

+        "modelName" : "vSAMP12",

+        "modelUuid" : "",

+        "modelInvariantId" : "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+        "modelVersion" : "1.0",

+        "modelCustomizationUuid" : "ff5256d2-5a33-55df-13ab-12abad84e7ff",

+        "modelInstanceName" : "",

+        "modelCustomizationName" : "",

+        "modelVersionId" : "fe6478e5-ea33-3346-ac12-ab121484a3fe",

+        "modelType" : "vnf"

+      },

+      "instanceData" : { },

+      "vfModules" : [ {

+        "modelInfo" : {

+          "modelName" : "vSAMP12::base::module-0",

+          "modelUuid" : "",

+          "modelInvariantId" : "miu-1001",

+          "modelVersion" : "1",

+          "modelCustomizationUuid" : "1001",

+          "modelInstanceName" : "",

+          "modelCustomizationName" : "",

+          "modelVersionId" : "",

+          "modelType" : "vfModule"

+        },

+        "instanceData" : { },

+        "hasVolumeGroup" : false,

+        "isBase" : true,

+        "initialCount" : 1

+      }, {

+        "modelInfo" : {

+          "modelName" : "base::module-0",

+          "modelUuid" : "",

+          "modelInvariantId" : "miu-1002",

+          "modelVersion" : "1",

+          "modelCustomizationUuid" : "1002",

+          "modelInstanceName" : "",

+          "modelCustomizationName" : "",

+          "modelVersionId" : "",

+          "modelType" : "vfModule"

+        },

+        "instanceData" : { },

+        "hasVolumeGroup" : false,

+        "isBase" : true,

+        "initialCount" : 1

+      }, {

+        "modelInfo" : {

+          "modelName" : "vSAMP12DEV::base::module-0",

+          "modelUuid" : "",

+          "modelInvariantId" : "miu-1003",

+          "modelVersion" : "1",

+          "modelCustomizationUuid" : "f86e8800-7629-427f-b284-3dbfd04db01f",

+          "modelInstanceName" : "",

+          "modelCustomizationName" : "",

+          "modelVersionId" : "",

+          "modelType" : "vfModule"

+        },

+        "instanceData" : { },

+        "hasVolumeGroup" : false,

+        "isBase" : true,

+        "initialCount" : 0

+      } ]

+    } ],

+    "serviceAllottedResources" : [ {

+      "modelInfo" : {

+        "modelName" : "Bruce Wayne",

+        "modelUuid" : "",

+        "modelInvariantId" : "not yet implemented",

+        "modelVersion" : "1.0",

+        "modelCustomizationUuid" : "ar-mod-custid-456-456",

+        "modelInstanceName" : "Clark Kent",

+        "modelCustomizationName" : "",

+        "modelVersionId" : "123-123",

+        "modelType" : "allottedResource"

+      },

+      "instanceData" : { }

+    } ]

+  }

+}
\ No newline at end of file