diff options
author | 2020-01-21 09:08:04 +0200 | |
---|---|---|
committer | 2020-01-22 09:43:25 +0200 | |
commit | 5e916090cf5642d3559c239b9acceb676941d3c2 (patch) | |
tree | 92104f82e95f5cd6a11033927618e0000bfd056e /vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso | |
parent | a0b4be90caf6bb3e6deed0002b42c8c5e9c1f8a8 (diff) |
make GR_API the default testApi in automation tests
Issue-ID: VID-757
Change-Id: I5af2029c53b47e2c303b424396ab0940414f9106
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Diffstat (limited to 'vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso')
17 files changed, 30 insertions, 33 deletions
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\"" + |