Code Review / vid.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge automation from ECOMP's repository
[vid.git] / vid-automation / src / main / java / vid / automation / test / test / VlanTagSubInterfaceTest.java
diff --git a/vid-automation/src/main/java/vid/automation/test/test/SubInterfaceTest.java b/vid-automation/src/main/java/vid/automation/test/test/VlanTagSubInterfaceTest.java
similarity index 83%
rename from vid-automation/src/main/java/vid/automation/test/test/SubInterfaceTest.java
rename to vid-automation/src/main/java/vid/automation/test/test/VlanTagSubInterfaceTest.java
index 59baaf7..3f8db2a 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/test/SubInterfaceTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/VlanTagSubInterfaceTest.java
@@ -1,12 +1,27 @@
 package vid.automation.test.test;
 
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.is;
+import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AAIAIC25_TO_ATT_AIC;
+import static org.testng.AssertJUnit.assertEquals;
+import static vid.automation.test.infra.Features.FLAG_COLLECTION_RESOURCE_SUPPORT;
+import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
+import static vid.automation.test.test.ALaCarteflowTest.AIC;
+
 import com.google.common.collect.ImmutableList;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.onap.sdc.ci.tests.utilities.GeneralUIUtils;
 import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest;
 import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetRelatedInstanceGroupsByVnfId;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet;
+import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet;
 import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetTenants;
-import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVNFInstancePost;
+import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfVlanTagging;
 import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet;
-import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.ui.Select;
 import org.testng.Assert;
@@ -19,49 +34,36 @@ import vid.automation.test.infra.FeatureTogglingTest;
 import vid.automation.test.infra.Get;
 import vid.automation.test.infra.SelectOption;
 import vid.automation.test.sections.SearchExistingPage;
-import vid.automation.test.sections.ViewEditPage;
+import vid.automation.test.sections.VidBasePage;
 import vid.automation.test.services.BulkRegistration;
 import vid.automation.test.services.SimulatorApi;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.is;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-import static vid.automation.test.infra.Features.FLAG_COLLECTION_RESOURCE_SUPPORT;
-import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
-
 @FeatureTogglingTest(FLAG_COLLECTION_RESOURCE_SUPPORT)
