summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2019-08-01 12:02:31 +0300
committerEylon Malin <eylon.malin@intl.att.com>2019-08-01 12:02:31 +0300
commit1c4cea59f9190c8a96bcd40233df0559ed03af2f (patch)
tree018a9d4f041ca6795cfea2e52d756d12522ca270
parentf75ace38ec02707694f11e385a26c8fed32882ea (diff)
fix expected cloud owner in e2e AddNetworkTest
Issue-ID: VID-482 Signed-off-by: Eylon Malin <eylon.malin@intl.att.com> Change-Id: Ieade85fa5652f1ade8058b60ef9f9ef80af28b8c
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java3
-rw-r--r--vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java2
-rw-r--r--vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java4
3 files changed, 4 insertions, 5 deletions
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java
index 307aef2c0..fcad03c58 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java
@@ -5,11 +5,12 @@ public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCrea
private final String serviceInstanceId;
private final String platform;
- public PresetMSOCreateNetworkALaCarteOldViewEdit(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String networkInstanceName, String platform) {
+ public PresetMSOCreateNetworkALaCarteOldViewEdit(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String networkInstanceName, String platform, String cloudOwner) {
super(overrideRequestId, responseInstanceId);
this.serviceInstanceId = serviceInstanceId;
this.networkInstanceName = networkInstanceName;
this.platform = platform == null ? "" : platform;
+ this.cloudOwner = cloudOwner;
}
@Override
diff --git a/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java b/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java
index 63fe15000..ca8c27655 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java
@@ -114,8 +114,6 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest {
List<WebElement> enabledTenantOption = tenantOptions.stream().filter(webElement -> webElement.isEnabled()).collect(Collectors.toList());
Assert.assertTrue(enabledTenantOption.size() == 1);
Assert.assertTrue(enabledTenantOption.get(0).getText().equals("test-hvf6-09"));
-
- // SimulatorApi.registerExpectation("aLacarteFlow/get_sdc_catalog_services_ggghhh.json",APPEND);
}
@Test(dataProvider = "msoTestApiOptions")
diff --git a/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java b/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java
index a65d7bf9d..fb8e83ad8 100644
--- a/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java
@@ -51,13 +51,13 @@ public class AddNetworkTest extends VidBaseTestCase {
SimulatorApi.registerExpectationFromPresets(
ImmutableList.of(
- PresetAAIGetCloudOwnersByCloudRegionId.PRESET_ONE_TO_ATT_AIC,
new PresetMSOCreateNetworkALaCarteOldViewEdit(
PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID,
"d198cc45-158b-480e-8d2c-03943c51268e",
"c187e9fe-40c3-4862-b73e-84ff056205f6",
instanceName,
- platform
+ platform,
+ "fusion"
),
new PresetMSOOrchestrationRequestGet(
PresetMSOOrchestrationRequestGet.COMPLETE,