11/7: merge casablanca to master

Commit: dbb53cabbff772880134699eb81dee775d7df8df
Subject: Send correct resourceModuleName
Issue: SO-1178

Commit: d3759e15184562647ea83b92cf02140fc705cb0d by ss835w
Subject: Update Regex Logic to take into account new scale out URI...
Issue: SO-117

Commit: 5dadc2c5790c961a74085d3d10b6f5aec6b7ba30
Subject: Fix msb url in homing cloudsite
Issue: SO-1180

Commit: 9a9b0fa23afe8d46171fe95f1090de5a7f701d3d
Subject: Updated Reference data for AutoScaleOut
Issue: SO-1174

Commit: 3178cad6c756140b18eb658277598e3e2d2d3dcf
Subject: ConfigurationParameter is empty for scaleout
Issue: SO-1083

Commit: 402bf528e9a796f6ce31ad36c16316c2b31acc48
Subject: Added Null check for gtConfigurationParameter
Issue: SO-1179

Commit: fb6ab40a64e74876ba1f08c4d3bdb6a040c21b94
Subject: Bug fixes November 5th
Issue: SO-1188

Commit: ce37ae979311ed4e55150426d477db262773beb0
Subject: Removed slashes and added catch block
Issue: SO-1183

Commit: 16aa0b6cc42c7287fc080c81451e301c0acc14cf
Subject: removed retry from rainy day table
Issue: SO-1185

Commit: 2073a3b4c20965252c7f3a0c1aea8e4407e876fa
Subject: Fixing scaleOut workflow looping issue
Issue: SO-1182

Commit: 5ca364a5e975877244ee51796602043a4b078a23
Subject: Make homingBB optinal and fix homing process
Issue: SO-1168

Commit: 1c554c3332ccf6be4e576e9159bbb0f901197379
Subject: bug fixing with reading dmaap message
Issue: SO-1191

Change-Id: Id747bc05b791787f304316396bc5fcd20d350b6f
Issue-ID: SO-1190
Signed-off-by: Rob Daugherty <rd472p@att.com>

