summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xepsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties2
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json2
-rw-r--r--vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java16
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDeleteWithCloudConfiguration.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteE2E.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress2.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfGroup.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteALaCarteService.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java11
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java11
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java13
-rw-r--r--vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java20
-rw-r--r--vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java2
-rw-r--r--vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json2
-rw-r--r--vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarte.json2
-rw-r--r--vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteForTemplate.json2
-rw-r--r--vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnf.json2
-rw-r--r--vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json2
-rw-r--r--vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json2
-rw-r--r--vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json2
-rw-r--r--vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json2
-rw-r--r--vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json2
-rw-r--r--vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json2
-rw-r--r--vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json2
-rw-r--r--vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json2
-rw-r--r--vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json2
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json2
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json2
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json2
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json2
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json2
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json2
-rw-r--r--vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json2
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts2
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/vnfGroups.e2e.ts2
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts2
-rw-r--r--vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json2
-rw-r--r--vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json2
49 files changed, 70 insertions, 89 deletions
diff --git a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
index 393327d85..41e50c362 100755
--- a/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
+++ b/epsdk-app-onap/src/main/webapp/WEB-INF/conf/system.properties
@@ -135,7 +135,7 @@ mso.restapi.cloudResourcesRequestsApiRoot=/cloudResourcesRequests/v1
mso.restapi.operationalEnvironment.cloudResourcesRequests.status=${mso.restapi.cloudResourcesRequestsApiRoot}?requestId=<request_id>
mso.displayTestAPIOnScreen=true
-mso.defaultTestAPI=VNF_API
+mso.defaultTestAPI=GR_API
mso.maxOpenedInstantiationRequests=200
mso.asyncPollingIntervalSeconds=1
refreshTimeInstantiationDashboard=10
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json
index d215a4331..16d369ba7 100644
--- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__fe_input_cypress.json
@@ -111,7 +111,7 @@
"rollbackOnFailure": false,
"isALaCarte": true,
"collectionResources": {},
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"vidNotions": {
"instantiationUI": "legacy",
"modelCategory": "other",
diff --git a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json
index 91f80e9f1..5c258f66b 100644
--- a/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json
+++ b/vid-app-common/src/test/resources/payload_jsons/vfmodule/upgrade_vfmodule_e2e__payload_to_mso.json
@@ -36,7 +36,7 @@
"retainAssignments": false,
"usePreload" : true,
"userParams": [],
- "testApi": "VNF_API"
+ "testApi": "GR_API"
},
"modelInfo": {
"modelType": "vfModule",
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..453152f2b 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
@@ -59,7 +59,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/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/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/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
index d1a777028..34805e1d4 100644
--- a/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
+++ b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
@@ -43,6 +43,6 @@
"modelType": "service",
"modelVersion": "1.0"
},
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"action": "Delete"
}
diff --git a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
index cb2f2011c..88757da22 100644
--- a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
+++ b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
@@ -208,5 +208,5 @@
"modelVersion": "1.0"
},
- "testApi": "VNF_API"
+ "testApi": "GR_API"
}
diff --git a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
index b7c6dc2a5..7dfe064d0 100644
--- a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
+++ b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
@@ -163,7 +163,7 @@
"instanceName": "SERVICE_INSTANCE_NAME",
"owningEntityName": null,
"rollbackOnFailure": false,
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"isALaCarte": true,
"vidNotions": {
"instantiationUI": "serviceWithVnfGrouping",
diff --git a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
index d6cf636de..5d8843a8c 100644
--- a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
+++ b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
@@ -182,5 +182,5 @@
"modelType": "service",
"modelVersion": "1.0"
},
- "testApi": "VNF_API"
+ "testApi": "GR_API"
}
diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
index bb0334b7a..478c32a64 100644
--- a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
+++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
@@ -64,7 +64,7 @@
"subscriberName": "SILVIA ROBBINS",
"owningEntityName": "WayneHolland",
"rollbackOnFailure": true,
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"isALaCarte": true,
"isDirty":true,
"action": "Create"
diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json
index 2e0f85ee4..e29471217 100644
--- a/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json
+++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json
@@ -119,5 +119,5 @@
"modelVersion": "1.0"
},
- "testApi": "VNF_API"
+ "testApi": "GR_API"
}
diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
index cabdbca38..aeaf6b65d 100644
--- a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
+++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
@@ -43,7 +43,7 @@
"subscriptionServiceType": "service-instance-type",
"tenantId": null,
"tenantName": null,
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"validationCounter": 0,
"vnfGroups": {
"VNF_GROUP1_INSTANCE_ID": {
diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json
index d5b282e89..aa1945f94 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json
@@ -57,7 +57,7 @@
"bulkSize": 1,
"rollbackOnFailure": "false",
"isALaCarte": true,
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"instanceId": "INSTANCE_ID",
"action": "None",
"trackById": "TRACK_BY_ID",
diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json
index 28761f393..0d840daed 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json
@@ -33,7 +33,7 @@
"subscriptionServiceType": "TYLER SILVIA",
"tenantId": "c85f0e80-0636-44a4-8cb2-4ec00d056e79",
"tenantName": "Hedvika Wendelin",
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"trackById": "TRACK_BY_ID",
"vnfGroups": {
},
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json
index 71ba53661..049626681 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json
+++ b/vid-automation/src/test/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/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json
index 430675256..d458b63c5 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json
@@ -38,7 +38,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/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
index f6373bfb4..0dc9321fe 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
@@ -291,5 +291,5 @@
},
"orchStatus": "Active",
"modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450",
- "testApi": "VNF_API"
+ "testApi": "GR_API"
}
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json
index ac5f7faf9..9cbbfceaf 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json
@@ -67,5 +67,5 @@
"isALaCarte": true,
"orchStatus": "Active",
"modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450",
- "testApi": "VNF_API"
+ "testApi": "GR_API"
} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json
index 3b0204aa7..951eac1fb 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json
@@ -12,7 +12,7 @@
"requestorId": "16807000"
},
"requestParameters": {
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"aLaCarte": false
}
}
diff --git a/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json b/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json
index a3fcd0e4e..2d7121729 100644
--- a/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json
+++ b/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json
@@ -183,7 +183,7 @@
"rollbackOnFailure": true,
"aicZoneName": null,
"owningEntityName": "WayneHolland",
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"modelInfo": {
"modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
"modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8",
diff --git a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
index 09734472c..87875f1ba 100644
--- a/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/viewEditUpgradeVfModule.e2e.ts
@@ -133,7 +133,7 @@ describe('View Edit Page: Upgrade VFModule', function () {
beforeEach(() => {
cy.clearSessionStorage();
- cy.setTestApiParamToVNF();
+ cy.setTestApiParamToGR();
cy.initVidMock();
cy.login();
});
diff --git a/vid-webpack-master/cypress/integration/iFrames/vnfGroups.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/vnfGroups.e2e.ts
index dc1b4bbf2..60fbfeaba 100644
--- a/vid-webpack-master/cypress/integration/iFrames/vnfGroups.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/vnfGroups.e2e.ts
@@ -12,7 +12,7 @@ describe('Vnf Groups', function () {
cy.initAAIMock();
cy.initVidMock();
cy.permissionVidMock();
- cy.setTestApiParamToVNF();
+ cy.setTestApiParamToGR();
cy.login();
});
diff --git a/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts
index 6700ff425..529d96a3b 100644
--- a/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts
@@ -480,7 +480,7 @@ describe('Drawing board : VRF', function () {
"rollbackOnFailure": "true",
"aicZoneName": null,
"owningEntityName": "WayneHolland",
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"modelInfo": {
"modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
"modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8",
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json
index d10c2bd32..d0c734bc2 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json
@@ -17,7 +17,7 @@
},
"requestParameters": {
"userParams": [],
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"usePreload": false
},
"cloudConfiguration": {
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json
index bc37b6bed..847ebf0d5 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json
@@ -32,7 +32,7 @@
"subscriberName":"SILVIA ROBBINS",
"owningEntityName":"WayneHolland",
"rollbackOnFailure":"true",
- "testApi": "VNF_API",
+ "testApi": "GR_API",
"isALaCarte":true,
"action": "Create"
}