AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>

3 files changed, 44 insertions, 5 deletions

diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomization.java
index 6fdf236a27..2dcc2e8e6e 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/AllottedResourceCustomization.java
@@ -42,6 +42,8 @@ public class AllottedResourceCustomization extends MavenLikeVersioning implement
 	private Integer minInstances;
 	private Integer maxInstances;
 	private AllottedResource ar = null;
+	private String providingServiceModelUuid;
+	private String providingServiceModelName;
 
 	public AllottedResourceCustomization() {
 		super();
@@ -128,9 +130,21 @@ public class AllottedResourceCustomization extends MavenLikeVersioning implement
 	public void setMaxInstances(Integer maxInstances) {
 		this.maxInstances = maxInstances;
 	}
+	public String getProvidingServiceModelUuid() {
+		return this.providingServiceModelUuid;
+	}
+	public void setProvidingServiceModelUuid(String providingServiceModelUuid) {
+		this.providingServiceModelUuid = providingServiceModelUuid;
+	}
+	public String getProvidingServiceModelName() {
+		return this.providingServiceModelName;
+	}
+	public void setProvidingServiceModelName(String providingServiceModelName) {
+		this.providingServiceModelName = providingServiceModelName;
+	}
 
 	@Override
-	public String toString() {
+	public String toString () {
 		return "modelCustomizationUuid=" + this.modelCustomizationUuid +
 			",modelInstanceName=" + this.modelInstanceName +
 			",modelInstanceName=" + this.modelInstanceName +
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
index f518678b44..37cad254ba 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/Service.java
@@ -42,6 +42,8 @@ public class Service extends MavenLikeVersioning implements Serializable {
 	private String category;
 	private String serviceType;
 	private String serviceRole;
+	private String environmentContext;
+	private String workloadContext;
 	private Map<String,ServiceRecipe> recipes;
 	private Set<ServiceToResourceCustomization> serviceResourceCustomizations;
 	
@@ -146,14 +148,29 @@ public class Service extends MavenLikeVersioning implements Serializable {
 	public void setServiceRole(String serviceRole) {
 		this.serviceRole = serviceRole;
 	}
+	public String getEnvironmentContext() {
+		return this.environmentContext;
+	}
+	public void setEnvironmentContext(String environmentContext) {
+		this.environmentContext = environmentContext;
+	}
+
+	public String getWorkloadContext() {
+		return this.workloadContext;
+	}
+	public void setWorkloadContext(String workloadContext) {
+		this.workloadContext = workloadContext;
+	}
 
 	@Override
 	public String toString() {
 		StringBuilder sb = new StringBuilder();
 		sb.append("SERVICE: name=").append(modelName).append(",modelVersion=").append(modelVersion)
-            .append(",description=").append(description).append(",modelInvariantUUID=").append(modelInvariantUUID)
-            .append(",toscaCsarArtifactUUID=").append(toscaCsarArtifactUUID).append(",serviceType=").append(serviceType)
-            .append(",serviceRole=").append(serviceRole);
+			.append(",description=").append(description).append(",modelInvariantUUID=").append(modelInvariantUUID)
+
+			.append(",toscaCsarArtifactUUID=").append(toscaCsarArtifactUUID).append(",serviceType=").append(serviceType)
+			.append(",serviceRole=").append(serviceRole).append(",envtContext=").append(this.environmentContext)
+			.append(",workloadContext=").append(this.workloadContext);
 		for (String recipeAction : recipes.keySet()) {
 			ServiceRecipe recipe = recipes.get(recipeAction);
 			sb.append("\n").append(recipe.toString());
diff --git a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
index cb5bf64b8c..64c031397f 100644
--- a/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
+++ b/mso-catalog-db/src/main/java/org/openecomp/mso/db/catalog/beans/VnfResourceCustomization.java
@@ -44,6 +44,7 @@ public class VnfResourceCustomization extends MavenLikeVersioning implements Ser
 	private String nfType;
 	private String nfRole;
 	private String nfNamingCode;
+	private String multiStageDesign;
     private List<VfModuleCustomization> vfModuleCustomizations;
     private Set<ServiceToResourceCustomization> serviceResourceCustomizations;
 
@@ -144,6 +145,12 @@ public class VnfResourceCustomization extends MavenLikeVersioning implements Ser
 	public void setNfNamingCode(String nfNamingCode) {
 		this.nfNamingCode = nfNamingCode;
 	}
+	public String getMultiStageDesign() {
+		return this.multiStageDesign;
+	}
+	public void setMultiStageDesign(String multiStageDesign) {
+		this.multiStageDesign = multiStageDesign;
+	}
 	public List<VfModuleCustomization> getVfModuleCustomizations() {
 		return this.vfModuleCustomizations;
 	}
@@ -189,7 +196,8 @@ public class VnfResourceCustomization extends MavenLikeVersioning implements Ser
             ", nfFunction=" + this.nfFunction +
             ", nfType=" + this.nfType +
             ", nfRole=" + this.nfRole +
-            ", nfNamingCode=" + this.nfNamingCode;
+            ", nfNamingCode=" + this.nfNamingCode +
+            ", multiStageDesign=" + this.multiStageDesign;
 	}
 
 }