Merge "Update create flow for E2E service"

2 files changed, 14 insertions, 1 deletions

diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
index 8e16d1c22f..0673af2f14 100644
--- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
+++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
@@ -88,7 +88,7 @@ public class VfcManager {
   public RestfulResponse createNs(NSResourceInputParameter segInput) throws ApplicationException {
 
     // Step1: get service template by node type
-    String csarId = segInput.getNsOperationKey().getNodeTemplateUUID();
+    String csarId = segInput.getNsServiceModelUUID();
     // nsdId for NFVO is "id" in the response, while for SDNO is "servcice template id"
     LOGGER.info("serviceTemplateId is {}, id is {}", csarId);
 
diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/model/NSResourceInputParameter.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/model/NSResourceInputParameter.java
index 765ee52069..d46844364f 100644
--- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/model/NSResourceInputParameter.java
+++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/model/NSResourceInputParameter.java
@@ -45,6 +45,8 @@ public class NSResourceInputParameter {
     private String nsServiceName;
 
     private String nsServiceDescription;
+    
+    private String nsServiceModelUUID;
 
     private NsParameters nsParameters;
 
@@ -136,4 +138,15 @@ public class NSResourceInputParameter {
     public void setNsScaleParameters(NsScaleParameters nsScaleParameters) {
         this.nsScaleParameters = nsScaleParameters;
     }
+
+
+	public String getNsServiceModelUUID() {
+		return nsServiceModelUUID;
+	}
+
+
+	public void setNsServiceModelUUID(String nsServiceModelUUID) {
+		this.nsServiceModelUUID = nsServiceModelUUID;
+	}
+    
 }