allow platform multi-selection for network

Issue-ID: VID-785
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Change-Id: I38e32dc5c1d5630d8cd7d5c18e964875be38002d

diff --git a/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java b/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java
index 3943af0..e61d57f 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java
+++ b/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java
@@ -2,7 +2,6 @@ package vid.automation.test.sections;
 
 import static org.hamcrest.core.Is.is;
 
-import java.util.List;
 import org.junit.Assert;
 import org.onap.sdc.ci.tests.utilities.GeneralUIUtils;
 import org.openqa.selenium.By;
@@ -15,13 +14,13 @@ import vid.automation.test.infra.SelectOption;
 public class ViewEditPage extends VidBasePage {
     public ViewEditPage selectNodeInstanceToAdd(String vnfName) {
         selectFromDropdownByTestId(Constants.ViewEdit.VNF_OPTION_TEST_ID_PREFIX + vnfName,
-                Constants.ViewEdit.ADD_VNF_BUTTON_TEST_ID);
+            Constants.ViewEdit.ADD_VNF_BUTTON_TEST_ID);
         return this;
     }
 
     public ViewEditPage selectVfModuleToAdd(String vfModuleName) {
         selectFromDropdownByTestId(Constants.ViewEdit.VF_MODULE_OPTION_TEST_ID_PREFIX + vfModuleName,
-                Constants.ViewEdit.ADD_VF_MODULE_BUTTON_TEST_ID);
+            Constants.ViewEdit.ADD_VF_MODULE_BUTTON_TEST_ID);
         return this;
     }
 
@@ -44,7 +43,7 @@ public class ViewEditPage extends VidBasePage {
 
     public ViewEditPage selectVolumeGroupToAdd(String volumeGroupName) {
         selectFromDropdownByTestId(Constants.ViewEdit.VOLUME_GROUP_OPTION_TEST_ID_PREFIX + volumeGroupName,
-                Constants.ViewEdit.ADD_VOLUME_GROUP_BUTTON_TEST_ID);
+            Constants.ViewEdit.ADD_VOLUME_GROUP_BUTTON_TEST_ID);
         return this;
     }
 
@@ -56,7 +55,7 @@ public class ViewEditPage extends VidBasePage {
 
     public ViewEditPage selectNetworkToAdd(String networkName) {
         selectFromDropdownByTestId(Constants.ViewEdit.NETWORK_OPTION_TEST_ID_PREFIX + networkName,
-                Constants.ViewEdit.ADD_NETWORK_BUTTON_TEST_ID);
+            Constants.ViewEdit.ADD_NETWORK_BUTTON_TEST_ID);
         return this;
     }
 
@@ -77,7 +76,7 @@ public class ViewEditPage extends VidBasePage {
 
     public ViewEditPage selectTenant(String tenant){
         SelectOption.byValue(tenant, Constants.ViewEdit.TENANT_SELECT_TESTS_ID);
-       // GeneralUIUtils.clickOnElementByTestId(Constants.ViewEdit.TENANT_SELECT_TESTS_ID, 60);
+        // GeneralUIUtils.clickOnElementByTestId(Constants.ViewEdit.TENANT_SELECT_TESTS_ID, 60);
         return this;
     }
 
@@ -131,8 +130,8 @@ public class ViewEditPage extends VidBasePage {
 //        return this;
 //    }
 
-    public ViewEditPage selectPlatform(List<String> platformList) {
-        SelectOption.selectOptionsFromMultiselectById("multi-selectPlatform", platformList);
+    public ViewEditPage selectPlatform(String platform) {
+        SelectOption.byValue(platform, Constants.OwningEntity.PLATFORM_SELECT_TEST_ID);
         return this;
     }
 }

diff --git a/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java b/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java
index 74ceec6..8421427 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java
@@ -357,7 +357,7 @@ public class VidBaseTestCase extends SetupCDTest{
 
         viewEditPage.selectSuppressRollback(suppressRollback);
         if(platform != null){
-            viewEditPage.selectPlatform(ImmutableList.of(platform));
+            viewEditPage.selectPlatform(platform);
         }
         viewEditPage.clickConfirmButton();
         viewEditPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT);