diff options
Diffstat (limited to 'integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/component/workspace/CompositionCanvasComponent.java')
-rw-r--r-- | integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/component/workspace/CompositionCanvasComponent.java | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/component/workspace/CompositionCanvasComponent.java b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/component/workspace/CompositionCanvasComponent.java index 6ecea473c5..f339412c14 100644 --- a/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/component/workspace/CompositionCanvasComponent.java +++ b/integration-tests/src/test/java/org/onap/sdc/frontend/ci/tests/pages/component/workspace/CompositionCanvasComponent.java @@ -19,6 +19,8 @@ package org.onap.sdc.frontend.ci.tests.pages.component.workspace; +import static org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum.DESIGNER; + import com.aventstack.extentreports.Status; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -31,7 +33,6 @@ import java.util.Set; import lombok.AllArgsConstructor; import lombok.Getter; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.onap.sdc.backend.ci.tests.datatypes.enums.UserRoleEnum; import org.onap.sdc.backend.ci.tests.utils.general.AtomicOperationUtils; import org.onap.sdc.frontend.ci.tests.datatypes.CanvasNodeElement; import org.onap.sdc.frontend.ci.tests.exception.CompositionCanvasRuntimeException; @@ -151,11 +152,11 @@ public class CompositionCanvasComponent extends AbstractPageObject { final Point pointFromCanvasCenter = calculateOffsetFromCenter(freePositionInCanvas); try { final Service service = - AtomicOperationUtils.getServiceObjectByNameAndVersion(UserRoleEnum.DESIGNER, serviceName, serviceVersion); + AtomicOperationUtils.getServiceObjectByNameAndVersion(DESIGNER, serviceName, serviceVersion); final Resource resourceToAdd = - AtomicOperationUtils.getResourceObjectByNameAndVersion(UserRoleEnum.DESIGNER, resourceName, resourceVersion); + AtomicOperationUtils.getResourceObjectByNameAndVersion(DESIGNER, resourceName, resourceVersion); final ComponentInstance componentInstance = AtomicOperationUtils - .addComponentInstanceToComponentContainer(resourceToAdd, service, UserRoleEnum.DESIGNER, true, + .addComponentInstanceToComponentContainer(resourceToAdd, service, DESIGNER, true, String.valueOf(pointFromCanvasCenter.getX()), String.valueOf(pointFromCanvasCenter.getY())) .left().value(); @@ -166,6 +167,24 @@ public class CompositionCanvasComponent extends AbstractPageObject { } } + public ComponentInstance createNodeOnResourceCanvas(final String serviceName, final String serviceVersion, final String resourceName, + final String resourceVersion) { + final Point freePositionInCanvas = getFreePositionInCanvas(20); + final Point pointFromCanvasCenter = calculateOffsetFromCenter(freePositionInCanvas); + try { + final Resource service = AtomicOperationUtils.getResourceObjectByNameAndVersion(DESIGNER, serviceName, serviceVersion); + final Resource resourceToAdd = AtomicOperationUtils.getResourceObjectByNameAndVersion(DESIGNER, resourceName, resourceVersion); + final ComponentInstance componentInstance = + AtomicOperationUtils.addComponentInstanceToComponentContainer(resourceToAdd, service, DESIGNER, true, + String.valueOf(pointFromCanvasCenter.getX()), String.valueOf(pointFromCanvasCenter.getY())).left().value(); + + LOGGER.debug("Created instance {} in the Service {}", componentInstance.getName(), serviceName); + return componentInstance; + } catch (final Exception e) { + throw new CompositionCanvasRuntimeException("Could not create node through the API", e); + } + } + private Point getFreePositionInCanvas(int maxAttempts) { boolean isPositionFree; final int minSpace = 150; |