Merge "mso stores vnf application id from macro create"

2 files changed, 14 insertions, 2 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 b56f654762..472a51eec6 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
@@ -1431,6 +1431,9 @@ public class BBInputSetup implements JavaDelegate {
             }
             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);
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java b/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java
index a2eb35464b..ca67f566b1 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/Vnfs.java
@@ -51,7 +51,8 @@ public class Vnfs implements Serializable {
     private List<Map<String, String>> instanceParams = new ArrayList<>();
     @JsonProperty("vfModules")
     private List<VfModules> vfModules = new ArrayList<>();
-
+    @JsonProperty("applicationId")
+    protected String applicationId;
 
     public ModelInfo getModelInfo() {
         return modelInfo;
@@ -117,12 +118,20 @@ public class Vnfs implements Serializable {
         this.vfModules = vfModules;
     }
 
+    public String getApplicationId() {
+        return applicationId;
+    }
+
+    public void setApplicationId(String applicationId) {
+        this.applicationId = applicationId;
+    }
+
     @Override
     public String toString() {
         return "Vnfs [modelInfo=" + modelInfo + ", cloudConfiguration=" + cloudConfiguration + ", instanceName="
                 + instanceName + ", platform=" + platform + ", " + "lineOfBusiness=" + lineOfBusiness
                 + ", productFamilyId=" + productFamilyId + ", instanceParams=" + instanceParams + ", vfModules="
-                + vfModules + "]";
+                + vfModules + ", applicaionId=" + applicationId + " ]";
     }
 
 }