summaryrefslogtreecommitdiffstats
path: root/vid-automation/src
diff options
context:
space:
mode:
authorEinat Vinouze <einat.vinouze@intl.att.com>2020-03-16 19:08:22 +0200
committerEinat Vinouze <einat.vinouze@intl.att.com>2020-03-18 10:58:23 +0200
commit06f53244384e546cc15750f6d050a98a752a0ade (patch)
tree379fb0247807d0792937d9cc732856923b00848b /vid-automation/src
parent6b57c89aa2ceda72126576c8cdb58b75e83df6f1 (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')
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteServiceCypress2.java10
-rw-r--r--vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java4
-rw-r--r--vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java2
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json2
4 files changed, 12 insertions, 6 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");
diff --git a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java
index 70ded1c09..07b81a46c 100644
--- a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java
+++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java
@@ -379,7 +379,7 @@ public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase {
new PresetMSOOrchestrationRequestGet(COMPLETE, deleteRequestId),
new PresetMSOCreateNetworkALaCarteServiceCypress2(createRequestId, serviceInstanceId,
"ExtVL", "action-data",
- "6b528779-44a3-4472-bdff-9cd15ec93450", "xxx1,platform"),
+ "6b528779-44a3-4472-bdff-9cd15ec93450", "xxx1,platform", "zzz1,ONAP"),
new PresetMSOOrchestrationRequestGet(COMPLETE, createRequestId),
PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC
), RegistrationStrategy.CLEAR_THEN_SET);
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json
index 114565ee3..af7ddd27c 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json
@@ -65,7 +65,7 @@
"lcpCloudRegionId":"hvf6",
"tenantId":"229bcdc6eaeb4ca59d55221141d01f8e",
"platformName":"xxx1,platform" ,
- "lineOfBusiness":"zzz1",
+ "lineOfBusiness":"zzz1,ONAP",
"instanceParams":[
{