summaryrefslogtreecommitdiffstats
path: root/vid-automation/src/main
diff options
context:
space:
mode:
authorEinat Vinouze <einat.vinouze@intl.att.com>2020-02-16 15:08:00 +0200
committerEinat Vinouze <einat.vinouze@intl.att.com>2020-02-16 15:08:52 +0200
commit1ce256f06ca424fb3f81847da78547d1cb22e1a8 (patch)
treefa97101153b597756a8654da615374a00bb4b5bc /vid-automation/src/main
parent737ebabf3a0054c801d60af2b3ec59a08c24370f (diff)
Remove tenant and lcpCloudRegionId - adjust test createNewServiceInstance_aLaCarte_WithVnf
Issue-ID: VID-758 Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com> Change-Id: I13e86efb1ea9be942cc5d26039019558e6baf5ce
Diffstat (limited to 'vid-automation/src/main')
-rw-r--r--vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java3
1 files changed, 2 insertions, 1 deletions
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 3caf59ef6..5590c0acd 100644
--- 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;
@@ -1329,7 +1330,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);