1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 10 insertions, 7 deletions

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
index 547b2fc70a..92e63ae84b 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfComponentsRecipe.java
@@ -20,13 +20,16 @@
 
 package org.openecomp.mso.db.catalog.beans;
 
+import java.io.Serializable;
 
-public class VnfComponentsRecipe extends Recipe {
+public class VnfComponentsRecipe extends Recipe implements Serializable {
+	
+	private static final long serialVersionUID = 768026109321305392L;
 
 	private String vnfType;
 	private String vnfComponentParamXSD;
 	private String vnfComponentType;
-	private String vfModuleId; 
+	private String vfModuleModelUUId; 
 
 	public VnfComponentsRecipe() {}
 
@@ -51,12 +54,12 @@ public class VnfComponentsRecipe extends Recipe {
 		this.vnfComponentType = vnfComponentType;
 	}
 	
-    public String getVfModuleId() {
-		return vfModuleId;
+    public String getVfModuleModelUUId() {
+		return vfModuleModelUUId;
 	}
 
-	public void setVfModuleId(String vfModuleId) {
-		this.vfModuleId = vfModuleId;
+	public void setVfModuleModelUUId(String vfModuleModelUUId) {
+		this.vfModuleModelUUId = vfModuleModelUUId;
 	}
 
 	@Override
@@ -66,7 +69,7 @@ public class VnfComponentsRecipe extends Recipe {
 		sb.append (",vnfComponentParamXSD=" + vnfComponentParamXSD);
 		sb.append (",serviceType=" + getServiceType ());
 		sb.append (",vnfComponentType=" + getVnfComponentType ());
-		sb.append (",vfModuleId=" + getVfModuleId ());
+		sb.append (",vfModuleId=" + getVfModuleModelUUId());
 		return sb.toString();
 	}
 }