diff options
author | Ittay Stern <ittay.stern@att.com> | 2020-01-23 13:47:25 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2020-01-23 13:47:25 +0000 |
commit | cf4b410cfd7a561649e105d62d1bad6d05dc2acd (patch) | |
tree | dc7b1e46a646568ee72004c7e777e50fdabb4195 /vid-automation | |
parent | c0fdfc29078390e1fcf9276af12613855cf7ca37 (diff) | |
parent | 6b72458af15811641de91a367edb9a01b2996e27 (diff) |
Merge "Product family ID on VNF should be mandatory"
Diffstat (limited to 'vid-automation')
2 files changed, 4 insertions, 0 deletions
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteE2E.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteE2E.java index 453152f2b..07839ba6b 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteE2E.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteE2E.java @@ -40,6 +40,7 @@ public class PresetMSOCreateVnfALaCarteE2E extends PresetMSOCreateVnfBase { + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" + " }," + " \"requestInfo\": {" + + " \"productFamilyId\":\"e433710f-9217-458d-a79d-1c7aff376d89\"," + " \"source\": \"VID\"," + " \"suppressRollback\": false," + " \"requestorId\": \""+requestorId+"\"" 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 eb3406f5f..3caf59ef6 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 @@ -1184,12 +1184,15 @@ public class NewServiceInstanceTest extends ModernUITestBase { browseASDCPage.selectTenant("092eb9e8e4b7412e8787dd091bc58e86"); + assertSetButtonDisabled(VNF_SET_BUTTON_TEST_ID); if(isNetwork){ browseASDCPage.selectPlatform("platform"); }else { SelectOption.selectOptionsFromMultiselectById("multi-selectPlatform", ImmutableList.of("platform")); + SelectOption.byTestIdAndVisibleText("TYLER SILVIA", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); + browseASDCPage.selectProductFamily("e433710f-9217-458d-a79d-1c7aff376d89"); } browseASDCPage.selectLineOfBusiness("ONAP"); |