6 files changed, 180 insertions, 13 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasksTest.java
index bf66283b17..6c20938780 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/aai/tasks/AAIUpdateTasksTest.java
@@ -184,6 +184,7 @@ public class AAIUpdateTasksTest extends BaseTaskTest{
 	
 	@Test
 	public void updateOrchestrationStatusAssignedOrPendingActivationVfModuleNoMultiStageTest() throws Exception {
+		execution.setVariable("aLaCarte", true);
 		ModelInfoGenericVnf modelInfoGenericVnf = new ModelInfoGenericVnf();
 		modelInfoGenericVnf.setMultiStageDesign("false");
 		genericVnf.setModelInfoGenericVnf(modelInfoGenericVnf);
@@ -194,7 +195,20 @@ public class AAIUpdateTasksTest extends BaseTaskTest{
 	}
 	
 	@Test
+	public void updateOrchestrationStatusAssignedOrPendingActivationVfModuleMultiStageButNotAlacarteTest() throws Exception {
+		execution.setVariable("aLaCarte", false);
+		ModelInfoGenericVnf modelInfoGenericVnf = new ModelInfoGenericVnf();
+		modelInfoGenericVnf.setMultiStageDesign("true");
+		genericVnf.setModelInfoGenericVnf(modelInfoGenericVnf);
+		doNothing().when(aaiVfModuleResources).updateOrchestrationStatusVfModule(vfModule, genericVnf, OrchestrationStatus.ASSIGNED);
+		aaiUpdateTasks.updateOrchestrationStatusAssignedOrPendingActivationVfModule(execution);
+		verify(aaiVfModuleResources, times(1)).updateOrchestrationStatusVfModule(vfModule, genericVnf, OrchestrationStatus.ASSIGNED);
+		assertEquals("", vfModule.getHeatStackId());
+	}
+	
+	@Test
 	public void updateOrchestrationStatusAssignedOrPendingActivationVfModuleWithMultiStageTest() throws Exception {
+		execution.setVariable("aLaCarte", true);
 		ModelInfoGenericVnf modelInfoGenericVnf = new ModelInfoGenericVnf();
 		modelInfoGenericVnf.setMultiStageDesign("true");
 		genericVnf.setModelInfoGenericVnf(modelInfoGenericVnf);
@@ -206,6 +220,7 @@ public class AAIUpdateTasksTest extends BaseTaskTest{
 	
 	@Test
 	public void updateOrchestrationStatusAssignedOrPendingActivationVfModuleExceptionTest() throws Exception {
+		execution.setVariable("aLaCarte", true);
 		doThrow(RuntimeException.class).when(aaiVfModuleResources).updateOrchestrationStatusVfModule(vfModule, genericVnf, OrchestrationStatus.ASSIGNED);
 		
 		expectedException.expect(BpmnError.class);
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOutTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOutTest.java
index 00a91f0ce2..ad848a4d49 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOutTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOutTest.java
@@ -93,9 +93,9 @@ public class ConfigurationScaleOutTest extends BaseTaskTest {
 		controllerSelectionReference.setActionCategory("testAction");
 		controllerSelectionReference.setVnfType("testVnfType");
 		String sdncResponse =  new String(Files.readAllBytes(Paths.get("src/test/resources/__files/SDNCClientGetResponse.json")));
-		String expectedPayload = "{\\\"request-parameters\\\":{\\\"vnf-host-ip-address\\\":\\\"10.222.22.2\\\","
-				+ "\\\"vf-module-id\\\":\\\"testVfModuleId1\\\"},\\\"configuration-parameters\\\""
-				+ ":{\\\"vnf-id\\\":\\\"66dac89b-2a5b-4cb9-b22e-a7e4488fb3db\\\",\\\"availability-zone\\\":\\\"AZ-MN02\\\"}}";
+		String expectedPayload = "{\"request-parameters\":{\"vnf-host-ip-address\":\"10.222.22.2\","
+				+ "\"vf-module-id\":\"testVfModuleId1\"},\"configuration-parameters\""
+				+ ":{\"vnf-id\":\"66dac89b-2a5b-4cb9-b22e-a7e4488fb3db\",\"availability-zone\":\"AZ-MN02\"}}";
 		execution.setVariable("SDNCQueryResponse_" + vfModule.getVfModuleId(), sdncResponse);
 		
 		doReturn(controllerSelectionReference).when(catalogDbClient).getControllerSelectionReferenceByVnfTypeAndActionCategory(genericVnf.getVnfType(), Action.ConfigScaleOut.toString());
@@ -115,9 +115,9 @@ public class ConfigurationScaleOutTest extends BaseTaskTest {
 		Action action = Action.ConfigScaleOut;
 		String vnfId = genericVnf.getVnfId();
 		String controllerType = "testType";
-		String payload = "{\\\"request-parameters\\\":{\\\"vnf-host-ip-address\\\":\\\"10.222.22.2\\\","
-				+ "\\\"vf-module-id\\\":\\\"testVfModuleId1\\\"},\\\"configuration-parameters\\\""
-				+ ":{\\\"vnf-id\\\":\\\"66dac89b-2a5b-4cb9-b22e-a7e4488fb3db\\\",\\\"availability-zone\\\":\\\"AZ-MN02\\\"}}";
+		String payload = "{\"request-parameters\":{\"vnf-host-ip-address\":\"10.222.22.2\","
+				+ "\"vf-module-id\":\"testVfModuleId1\"},\"configuration-parameters\""
+				+ ":{\"vnf-id\":\"66dac89b-2a5b-4cb9-b22e-a7e4488fb3db\",\"availability-zone\":\"AZ-MN02\"}}";
 		HashMap<String, String> payloadInfo = new HashMap<String, String>();
 		payloadInfo.put("vnfName", "testVnfName");
 		payloadInfo.put("vfModuleId", "testVfModuleId");
@@ -135,5 +135,56 @@ public class ConfigurationScaleOutTest extends BaseTaskTest {
 		configurationScaleOut.callAppcClient(execution);
 		verify(appCClient, times(1)).runAppCCommand(action, msoRequestId, vnfId, Optional.of(payload), payloadInfo, controllerType);
 	}
+	@Test
+	public void setParamsForConfigurationScaleOutBadPathTest() throws Exception {
+		ControllerSelectionReference controllerSelectionReference = new ControllerSelectionReference();
+		controllerSelectionReference.setControllerName("testName");
+		controllerSelectionReference.setActionCategory("testAction");
+		controllerSelectionReference.setVnfType("testVnfType");
+		String sdncResponse =  new String(Files.readAllBytes(Paths.get("src/test/resources/__files/SDNCClientResponseIncorrectPath.json")));
+		String expectedPayload = "{\"request-parameters\":{\"vnf-host-ip-address\":\"10.222.22.2\","
+				+ "\"vf-module-id\":\"testVfModuleId1\"},\"configuration-parameters\""
+				+ ":{\"vnf-id\":\"66dac89b-2a5b-4cb9-b22e-a7e4488fb3db\",\"availability-zone\":null}}";
+		execution.setVariable("SDNCQueryResponse_" + vfModule.getVfModuleId(), sdncResponse);
+		
+		doReturn(controllerSelectionReference).when(catalogDbClient).getControllerSelectionReferenceByVnfTypeAndActionCategory(genericVnf.getVnfType(), Action.ConfigScaleOut.toString());
+		
+		configurationScaleOut.setParamsForConfigurationScaleOut(execution);
+		
+		assertEquals(genericVnf.getVnfId(), execution.getVariable("vnfId"));
+		assertEquals(genericVnf.getVnfName(), execution.getVariable("vnfName"));
+		assertEquals("ConfigScaleOut", execution.getVariable("action"));
+		assertEquals(requestContext.getMsoRequestId(), execution.getVariable("msoRequestId"));
+		assertEquals(controllerSelectionReference.getControllerName(), execution.getVariable("controllerType"));
+		assertEquals(vfModule.getVfModuleId(), execution.getVariable("vfModuleId"));
+		assertEquals(expectedPayload, execution.getVariable("payload"));
+	}
 
+	@Test
+	public void callAppcClientExceptionTest() throws Exception {
+		expectedException.expect(BpmnError.class);
+		Action action = Action.ConfigScaleOut;
+		String vnfId = genericVnf.getVnfId();
+		String controllerType = "testType";
+		String payload = "{\"request-parameters\":{\"vnf-host-ip-address\":\"10.222.22.2\","
+				+ "\"vf-module-id\":\"testVfModuleId1\"},\"configuration-parameters\""
+				+ ":{\"vnf-id\":\"66dac89b-2a5b-4cb9-b22e-a7e4488fb3db\",\"availability-zone\":\"AZ-MN02\"}}";
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		payloadInfo.put("vnfName", "testVnfName");
+		payloadInfo.put("vfModuleId", "testVfModuleId");
+	
+		execution.setVariable("action", Action.ConfigScaleOut.toString());
+		execution.setVariable("msoRequestId", msoRequestId);
+		execution.setVariable("controllerType", controllerType);
+		execution.setVariable("vnfId", "testVnfId1");
+		execution.setVariable("vnfName", "testVnfName");
+		execution.setVariable("vfModuleId", "testVfModuleId");
+		execution.setVariable("payload", payload);
+		
+		
+		doThrow(new BpmnError("BPMN Error")).when(exceptionUtil).buildAndThrowWorkflowException(any(BuildingBlockExecution.class), eq(1002), eq("APPC Client Failed"));	
+		doThrow(new RuntimeException("APPC Client Failed")).when(appCClient).runAppCCommand(action, msoRequestId, vnfId, Optional.of(payload), payloadInfo, controllerType);
+		configurationScaleOut.callAppcClient(execution);
+		verify(appCClient, times(1)).runAppCCommand(action, msoRequestId, vnfId, Optional.of(payload), payloadInfo, controllerType);
+	}
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericVnfHealthCheckTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericVnfHealthCheckTest.java
index af390d1d76..e17859969d 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericVnfHealthCheckTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericVnfHealthCheckTest.java
@@ -112,4 +112,34 @@ public class GenericVnfHealthCheckTest extends BaseTaskTest {
 		genericVnfHealthCheck.callAppcClient(execution);
 		verify(appCClient, times(1)).runAppCCommand(action, msoRequestId, vnfId, Optional.of(payload), payloadInfo, controllerType);
 	}
+	
+	@Test
+	public void callAppcClientExceptionTest() throws Exception {
+		expectedException.expect(BpmnError.class);
+		Action action = Action.HealthCheck;
+		String vnfId = genericVnf.getVnfId();
+		String payload = "{\"testName\":\"testValue\",}";
+		String controllerType = "testType";
+		HashMap<String, String> payloadInfo = new HashMap<String, String>();
+		payloadInfo.put("vnfName", "testVnfName");
+		payloadInfo.put("vfModuleId", "testVfModuleId");
+		payloadInfo.put("oamIpAddress", "testOamIpAddress");
+		payloadInfo.put("vnfHostIpAddress", "testOamIpAddress");
+		execution.setVariable("action", Action.HealthCheck.toString());
+		execution.setVariable("msoRequestId", msoRequestId);
+		execution.setVariable("controllerType", controllerType);
+		execution.setVariable("vnfId", "testVnfId1");
+		execution.setVariable("vnfName", "testVnfName");
+		execution.setVariable("vfModuleId", "testVfModuleId");
+		execution.setVariable("oamIpAddress", "testOamIpAddress");
+		execution.setVariable("vnfHostIpAddress", "testOamIpAddress");
+		execution.setVariable("payload", payload);
+		
+		doThrow(new BpmnError("BPMN Error")).when(exceptionUtil).buildAndThrowWorkflowException(any(BuildingBlockExecution.class), eq(1002), eq("APPC Client Failed"));	
+		doThrow(new RuntimeException("APPC Client Failed")).when(appCClient).runAppCCommand(action, msoRequestId, vnfId, Optional.of(payload), payloadInfo, controllerType);
+		
+		
+		genericVnfHealthCheck.callAppcClient(execution);
+		verify(appCClient, times(1)).runAppCCommand(action, msoRequestId, vnfId, Optional.of(payload), payloadInfo, controllerType);
+	}
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/OrchestrationStatusValidatorTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/OrchestrationStatusValidatorTest.java
index 5496eed11d..60d456e2b5 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/OrchestrationStatusValidatorTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/OrchestrationStatusValidatorTest.java
@@ -63,7 +63,7 @@ public class OrchestrationStatusValidatorTest extends BaseTaskTest {
 	public void test_validateOrchestrationStatus() throws Exception {
 		String flowToBeCalled = "AssignServiceInstanceBB";
 		setServiceInstance().setOrchestrationStatus(OrchestrationStatus.PRECREATED);
-		
+		execution.setVariable("aLaCarte", true);
 		execution.setVariable("flowToBeCalled", flowToBeCalled);
 		
 		BuildingBlockDetail buildingBlockDetail = new BuildingBlockDetail();
@@ -103,6 +103,7 @@ public class OrchestrationStatusValidatorTest extends BaseTaskTest {
 		si.setConfigurations(configurations);
 		
 		execution.setVariable("flowToBeCalled", flowToBeCalled);
+		execution.setVariable("aLaCarte", true);
 		
 		BuildingBlockDetail buildingBlockDetail = new BuildingBlockDetail();
 		buildingBlockDetail.setBuildingBlockName("UnassignFabricConfigurationBB");
@@ -200,6 +201,7 @@ public class OrchestrationStatusValidatorTest extends BaseTaskTest {
 		String flowToBeCalled = "UnassignServiceInstanceBB";
 		
 		execution.setVariable("flowToBeCalled", flowToBeCalled);
+		execution.setVariable("aLaCarte", true);
 		
 		BuildingBlockDetail buildingBlockDetail = new BuildingBlockDetail();
 		buildingBlockDetail.setBuildingBlockName("UnassignServiceInstanceBB");
@@ -221,7 +223,7 @@ public class OrchestrationStatusValidatorTest extends BaseTaskTest {
 		String flowToBeCalled = "CreateVfModuleBB";
 				
 		execution.setVariable("orchestrationStatusValidationResult", OrchestrationStatusValidationDirective.SILENT_SUCCESS);
-		
+		execution.setVariable("aLaCarte", true);
 		execution.setVariable("flowToBeCalled", flowToBeCalled);
 		
 		GenericVnf genericVnf = buildGenericVnf();
@@ -258,7 +260,7 @@ public class OrchestrationStatusValidatorTest extends BaseTaskTest {
 		String flowToBeCalled = "CreateVfModuleBB";
 		
 		execution.setVariable("orchestrationStatusValidationResult", OrchestrationStatusValidationDirective.CONTINUE);
-		
+		execution.setVariable("aLaCarte", true);
 		execution.setVariable("flowToBeCalled", flowToBeCalled);
 		
 		GenericVnf genericVnf = buildGenericVnf();
@@ -294,7 +296,7 @@ public class OrchestrationStatusValidatorTest extends BaseTaskTest {
 		String flowToBeCalled = "CreateVfModuleBB";		
 		
 		execution.setVariable("orchestrationStatusValidationResult", OrchestrationStatusValidationDirective.SILENT_SUCCESS);
-		
+		execution.setVariable("aLaCarte", true);
 		execution.setVariable("flowToBeCalled", flowToBeCalled);
 		
 		GenericVnf genericVnf = buildGenericVnf();
@@ -330,7 +332,7 @@ public class OrchestrationStatusValidatorTest extends BaseTaskTest {
 		String flowToBeCalled = "CreateVfModuleBB";
 				
 		execution.setVariable("orchestrationStatusValidationResult", OrchestrationStatusValidationDirective.SILENT_SUCCESS);
-		
+		execution.setVariable("aLaCarte", true);
 		execution.setVariable("flowToBeCalled", flowToBeCalled);
 		
 		GenericVnf genericVnf = buildGenericVnf();
@@ -366,7 +368,7 @@ public class OrchestrationStatusValidatorTest extends BaseTaskTest {
 		String flowToBeCalled = "CreateVfModuleBB";
 				
 		execution.setVariable("orchestrationStatusValidationResult", OrchestrationStatusValidationDirective.SILENT_SUCCESS);
-		
+		execution.setVariable("aLaCarte", true);
 		execution.setVariable("flowToBeCalled", flowToBeCalled);
 		
 		GenericVnf genericVnf = buildGenericVnf();
@@ -396,4 +398,40 @@ public class OrchestrationStatusValidatorTest extends BaseTaskTest {
 		
 		assertEquals(OrchestrationStatusValidationDirective.SILENT_SUCCESS, execution.getVariable("orchestrationStatusValidationResult"));
 	}
+	
+	@Test
+	public void test_validateOrchestrationStatusSecondStageOfMultiStageWrongAlacarteValueVfModule() throws Exception {
+		String flowToBeCalled = "CreateVfModuleBB";
+				
+		execution.setVariable("orchestrationStatusValidationResult", OrchestrationStatusValidationDirective.SILENT_SUCCESS);
+		execution.setVariable("aLaCarte", false);
+		execution.setVariable("flowToBeCalled", flowToBeCalled);
+		
+		GenericVnf genericVnf = buildGenericVnf();
+		ModelInfoGenericVnf modelInfoGenericVnf = genericVnf.getModelInfoGenericVnf();
+		modelInfoGenericVnf.setMultiStageDesign("true");
+		setGenericVnf().setModelInfoGenericVnf(modelInfoGenericVnf);
+		setVfModule().setOrchestrationStatus(OrchestrationStatus.PENDING_ACTIVATION);
+		
+		BuildingBlockDetail buildingBlockDetail = new BuildingBlockDetail();
+		buildingBlockDetail.setBuildingBlockName("CreateVfModuleBB");
+		buildingBlockDetail.setId(1);
+		buildingBlockDetail.setResourceType(ResourceType.VF_MODULE);
+		buildingBlockDetail.setTargetAction(OrchestrationAction.CREATE);
+		
+		doReturn(buildingBlockDetail).when(catalogDbClient).getBuildingBlockDetail(flowToBeCalled);
+		
+		OrchestrationStatusStateTransitionDirective orchestrationStatusStateTransitionDirective = new OrchestrationStatusStateTransitionDirective();
+		orchestrationStatusStateTransitionDirective.setFlowDirective(OrchestrationStatusValidationDirective.SILENT_SUCCESS);
+		orchestrationStatusStateTransitionDirective.setId(1);
+		orchestrationStatusStateTransitionDirective.setOrchestrationStatus(OrchestrationStatus.PENDING_ACTIVATION);
+		orchestrationStatusStateTransitionDirective.setResourceType(ResourceType.VF_MODULE);
+		orchestrationStatusStateTransitionDirective.setTargetAction(OrchestrationAction.ACTIVATE);
+		
+		doReturn(orchestrationStatusStateTransitionDirective).when(catalogDbClient).getOrchestrationStatusStateTransitionDirective(ResourceType.VF_MODULE, OrchestrationStatus.PENDING_ACTIVATION, OrchestrationAction.CREATE);
+		
+		orchestrationStatusValidator.validateOrchestrationStatus(execution);
+		
+		assertEquals(OrchestrationStatusValidationDirective.SILENT_SUCCESS, execution.getVariable("orchestrationStatusValidationResult"));
+	}
 }
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
index 14398710f3..76a807056c 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
@@ -821,7 +821,7 @@ public class WorkflowActionTest extends BaseTaskTest {
 		String uri5 = "'/v6/serviceInstances/123/vnfs";
 		String uri6 = "/v6/serviceInstances/123/vnfs/1234/someAction";
 		String uri7 = "/v6/serviceInstances/123/vnfs/1234/vfModules/5678/replace";
-		
+		String uri8 = "/v6/serviceInstances/123/vnfs/1234/vfModules/scaleOut";
 		Resource expected1 = new Resource(WorkflowType.SERVICE, "123", true);
 		Resource expected2 = new Resource(WorkflowType.VNF, "1234", false);
 		Resource expected3 = new Resource(WorkflowType.VNF, "1234", false);
@@ -847,6 +847,10 @@ public class WorkflowActionTest extends BaseTaskTest {
 		result = workflowAction.extractResourceIdAndTypeFromUri(uri7);
 		assertEquals(expected4.getResourceId(),result.getResourceId());
 		assertEquals(expected4.getResourceType(),result.getResourceType());
+		result = workflowAction.extractResourceIdAndTypeFromUri(uri8);
+        assertEquals(UUID.randomUUID().toString().length(),result.getResourceId().length());    
+        assertEquals("VfModule", result.getResourceType().toString());
+		
 	}
 	
 	@Test
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/SDNCClientResponseIncorrectPath.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/SDNCClientResponseIncorrectPath.json
new file mode 100644
index 0000000000..7e263b4465
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/SDNCClientResponseIncorrectPath.json
@@ -0,0 +1,29 @@
+{
+  "vnf-topology": {
+    "tenant": "0422ffb57ba042c0800a29dc85ca70f8",
+    "vnf-topology-identifier-structure": {
+      "vnf-id": "66dac89b-2a5b-4cb9-b22e-a7e4488fb3db",
+      "vnf-type": "InfraMSO_vSAMP10a_Service/InfraMSO_vSAMP10a-2 0",
+      "vnf-name": "MSO-DEV-VNF-1806HF1-InfraMSO_vSAMP10a-1XXX-GR_21"
+    },
+    "aic-clli": "AUSTTXGR",
+    "vnf-resource-assignments": {
+      "availability-zones": {
+        "availability-zone": [
+        	{
+          		"test":"AZ-MN02"
+          	}
+        ],
+        "max-count": 1
+      }
+    },
+    "aic-cloud-region": "mtn6",
+    "onap-model-information": {
+      "model-customization-uuid": "034226ae-879a-46b5-855c-d02babcb6cb6",
+      "model-uuid": "cb79c25f-b30d-4d95-afb5-97be4021f3db",
+      "model-invariant-uuid": "e93d3a7a-446d-486b-ae48-d474a9156064",
+      "model-name": "InfraMSO_vSAMP10a-2",
+      "model-version": "1.0"
+    }
+  }
+}
\ No newline at end of file