diff options
Diffstat (limited to 'test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/resource/ComponentRelationshipInVfTest.java')
-rw-r--r-- | test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/resource/ComponentRelationshipInVfTest.java | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/resource/ComponentRelationshipInVfTest.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/resource/ComponentRelationshipInVfTest.java index d05dd1039a..675a5883bb 100644 --- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/resource/ComponentRelationshipInVfTest.java +++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/execute/resource/ComponentRelationshipInVfTest.java @@ -39,9 +39,10 @@ import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum; import org.openecomp.sdc.be.datatypes.enums.ResourceTypeEnum; import org.openecomp.sdc.be.model.CapReqDef; import org.openecomp.sdc.be.model.CapabilityDefinition; +import org.openecomp.sdc.be.model.CapabilityRequirementRelationship; import org.openecomp.sdc.be.model.ComponentInstance; import org.openecomp.sdc.be.model.RelationshipImpl; -import org.openecomp.sdc.be.model.RequirementAndRelationshipPair; +import org.openecomp.sdc.be.model.RelationshipInfo; import org.openecomp.sdc.be.model.RequirementCapabilityRelDef; import org.openecomp.sdc.be.model.RequirementDefinition; import org.openecomp.sdc.be.model.Resource; @@ -119,7 +120,7 @@ public class ComponentRelationshipInVfTest extends ComponentBaseTest { requirementDef.setFromNode(riReq.getUniqueId()); requirementDef.setToNode(riCap.getUniqueId()); - RequirementAndRelationshipPair pair = new RequirementAndRelationshipPair(); + RelationshipInfo pair = new RelationshipInfo(); pair.setRequirementOwnerId(riReq.getUniqueId()); pair.setCapabilityOwnerId(riCap.getUniqueId()); pair.setRequirement("host"); @@ -128,8 +129,10 @@ public class ComponentRelationshipInVfTest extends ComponentBaseTest { pair.setRelationships(relationship); pair.setCapabilityUid(capbilityUid); pair.setRequirementUid(requirementUid); - List<RequirementAndRelationshipPair> relationships = new ArrayList<>(); - relationships.add(pair); + List<CapabilityRequirementRelationship> relationships = new ArrayList<>(); + CapabilityRequirementRelationship capReqRel = new CapabilityRequirementRelationship(); + relationships.add(capReqRel); + capReqRel.setRelation(pair); requirementDef.setRelationships(relationships); return requirementDef; } @@ -179,7 +182,7 @@ public class ComponentRelationshipInVfTest extends ComponentBaseTest { requirementDef.setFromNode(riReq.getUniqueId()); requirementDef.setToNode(riCap.getUniqueId()); - RequirementAndRelationshipPair pair = new RequirementAndRelationshipPair(); + RelationshipInfo pair = new RelationshipInfo(); pair.setRequirementOwnerId(riReq.getUniqueId()); pair.setCapabilityOwnerId(riCap.getUniqueId()); pair.setRequirement("host"); @@ -188,8 +191,10 @@ public class ComponentRelationshipInVfTest extends ComponentBaseTest { pair.setRelationships(relationship); pair.setCapabilityUid(capList.get(0).getUniqueId()); pair.setRequirementUid(reqList.get(0).getUniqueId()); - List<RequirementAndRelationshipPair> relationships = new ArrayList<>(); - relationships.add(pair); + List<CapabilityRequirementRelationship> relationships = new ArrayList<>(); + CapabilityRequirementRelationship capReqRel = new CapabilityRequirementRelationship(); + relationships.add(capReqRel); + capReqRel.setRelation(pair); requirementDef.setRelationships(relationships); RestResponse associateInstances = ComponentInstanceRestUtils.associateInstances(requirementDef, designerUser, @@ -979,7 +984,7 @@ public class ComponentRelationshipInVfTest extends ComponentBaseTest { RequirementCapabilityRelDef requirementDef = setRelationshipBetweenInstances(riReq, riCap, capReqDefBeforeAssociate); assertTrue(requirementDef.getRelationships().size() == 1); - String requirement = requirementDef.getRelationships().get(0).getRequirement(); + String requirement = requirementDef.getRelationships().get(0).getRelation().getRequirement(); RestResponse associateInstances = ComponentInstanceRestUtils.associateInstances(requirementDef, designerUser, resourceDetailsVF.getUniqueId(), ComponentTypeEnum.RESOURCE); assertEquals("Check response code ", 404, associateInstances.getErrorCode().intValue()); @@ -1122,7 +1127,7 @@ public class ComponentRelationshipInVfTest extends ComponentBaseTest { .getCapabilities(); Map<String, List<RequirementDefinition>> requirementsBeforeAssociate = capReqDefBeforeAssociate .getRequirements(); - String requirementName = requirementDef.getRelationships().get(0).getRequirement(); + String requirementName = requirementDef.getRelationships().get(0).getRelation().getRequirement(); RestResponse dissociateInstances = ComponentInstanceRestUtils.dissociateInstances(requirementDef, designerUser, resourceDetailsVF.getUniqueId(), ComponentTypeEnum.RESOURCE); |