From a6f08e35c331cd50073b9875886b79c7645bae38 Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Thu, 28 Nov 2019 16:46:01 +0200 Subject: remove FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD Issue-ID: VID-721 Change-Id: Ia06b7afe0cc2aa6f906f56802dc537f6fec283d0 Signed-off-by: Eylon Malin --- .../java/vid/automation/test/infra/Features.java | 1 - .../automation/test/test/NewServiceInstanceTest.java | 20 ++++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) (limited to 'vid-automation/src/main/java') diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index 8f07586d5..cdf30e28d 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -12,7 +12,6 @@ public enum Features implements Feature { FLAG_UNASSIGN_SERVICE, FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS, FLAG_SHOW_VERIFY_SERVICE, - FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD, FLAG_RESTRICTED_SELECT, FLAG_5G_IN_NEW_INSTANTIATION_UI, FLAG_ASYNC_ALACARTE_VNF, 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 048c09334..2a7c59f01 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 @@ -534,11 +534,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { //@Step("edit vf module and just set name") private void editVfModuleAndJustSetName(String vfModuleName, String vfModuleUUID) { - if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) { - hoverAndClickEditButton(vfModuleUUID + "-" + vfModuleName); - } else { - drawingBoardPage.clickAddButtonByNodeName(vfModuleName); - } + hoverAndClickEditButton(vfModuleUUID + "-" + vfModuleName); Input.text("VF instance name ZERO", "instanceName"); Click.byTestId(VNF_SET_BUTTON_TEST_ID); } @@ -1159,7 +1155,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { BrowseASDCPage browseASDCPage = new BrowseASDCPage(); String nodeToEdit = extractNodeToEdit(vnfData); - if (addedByDefault && Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) { + if (addedByDefault) { hoverAndClickEditButton(nodeToEdit); } else { drawingBoardPage.clickAddButtonByNodeName(vnfData.vnfName); @@ -1335,13 +1331,11 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { } private void clickEditVfModule(ServiceData serviceData) { - if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) { - hoverAndClickEditButton(serviceData.vfData.uuid + "-" + serviceData.vfData.vfName); - } + hoverAndClickEditButton(serviceData.vfData.uuid + "-" + serviceData.vfData.vfName); } private void clickAddVfModule(ServiceData serviceData, boolean addedByDefault) { - if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive() && addedByDefault) { + if (addedByDefault) { return; } System.out.println("VFModule should be added 'manually'"); @@ -1356,10 +1350,8 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { } private void clickRemoveVfModule(String vfModuleId, String vfModuleName) { - if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) { - System.out.println("will remove " + vfModule0Name); - hoverAndClickDeleteButton(vfModuleId + "-" + vfModuleName); - } + System.out.println("will remove " + vfModule0Name); + hoverAndClickDeleteButton(vfModuleId + "-" + vfModuleName); } private void assertPauseOnPausePointsVisibility(boolean visibility) { -- cgit 1.2.3-korg