update field in service decomp object

removed duplicate json test file and updated existing
update ServiceDecompoition serviceNetworks field

Change-Id: Iea3dc7efe4edb8ba32e45772fd9d77d9e7fc0ef6
Issue-ID: SO-887
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

2 files changed, 109 insertions, 0 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/DecomposeServiceTest.groovy b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/DecomposeServiceTest.groovy
new file mode 100644
index 0000000000..5deec5b434
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/groovy/org/onap/so/bpmn/common/scripts/DecomposeServiceTest.groovy
@@ -0,0 +1,76 @@
+/*- 
+ * ============LICENSE_START======================================================= 
+ * ONAP - SO 
+ * ================================================================================ 
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. 
+ * ================================================================================ 
+ * Licensed under the Apache License, Version 2.0 (the "License"); 
+ * you may not use this file except in compliance with the License. 
+ * You may obtain a copy of the License at 
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0 
+ * 
+ * Unless required by applicable law or agreed to in writing, software 
+ * distributed under the License is distributed on an "AS IS" BASIS, 
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 
+ * See the License for the specific language governing permissions and 
+ * limitations under the License. 
+ * ============LICENSE_END========================================================= 
+ */ 
+
+package org.onap.so.bpmn.common.scripts
+
+import org.junit.Before
+import org.mockito.MockitoAnnotations
+import org.onap.so.bpmn.core.domain.ModelInfo
+import org.onap.so.bpmn.core.domain.NetworkResource
+import org.onap.so.bpmn.core.domain.ServiceDecomposition
+import org.onap.so.bpmn.core.json.DecomposeJsonUtil
+import org.onap.so.bpmn.core.domain.ServiceInstance
+
+import org.onap.so.bpmn.mock.FileUtil
+import static org.mockito.Mockito.*
+import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity
+import static org.junit.Assert.*;
+import org.junit.Test;
+import static com.shazam.shazamcrest.MatcherAssert.assertThat;
+import static com.shazam.shazamcrest.matcher.Matchers.sameBeanAs;
+
+class DecomposeServiceTest {
+	
+	@Test
+	public void testDecomposeService() {
+		
+		String catalogDbResponse = FileUtil.readResourceFile("__files/decomposition/catalogDbResponse.json");
+		
+		ServiceDecomposition serviceDecomposition = new ServiceDecomposition();
+		ServiceInstance serviceInstance = new ServiceInstance();
+		serviceInstance.setInstanceId("serviceInstanceID");
+		serviceDecomposition.setServiceType("");
+		serviceDecomposition.setServiceRole("");
+		
+		ArrayList networkResources = new ArrayList();
+		NetworkResource networkResource = new NetworkResource();
+		networkResource.setNetworkType("testNetworkType");
+		networkResource.setNetworkRole("testNetworkRole");
+		networkResource.setNetworkScope("testNetworkScope");
+		networkResource.setToscaNodeType("testToscaModelType")
+		networkResource.setNetworkTechnology("testNetworkTechnology");
+		ModelInfo modelInfo = new ModelInfo();
+		modelInfo.setModelName("testModleName");
+		modelInfo.setModelUuid("testModelUuid")
+		modelInfo.setModelInvariantUuid("testModelInvariantId")
+		modelInfo.setModelVersion("testModelVersion");
+		modelInfo.setModelCustomizationUuid("testModelCustomizationUuid");
+		modelInfo.setModelInstanceName("testModelInstanceName");
+		networkResource.setModelInfo(modelInfo);
+		
+		networkResources.add(networkResource);
+		serviceDecomposition.setNetworkResources(networkResources)
+		serviceDecomposition.setServiceInstance(serviceInstance);
+		
+		ServiceDecomposition serviceDecompositionExtracted = DecomposeJsonUtil.jsonToServiceDecomposition(catalogDbResponse, "serviceInstanceID")
+		
+		assertThat(serviceDecompositionExtracted, sameBeanAs(serviceDecomposition).ignoring("modelInfo").ignoring("vnfResources").ignoring("allottedResources").ignoring("networkResources.resourceId"));
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/decomposition/catalogDbResponse.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/decomposition/catalogDbResponse.json
new file mode 100644
index 0000000000..087233d08b
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/decomposition/catalogDbResponse.json
@@ -0,0 +1,33 @@
+{
+  "serviceResources": {
+    "serviceType": "",
+    "workloadContext": "testWorkloadContext",
+    "serviceAllottedResources": [],
+    "modelInfo": {
+      "modelInvariantUuid": "testModelInvariantId",
+      "modelName": "testModleName",
+      "modelVersion": "testModelVersion",
+      "modelUuid": "testModelUuid"
+    },
+    "environmentContext": "testEnvironmentContent",
+    "serviceRole": "",
+    "serviceVnfs": [],
+    "serviceNetworks": [
+      {
+        "toscaNodeType": "testToscaModelType",
+        "networkTechnology": "testNetworkTechnology",
+        "networkScope": "testNetworkScope",
+        "modelInfo": {
+          "modelInvariantUuid": "testModelInvariantId",
+          "modelName": "testModleName",
+          "modelVersion": "testModelVersion",
+          "modelCustomizationUuid": "testModelCustomizationUuid",
+          "modelInstanceName": "testModelInstanceName",
+          "modelUuid": "testModelUuid"
+        },
+        "networkRole": "testNetworkRole",
+        "networkType": "testNetworkType"
+      }
+    ]
+  }
+}
\ No newline at end of file