diff options
| author |   Steve Smokowski <ss835w@att.com> | 2019-09-30 13:17:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-30 13:17:06 +0000 |
| commit | d4c2f4467d3981f3856f328e747ec92023ef298a (patch) | |
| tree | 36fb243a9faa8200bd0cf5ce7daa8defa83c7989 | |
| parent | c599aaba3cf6c205fd1bb2f8641b01b31695ec98 (diff) | |
| parent | 6b84dd075db4e1d224780a4b16fe4079db4d7d54 (diff) | |
Merge "revert the code change of mso7941 .logic is"
| -rw-r--r-- | bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java index 3cf5a60de7..433aa0c11a 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java @@ -389,11 +389,8 @@ public class BBInputSetup implements JavaDelegate { String instanceName, ConfigurationResourceKeys configurationResourceKeys, RequestDetails requestDetails) { Configuration configuration = null; for (Configuration configurationTemp : serviceInstance.getConfigurations()) { - if ((bbName.contains("Fabric") && configurationTemp.getConfigurationSubType() != null - && configurationTemp.getConfigurationSubType().equalsIgnoreCase("Fabric Config")) - || (lookupKeyMap.get(ResourceKey.CONFIGURATION_ID) != null && configurationTemp.getConfigurationId() - .equalsIgnoreCase(lookupKeyMap.get(ResourceKey.CONFIGURATION_ID)))) { - lookupKeyMap.put(ResourceKey.CONFIGURATION_ID, configurationTemp.getConfigurationId()); + if (lookupKeyMap.get(ResourceKey.CONFIGURATION_ID) != null && configurationTemp.getConfigurationId() + .equalsIgnoreCase(lookupKeyMap.get(ResourceKey.CONFIGURATION_ID))) { configuration = configurationTemp; org.onap.aai.domain.yang.Configuration aaiConfiguration = bbInputSetupUtils.getAAIConfiguration(configuration.getConfigurationId()); |