Remove tenant and lcpCloudRegionId - adjust test createNewServiceInstance_aLaCarte_Wi...

[vid.git] / vid-automation / src / main / java / vid / automation / test / test / NewServiceInstanceTest.java

diff --git a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java
index eb3406f..4fdf825 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java
@@ -19,6 +19,7 @@ import static vid.automation.test.infra.Features.FLAG_1908_INFRASTRUCTURE_VPN;
 import static vid.automation.test.infra.Features.FLAG_1908_MACRO_NOT_TRANSPORT_NEW_VIEW_EDIT;
 import static vid.automation.test.infra.Features.FLAG_1908_TRANSPORT_SERVICE_NEW_INSTANTIATION_UI;
 import static vid.automation.test.infra.Features.FLAG_2002_ANY_ALACARTE_BESIDES_EXCLUDED_NEW_INSTANTIATION_UI;
+import static vid.automation.test.infra.Features.FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF;
 import static vid.automation.test.infra.Features.FLAG_5G_IN_NEW_INSTANTIATION_UI;
 import static vid.automation.test.infra.Features.FLAG_ENABLE_WEBPACK_MODERN_UI;
 import static vid.automation.test.infra.ModelInfo.aLaCarteNetworkProvider5G;
@@ -668,6 +669,19 @@ public class NewServiceInstanceTest extends ModernUITestBase {
             + "                    \"instanceName\": \""+vgName+"\""
             + "                }}";
 
+        String vnfLcpCloudRegionId = "some legacy region";
+        String vnfTenantId = "092eb9e8e4b7412e8787dd091bc58e86";
+
+        String vfmoduleLcpCloudRegionId;
+        String vfmoduleTenantId;
+
+        if (FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF.isActive()) {
+            vfmoduleLcpCloudRegionId = vnfLcpCloudRegionId;
+            vfmoduleTenantId = vnfTenantId;
+        } else {
+            vfmoduleLcpCloudRegionId = "hvf6";
+            vfmoduleTenantId = "bae71557c5bb4d5aac6743a4e5f1d054";
+        }
 
         registerExpectationFromPresets(
             ImmutableList.of(
@@ -677,16 +691,16 @@ public class NewServiceInstanceTest extends ModernUITestBase {
                     requestorID, serviceModelInfo),
                 PRESET_SOME_LEGACY_REGION_TO_ATT_AIC,
                 new PresetMSOOrchestrationRequestGet(COMPLETE, serviceRequestId),
-                new PresetMSOCreateVnfALaCarteE2E(vnfRequestId, serviceInstanceId, vnfInstanceId, "ONAP", requestorID, serviceModelInfo),
+                new PresetMSOCreateVnfALaCarteE2E(vnfRequestId, serviceInstanceId, vnfInstanceId, "ONAP", requestorID, vnfLcpCloudRegionId, vnfTenantId, serviceModelInfo),
                 new PresetMSOOrchestrationRequestGet(COMPLETE, vnfRequestId),
                 PRESET_MTN6_TO_ATT_AIC,
-                new PresetMSOCreateVfModuleALaCarteE2E(vfm0RequestId, vfm0InstanceId, serviceInstanceId, vnfInstanceId, requestorID, serviceModelInfo, null, vfm0, null),
+                new PresetMSOCreateVfModuleALaCarteE2E(vfm0RequestId, vfm0InstanceId, serviceInstanceId, vnfInstanceId, requestorID, serviceModelInfo, null, vfm0, null, vfmoduleLcpCloudRegionId, vfmoduleTenantId),
                 new PresetMSOOrchestrationRequestGet(COMPLETE, vfm0RequestId),
-                new PresetMSOCreateVfModuleALaCarteE2E(vg1RequestId, vg1InstanceId, serviceInstanceId, vnfInstanceId, requestorID, serviceModelInfo, vgName, vg1, null),
+                new PresetMSOCreateVfModuleALaCarteE2E(vg1RequestId, vg1InstanceId, serviceInstanceId, vnfInstanceId, requestorID, serviceModelInfo, vgName, vg1, null, vfmoduleLcpCloudRegionId, vfmoduleTenantId),
                 new PresetMSOOrchestrationRequestGet(COMPLETE, vg1RequestId),
-                new PresetMSOCreateVfModuleALaCarteE2E(vfm1RequestId, vfm1InstanceId, serviceInstanceId, vnfInstanceId, requestorID, serviceModelInfo, null, vfm1, vgRelatedInstance),
+                new PresetMSOCreateVfModuleALaCarteE2E(vfm1RequestId, vfm1InstanceId, serviceInstanceId, vnfInstanceId, requestorID, serviceModelInfo, null, vfm1, vgRelatedInstance, vfmoduleLcpCloudRegionId, vfmoduleTenantId),
                 new PresetMSOOrchestrationRequestGet(COMPLETE, vfm1RequestId),
-                new PresetMSOCreateVfModuleALaCarteE2E(vfm12RequestId, vfm12InstanceId, serviceInstanceId, vnfInstanceId, requestorID, serviceModelInfo, null, vfm12, null),
+                new PresetMSOCreateVfModuleALaCarteE2E(vfm12RequestId, vfm12InstanceId, serviceInstanceId, vnfInstanceId, requestorID, serviceModelInfo, null, vfm12, null, vfmoduleLcpCloudRegionId, vfmoduleTenantId),
                 new PresetMSOOrchestrationRequestGet(COMPLETE, vfm12RequestId)
             ),
             APPEND
@@ -1184,12 +1198,15 @@ public class NewServiceInstanceTest extends ModernUITestBase {
 
         browseASDCPage.selectTenant("092eb9e8e4b7412e8787dd091bc58e86");
 
+
         assertSetButtonDisabled(VNF_SET_BUTTON_TEST_ID);
 
         if(isNetwork){
             browseASDCPage.selectPlatform("platform");
         }else {
             SelectOption.selectOptionsFromMultiselectById("multi-selectPlatform", ImmutableList.of("platform"));
+            SelectOption.byTestIdAndVisibleText("TYLER SILVIA", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID);
+            browseASDCPage.selectProductFamily("e433710f-9217-458d-a79d-1c7aff376d89");
         }
 
         browseASDCPage.selectLineOfBusiness("ONAP");
@@ -1326,7 +1343,7 @@ public class NewServiceInstanceTest extends ModernUITestBase {
             Assert.assertEquals(Get.byTestId("model-item-value-serviceName").getText(), serviceInstanceName, "Service name should be shown in vf module");
         }
 
-        if (serviceData.isALaCarte) {
+        if (serviceData.isALaCarte && !FLAG_2006_VFMODULE_TAKES_TENANT_AND_REGION_FROM_VNF.isActive()) {
             String lcpRegion = "hvf6";
             Wait.waitByClassAndText("lcpRegionOption", lcpRegion, 30);
             viewEditPage.selectLcpRegion(lcpRegion, AIC);