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>

4 files changed, 74 insertions, 11 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json
index 91048eca9b..5a7ef5e2c7 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request.json
@@ -2,11 +2,11 @@
 	"requestDetails": {
 		"modelInfo": {
 			"modelType": "volumeGroup",
-			"modelId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
-			"modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
+			"modelInvariantUuid": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
+			"modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
 			"modelName": "vSAMP12::base::module-0",
 			"modelVersion": "1",
-			"modelCustomizationId": "ee6478e5-ea33-3346-ac12-ab121484a3fe"
+			"modelCustomizationUuid": "ee6478e5-ea33-3346-ac12-ab121484a3fe"
 		},
 		"cloudConfiguration": {
 			"lcpCloudRegionId": "mdt1",
@@ -23,8 +23,8 @@
 					"instanceId": "{service-instance-id}",
 					"modelInfo": {
 						"modelType": "service",
-						"modelId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-						"modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+						"modelInvariantUuid": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+						"modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
 						"modelName": "Test",
 						"modelVersion": "2.0"
 					}
@@ -34,11 +34,11 @@
 					"instanceId": "{vnf-instance-id}",
 					"modelInfo": {
 						"modelType": "vnf",
-						"modelId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-						"modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
+						"modelInvariantUuid": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+						"modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
 						"modelName": "vSAMP12",
 						"modelVersion": "1",
-						"modelCustomizationName": "vSAMP12"
+						"modelInstanceName": "vSAMP12"
 					}
 				}
 			}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request_noreqparm.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request_noreqparm.json
index 72e41839fb..de99a6da56 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request_noreqparm.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_VID_request_noreqparm.json
@@ -3,7 +3,7 @@
 		"modelInfo": {
 			"modelType": "volumeGroup",
 			"modelId": "ff5256d2-5a33-55df-13ab-12abad84e7ff",
-			"modelNameVersionId": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
+			"modelUuid": "fe6478e5-ea33-3346-ac12-ab121484a3fe",
 			"modelName": "vSAMP12::base::module-0",
 			"modelVersion": "1"
 		},
@@ -23,7 +23,7 @@
 					"modelInfo": {
 						"modelType": "service",
 						"modelId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
-						"modelNameVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+						"modelUuid": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
 						"modelName": "{parent service model name}",
 						"modelVersion": "1"
 					}
@@ -34,7 +34,7 @@
 					"modelInfo": {
 						"modelType": "vnf",
 						"modelId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
-						"modelNameVersionId": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
+						"modelUuid": "fe6478e4-ea33-3346-ac12-ab121484a3fe",
 						"modelName": "Test/vSAMP12",
 						"modelVersion": "1"
 					}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
index cb20a41ca0..8d9efb3b39 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/createVfModuleVolume_queryVolumeName_AAIResponse_Success.xml
@@ -29,6 +29,7 @@
 		 <heat-stack-id/>

 		 <vnf-type>simple_cinder_master</vnf-type>

 		 <orchestration-status>Pending</orchestration-status>

+		 <vf-module-model-customization-id>ee6478e5-ea33-3346-ac12-ab121484a3fe</vf-module-model-customization-id>

 		 <resource-version>1460134360</resource-version>

 		 <relationship-list>

 			<relationship>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_HasVfModRelationship.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_HasVfModRelationship.xml
new file mode 100644
index 0000000000..8d9c5c0a43
--- /dev/null
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/CreateVfModuleVolumeInfraV1/queryVolumeId_AAIResponse_HasVfModRelationship.xml
@@ -0,0 +1,62 @@
+<volume-group xmlns="http://com.att.aai.inventory/v8">

+	<volume-group-id>78987</volume-group-id>

+	<volume-group-name>MSOTESTVOL102a-vSAMP12_base_vol_module-0</volume-group-name>

+	<heat-stack-id/>

+	<vnf-type>Test/vSAMP12</vnf-type>

+	<orchestration-status>Pending</orchestration-status>

+	<resource-version>0000020</resource-version>

+	<relationship-list>

+		<relationship>

+			<related-to>generic-vnf</related-to>

+			<related-link>https://aai-ext1.test.att.com:8443/aai/v8/network/generic-vnfs/generic-vnf/9e48f6ea-f786-46de-800a-d480e5ccc846/</related-link>

+			<relationship-data>

+				<relationship-key>generic-vnf.vnf-id</relationship-key>

+				<relationship-value>9e48f6ea-f786-46de-800a-d480e5ccc846</relationship-value>

+			</relationship-data>

+			<related-to-property>

+				<property-key>generic-vnf.vnf-name</property-key>

+				<property-value>MSOSTSAMP12-10601</property-value>

+			</related-to-property>

+		</relationship>

+		<relationship>

+			<related-to>tenant</related-to>

+			<related-link>https://aai-ext1.test.att.com:8443/aai/v7/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/fba1bd1e195a404cacb9ce17a9b2b421/</related-link>

+			<relationship-data>

+				<relationship-key>tenant.tenant-id</relationship-key>

+				<relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>

+			</relationship-data>

+			<relationship-data>

+				<relationship-key>cloud-region.cloud-owner</relationship-key>

+				<relationship-value>att-aic</relationship-value>

+			</relationship-data>

+			<relationship-data>

+				<relationship-key>cloud-region.cloud-region-id</relationship-key>

+				<relationship-value>mdt1</relationship-value>

+			</relationship-data>

+			<related-to-property>

+				<property-key>tenant.tenant-name</property-key>

+				<property-value>ECOMP_MDT1</property-value>

+			</related-to-property>

+		</relationship>

+		<relationship>

+			<related-to>vf-module</related-to>

+			<related-link>https://aai-ext1.test.att.com:8443/aai/v7/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/fba1bd1e195a404cacb9ce17a9b2b421/</related-link>

+			<relationship-data>

+				<relationship-key>vf-module.vf-module-id</relationship-key>

+				<relationship-value>fba1bd1e195a404cacb9ce17a9b2b421</relationship-value>

+			</relationship-data>

+			<relationship-data>

+				<relationship-key>cloud-region.cloud-owner</relationship-key>

+				<relationship-value>att-aic</relationship-value>

+			</relationship-data>

+			<relationship-data>

+				<relationship-key>cloud-region.cloud-region-id</relationship-key>

+				<relationship-value>mdt1</relationship-value>

+			</relationship-data>

+			<related-to-property>

+				<property-key>vf-module.vf-module-name</property-key>

+				<property-value>ECOMP_MDT1</property-value>

+			</related-to-property>

+		</relationship>

+	</relationship-list>

+</volume-group>
\ No newline at end of file