From: Steve Smokowski <ss835w@att.com>
Date: Thu, 16 Jan 2020 17:56:57 +0000 (+0000)
Subject: Merge "update bb input setup to handle replace for"
X-Git-Tag: 1.6.1~283
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7e62ba22c5ac473bd5fad65d19f08e8444cb3ccf;p=so.git

Merge "update bb input setup to handle replace for"
---

7e62ba22c5ac473bd5fad65d19f08e8444cb3ccf
diff --cc bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java
index 472a51eec6,d506c78966..6afceac78f
--- 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
@@@ -1431,12 -1444,9 +1444,12 @@@ public class BBInputSetup implements Ja
              }
              String productFamilyId = requestDetails.getRequestInfo().getProductFamilyId();
              String applicationId = "";
 +            if (vnfs.getApplicationId() != null) {
 +                applicationId = vnfs.getApplicationId();
 +            }
              this.populateGenericVnf(vnfs.getModelInfo(), vnfs.getInstanceName(), vnfs.getPlatform(),
                      vnfs.getLineOfBusiness(), service, bbName, serviceInstance, lookupKeyMap, null, vnfId, vnfType,
-                     vnfs.getInstanceParams(), productFamilyId, applicationId);
+                     vnfs.getInstanceParams(), productFamilyId, applicationId, false);
  
          } else if (bbName.contains(PNF)) {
              String pnfId = lookupKeyMap.get(ResourceKey.PNF);