From 2340ce33ccc486f0c6e0b23dc7fb332616345f68 Mon Sep 17 00:00:00 2001 From: Arthur Martella Date: Thu, 31 May 2018 00:00:27 -0400 Subject: 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 --- .../org/openecomp/mso/client/appc/ApplicationControllerClient.java | 4 ++-- .../openecomp/mso/client/appc/ApplicationControllerClientTest.java | 4 ++-- .../src/main/resources/process/CreateVfModuleInfra.bpmn | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) 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 aa94eb5797..414f3e21ca 100644 --- 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 2800a282ee..6c2b23b926 100644 --- 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(); assertEquals(properties.get("topic.read"), "APPC-TEST-AMDOCS2"); assertEquals(properties.get("topic.write"), "APPC-TEST-AMDOCS1-DEV3"); - assertEquals(properties.get("sdnc-topic.read"), "SDNC-LCM-READ"); - assertEquals(properties.get("sdnc-topic.write"), "SDNC-LCM-WRITE"); + assertEquals(properties.get("SDNC-topic.read"), "SDNC-LCM-READ"); + assertEquals(properties.get("SDNC-topic.write"), "SDNC-LCM-WRITE"); assertEquals(properties.get("topic.read.timeout"), "120000"); assertEquals(properties.get("client.response.timeout"), "120000"); assertEquals(properties.get("poolMembers"), diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateVfModuleInfra.bpmn index b04220957e..b71a4ad4f5 100644 --- 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)]]> + -- cgit 1.2.3-korg