1 files changed, 20 insertions, 5 deletions

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinition.java
index 4a42436583..7a85a763f6 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/components/ServiceMetadataDataDefinition.java
@@ -22,8 +22,6 @@ package org.openecomp.sdc.be.datatypes.components;
 
 import java.io.Serializable;
 
-import org.openecomp.sdc.be.datatypes.tosca.ToscaDataDefinition;
-
 public class ServiceMetadataDataDefinition extends ComponentMetadataDataDefinition implements Serializable {
 
 	/**
@@ -40,6 +38,8 @@ public class ServiceMetadataDataDefinition extends ComponentMetadataDataDefiniti
 
 	private String namingPolicy = EMPTY_STR;
 
+	private String environmentContext;
+
 	public ServiceMetadataDataDefinition() {
 		super();
 		serviceType = "";
@@ -92,11 +92,20 @@ public class ServiceMetadataDataDefinition extends ComponentMetadataDataDefiniti
 		this.namingPolicy = namingPolicy;
 	}
 
+	public String getEnvironmentContext() { return environmentContext;  }
+
+	public void setEnvironmentContext(String environmentContext) { this.environmentContext = environmentContext;  }
+
 	@Override
 	public String toString() {
-		return "ServiceMetadataDataDefinition [ distributionStatus=" + distributionStatus
-				+ ", serviceType=" + serviceType + ", serviceRole=" + serviceRole + ", ecompGeneratedNaming="
-				+ ecompGeneratedNaming + ", namingPolicy=" + namingPolicy + ", parent=" + super.toString() + "]";
+		return "ServiceMetadataDataDefinition{" +
+				"distributionStatus='" + distributionStatus + '\'' +
+				", serviceType='" + serviceType + '\'' +
+				", serviceRole='" + serviceRole + '\'' +
+				", ecompGeneratedNaming=" + ecompGeneratedNaming +
+				", namingPolicy='" + namingPolicy + '\'' +
+				", environmentContext='" + environmentContext + '\'' +
+				'}';
 	}
 
 	@Override
@@ -108,6 +117,7 @@ public class ServiceMetadataDataDefinition extends ComponentMetadataDataDefiniti
 		result = prime * result + ((namingPolicy == null) ? 0 : namingPolicy.hashCode());
 		result = prime * result + ((serviceType == null) ? 0 : serviceType.hashCode());
 		result = prime * result + ((serviceRole == null) ? 0 : serviceRole.hashCode());
+		result = prime * result + ((environmentContext == null) ? 0 : environmentContext.hashCode());
 		return result;
 	}
 
@@ -151,6 +161,11 @@ public class ServiceMetadataDataDefinition extends ComponentMetadataDataDefiniti
 				return false;
 		} else if (!serviceRole.equals(other.serviceRole))
 			return false;
+		if (environmentContext == null){
+			if (other.environmentContext != null)
+				return false;
+		} else if (!environmentContext.equals(other.environmentContext))
+			return false;
 		return super.equals(obj);
 	}