-public class SubInterfaceTest extends CreateInstanceDialogBaseTest {
+public class VlanTagSubInterfaceTest extends CreateInstanceDialogBaseTest {
 
-    private final ViewEditPage viewEditPage = new ViewEditPage();
     private final String ecompNamingFalseInstanceId = "dc3a893e-0104-4ef6-abfe-6c2932294a3e";
     private final String ecompNamingTrueInstanceId = "dc3a893e-0104-4ef6-abfe-6c2932294a3f";
 
     @BeforeClass
     protected void registerToSimulator() {
         SimulatorApi.clearAll();
-        BulkRegistration.createNewServiceInstance("USP VOICE");
+        BulkRegistration.createNewServiceInstance("SILVIA ROBBINS");
 
         BulkRegistration.searchExistingVFServiceWithVFCInstanceGroupInstance("Created");
         SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.APPEND
                 , "add_subinterface/get_sdc_catalog_services_vid-test-333.json"
-                , "add_subinterface/aai_get_services.json"
-                , "add_subinterface/aai_get_subscribers.json"
                 , "add_subinterface/aai_get_aic_zones.json"
         );
 
-        final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion1 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("e433710f-9217-458d-a79d-1c7aff376d89", "mtn6", "untraaa");
-        final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion2 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("e433710f-9217-458d-a79d-1c7aff376d89", "AAIAIC25", "untraaa");
+        final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion1 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("irma-aic", "hvf6", "untraaa");
+        final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion2 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("irma-aic", "JANET25", "untraaa");
 
         SimulatorApi.registerExpectationFromPresets(ImmutableList.of(
-                    new PresetMSOCreateVNFInstancePost(ecompNamingTrueInstanceId, "6bce7302-70bd-4057-b48e-8d5b99e686ca"),
-                    new PresetMSOCreateVNFInstancePost(ecompNamingFalseInstanceId, "6bce7302-70bd-4057-b48e-8d5b99e686cb"),
+                    new PresetAAIGetServicesGet(),
+                    new PresetAAIGetSubscribersGet(),
+                    new PresetMSOCreateVnfVlanTagging(ecompNamingTrueInstanceId, "6bce7302-70bd-4057-b48e-8d5b99e686ca", true),
+                    new PresetMSOCreateVnfVlanTagging(ecompNamingFalseInstanceId, "6bce7302-70bd-4057-b48e-8d5b99e686cb", false),
+                    PRESET_AAIAIC25_TO_ATT_AIC,
                     new PresetAAIGetTenants(),
                     presetAAIGetInstanceGroupsByCloudRegion1,
                     presetAAIGetInstanceGroupsByCloudRegion2,
@@ -77,17 +79,20 @@ public class SubInterfaceTest extends CreateInstanceDialogBaseTest {
 
     @DataProvider
     private Object[][] getServices() {
-        return new Object[][]{{ecompNamingTrueInstanceId, true}, {ecompNamingFalseInstanceId, false}};
+        return new Object[][]{
+                {ecompNamingTrueInstanceId},
+                {ecompNamingFalseInstanceId}
+        };
     }
 
     @Test(dataProvider = "getServices")
-    public void createSubInterface_validPopupDataAndUIEcompNamingTrue(String serviceUuid, boolean ecompNamingEnabled) {
+    public void createSubInterface_validPopupDataAndUI(String serviceUuid) {
         SearchExistingPage searchExistingPage = new SearchExistingPage();
 
-        searchExistingPage.goOutFromIframe();
+        VidBasePage.goOutFromIframe();
         goToExistingInstanceById(serviceUuid);
 
-        String vnfName = "vDBE 0";
+        String vnfName = "vDOROTHEA 0";
         Assert.assertNotNull(Get.byClassAndText("instanceGroupTreeNode","instance group name"));
         GeneralUIUtils.clickOnElementByTestId(Constants.ViewEdit.ADD_VNF_BUTTON_TEST_ID, 60);
         GeneralUIUtils.clickOnElementByTestId(Constants.ViewEdit.VNF_OPTION_TEST_ID_PREFIX + vnfName, 60);
@@ -97,17 +102,13 @@ public class SubInterfaceTest extends CreateInstanceDialogBaseTest {
         searchExistingPage.goToIframe();
 
         WebElement instanceNameInput = GeneralUIUtils.getInputElement(Constants.INSTANCE_NAME_SELECT_TESTS_ID);
-        if (ecompNamingEnabled) {
-            assertNull(instanceNameInput);
-        } else {
-            instanceNameInput.sendKeys("New Name");
-        }
-        SelectOption.byTestIdAndVisibleText("VIRTUAL USP", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID);
-        SelectOption.byTestIdAndVisibleText("AAIAIC25", Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID);
+        instanceNameInput.sendKeys("NewName");
+        SelectOption.byTestIdAndVisibleText("TYLER SILVIA", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID);
+        viewEditPage.selectLcpRegion("JANET25", AIC);
         SelectOption.byTestIdAndVisibleText("USP-SIP-IC-24335-T-01", Constants.ViewEdit.TENANT_SELECT_TESTS_ID);
         SelectOption.byTestIdAndVisibleText("UUUAIAAI-YYY1", Constants.ViewEdit.AIC_ZONE_TEST_ID);
-        SelectOption.byTestIdAndVisibleText("plat1", Constants.OwningEntity.PLATFORM_SELECT_TEST_ID);
-        SelectOption.byTestIdAndVisibleText("ecomp", Constants.OwningEntity.LOB_SELECT_TEST_ID);
+        SelectOption.byTestIdAndVisibleText("xxx1", Constants.OwningEntity.PLATFORM_SELECT_TEST_ID);
+        SelectOption.byTestIdAndVisibleText("ONAP", Constants.OwningEntity.LOB_SELECT_TEST_ID);
         SelectOption.byTestIdAndVisibleText("Rollback", Constants.SUPPRESS_ROLLBACK_SELECT_TESTS_ID);
 
 
@@ -177,7 +178,7 @@ public class SubInterfaceTest extends CreateInstanceDialogBaseTest {
         }
 
         Click.byTestId(Constants.ConfigurationCreation.NEXT_BUTTON_TEST_ID);
-        searchExistingPage.goOutFromIframe();
+        VidBasePage.goOutFromIframe();
         assertSuccessfulServiceInstanceCreation();
         viewEditPage.clickCommitCloseButton();
     }
ARCHIVED- 2022-02-15 at the request of the project