diff options
| author |   Einat Vinouze <einat.vinouze@intl.att.com> | 2020-03-16 19:08:22 +0200 |
|---|---|---|
| committer | Einat Vinouze <einat.vinouze@intl.att.com> | 2020-03-18 10:58:23 +0200 |
| commit | 06f53244384e546cc15750f6d050a98a752a0ade (patch) | |
| tree | 379fb0247807d0792937d9cc732856923b00848b /vid-automation/src/main | |
| parent | 6b57c89aa2ceda72126576c8cdb58b75e83df6f1 (diff) | |
allow LOB multi-selection for network
Issue-ID: VID-788
Change-Id: I03674ea0c04567291ba647c76b7c88bc11a7cf0e
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Diffstat (limited to 'vid-automation/src/main')
2 files changed, 10 insertions, 4 deletions
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteServiceCypress2.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteServiceCypress2.java index b7f629c8a..2df43b82a 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteServiceCypress2.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteServiceCypress2.java @@ -6,21 +6,25 @@ public class PresetMSOCreateNetworkALaCarteServiceCypress2 extends PresetMSOBase private String serviceModelName; private String serviceModelVersionId; private String platformName; + private String lineOfBusinessName; + public PresetMSOCreateNetworkALaCarteServiceCypress2(String overrideRequestId, String serviceInstanceId, String networkName) { this(overrideRequestId, serviceInstanceId, networkName, "ComplexService", "6e59c5de-f052-46fa-aa7e-2fca9d674c44", - "xxx1"); + "xxx1", "zzz1"); } public PresetMSOCreateNetworkALaCarteServiceCypress2(String overrideRequestId, String serviceInstanceId, - String networkName, String serviceModelName, String serviceModelVersionId, String platformName) { + String networkName, String serviceModelName, String serviceModelVersionId, String platformName, + String lineOfBusinessName) { super(overrideRequestId); this.serviceInstanceId = serviceInstanceId; this.networkName = networkName; this.serviceModelName = serviceModelName; this.serviceModelVersionId = serviceModelVersionId; this.platformName = platformName; + this.lineOfBusinessName = lineOfBusinessName; } @Override @@ -42,7 +46,7 @@ public class PresetMSOCreateNetworkALaCarteServiceCypress2 extends PresetMSOBase "\"source\":\"VID\"," + "\"suppressRollback\":false," + "\"requestorId\":\"us16807000\"}," + - "\"lineOfBusiness\":{\"lineOfBusinessName\":\"zzz1\"}," + + "\"lineOfBusiness\":{\"lineOfBusinessName\":\"" + lineOfBusinessName + "\"}," + "\"cloudConfiguration\":" + "{\"lcpCloudRegionId\":\"hvf6\"," + addCloudOwnerIfNeeded() + 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 99e824086..7ce350060 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 @@ -1205,9 +1205,11 @@ public class NewServiceInstanceTest extends ModernUITestBase { if(!isNetwork){ SelectOption.byTestIdAndVisibleText("TYLER SILVIA", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); browseASDCPage.selectProductFamily("e433710f-9217-458d-a79d-1c7aff376d89"); + browseASDCPage.selectLineOfBusiness("ONAP"); + } else { + SelectOption.selectOptionsFromMultiselectById("multi-lineOfBusiness",ImmutableList.of("ONAP")); } - browseASDCPage.selectLineOfBusiness("ONAP"); assertSetButtonEnabled(VNF_SET_BUTTON_TEST_ID); browseASDCPage.setLegacyRegion("some legacy region"); |