diff options
Diffstat (limited to 'vid-automation/src/main')
31 files changed, 60 insertions, 74 deletions
diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java index b3be16a42..dd08eb312 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java @@ -171,9 +171,6 @@ public abstract class SetupCDTest extends DriverFactory { public static void navigateToUrl(String url) { try { - System.out.println("Deleting cookies..."); - deleteCookies(); - System.out.println("Navigating to URL : " + url); getDriver().navigate().to(url); GeneralUIUtils.waitForLoader(); diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java index 7c4ce0376..0888bd9c8 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java @@ -11,22 +11,6 @@ public abstract class BaseMSOPreset extends BasePreset { public static final String DEFAULT_INSTANCE_ID = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb"; protected String cloudOwner = DEFAULT_CLOUD_OWNER; - public static String getRequestBodyWithTestApiOnly() { - if (Features.FLAG_ADD_MSO_TESTAPI_FIELD.isActive()) { - return "" + - "{" + - " \"requestDetails\": { " + - " \"requestParameters\": { " + - " \"testApi\": \"VNF_API\" " + - " } " + - " } " + - "} " + - ""; - } else { - return null; - } - } - protected String addCloudOwnerIfNeeded() { return Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST.isActive() ? "\"cloudOwner\": \"" + cloudOwner + "\"," : ""; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDeleteWithCloudConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDeleteWithCloudConfiguration.java index 0c813641d..ad7bd0be2 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDeleteWithCloudConfiguration.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDeleteWithCloudConfiguration.java @@ -23,7 +23,7 @@ public abstract class PresetMSOBaseDeleteWithCloudConfiguration extends PresetMS " \"requestorId\": \"us16807000\"" + " }," + " \"requestParameters\": {" + - " \"testApi\": \"VNF_API\"" + + " \"testApi\": \"GR_API\"" + " }," + " \"cloudConfiguration\": {" + " \"lcpCloudRegionId\": \"hvf6\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java index 0b7c6517f..835621a6c 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java @@ -70,7 +70,7 @@ public class PresetMSOCreateNetworkALaCarte5G extends PresetMSOBaseCreateInstanc " }" + " ]," + " \"requestParameters\": {" + - " \"testApi\": \"VNF_API\"," + + " \"testApi\": \"GR_API\"," + " \"userParams\": []" + " }" + " }" + 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 fcad03c58..fd70723ad 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 @@ -38,7 +38,7 @@ public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCrea " \"modelCustomizationName\": \"AIC30_CONTRAIL_BASIC 0\"" + " }," + " \"requestParameters\": {" + - " \"testApi\": \"VNF_API\"," + + " \"testApi\": \"GR_API\"," + " \"userParams\": []" + " }," + " \"cloudConfiguration\": {" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte.java index 180aaefd1..a0867e541 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte.java @@ -44,7 +44,7 @@ public class PresetMSOCreateServiceInstanceAlacarte extends PresetMSOCreateServi " \"requestorId\": \""+this.requestorId+"\"" + " }," + " \"requestParameters\": {" + - " \"testApi\": \"VNF_API\"," + + " \"testApi\": \"GR_API\"," + " \"subscriptionServiceType\": \"TYLER SILVIA\"," + " \"aLaCarte\": true," + " \"userParams\": []" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java index f80f6bb57..f1de64faa 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java @@ -42,7 +42,7 @@ public class PresetMSOCreateServiceInstanceGen2AlacarteService extends PresetMSO " \"requestorId\": \"us16807000\" " + " }, " + " \"requestParameters\": { " + - " \"testApi\": \"VNF_API\", " + + " \"testApi\": \"GR_API\", " + " \"subscriptionServiceType\": \"TYLER SILVIA\", " + " \"aLaCarte\": true, " + " \"userParams\": [] " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java index 28705ad89..fcec15536 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java @@ -50,7 +50,7 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService " \"requestorId\": \"" + userId + "\" " + " }, " + " \"requestParameters\": { " + - " \"testApi\": \"VNF_API\", " + + " \"testApi\": \"GR_API\", " + " \"subscriptionServiceType\": \"TYLER SILVIA\", " + " \"aLaCarte\": true, " + " \"userParams\": [] " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService.java index cc33a3b14..4ad26cc8f 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService.java @@ -47,7 +47,7 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService extends " \"requestorId\": \"us16807000\" " + " }, " + " \"requestParameters\": { " + - " \"testApi\": \"VNF_API\", " + + " \"testApi\": \"GR_API\", " + " \"subscriptionServiceType\": \"TYLER SILVIA\", " + " \"aLaCarte\": true, " + " \"userParams\": [] " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance.java index f203a7df6..9ace3596f 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance.java @@ -66,7 +66,7 @@ public class PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance extends Preset " ]," + " \"requestParameters\": {" + " \"userParams\": []," + - " \"testApi\": \"VNF_API\"" + + " \"testApi\": \"GR_API\"" + " }" + " }" + "}"; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java index 07a782642..185c4bfe8 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java @@ -76,7 +76,7 @@ public class PresetMSOCreateVfModuleALaCarteE2E extends PresetMSOCreateVfModuleB + " \"value\": \"sample\"" + " }" + " ]," - + " \"testApi\": \"VNF_API\"" + + " \"testApi\": \"GR_API\"" + " }" + " }" + "}"; 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 dba42f32f..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+"\"" @@ -59,7 +60,7 @@ public class PresetMSOCreateVnfALaCarteE2E extends PresetMSOCreateVnfBase { + " ]," + " \"requestParameters\": {" + " \"userParams\": []," - + " \"testApi\": \"VNF_API\"" + + " \"testApi\": \"GR_API\"" + " }" + " }" + "}"; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress2.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress2.java index afdb3f49b..bca049d0d 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress2.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress2.java @@ -30,7 +30,7 @@ public class PresetMSOCreateVnfALaCarteServiceCypress2 extends PresetMSOCreateVn "\"modelType\":\"vnf\"," + "\"modelVersion\":\"4.0\"}," + "\"requestParameters\":{" + - "\"testApi\": \"VNF_API\", " + + "\"testApi\": \"GR_API\", " + "\"userParams\":[]" + "}," + "\"relatedInstanceList\":[" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfGroup.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfGroup.java index ac2d6f4b9..41e67480e 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfGroup.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfGroup.java @@ -45,7 +45,7 @@ public class PresetMSOCreateVnfGroup extends PresetMSOBaseCreateInstancePost { " }" + " ]," + " \"requestParameters\": {" + - " \"testApi\": \"VNF_API\", " + + " \"testApi\": \"GR_API\", " + " \"userParams\": []" + " }" + " }" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java index d5faa3f1c..131fe8018 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java @@ -55,7 +55,7 @@ public class PresetMSOCreateVnfVlanTagging extends PresetMSOBaseCreateInstancePo " }," + " \"requestParameters\": {" + " \"userParams\": []," + - " \"testApi\": \"VNF_API\"" + + " \"testApi\": \"GR_API\"" + " }," + " \"relatedInstanceList\": [{" + " \"relatedInstance\": {" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteALaCarteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteALaCarteService.java index b20d462e6..0fb9179c2 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteALaCarteService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteALaCarteService.java @@ -37,7 +37,7 @@ public class PresetMSODeleteALaCarteService extends PresetMSODeleteService { " \"requestorId\": \"us16807000\"" + " }," + " \"requestParameters\": {" + - " \"testApi\": \"VNF_API\","+ + " \"testApi\": \"GR_API\","+ " \"aLaCarte\": true" + " }" + " }" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java index 1d3b8c00a..4c667d9a4 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java @@ -1,13 +1,12 @@ package org.onap.simulator.presetGenerator.presets.mso; -import com.google.common.collect.ImmutableMap; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; -import org.springframework.http.HttpMethod; +import static java.util.Collections.singletonList; +import com.google.common.collect.ImmutableMap; import java.util.List; import java.util.Map; - -import static java.util.Collections.singletonList; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extends BaseMSOPreset { @@ -82,7 +81,7 @@ public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extend " \"requestParameters\": {" + " \"subscriptionServiceType\": \"TYLER SILVIA\"," + " \"aLaCarte\": true," + - " \"testApi\": \"VNF_API\"" + + " \"testApi\": \"GR_API\"" + " }," + " \"project\": {" + " \"projectName\": \"WATKINS\"" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java index 8524d92cd..ee4fd3a67 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java @@ -1,13 +1,12 @@ package org.onap.simulator.presetGenerator.presets.mso; -import com.google.common.collect.ImmutableMap; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; -import org.springframework.http.HttpMethod; +import static java.util.Collections.singletonList; +import com.google.common.collect.ImmutableMap; import java.util.List; import java.util.Map; - -import static java.util.Collections.singletonList; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; public class PresetMSOOrchestrationRequestsGetByRequestId extends BaseMSOPreset { @@ -57,7 +56,7 @@ public class PresetMSOOrchestrationRequestsGetByRequestId extends BaseMSOPreset " \"requestParameters\": {" + " \"subscriptionServiceType\": \"Kennedy\"," + " \"aLaCarte\": true," + - " \"testApi\": \"VNF_API\"" + + " \"testApi\": \"GR_API\"" + " }," + " \"project\": {" + " \"projectName\": \"Kennedy\"" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java index 921776569..cbce5a2c0 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java @@ -1,13 +1,12 @@ package org.onap.simulator.presetGenerator.presets.mso; -import com.google.common.collect.ImmutableMap; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; -import org.springframework.http.HttpMethod; +import static java.util.Collections.singletonList; +import com.google.common.collect.ImmutableMap; import java.util.List; import java.util.Map; - -import static java.util.Collections.singletonList; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; public class PresetMSOOrchestrationRequestsGetByServiceInstanceId extends BaseMSOPreset { @@ -68,7 +67,7 @@ public class PresetMSOOrchestrationRequestsGetByServiceInstanceId extends BaseMS " \"requestParameters\": {" + " \"subscriptionServiceType\": \"Kennedy\"," + " \"aLaCarte\": true," + - " \"testApi\": \"VNF_API\"" + + " \"testApi\": \"GR_API\"" + " }," + " \"project\": {" + " \"projectName\": \"Kennedy\"" + @@ -138,7 +137,7 @@ public class PresetMSOOrchestrationRequestsGetByServiceInstanceId extends BaseMS " \"lcpCloudRegionId\":\"olson5b\"" + " }," + " \"requestParameters\":{" + - " \"testApi\":\"VNF_API\"" + + " \"testApi\":\"GR_API\"" + " }," + " \"platform\":{" + " \"platformName\":\"AIC\"" + diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index f55053497..55b7b3fd0 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -57,6 +57,8 @@ public enum Features implements Feature { FLAG_2004_CREATE_ANOTHER_INSTANCE_FROM_TEMPLATE, FLAG_2002_UNLIMITED_MAX, FLAG_2004_INSTANTIATION_TEMPLATES_POPUP, + FLAG_2006_VFM_SDNC_PRELOAD_FILES, + FLAG_2006_USER_PERMISSIONS_BY_OWNING_ENTITY, ; public boolean isActive() { 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 92b01d17c..99107aeee 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 @@ -39,7 +39,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { static final String SERVICE_NAME = "ggghhh"; static final String SERVICE_ID = "537d3eb0-b7ab-4fe8-a438-6166ab6af49b"; static final String VNF_ID = "0eb38f69-d96b-4d5e-b8c9-3736c292f0f7"; - static final String DEFAULT_TEST_API_VALUE = "VNF_API"; + static final String DEFAULT_TEST_API_VALUE = "GR_API"; public static final String SERVICE_INSTANCE_ID = "SERVICE_INSTANCE_ID"; public static final String A_LACARTE_FLOW_GET_ORCHESTRATION = "aLacarteFlow/get_orchestration_request_status.json"; public static final String ORCHESTRATION_REQUEST_ID = "orchestrationRequestId"; @@ -71,7 +71,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { @Test(dataProvider = "msoTestApiOptions") - private void testAddVfModule(String msoTestApiOption, String msoTestApiValue) { + public void testAddVfModule(String msoTestApiOption, String msoTestApiValue) { withMsoTestApiConfiguration(msoTestApiOption, msoTestApiValue, () -> { final String REQUEST_ID = "dbe54591-c8ed-46d3-abc7-d3a24873bddd"; final String MODEL_UUID = "d205e01d-e5da-4e68-8c52-f95cb0607959"; @@ -104,7 +104,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { } @Test - private void testTenant() throws Exception { + public void testTenant() throws Exception { ViewEditPage viewEditPage = new ViewEditPage(); User user = usersService.getUser("Emanuel_with_tenant"); relogin(user.credentials); @@ -120,7 +120,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { } @Test(dataProvider = "msoTestApiOptions") - private void testAddVnf(String msoTestApiOption, String msoTestApiValue) { + public void testAddVnf(String msoTestApiOption, String msoTestApiValue) { withMsoTestApiConfiguration(msoTestApiOption, msoTestApiValue, () -> { final String MODEL_UUID = MODEL; String instanceName = new VidBasePage().generateInstanceName(Constants.ViewEdit.VNF_INSTANCE_NAME_PREFIX); @@ -145,7 +145,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { } @Test(dataProvider = "msoTestApiOptions") - private void requiredLineOfBussiness_confirmVnfWithNoLob(String msoTestApiOption, String msoTestApiValue) throws Exception { + public void requiredLineOfBussiness_confirmVnfWithNoLob(String msoTestApiOption, String msoTestApiValue) throws Exception { withMsoTestApiConfiguration(msoTestApiOption, msoTestApiValue, () -> { goToInstance(); String instanceName = new VidBasePage().generateInstanceName(Constants.ViewEdit.VNF_INSTANCE_NAME_PREFIX); @@ -170,7 +170,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { } @Test - private void emptyLobAfterReopenCreateVnfDialog() throws Exception { + public void emptyLobAfterReopenCreateVnfDialog() throws Exception { final String lobToSelect = "ONAP"; goToInstance(); ViewEditPage viewEditPage = new ViewEditPage(); @@ -185,7 +185,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { } @Test(dataProvider = "msoTestApiOptions") - private void testAddVolumeGroup(String msoTestApiOption, String msoTestApiValue) throws Exception { + public void testAddVolumeGroup(String msoTestApiOption, String msoTestApiValue) throws Exception { withMsoTestApiConfiguration(msoTestApiOption, msoTestApiValue, () -> { final String REQUEST_ID = "dbe54591-c8ed-46d3-abc7-d3a24873bdaa"; final String MODEL_UUID = "13f022c4-651e-4326-b8e1-61e9a8c7a7ad"; @@ -230,8 +230,8 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { @DataProvider public static Object[][] msoTestApiOptions() { return new Object[][]{ - {"VNF_API (old)", DEFAULT_TEST_API_VALUE} - , {"GR_API (new)", "GR_API"} + {"GR_API (new)", DEFAULT_TEST_API_VALUE} + , {"VNF_API (old)", "VNF_API"} }; } @@ -244,7 +244,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { test.run(); } finally { // back to default - selectMsoTestApiOption("VNF_API (old)"); + selectMsoTestApiOption("GR_API (new)"); } } } diff --git a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java index 351e5b03f..e092ad35a 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java @@ -649,7 +649,7 @@ public class ChangeManagementTest extends VidBaseTestCase { .put("workflow", "" + workflowName + "") .put("policyYN", "Y") .put("sniroYN", "Y") - .put("testApi", "VNF_API") + .put("testApi", "GR_API") .put("vnfType", "vMobileDNS") .putAll(workflowParams) .build() 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"); diff --git a/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java index cbc28d0b0..94af6594b 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java @@ -4,8 +4,8 @@ import static org.apache.logging.log4j.core.util.Assert.isNonEmpty; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.matchesPattern; import static org.hamcrest.collection.IsEmptyCollection.empty; -import static org.testng.AssertJUnit.assertEquals; import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; import com.google.common.collect.ImmutableMap; @@ -14,6 +14,7 @@ import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.Arrays; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -55,7 +56,7 @@ public class ViewEditServiceInstanceTest extends VidBaseTestCase { private final String crNetworkText ="NETWORK INSTANCE GROUP: l3network-id-rs804s | ROLE: RosemaProtectedOam.OAM | TYPE: Tenant_Layer_3 | # OF NETWORKS: 3"; private final String crCollectionText ="COLLECTION: collection-name | TYPE: L3-NETWORK"; private final String crInfoText = "\"requestState\": \"COMPLETE\""; - SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss"); + SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss", Locale.US); static final String LCP_REGION = "hvf6"; static final String CLOUD_OWNER = "AIC"; static final String TENANT = "bae71557c5bb4d5aac6743a4e5f1d054"; @@ -284,6 +285,7 @@ public class ViewEditServiceInstanceTest extends VidBaseTestCase { viewEditPage.clickCloseButton(); } + //this test works only if your browser run at UTC timezone @Test public void testTimestampOnDeactivateAndInfoServiceInstance() throws ParseException { SimulatorApi.clearAll(); @@ -296,7 +298,7 @@ public class ViewEditServiceInstanceTest extends VidBaseTestCase { goToExistingInstanceById(serviceInstanceId); Click.byClass("service-info"); GeneralUIUtils.ultimateWait(); - assertEquals("Timestamp isn't the finished time", getTimeatampValue(Constants.ViewEdit.DETAILS_LOG), "Tue, 24 Oct 2017 02:28:39"); + assertThat("Timestamp isn't the finished time", getTimeatampValue(Constants.ViewEdit.DETAILS_LOG), matchesPattern("Mon, 23 Oct 2017 [0-9]{1,2}:28:39")); //timezone insensitive viewEditPage.clickCloseButton(); viewEditPage.clickDeactivateButton(); GeneralUIUtils.ultimateWait(); diff --git a/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json b/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json index d8aebc746..222f895c4 100644 --- a/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json +++ b/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json @@ -1943,7 +1943,7 @@ "bulkSize": "3", "aicZoneName": "NFTJSSSS-NFT1", "owningEntityName": "WayneHolland", - "testApi": "VNF_API", + "testApi": "GR_API", "tenantName": "AIN Web Tool-15-D-testalexandria", "modelInfo": { "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", diff --git a/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarte.json b/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarte.json index 71ba53661..049626681 100644 --- a/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarte.json +++ b/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarte.json @@ -20,7 +20,7 @@ "tenantId" : "c85f0e80-0636-44a4-8cb2-4ec00d056e79", "tenantName" : "Hedvika Wendelin", "bulkSize": "1", - "testApi": "VNF_API", + "testApi": "GR_API", "isALaCarte": true } diff --git a/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteForTemplate.json b/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteForTemplate.json index 5b831b937..3abb41f8f 100644 --- a/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteForTemplate.json +++ b/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteForTemplate.json @@ -26,7 +26,7 @@ "rollbackOnFailure": true, "aicZoneName": null, "owningEntityName": "WayneHolland", - "testApi": "VNF_API", + "testApi": "GR_API", "tenantName": null, "modelInfo": { "modelInvariantId": "d1068db8-b933-4919-8972-8bc1aed366c8", diff --git a/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnf.json b/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnf.json index c6529c86e..b145f3e9b 100644 --- a/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnf.json +++ b/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnf.json @@ -41,7 +41,7 @@ "tenantId" : "c85f0e80-0636-44a4-8cb2-4ec00d056e79", "tenantName" : "Hedvika Wendelin", "bulkSize": "BULK_SIZE", - "testApi": "VNF_API", + "testApi": "GR_API", "isALaCarte": true } diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json b/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json index 3e31a39df..a6b808888 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json @@ -22,7 +22,7 @@ "modelCustomizationName": "AIC30_CONTRAIL_BASIC 0" }, "requestParameters": { - "testApi": "VNF_API", + "testApi": "GR_API", "userParams": [] }, "cloudConfiguration": { diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json index 5cf1c341f..d6c4ec345 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json @@ -21,7 +21,7 @@ "userParams": [], "subscriptionServiceType": "TYLER SILVIA", "aLaCarte": true, - "testApi": "VNF_API" + "testApi": "GR_API" }, "subscriberInfo": { "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/mso_instance_orch_status_req.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/mso_instance_orch_status_req.json index 1106697cb..e45de76cd 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/mso_instance_orch_status_req.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/mso_instance_orch_status_req.json @@ -13,7 +13,7 @@ { "request": { "requestId": "678cc766-b673-4a50-b9c5-471f68914590", - "startTime": "Mon, 23 Oct 2017 23:28:39 GMT", + "startTime": "Mon, 23 Oct 2017 15:28:39 GMT", "requestScope": "service", "requestType": "createInstance", "instanceReferences": { @@ -24,7 +24,7 @@ "requestState": "COMPLETE", "statusMessage": "Service Instance was created successfully.", "percentProgress": 100, - "finishTime": "Mon, 23 Oct 2017 23:28:39 GMT" + "finishTime": "Mon, 23 Oct 2017 15:28:39 GMT" } } } |