Miscellaneous fixes for SO-SDNC integration

changing capitalization of SDNC in LCM property

adding payload to createVfModule bpmn

Change-Id: Ib4d8e172a929a8138cf4e3fbf446170467b44a42
Issue-ID: INT-475
Signed-off-by: Arthur Martella <am153x@att.com>

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
index aa94eb5..414f3e2 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
@@ -145,8 +145,8 @@ public class ApplicationControllerClient {
                
                properties.put("topic.read", globalProperties.get("appc.client.topic.read"));
                properties.put("topic.write", globalProperties.get("appc.client.topic.write"));
-               properties.put("sdnc-topic.read", globalProperties.get("appc.client.topic.sdnc.read"));
-               properties.put("sdnc-topic.write", globalProperties.get("appc.client.topic.sdnc.write"));
+               properties.put("SDNC-topic.read", globalProperties.get("appc.client.topic.sdnc.read"));
+               properties.put("SDNC-topic.write", globalProperties.get("appc.client.topic.sdnc.write"));
                properties.put("topic.read.timeout", globalProperties.get("appc.client.topic.read.timeout"));
                properties.put("client.response.timeout", globalProperties.get("appc.client.response.timeout"));
                properties.put("poolMembers", globalProperties.get("appc.client.poolMembers"));

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
index 2800a28..6c2b23b 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
@@ -99,8 +99,8 @@ public class ApplicationControllerClientTest {
                Properties properties = client.getLCMProperties();\r
                assertEquals(properties.get("topic.read"), "APPC-TEST-AMDOCS2");\r
                assertEquals(properties.get("topic.write"), "APPC-TEST-AMDOCS1-DEV3");\r
-               assertEquals(properties.get("sdnc-topic.read"), "SDNC-LCM-READ");\r
-               assertEquals(properties.get("sdnc-topic.write"), "SDNC-LCM-WRITE");\r
+               assertEquals(properties.get("SDNC-topic.read"), "SDNC-LCM-READ");\r
+               assertEquals(properties.get("SDNC-topic.write"), "SDNC-LCM-WRITE");\r
                assertEquals(properties.get("topic.read.timeout"), "120000");\r
                assertEquals(properties.get("client.response.timeout"), "120000");\r
                assertEquals(properties.get("poolMembers"),\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn
index b042209..b71a4ad 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn
@@ -249,6 +249,7 @@ exceptionUtil.processJavaException(execution)]]></bpmn2:script>
         <camunda:in source="CVFMI_requestId" target="msoRequestId" />
         <camunda:in source="CVFMI_vnfName" target="vnfName" />
         <camunda:in source="CVFMO_controllerType" target="controllerType" />
+        <camunda:in source="payload" target="payload" />
         <camunda:in source="healthCheckIndex0" target="healthCheckIndex" />
         <camunda:out source="errorCode" target="errorConfigScaleOutCode" />
         <camunda:out source="errorText" target="errorText" />