diff options
| author |   Bonkur, Venkat <venkat.bonkur@att.com> | 2019-09-27 13:09:26 -0400 |
|---|---|---|
| committer |   Benjamin, Max (mb388a) <mb388a@att.com> | 2019-09-27 13:09:26 -0400 |
| commit | 6b84dd075db4e1d224780a4b16fe4079db4d7d54 (patch) | |
| tree | a6c9571be9493bf36c98639b9e130fe121db78f7 /bpmn/MSOCommonBPMN/src/main/java/org | |
| parent | d6a26f001eb691c6e8b7269e9045980ca3a57e9b (diff) | |
revert the code change of mso7941 .logic is
revert the code change of mso7941 .logic is implemented in mso8129 in
WorkflowActionBBTasks based on vnfc and config relationship
Issue-ID: SO-2370
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I3132950f4a65d3c2662cfbdf6baa93dfe5db0140
Diffstat (limited to 'bpmn/MSOCommonBPMN/src/main/java/org')
| -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()); |