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/NetworkRecipe.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
index 1cd3526946..40612ad841 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/NetworkRecipe.java
@@ -21,16 +21,19 @@
 package org.openecomp.mso.db.catalog.beans;
 
 
-public class NetworkRecipe extends Recipe {
-	private String networkType;
+import java.io.Serializable;
+
+public class NetworkRecipe extends Recipe implements Serializable {
+	private static final long serialVersionUID = 768026109321305392L;
+	private String modelName;
 	private String networkParamXSD;
 	public NetworkRecipe() {}
 
-	public String getNetworkType() {
-		return networkType;
+	public String getModelName() {
+		return modelName;
 	}
-	public void setNetworkType(String networkType) {
-		this.networkType = networkType;
+	public void setModelName(String modelName) {
+		this.modelName = modelName;
 	}
 
 	public String getNetworkParamXSD() {
@@ -44,7 +47,7 @@ public class NetworkRecipe extends Recipe {
 	public String toString () {
 		StringBuffer sb = new StringBuffer();
 		sb.append(super.toString());
-		sb.append (",networkType=" + networkType);
+		sb.append (",modelName=" + modelName);
 		sb.append (",networkParamXSD=" + networkParamXSD);
 		return sb.toString();
 	}