ComponentBaseTest.java enhancement and

new onboarding class that test onboarding only

And merge release/1710 branch into master

Change-Id: I300d897b151010aa26f8732518fa2e3b7ed4291b
Issue-Id: SDC-331
Signed-off-by: Idan Amit <ia096e@intl.att.com>

3 files changed, 19 insertions, 1 deletions

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinition.java
index 8ec5a89c44..fd04f47b29 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/CapabilityDataDefinition.java
@@ -52,6 +52,7 @@ public class CapabilityDataDefinition extends ToscaDataDefinition implements Ser
 		this.setType(a.getType());		
 		this.setDescription (  a.getDescription());
 		this.setName(  a.getName());
+		this.setParentName(  a.getParentName());
 		this.setValidSourceTypes( a.getValidSourceTypes());
 		this.setCapabilitySources( a.getCapabilitySources());
 		this.setOwnerId( a.getOwnerId());
@@ -128,6 +129,14 @@ public class CapabilityDataDefinition extends ToscaDataDefinition implements Ser
 	public void setName(String name) {
 		setToscaPresentationValue(JsonPresentationFields.NAME, name);
 	}
+	
+	public String getParentName() {
+		return (String) getToscaPresentationValue(JsonPresentationFields.PARENT_NAME);
+	}
+
+	public void setParentName(String parentName) {
+		setToscaPresentationValue(JsonPresentationFields.PARENT_NAME, parentName);
+	}
 
 	public String getType() {
 		return (String) getToscaPresentationValue(JsonPresentationFields.TYPE);
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinition.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinition.java
index b32f65f9d3..4a6f770ebc 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinition.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/elements/RequirementDataDefinition.java
@@ -47,6 +47,7 @@ public class RequirementDataDefinition extends ToscaDataDefinition implements Se
 	public RequirementDataDefinition(RequirementDataDefinition other) {
 		this.setUniqueId(other.getUniqueId());
 		this.setName(other.getName());
+		this.setParentName(other.getParentName());
 		this.setCapability(other.getCapability());
 		this.setNode(other.getNode());
 		this.setRelationship(other.getRelationship());
@@ -78,6 +79,14 @@ public class RequirementDataDefinition extends ToscaDataDefinition implements Se
 	public void setName(String name) {
 		setToscaPresentationValue(JsonPresentationFields.NAME, name);
 	}
+	
+	public String getParentName() {
+		return (String) getToscaPresentationValue(JsonPresentationFields.PARENT_NAME);
+	}
+	
+	public void setParentName(String parentName) {
+		setToscaPresentationValue(JsonPresentationFields.PARENT_NAME, parentName);
+	}
 
 	/**
 	 * specify the capability type
diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
index fd028c0349..8634ac871a 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/JsonPresentationFields.java
@@ -134,7 +134,7 @@ public enum JsonPresentationFields {
 	RELATIONSHIP					("relationship", 				null),
 	VALID_SOURCE_TYPES				("validSourceTypes", 			null),
 	REQUIREMENT_ID					("requirementId", 				null),
-	
+	PARENT_NAME						("parentName", 					null),
 	//Relation
 	CAPABILTY_OWNER_ID				("capabilityOwnerId", 			null),
 	REQUIREMENT_OWNER_ID			("requirementOwnerId", 			null),