From: Bonkur, Venkat <venkat.bonkur@att.com>
Date: Fri, 27 Sep 2019 17:09:26 +0000 (-0400)
Subject: revert the code change of mso7941 .logic is
X-Git-Tag: 1.5.3~14^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F44%2F96344%2F1;p=so.git

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
---

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());