diff options
| author |   Elena Kuleshov <ek1439@att.com> | 2018-05-30 14:13:48 -0400 |
|---|---|---|
| committer |   Marcus G K Williams <marcus.williams@intel.com> | 2018-05-30 13:40:51 -0700 |
| commit | 7fadb0d88ddd643182a63439510ad8a586653c4a (patch) | |
| tree | f6280ef4b6d0162a743bc92175375b6ef0209643 /bpmn/MSOCommonBPMN/src/main | |
| parent | eb9d135264ab1d7f59e0bf411f5562f778822eb6 (diff) | |
Change topics setup for LCM
- Fix general topic properties.
- Fix junit for getLcmProperties
Change-Id: I424129c18a017908280c6bdc831a6a72ba1192ca
Issue-ID: SO-602
Signed-off-by: Elena Kuleshov <ek1439@att.com>
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main')
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java | 12 |
1 files changed, 3 insertions, 9 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 72ffa9641a..aa94eb5797 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 @@ -142,15 +142,9 @@ public class ApplicationControllerClient { Properties properties = new Properties(); Map<String, String> globalProperties = PropertyConfiguration.getInstance() .getProperties("mso.bpmn.urn.properties"); - if (controllerType==null || controllerType.length()==0 || controllerType.equalsIgnoreCase("appc")) { - properties.put("topic.read", globalProperties.get("appc.client.topic.read")); - properties.put("topic.write", globalProperties.get("appc.client.topic.write")); - } else { - properties.put("topic.read", globalProperties.get("appc.client.topic." + controllerType + ".read")); - properties.put("topic.write", globalProperties.get("appc.client.topic." + controllerType + ".write")); - } - properties.put("topic.sdnc.read", globalProperties.get("appc.client.topic.sdnc.read")); - properties.put("topic.sdnc.write", globalProperties.get("appc.client.topic.sdnc.write")); + + 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("topic.read.timeout", globalProperties.get("appc.client.topic.read.timeout")); |