summaryrefslogtreecommitdiffstats
path: root/vid-automation/src/main/java/org/opencomp
diff options
context:
space:
mode:
authorkurczews <krzysztof.kurczewski@nokia.com>2018-08-13 12:04:07 +0200
committerkurczews <krzysztof.kurczewski@nokia.com>2018-08-13 12:06:02 +0200
commit5ac1100c02912f7a45d2949d94cd33d054283139 (patch)
tree162e996dcaa5dd1e7db73ce3d0ac8adca08d8233 /vid-automation/src/main/java/org/opencomp
parentccfb3ba1fbeb9f2807fa498686ce4441ac5cfc21 (diff)
Renaming vid-automation #1
Change-Id: Ib5b576a931e37930119e440e965e491b1711d073 Issue-ID: VID-205 Signed-off-by: kurczews <krzysztof.kurczewski@nokia.com>
Diffstat (limited to 'vid-automation/src/main/java/org/opencomp')
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java48
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBadBodyForGetServicesGet.java15
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseGetServicesGet.java16
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseSearchNodeQuery.java16
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java93
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java182
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java185
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java181
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java176
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java157
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java59
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java338
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java342
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java337
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java794
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java33
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java31
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java129
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePortsError.java18
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java129
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java80
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java122
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java46
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java159
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGetInvalidResponse.java17
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java27
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java100
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java14
-rw-r--r--vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java427
29 files changed, 0 insertions, 4271 deletions
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java
deleted file mode 100644
index 18644b819..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class BasePresetAAIGetVersion extends BaseAAIPreset {
- public String modelVersionId1;
- public String modelInvariantId;
-
- public BasePresetAAIGetVersion(String modelVersionId1, String modelInvariantId) {
- this.modelVersionId1 = modelVersionId1;
- this.modelInvariantId = modelInvariantId;
- }
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of("format", Collections.singletonList("resource"));
- }
-
- @Override
- public Object getRequestBody() {
- return "{\"start\" : \"service-design-and-creation/models/\", \"query\" : \"query/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK\"}";
- }
-
- public String getModelVersionId1() {
- return modelVersionId1;
- }
-
- public String getModelInvariantId() {
- return modelInvariantId;
- }
-
-
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBadBodyForGetServicesGet.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBadBodyForGetServicesGet.java
deleted file mode 100644
index 0a90bf8df..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBadBodyForGetServicesGet.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-public class PresetAAIBadBodyForGetServicesGet extends PresetAAIBaseGetServicesGet {
-
- private String responseBody;
-
- public PresetAAIBadBodyForGetServicesGet(String responseBody) {
- this.responseBody = responseBody;
- }
-
- @Override
- public Object getResponseBody() {
- return responseBody;
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseGetServicesGet.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseGetServicesGet.java
deleted file mode 100644
index 82e3f406e..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseGetServicesGet.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-public class PresetAAIBaseGetServicesGet extends BaseAAIPreset {
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.GET;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/service-design-and-creation/services";
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseSearchNodeQuery.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseSearchNodeQuery.java
deleted file mode 100644
index d8553ca8d..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIBaseSearchNodeQuery.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-public abstract class PresetAAIBaseSearchNodeQuery extends BaseAAIPreset {
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.GET;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/search/nodes-query";
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java
deleted file mode 100644
index 2e634bd9e..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAICloudRegionAndSourceFromConfigurationPut extends BaseAAIPreset {
-
- public PresetAAICloudRegionAndSourceFromConfigurationPut(String configurationId, String cloudRegionId) {
- this.configurationId = configurationId;
- this.cloudRegionId = cloudRegionId;
- }
-
- private final String configurationId;
- private final String cloudRegionId;
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "format", Collections.singletonList("simple"),
- "nodesOnly", Collections.singletonList("true")
- );
- }
-
- @Override
- public Object getRequestBody() {
- return ImmutableMap.of(
- "start", ImmutableList.of("network/configurations/configuration/" + getConfigurationId()),
- "query", "query/cloud-region-and-source-FromConfiguration"
- );
- // "{" +
- // " \"start\": [\"network/configurations/configuration/{configuration-id}\"]," +
- // " \"query\": \"query/cloud-region-and-source-FromConfiguration\"" +
- // "}";
- }
-
- public String getConfigurationId() {
- return configurationId;
- }
-
- public String getCloudRegionId() {
- return cloudRegionId;
- }
-
- @Override
- public Object getResponseBody() {
- return "" +
- "{" +
- " \"results\": [{" +
- " \"id\": \"2979590232\"," +
- " \"node-type\": \"cloud-region\"," +
- " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/SDNO-S-BcloudReg-E1802\"," +
- " \"properties\": {" +
- " \"cloud-owner\": \"att-aic\"," +
- " \"cloud-region-id\": \"" + getCloudRegionId() + "\"," +
- " \"sriov-automation\": false," +
- " \"resource-version\": \"1513631040564\"" +
- " }" +
- " }," +
- " {" +
- " \"id\": \"2979598424\"," +
- " \"node-type\": \"generic-vnf\"," +
- " \"url\": \"/aai/v12/network/generic-vnfs/generic-vnf/SOURCE-gVnf-E1802\"," +
- " \"properties\": {" +
- " \"vnf-id\": \"SOURCE-gVnf-E1802\"," +
- " \"vnf-name\": \"SOURCE-vnf-SDNO\"," +
- " \"vnf-type\": \"S-1-SDNO\"," +
- " \"service-id\": \"a9a77d5a-123e-4-SDNO\"," +
- " \"orchestration-status\": \"active\"," +
- " \"in-maint\": true," +
- " \"is-closed-loop-disabled\": false," +
- " \"resource-version\": \"1513631043149\"" +
- " }" +
- " }" +
- " ]" +
- "}";
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java
deleted file mode 100644
index 283befefa..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAIGetInstanceGroupsByCloudRegion extends BaseAAIPreset {
-
- private String cloudOwner;
- private String cloudRegionId;
- private String networkFunction;
- private final String type = "L3-NETWORK";
- private final String role = "SUB-INTERFACE";
-
- public PresetAAIGetInstanceGroupsByCloudRegion(String cloudOwner, String cloudRegionId, String networkFunction) {
- this.cloudOwner = cloudOwner;
- this.cloudRegionId = cloudRegionId;
- this.networkFunction = networkFunction;
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "format", Collections.singletonList("resource")
- );
- }
-
- @Override
- public Object getRequestBody() {
- return ImmutableMap.of(
- "start", ImmutableList.of("cloud-infrastructure/cloud-regions/cloud-region/" + getCloudOwner() + "/" + getCloudRegionId()),
- "query", "query/instance-group-byCloudRegion?type=" + type + "&role=" + role + "&function=" + getNetworkFunction()
- );
- }
-
- public String getCloudOwner() {
- return cloudOwner;
- }
-
- public String getCloudRegionId() {
- return cloudRegionId;
- }
-
- public String getNetworkFunction() {
- return networkFunction;
- }
-
- @Override
- public Object getResponseBody() {
- return "{\n" +
- " \"results\": [\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"model-id3\",\n" +
- " \"model-version-id\": \"a0efd5fc-f7be-4502-936a-a6c6392b958f\",\n" +
- " \"id\": \"AAI-12002-test3-vm230w\",\n" +
- " \"description\": \"a9DEa0kpY\",\n" +
- " \"instance-group-type\": \"type\",\n" +
- " \"resource-version\": \"1520888659539\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"cloud-region\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
- " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
- " \"relationship-value\": \"AAI-12002-vm230w\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
- " \"relationship-value\": \"AAI-region-vm230w\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"cloud-region.owner-defined-type\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"model-id1\",\n" +
- " \"model-version-id\": \"a0efd5fc-f7be-4502-936a-a6c6392b958f\",\n" +
- " \"id\": \"AAI-12002-test1-vm230w\",\n" +
- " \"description\": \"a9DEa0kpY\",\n" +
- " \"instance-group-type\": \"type\",\n" +
- " \"resource-version\": \"1520886467989\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"cloud-region\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
- " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
- " \"relationship-value\": \"AAI-12002-vm230w\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
- " \"relationship-value\": \"AAI-region-vm230w\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"cloud-region.owner-defined-type\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"model-id2\",\n" +
- " \"model-version-id\": \"version2\",\n" +
- " \"id\": \"AAI-12002-test2-vm230w\",\n" +
- " \"description\": \"a9DEa0kpY\",\n" +
- " \"instance-group-type\": \"type\",\n" +
- " \"resource-version\": \"1520888629970\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"cloud-region\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
- " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
- " \"relationship-value\": \"AAI-12002-vm230w\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
- " \"relationship-value\": \"AAI-region-vm230w\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"cloud-region.owner-defined-type\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " }\n" +
- " ]\n" +
- "}\n";
- }
-
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java
deleted file mode 100644
index e47612d15..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest extends BaseAAIPreset {
-
- private String cloudOwner;
- private String cloudRegionId;
- private String networkFunction;
- private final String type = "L3-NETWORK";
- private final String role = "SUB-INTERFACE";
-
- public PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest(String cloudOwner, String cloudRegionId, String networkFunction) {
- this.cloudOwner = cloudOwner;
- this.cloudRegionId = cloudRegionId;
- this.networkFunction = networkFunction;
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "format", Collections.singletonList("resource")
- );
- }
-
- @Override
- public Object getRequestBody() {
- return ImmutableMap.of(
- "start", ImmutableList.of("cloud-infrastructure/cloud-regions/cloud-region/" + getCloudOwner() + "/" + getCloudRegionId()),
- "query", "query/instance-group-byCloudRegion?type=" + type + "&role=" + role + "&function=" + getNetworkFunction()
- );
- }
-
- public String getCloudOwner() {
- return cloudOwner;
- }
-
- public String getCloudRegionId() {
- return cloudRegionId;
- }
-
- public String getNetworkFunction() {
- return networkFunction;
- }
-
- @Override
- public Object getResponseBody() {
- return "{\n" +
- " \"results\": [\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"some-filed\": \"some-data\",\n" + //extra field
- " \"model-invariant-id\": \"model-id3\",\n" +
- " \"model-version-id\": \"a0efd5fc-f7be-4502-936a-a6c6392b958f\",\n" +
- " \"id\": \"AAI-12002-test3-vm230w\",\n" +
- " \"description\": \"a9DEa0kpY\",\n" +
- " \"instance-group-type\": \"type\",\n" +
- " \"resource-version\": \"1520888659539\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"cloud-region\",\n" +
- " \"some-filed\": \"some-data\",\n" + //extra field
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
- " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
- " \"relationship-value\": \"AAI-12002-vm230w\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
- " \"relationship-value\": \"AAI-region-vm230w\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"cloud-region.owner-defined-type\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"model-id1\",\n" +
- " \"model-version-id\": \"a0efd5fc-f7be-4502-936a-a6c6392b958f\",\n" +
- " \"id\": \"AAI-12002-test1-vm230w\",\n" +
- " \"description\": \"a9DEa0kpY\",\n" +
- " \"instance-group-type\": \"type\",\n" +
- " \"resource-version\": \"1520886467989\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"cloud-region\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
- " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
- " \"some-filed\": \"some-data\",\n" + //extra field
- " \"relationship-value\": \"AAI-12002-vm230w\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
- " \"relationship-value\": \"AAI-region-vm230w\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"cloud-region.owner-defined-type\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"model-id2\",\n" +
- " \"model-version-id\": \"version2\",\n" +
- " \"id\": \"AAI-12002-test2-vm230w\",\n" +
- " \"description\": \"a9DEa0kpY\",\n" +
- " \"instance-group-type\": \"type\",\n" +
- " \"resource-version\": \"1520888629970\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"cloud-region\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
- " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
- " \"relationship-value\": \"AAI-12002-vm230w\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
- " \"relationship-value\": \"AAI-region-vm230w\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"cloud-region.owner-defined-type\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " }\n" +
- " ]\n" +
- "}\n";
- }
-
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java
deleted file mode 100644
index 9c8f82d18..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing extends BaseAAIPreset {
-
- private String cloudOwner;
- private String cloudRegionId;
- private String networkFunction;
- private final String type = "L3-NETWORK";
- private final String role = "SUB-INTERFACE";
-
- public PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing(String cloudOwner, String cloudRegionId, String networkFunction) {
- this.cloudOwner = cloudOwner;
- this.cloudRegionId = cloudRegionId;
- this.networkFunction = networkFunction;
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "format", Collections.singletonList("resource")
- );
- }
-
- @Override
- public Object getRequestBody() {
- return ImmutableMap.of(
- "start", ImmutableList.of("cloud-infrastructure/cloud-regions/cloud-region/" + getCloudOwner() + "/" + getCloudRegionId()),
- "query", "query/instance-group-byCloudRegion?type=" + type + "&role=" + role + "&function=" + getNetworkFunction()
- );
- }
-
- public String getCloudOwner() {
- return cloudOwner;
- }
-
- public String getCloudRegionId() {
- return cloudRegionId;
- }
-
- public String getNetworkFunction() {
- return networkFunction;
- }
-
- @Override
- public Object getResponseBody() {
- return "{\n" +
- " \"results\": [\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"model-id3\",\n" +
- " \"model-version-id\": \"version3\",\n" +
- " \"id\": \"AAI-12002-test3-vm230w\",\n" +
- " \"description\": \"a9DEa0kpY\",\n" +
- " \"resource-version\": \"1520888659539\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"cloud-region\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
- " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
- " \"relationship-value\": \"AAI-12002-vm230w\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
- " \"relationship-value\": \"AAI-region-vm230w\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"cloud-region.owner-defined-type\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"model-id1\",\n" +
- " \"model-version-id\": \"version1\",\n" +
- " \"id\": \"AAI-12002-test1-vm230w\",\n" +
- " \"description\": \"a9DEa0kpY\",\n" +
- " \"instance-group-type\": \"type\",\n" +
- " \"resource-version\": \"1520886467989\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"cloud-region\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
- " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
- " \"relationship-value\": \"AAI-12002-vm230w\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
- " \"relationship-value\": \"AAI-region-vm230w\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"cloud-region.owner-defined-type\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"model-id2\",\n" +
- " \"model-version-id\": \"version2\",\n" +
- " \"id\": \"AAI-12002-test2-vm230w\",\n" +
- " \"description\": \"a9DEa0kpY\",\n" +
- " \"instance-group-type\": \"type\",\n" +
- " \"resource-version\": \"1520888629970\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"cloud-region\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
- " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
- " \"relationship-value\": \"AAI-12002-vm230w\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
- " \"relationship-value\": \"AAI-region-vm230w\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"cloud-region.owner-defined-type\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " }\n" +
- " ]\n" +
- "}\n";
- }
-
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java
deleted file mode 100644
index 0cf32095e..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAIGetModelsByOwningEntity extends BaseAAIPreset {
- String oeName;
-
- public PresetAAIGetModelsByOwningEntity(String oeName) {
- this.oeName = oeName;
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.GET;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/business/owning-entities";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "owning-entity-id", Collections.singletonList(oeName)
- );
- }
-
- @Override
- public Object getResponseBody() {
- return "{" +
- " \"owning-entity\": [" +
- " {" +
- " \"owning-entity-id\": \"43b8a85a-0421-4265-9069-117dd6526b8a\"," +
- " \"owning-entity-name\": \"" + oeName + "\"," +
- " \"resource-version\": \"1527418700853\"," +
- " \"relationship-list\": {" +
- " \"relationship\": [" +
- " {" +
- " \"related-to\": \"service-instance\"," +
- " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," +
- " \"related-link\": \"/aai/v12/business/customers/customer/MSO_1610_ST/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/af9d52f9-13b2-4657-a198-463677f82dc0\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"customer.global-customer-id\"," +
- " \"relationship-value\": \"MSO_1610_ST\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-subscription.service-type\"," +
- " \"relationship-value\": \"MSO-dev-service-type\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-instance.service-instance-id\"," +
- " \"relationship-value\": \"af9d52f9-13b2-4657-a198-463677f82dc0\"" +
- " }" +
- " ]," +
- " \"related-to-property\": [" +
- " {" +
- " \"property-key\": \"service-instance.service-instance-name\"," +
- " \"property-value\": \"xbghrftgr_shani\"" +
- " }" +
- " ]" +
- " }," +
- " {" +
- " \"related-to\": \"service-instance\"," +
- " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," +
- " \"related-link\": \"/aai/v12/business/customers/customer/MSO_1610_ST/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/49769492-5def-4c89-8e73-b236f958fa40\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"customer.global-customer-id\"," +
- " \"relationship-value\": \"MSO_1610_ST\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-subscription.service-type\"," +
- " \"relationship-value\": \"MSO-dev-service-type\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-instance.service-instance-id\"," +
- " \"relationship-value\": \"49769492-5def-4c89-8e73-b236f958fa40\"" +
- " }" +
- " ]," +
- " \"related-to-property\": [" +
- " {" +
- " \"property-key\": \"service-instance.service-instance-name\"," +
- " \"property-value\": \"fghghfhgf\"" +
- " }" +
- " ]" +
- " }," +
- " {" +
- " \"related-to\": \"service-instance\"," +
- " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," +
- " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/13695dfb-db99-4c2f-905e-fe7bf2fc7b9f\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"customer.global-customer-id\"," +
- " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-subscription.service-type\"," +
- " \"relationship-value\": \"vMOG\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-instance.service-instance-id\"," +
- " \"relationship-value\": \"13695dfb-db99-4c2f-905e-fe7bf2fc7b9f\"" +
- " }" +
- " ]," +
- " \"related-to-property\": [" +
- " {" +
- " \"property-key\": \"service-instance.service-instance-name\"," +
- " \"property-value\": \"FIRSTNET_DEMO\"" +
- " }" +
- " ]" +
- " }," +
- " {" +
- " \"related-to\": \"service-instance\"," +
- " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," +
- " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/7e4f8130-5dee-47c4-8770-1abc5f5ded83\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"customer.global-customer-id\"," +
- " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-subscription.service-type\"," +
- " \"relationship-value\": \"Mobility\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-instance.service-instance-id\"," +
- " \"relationship-value\": \"7e4f8130-5dee-47c4-8770-1abc5f5ded83\"" +
- " }" +
- " ]," +
- " \"related-to-property\": [" +
- " {" +
- " \"property-key\": \"service-instance.service-instance-name\"," +
- " \"property-value\": \"Amir123\"" +
- " }" +
- " ]" +
- " }," +
- " {" +
- " \"related-to\": \"service-instance\"," +
- " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," +
- " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/d849b312-03f6-4fa3-a923-a469b850ec73\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"customer.global-customer-id\"," +
- " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-subscription.service-type\"," +
- " \"relationship-value\": \"Mobility\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-instance.service-instance-id\"," +
- " \"relationship-value\": \"d849b312-03f6-4fa3-a923-a469b850ec73\"" +
- " }" +
- " ]," +
- " \"related-to-property\": [" +
- " {" +
- " \"property-key\": \"service-instance.service-instance-name\"," +
- " \"property-value\": \"edbh54\"" +
- " }" +
- " ]" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " ]" +
- " }";
- }
-} \ No newline at end of file
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java
deleted file mode 100644
index df0df6ccc..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java
+++ /dev/null
@@ -1,157 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-public class PresetAAIGetModelsByProject extends BaseAAIPreset {
- private String projectName;
- private String serviceInstanceId;
-
- public PresetAAIGetModelsByProject(String projectName) {
- this.projectName = projectName;
- ImmutableMap servicesPerProject = ImmutableMap.of ("x1","7e4f8130-5dee-47c4-8770-1abc5f5ded83",
- "yyy1","13695dfb-db99-4c2f-905e-fe7bf2fc7b9f");
- this.serviceInstanceId = (servicesPerProject.containsKey(projectName)) ? servicesPerProject.get(projectName).toString(): UUID.randomUUID().toString();
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.GET;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/business/projects";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "project-name", Collections.singletonList(projectName)
- );
- }
-
- @Override
- public Object getResponseBody() {
- return "{" +
- " \"project\": [" +
- " {" +
- " \"project-name\": \"" + projectName + "\"," +
- " \"resource-version\": \"1527026201826\"," +
- " \"relationship-list\": {" +
- " \"relationship\": [" +
- " {" +
- " \"related-to\": \"service-instance\"," +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
- " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/3f826016-3ac9-4928-9561-beee75fd91d5\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"customer.global-customer-id\"," +
- " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-subscription.service-type\"," +
- " \"relationship-value\": \"Mobility\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-instance.service-instance-id\"," +
- " \"relationship-value\": \"3f826016-3ac9-4928-9561-beee75fd91d5\"" +
- " }" +
- " ]," +
- " \"related-to-property\": [" +
- " {" +
- " \"property-key\": \"service-instance.service-instance-name\"," +
- " \"property-value\": \"Lital_SRIOV2_001\"" +
- " }" +
- " ]" +
- " }," +
- " {" +
- " \"related-to\": \"service-instance\"," +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
- " \"related-link\": \"/aai/v12/business/customers/customer/DHV1707-TestSubscriber-2/service-subscriptions/service-subscription/HNGATEWAY/service-instances/service-instance/45713f81-04b8-4fd0-b824-64536d493984\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"customer.global-customer-id\"," +
- " \"relationship-value\": \"DHV1707-TestSubscriber-2\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-subscription.service-type\"," +
- " \"relationship-value\": \"HNGATEWAY\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-instance.service-instance-id\"," +
- " \"relationship-value\": \"45713f81-04b8-4fd0-b824-64536d493984\"" +
- " }" +
- " ]," +
- " \"related-to-property\": [" +
- " {" +
- " \"property-key\": \"service-instance.service-instance-name\"," +
- " \"property-value\": \"kkkk\"" +
- " }" +
- " ]" +
- " }," +
- " {" +
- " \"related-to\": \"service-instance\"," +
- " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," +
- " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/" + serviceInstanceId + "\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"customer.global-customer-id\"," +
- " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-subscription.service-type\"," +
- " \"relationship-value\": \"vMOG\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-instance.service-instance-id\"," +
- " \"relationship-value\": \"" + serviceInstanceId + "\"" +
- " }" +
- " ]," +
- " \"related-to-property\": [" +
- " {" +
- " \"property-key\": \"service-instance.service-instance-name\"," +
- " \"property-value\": \"FIRSTNET_DEMO\"" +
- " }" +
- " ]" +
- " }," +
- " {" +
- " \"related-to\": \"service-instance\"," +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
- " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/ff2d9326-1ef5-4760-aba0-0eaf372ae675\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"customer.global-customer-id\"," +
- " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-subscription.service-type\"," +
- " \"relationship-value\": \"Mobility\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"service-instance.service-instance-id\"," +
- " \"relationship-value\": \"ff2d9326-1ef5-4760-aba0-0eaf372ae675\"" +
- " }" +
- " ]," +
- " \"related-to-property\": [" +
- " {" +
- " \"property-key\": \"service-instance.service-instance-name\"," +
- " \"property-value\": \"VNF_INSTANCE_DEMO_THREE\"" +
- " }" +
- " ]" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " ]" +
- "}";
- }
-
-
-} \ No newline at end of file
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java
deleted file mode 100644
index 6586eb1bc..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-public class PresetAAIGetMultipleVersion extends BasePresetAAIGetVersion {
- public String modelVersionId2;
- public String modelVersionId3;
- public PresetAAIGetMultipleVersion(String modelVersionId1,
- String modelVersionId2,
- String modelVersionId3,
- String modelInvariantId) {
- super( modelVersionId1, modelInvariantId);
- this.modelVersionId2 = modelVersionId2;
- this.modelVersionId3 = modelVersionId3;
- }
- public String getModelVersionId2() {
- return modelVersionId2;
- }
- public String getModelVersionId3() {
- return modelVersionId3;
- }
-
- @Override
- public Object getResponseBody() {
- return "{\"results\": [" +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"" + getModelInvariantId() + "\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"1500138206526\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"" + getModelVersionId1() + "\"," +
- " \"model-name\": \"action-data\"," +
- " \"model-version\": \"1.0\"," +
- " \"model-description\": \"decontamination arm circus ammonia hump edge\"," +
- " \"resource-version\": \"1500137463984\"" +
- " }," +
- " {" +
- " \"model-version-id\": \"" + getModelVersionId3() + "\"," +
- " \"model-name\": \"action-data\"," +
- " \"model-version\": \"3.0\"," +
- " \"model-description\": \"Non decontamination arm circus ammonia hump edge\"," +
- " \"resource-version\": \"1500137463986\"" +
- " }," +
- " {" +
- " \"model-version-id\": \"" + getModelVersionId2() + "\"," +
- " \"model-name\": \"action-data\"," +
- " \"model-version\": \"2.0\"," +
- " \"model-description\": \"The oldest one\"," +
- " \"resource-version\": \"1500137463980\"" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }" +
- " ]}";
- }
-
- } \ No newline at end of file
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java
deleted file mode 100644
index 8a27fbce8..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAIGetNetworkCollectionDetails extends BaseAAIPreset {
-
-
- private String serviceInstanceId;
-
- public PresetAAIGetNetworkCollectionDetails(String serviceInstanceId) {
- this.serviceInstanceId = serviceInstanceId;
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "format", Collections.singletonList("resource")
- );
- }
-
- @Override
- public Object getRequestBody() {
- return ImmutableMap.of(
- "start", ImmutableList.of("nodes/service-instances/service-instance/" + getServiceInstanceId()),
- "query", "query/network-collection-ByServiceInstance"
- );
- }
-
- public String getServiceInstanceId() {
- return serviceInstanceId;
- }
-
-
- @Override
- public Object getResponseBody() {
- return "{\n" +
- " \"results\": [\n" +
- " {\n" +
- " \"service-instance\": {\n" +
- " \"service-instance-id\": \"2UJZZ01777-rs804s\",\n" +
- " \"resource-version\": \"1521662813382\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"collection\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/collections/collection/collection-1-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"collection.collection-id\",\n" +
- " \"relationship-value\": \"collection-1-2018-rs804s\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"collection\": {\n" +
- " \"collection-id\": \"collection-1-2018-rs804s\",\n" +
- " \"model-invariant-id\": \"5761e0a7-defj777\",\n" +
- " \"model-version-id\": \"5761e0a7-defj232\",\n" +
- " \"collection-name\": \"collection-name\",\n" +
- " \"collection-type\": \"L3-NETWORK\",\n" +
- " \"collection-role\": \"SUB-INTERFACE\",\n" +
- " \"collection-function\": \"collection-function\",\n" +
- " \"collection-customization-id\": \"custom-unique-data-id\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"service-instance\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/business/customers/customer/customer-1-2017-rs804s/service-subscriptions/service-subscription/service-value7-rs804s/service-instances/service-instance/2UJZZ01777-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"customer.global-customer-id\",\n" +
- " \"relationship-value\": \"customer-1-2017-rs804s\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"service-subscription.service-type\",\n" +
- " \"relationship-value\": \"service-value7-rs804s\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"service-instance.service-instance-id\",\n" +
- " \"relationship-value\": \"2UJZZ01777-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"service-instance.service-instance-name\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " \"resource-version\": \"1521662811309\"\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"5761e0a7-defj777\",\n" +
- " \"model-version-id\": \"5761e0a7-defj22\",\n" +
- " \"id\": \"instanceGroup-2018-rs804s\",\n" +
- " \"description\": \"zr6h\",\n" +
- " \"instance-group-type\": \"7DDjOdNL\",\n" +
- " \"resource-version\": \"1521662814023\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"l3-network\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/l3-networks/l3-network/l3network-id-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"l3-network.network-id\",\n" +
- " \"relationship-value\": \"l3network-id-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"l3-network.network-name\",\n" +
- " \"property-value\": \"oam-net\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"collection\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/collections/collection/collection-1-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"collection.collection-id\",\n" +
- " \"relationship-value\": \"collection-1-2018-rs804s\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"l3-network\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/l3-networks/l3-network/l3network-id-3-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"l3-network.network-id\",\n" +
- " \"relationship-value\": \"l3network-id-3-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"l3-network.network-name\",\n" +
- " \"property-value\": \"oam-net\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"l3-network\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/l3-networks/l3-network/l3network-id-2-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"l3-network.network-id\",\n" +
- " \"relationship-value\": \"l3network-id-2-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"l3-network.network-name\",\n" +
- " \"property-value\": \"oam-net\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"l3-network\": {\n" +
- " \"network-id\": \"l3network-id-rs804s\",\n" +
- " \"network-name\": \"oam-net\",\n" +
- " \"network-type\": \"Tenant_Layer_3\",\n" +
- " \"network-role\": \"HngwProtectedOam.OAM\",\n" +
- " \"network-technology\": \"Contrail\",\n" +
- " \"is-bound-to-vpn\": false,\n" +
- " \"resource-version\": \"1521662814627\",\n" +
- " \"is-provider-network\": false,\n" +
- " \"is-shared-network\": false,\n" +
- " \"is-external-network\": false,\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"l3-network\": {\n" +
- " \"network-id\": \"l3network-id-3-rs804s\",\n" +
- " \"network-name\": \"oam-net\",\n" +
- " \"network-type\": \"Tenant_Layer_3\",\n" +
- " \"network-role\": \"HngwProtectedOam.OAM\",\n" +
- " \"network-technology\": \"Contrail\",\n" +
- " \"is-bound-to-vpn\": false,\n" +
- " \"resource-version\": \"1521662816043\",\n" +
- " \"is-provider-network\": false,\n" +
- " \"is-shared-network\": false,\n" +
- " \"is-external-network\": false,\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"l3-network\": {\n" +
- " \"network-id\": \"l3network-id-2-rs804s\",\n" +
- " \"network-name\": \"oam-net\",\n" +
- " \"network-type\": \"Tenant_Layer_3\",\n" +
- " \"network-role\": \"HngwProtectedOam.OAM\",\n" +
- " \"network-technology\": \"Contrail\",\n" +
- " \"is-bound-to-vpn\": false,\n" +
- " \"resource-version\": \"1521662815304\",\n" +
- " \"is-provider-network\": false,\n" +
- " \"is-shared-network\": false,\n" +
- " \"is-external-network\": false,\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " }\n" +
- " ]\n" +
- "}";
- }
-
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java
deleted file mode 100644
index 9e4d653d2..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAIGetNetworkCollectionDetailsInvalidRequest extends BaseAAIPreset {
-
- private String serviceInstanceId;
-
- public PresetAAIGetNetworkCollectionDetailsInvalidRequest(String serviceInstanceId) {
- this.serviceInstanceId = serviceInstanceId;
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "format", Collections.singletonList("resource")
- );
- }
-
- @Override
- public Object getRequestBody() {
- return ImmutableMap.of(
- "start", ImmutableList.of("nodes/service-instances/service-instance/" + getServiceInstanceId()),
- "query", "query/network-collection-ByServiceInstance"
- );
- }
-
- public String getServiceInstanceId() {
- return serviceInstanceId;
- }
-
-
- @Override
- public Object getResponseBody() {
- return "{\n" +
- " \"results\": [\n" +
- " {\n" +
- " \"service-instance\": {\n" +
- " \"service-instance-id\": \"2UJZZ01777-rs804s\",\n" +
- " \"resource-version\": \"1521662813382\",\n" +
- " \"resource-versions\": \"1521662813382\",\n" + //extra field
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"collection\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/collections/collection/collection-1-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"collection.collection-id\",\n" +
- " \"relationship-value\": \"collection-1-2018-rs804s\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"collection\": {\n" +
- " \"collection-id\": \"collection-1-2018-rs804s\",\n" +
- " \"model-invariant-id\": \"5761e0a7-defj777\",\n" +
- " \"model-version-id\": \"5761e0a7-defj232\",\n" +
- " \"collection-name\": \"collection-name\",\n" +
- " \"collection-names\": \"collection-name\",\n" +//extra field
- " \"collection-type\": \"L3-NETWORK\",\n" +
- " \"collection-role\": \"SUB-INTERFACE\",\n" +
- " \"collection-function\": \"collection-function\",\n" +
- " \"collection-customization-id\": \"custom-unique-data-id\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"service-instance\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/business/customers/customer/customer-1-2017-rs804s/service-subscriptions/service-subscription/service-value7-rs804s/service-instances/service-instance/2UJZZ01777-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"customer.global-customer-id\",\n" +
- " \"relationship-value\": \"customer-1-2017-rs804s\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"service-subscription.service-type\",\n" +
- " \"relationship-value\": \"service-value7-rs804s\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"service-instance.service-instance-id\",\n" +
- " \"relationship-value\": \"2UJZZ01777-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"service-instance.service-instance-name\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " \"resource-version\": \"1521662811309\"\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"5761e0a7-defj777\",\n" +
- " \"model-version-id\": \"5761e0a7-defj22\",\n" +
- " \"id\": \"instanceGroup-2018-rs804s\",\n" +
- " \"ids\": \"instanceGroup-2018-rs804s\",\n" + //extra field
- " \"description\": \"zr6h\",\n" +
- " \"instance-group-type\": \"7DDjOdNL\",\n" +
- " \"resource-version\": \"1521662814023\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"l3-network\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/l3-networks/l3-network/l3network-id-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"l3-network.network-id\",\n" +
- " \"relationship-value\": \"l3network-id-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"l3-network.network-name\",\n" +
- " \"property-value\": \"oam-net\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"collection\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/collections/collection/collection-1-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"collection.collection-id\",\n" +
- " \"relationship-value\": \"collection-1-2018-rs804s\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"l3-network\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/l3-networks/l3-network/l3network-id-3-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"l3-network.network-id\",\n" +
- " \"relationship-value\": \"l3network-id-3-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"l3-network.network-name\",\n" +
- " \"property-value\": \"oam-net\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"l3-network\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/l3-networks/l3-network/l3network-id-2-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"l3-network.network-id\",\n" +
- " \"relationship-value\": \"l3network-id-2-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"l3-network.network-name\",\n" +
- " \"property-value\": \"oam-net\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"l3-network\": {\n" +
- " \"network-id\": \"l3network-id-rs804s\",\n" +
- " \"network-name\": \"oam-net\",\n" +
- " \"network-type\": \"Tenant_Layer_3\",\n" +
- " \"network-role\": \"HngwProtectedOam.OAM\",\n" +
- " \"network-roles\": \"HngwProtectedOam.OAM\",\n" +//extra field
- " \"network-technology\": \"Contrail\",\n" +
- " \"is-bound-to-vpn\": false,\n" +
- " \"resource-version\": \"1521662814627\",\n" +
- " \"is-provider-network\": false,\n" +
- " \"is-shared-network\": false,\n" +
- " \"is-external-network\": false,\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"l3-network\": {\n" +
- " \"network-id\": \"l3network-id-3-rs804s\",\n" +
- " \"network-name\": \"oam-net\",\n" +
- " \"network-type\": \"Tenant_Layer_3\",\n" +
- " \"network-role\": \"HngwProtectedOam.OAM\",\n" +
- " \"network-technology\": \"Contrail\",\n" +
- " \"is-bound-to-vpn\": false,\n" +
- " \"resource-version\": \"1521662816043\",\n" +
- " \"is-provider-network\": false,\n" +
- " \"is-shared-network\": false,\n" +
- " \"is-external-network\": false,\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"l3-network\": {\n" +
- " \"network-id\": \"l3network-id-2-rs804s\",\n" +
- " \"network-name\": \"oam-net\",\n" +
- " \"network-type\": \"Tenant_Layer_3\",\n" +
- " \"network-role\": \"HngwProtectedOam.OAM\",\n" +
- " \"network-technology\": \"Contrail\",\n" +
- " \"is-bound-to-vpn\": false,\n" +
- " \"resource-version\": \"1521662815304\",\n" +
- " \"is-provider-network\": false,\n" +
- " \"is-shared-network\": false,\n" +
- " \"is-external-network\": false,\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " }\n" +
- " ]\n" +
- "}";
- }
-
-
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java
deleted file mode 100644
index e137ee233..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAIGetNetworkCollectionDetailsRequiredMissing extends BaseAAIPreset {
-
-
- private String serviceInstanceId;
-
- public PresetAAIGetNetworkCollectionDetailsRequiredMissing(String serviceInstanceId) {
- this.serviceInstanceId = serviceInstanceId;
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "format", Collections.singletonList("resource")
- );
- }
-
- @Override
- public Object getRequestBody() {
- return ImmutableMap.of(
- "start", ImmutableList.of("nodes/service-instances/service-instance/" + getServiceInstanceId()),
- "query", "query/network-collection-ByServiceInstance"
- );
- }
-
- public String getServiceInstanceId() {
- return serviceInstanceId;
- }
-
-
- @Override
- public Object getResponseBody() {
- return "{\n" +
- " \"results\": [\n" +
- " {\n" +
- " \"service-instance\": {\n" +
- " \"service-instance-id\": \"2UJZZ01777-rs804s\",\n" +
- " \"resource-version\": \"1521662813382\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"collection\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/collections/collection/collection-1-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"collection.collection-id\",\n" +
- " \"relationship-value\": \"collection-1-2018-rs804s\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"collection\": {\n" +
- " \"collection-id\": \"collection-1-2018-rs804s\",\n" +
- " \"model-invariant-id\": \"5761e0a7-defj777\",\n" +
- " \"model-version-id\": \"5761e0a7-defj232\",\n" +
- " \"collection-name\": \"collection-name\",\n" +
- " \"collection-type\": \"L3-NETWORK\",\n" +
- " \"collection-role\": \"SUB-INTERFACE\",\n" +
- " \"collection-function\": \"collection-function\",\n" +
- " \"collection-customization-id\": \"custom-unique-data-id\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"service-instance\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/business/customers/customer/customer-1-2017-rs804s/service-subscriptions/service-subscription/service-value7-rs804s/service-instances/service-instance/2UJZZ01777-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"customer.global-customer-id\",\n" +
- " \"relationship-value\": \"customer-1-2017-rs804s\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"service-subscription.service-type\",\n" +
- " \"relationship-value\": \"service-value7-rs804s\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"service-instance.service-instance-id\",\n" +
- " \"relationship-value\": \"2UJZZ01777-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"service-instance.service-instance-name\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " \"resource-version\": \"1521662811309\"\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"instance-group\": {\n" +
- " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" +
- " \"model-invariant-id\": \"5761e0a7-defj777\",\n" +
- " \"model-version-id\": \"5761e0a7-defj22\",\n" +
- " \"id\": \"instanceGroup-2018-rs804s\",\n" +
- " \"instance-group-type\": \"7DDjOdNL\",\n" +
- " \"resource-version\": \"1521662814023\",\n" +
- " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" +
- " \"instance-group-function\": \"testfunction2\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"l3-network\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/l3-networks/l3-network/l3network-id-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"l3-network.network-id\",\n" +
- " \"relationship-value\": \"l3network-id-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"l3-network.network-name\",\n" +
- " \"property-value\": \"oam-net\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"collection\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/collections/collection/collection-1-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"collection.collection-id\",\n" +
- " \"relationship-value\": \"collection-1-2018-rs804s\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"l3-network\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/l3-networks/l3-network/l3network-id-3-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"l3-network.network-id\",\n" +
- " \"relationship-value\": \"l3network-id-3-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"l3-network.network-name\",\n" +
- " \"property-value\": \"oam-net\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"l3-network\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/l3-networks/l3-network/l3network-id-2-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"l3-network.network-id\",\n" +
- " \"relationship-value\": \"l3network-id-2-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"l3-network.network-name\",\n" +
- " \"property-value\": \"oam-net\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"l3-network\": {\n" +
- " \"network-id\": \"l3network-id-rs804s\",\n" +
- " \"network-name\": \"oam-net\",\n" +
- " \"network-type\": \"Tenant_Layer_3\",\n" +
- " \"network-role\": \"HngwProtectedOam.OAM\",\n" +
- " \"network-technology\": \"Contrail\",\n" +
- " \"is-bound-to-vpn\": false,\n" +
- " \"resource-version\": \"1521662814627\",\n" +
- " \"is-provider-network\": false,\n" +
- " \"is-shared-network\": false,\n" +
- " \"is-external-network\": false,\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"l3-network\": {\n" +
- " \"network-id\": \"l3network-id-3-rs804s\",\n" +
- " \"network-name\": \"oam-net\",\n" +
- " \"network-type\": \"Tenant_Layer_3\",\n" +
- " \"network-role\": \"HngwProtectedOam.OAM\",\n" +
- " \"network-technology\": \"Contrail\",\n" +
- " \"is-bound-to-vpn\": false,\n" +
- " \"resource-version\": \"1521662816043\",\n" +
- " \"is-provider-network\": false,\n" +
- " \"is-shared-network\": false,\n" +
- " \"is-external-network\": false,\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " },\n" +
- " {\n" +
- " \"l3-network\": {\n" +
- " \"network-id\": \"l3network-id-2-rs804s\",\n" +
- " \"network-name\": \"oam-net\",\n" +
- " \"network-type\": \"Tenant_Layer_3\",\n" +
- " \"network-role\": \"HngwProtectedOam.OAM\",\n" +
- " \"network-technology\": \"Contrail\",\n" +
- " \"is-bound-to-vpn\": false,\n" +
- " \"resource-version\": \"1521662815304\",\n" +
- " \"is-provider-network\": false,\n" +
- " \"is-shared-network\": false,\n" +
- " \"is-external-network\": false,\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"instanceGroup-2018-rs804s\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"zr6h\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"wKmBXiO1xm8bK\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " }\n" +
- " }\n" +
- " ]\n" +
- "}";
- }
-
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java
deleted file mode 100644
index 02f01bd7a..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java
+++ /dev/null
@@ -1,794 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-public class PresetAAIGetNetworkZones extends BaseAAIPreset {
-
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.GET;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/network/zones";
- }
-
- @Override
- public Object getResponseBody() {
- return "{" +
- " \"zone\": [" +
- " {" +
- " \"zone-id\": \"NFT1\"," +
- " \"zone-name\": \"NFTJSSSS-NFT1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"JAG1\"," +
- " \"zone-name\": \"YUDFJULP-JAG1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"YYY1\"," +
- " \"zone-name\": \"UUUAIAAI-YYY1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"BAN1\"," +
- " \"zone-name\": \"VSDKYUTP-BAN1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DKJ1\"," +
- " \"zone-name\": \"DKJSJDKA-DKJ1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"MCS1\"," +
- " \"zone-name\": \"ASACMAMS-MCS1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"UIO1\"," +
- " \"zone-name\": \"uioclli1-UIO1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"RAJ1\"," +
- " \"zone-name\": \"YGBIJNLQ-RAJ1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"OPA1\"," +
- " \"zone-name\": \"opaclli1-OPA1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SDE1\"," +
- " \"zone-name\": \"ZXCVBNMA-SDE1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"VEN2\"," +
- " \"zone-name\": \"FGHJUHIL-VEN2\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ORL1\"," +
- " \"zone-name\": \"ORLDFLMA-ORL1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"JAD1\"," +
- " \"zone-name\": \"JADECLLI-JAD1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ZXL1\"," +
- " \"zone-name\": \"LWLWCANN-ZXL1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"CKL1\"," +
- " \"zone-name\": \"CLKSKCKK-CKL1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SDF1\"," +
- " \"zone-name\": \"sdfclli1-SDF1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"RAD1\"," +
- " \"zone-name\": \"RADICAL1-RAD1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"KIT1\"," +
- " \"zone-name\": \"BHYJFGLN-KIT1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"REL1\"," +
- " \"zone-name\": \"INGERFGT-REL1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"JNL1\"," +
- " \"zone-name\": \"CJALSDAC-JNL1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"OLK1\"," +
- " \"zone-name\": \"OLKOLKLS-OLK1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"CHI1\"," +
- " \"zone-name\": \"CHILLIWE-CHI1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"UUU4\"," +
- " \"zone-name\": \"UUUAAAUU-UUU4\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TUF1\"," +
- " \"zone-name\": \"TUFCLLI1-TUF1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"KJN1\"," +
- " \"zone-name\": \"CKALDKSA-KJN1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAM1\"," +
- " \"zone-name\": \"SNDGCA64-SAN1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SCK1\"," +
- " \"zone-name\": \"SCKSCKSK-SCK1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"HJH1\"," +
- " \"zone-name\": \"AOEEQQQD-HJH1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"HGD1\"," +
- " \"zone-name\": \"SDFQWHGD-HGD1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"KOR1\"," +
- " \"zone-name\": \"HYFLNBVT-KOR1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL43\"," +
- " \"zone-name\": \"AICLOCID-ATL43\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL54\"," +
- " \"zone-name\": \"AICFTAAI-ATL54\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL66\"," +
- " \"zone-name\": \"CLLIAAII-ATL66\"" +
- " }," +
- " {" +
- " \"zone-id\": \"VEL1\"," +
- " \"zone-name\": \"BNMLKUIK-VEL1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ICC1\"," +
- " \"zone-name\": \"SANJITAT-ICC1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"MNT11\"," +
- " \"zone-name\": \"WSXEFBTH-MNT11\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DEF2\"," +
- " \"zone-name\": \"WSBHGTYL-DEF2\"" +
- " }," +
- " {" +
- " \"zone-id\": \"MAD11\"," +
- " \"zone-name\": \"SDFQWGKL-MAD11\"" +
- " }," +
- " {" +
- " \"zone-id\": \"OLG1\"," +
- " \"zone-name\": \"OLHOLHOL-OLG1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"GAR1\"," +
- " \"zone-name\": \"NGFVSJKO-GAR1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAN22\"," +
- " \"zone-name\": \"GNVLSCTL-SAN22\"" +
- " }," +
- " {" +
- " \"zone-id\": \"HRG1\"," +
- " \"zone-name\": \"HRGHRGGS-HRG1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"JCS1\"," +
- " \"zone-name\": \"JCSJSCJS-JCS1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DHA12\"," +
- " \"zone-name\": \"WSXEDECF-DHA12\"" +
- " }," +
- " {" +
- " \"zone-id\": \"HJE1\"," +
- " \"zone-name\": \"AOEEWWWD-HJE1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"NCA1\"," +
- " \"zone-name\": \"NCANCANN-NCA1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"IOP1\"," +
- " \"zone-name\": \"iopclli1-IOP1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"RTY1\"," +
- " \"zone-name\": \"rtyclli1-RTY1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"KAP1\"," +
- " \"zone-name\": \"HIOUYTRQ-KAP1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ZEN1\"," +
- " \"zone-name\": \"ZENCLLI1-ZEN1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"HKA1\"," +
- " \"zone-name\": \"JAKHLASS-HKA1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"CQK1\"," +
- " \"zone-name\": \"CQKSCAKK-CQK1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAI1\"," +
- " \"zone-name\": \"UBEKQLPD-SAI1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ERT1\"," +
- " \"zone-name\": \"ertclli1-ERT1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"IBB1\"," +
- " \"zone-name\": \"PLMKOIJU-IBB1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TIR2\"," +
- " \"zone-name\": \"PLKINHYI-TIR2\"" +
- " }," +
- " {" +
- " \"zone-id\": \"HSD1\"," +
- " \"zone-name\": \"CHASKCDS-HSD1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SLF78\"," +
- " \"zone-name\": \"SDCTLFN1-SLF78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SEE78\"," +
- " \"zone-name\": \"SDCTEEE4-SEE78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAN13\"," +
- " \"zone-name\": \"TOKYJPFA-SAN13\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAA78\"," +
- " \"zone-name\": \"SDCTAAA1-SAA78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"LUC1\"," +
- " \"zone-name\": \"ATLDFGYC-LUC1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"AMD13\"," +
- " \"zone-name\": \"MEMATLAN-AMD13\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TOR1\"," +
- " \"zone-name\": \"TOROONXN-TOR1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"QWE1\"," +
- " \"zone-name\": \"QWECLLI1-QWE1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ZOG1\"," +
- " \"zone-name\": \"ZOGASTRO-ZOG1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"CAL33\"," +
- " \"zone-name\": \"CALIFORN-CAL33\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SHH78\"," +
- " \"zone-name\": \"SDIT1HHH-SHH78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DSA1\"," +
- " \"zone-name\": \"LKJHGFDS-DSA1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"CLG1\"," +
- " \"zone-name\": \"CLGRABAD-CLG1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"BNA1\"," +
- " \"zone-name\": \"BNARAGBK-BNA1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL84\"," +
- " \"zone-name\": \"CANTTCOC-ATL84\"" +
- " }," +
- " {" +
- " \"zone-id\": \"APP1\"," +
- " \"zone-name\": \"WBHGTYUI-APP1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"RJN1\"," +
- " \"zone-name\": \"RJNRBZAW-RJN1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"EHH78\"," +
- " \"zone-name\": \"SDCSHHH5-EHH78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"mac10\"," +
- " \"zone-name\": \"PKGTESTF-mac10\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SXB78\"," +
- " \"zone-name\": \"SDCTGXB1-SXB78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAX78\"," +
- " \"zone-name\": \"SDCTAXG1-SAX78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SYD1\"," +
- " \"zone-name\": \"SYDNAUBV-SYD1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TOK1\"," +
- " \"zone-name\": \"TOKYJPFA-TOK1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"KGM2\"," +
- " \"zone-name\": \"KGMTNC20-KGM2\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DCC1b\"," +
- " \"zone-name\": \"POIUYTGH-DCC1b\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SKK78\"," +
- " \"zone-name\": \"SDCTKKK1-SKK78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SGG78\"," +
- " \"zone-name\": \"SDCTGGG1-SGG78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SJJ78\"," +
- " \"zone-name\": \"SDCTJJJ1-SJJ78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SBX78\"," +
- " \"zone-name\": \"SDCTBXG1-SBX78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"LAG1\"," +
- " \"zone-name\": \"LARGIZON-LAG1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"IAA1\"," +
- " \"zone-name\": \"QAZXSWED-IAA1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"POI1\"," +
- " \"zone-name\": \"PLMNJKIU-POI1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"LAG1a\"," +
- " \"zone-name\": \"LARGIZON-LAG1a\"" +
- " }," +
- " {" +
- " \"zone-id\": \"PBL1\"," +
- " \"zone-name\": \"PBLAPBAI-PBL1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"LAG45\"," +
- " \"zone-name\": \"LARGIZON-LAG1a\"" +
- " }," +
- " {" +
- " \"zone-id\": \"MAR1\"," +
- " \"zone-name\": \"MNBVCXZM-MAR1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"HST70\"," +
- " \"zone-name\": \"HSTNTX70-HST70\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DCC1a\"," +
- " \"zone-name\": \"POIUYTGH-DCC1a\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TOL1\"," +
- " \"zone-name\": \"TOLDOH21-TOL1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"LON1\"," +
- " \"zone-name\": \"LONEENCO-LON1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SJU78\"," +
- " \"zone-name\": \"SDIT1JUB-SJU78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"STN27\"," +
- " \"zone-name\": \"HSTNTX01-STN27\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SSW56\"," +
- " \"zone-name\": \"ss8126GT-SSW56\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SBB78\"," +
- " \"zone-name\": \"SDIT1BBB-SBB78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DCC3\"," +
- " \"zone-name\": \"POIUYTGH-DCC3\"" +
- " }," +
- " {" +
- " \"zone-id\": \"GNV1\"," +
- " \"zone-name\": \"GNVLSCTL-GNV1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"WAS1\"," +
- " \"zone-name\": \"WASHDCSW-WAS1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TOY1\"," +
- " \"zone-name\": \"TORYONNZ-TOY1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"STT1\"," +
- " \"zone-name\": \"STTLWA02-STT1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"STG1\"," +
- " \"zone-name\": \"STTGGE62-STG1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SLL78\"," +
- " \"zone-name\": \"SDCTLLL1-SLL78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SBU78\"," +
- " \"zone-name\": \"SDIT1BUB-SBU78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL2\"," +
- " \"zone-name\": \"ATLNGANW-ATL2\"" +
- " }," +
- " {" +
- " \"zone-id\": \"BOT1\"," +
- " \"zone-name\": \"BOTHWAKY-BOT1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SNG1\"," +
- " \"zone-name\": \"SNGPSIAU-SNG1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"NYC1\"," +
- " \"zone-name\": \"NYCMNY54-NYC1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"LAG1b\"," +
- " \"zone-name\": \"LARGIZON-LAG1b\"" +
- " }," +
- " {" +
- " \"zone-id\": \"AMD15\"," +
- " \"zone-name\": \"AMDFAA01-AMD15\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SNA1\"," +
- " \"zone-name\": \"SNANTXCA-SNA1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"PLT1\"," +
- " \"zone-name\": \"PLTNCA60-PLT1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TLP1\"," +
- " \"zone-name\": \"TLPNXM18-TLP1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SDD81\"," +
- " \"zone-name\": \"SAIT1DD6-SDD81\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DCC1\"," +
- " \"zone-name\": \"POIUYTGH-DCC1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DCC2\"," +
- " \"zone-name\": \"POIUYTGH-DCC2\"" +
- " }," +
- " {" +
- " \"zone-id\": \"OKC1\"," +
- " \"zone-name\": \"OKCBOK55-OKC1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"PAR1\"," +
- " \"zone-name\": \"PARSFRCG-PAR1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TES36\"," +
- " \"zone-name\": \"ABCEETES-TES36\"" +
- " }," +
- " {" +
- " \"zone-id\": \"COM1\"," +
- " \"zone-name\": \"PLMKOPIU-COM1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ANI1\"," +
- " \"zone-name\": \"ATLNGTRE-ANI1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SDG78\"," +
- " \"zone-name\": \"SDIT1BDG-SDG78\"" +
- " }," +
- " {" +
- " \"zone-id\": \"mac20\"," +
- " \"zone-name\": \"PKGTESTF-mac20\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DSF45\"," +
- " \"zone-name\": \"DSFBG123-DSF45\"" +
- " }," +
- " {" +
- " \"zone-id\": \"HST25\"," +
- " \"zone-name\": \"HSTNTX01-HST25\"" +
- " }," +
- " {" +
- " \"zone-id\": \"AMD18\"," +
- " \"zone-name\": \"AUDIMA01-AMD18\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAA80\"," +
- " \"zone-name\": \"SAIT9AA3-SAA80\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SSA56\"," +
- " \"zone-name\": \"SSIT2AA7-SSA56\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SDD82\"," +
- " \"zone-name\": \"SAIT1DD9-SDD82\"" +
- " }," +
- " {" +
- " \"zone-id\": \"JCV1\"," +
- " \"zone-name\": \"JCVLFLBW-JCV1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SUL2\"," +
- " \"zone-name\": \"WERTYUJK-SUL2\"" +
- " }," +
- " {" +
- " \"zone-id\": \"PUR1\"," +
- " \"zone-name\": \"purelyde-PUR1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"FDE55\"," +
- " \"zone-name\": \"FDERT555-FDE55\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SITE\"," +
- " \"zone-name\": \"LONEENCO-SITE\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL1\"," +
- " \"zone-name\": \"ATLNGAMA-ATL1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"JUL1\"," +
- " \"zone-name\": \"ZXCVBNMM-JUL1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TAT34\"," +
- " \"zone-name\": \"TESAAISB-TAT34\"" +
- " }," +
- " {" +
- " \"zone-id\": \"XCP12\"," +
- " \"zone-name\": \"CHKGH123-XCP12\"" +
- " }," +
- " {" +
- " \"zone-id\": \"RAI1\"," +
- " \"zone-name\": \"poiuytre-RAI1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"HPO1\"," +
- " \"zone-name\": \"ATLNGAUP-HPO1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"KJF12\"," +
- " \"zone-name\": \"KJFDH123-KJF12\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SCC80\"," +
- " \"zone-name\": \"SAIT9CC3-SCC80\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAA12\"," +
- " \"zone-name\": \"SAIT9AF8-SAA12\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAA14\"," +
- " \"zone-name\": \"SAIT1AA9-SAA14\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL35\"," +
- " \"zone-name\": \"TTESSAAI-ATL35\"" +
- " }," +
- " {" +
- " \"zone-id\": \"CWY1\"," +
- " \"zone-name\": \"CWYMOWBS-CWY1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL76\"," +
- " \"zone-name\": \"TELEPAAI-ATL76\"" +
- " }," +
- " {" +
- " \"zone-id\": \"DSL12\"," +
- " \"zone-name\": \"DSLFK242-DSL12\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL53\"," +
- " \"zone-name\": \"AAIATLTE-ATL53\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAA11\"," +
- " \"zone-name\": \"SAIT9AA2-SAA11\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL62\"," +
- " \"zone-name\": \"TESSASCH-ATL62\"" +
- " }," +
- " {" +
- " \"zone-id\": \"AUG1\"," +
- " \"zone-name\": \"ASDFGHJK-AUG1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"POI22\"," +
- " \"zone-name\": \"POIUY123-POI22\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SAA13\"," +
- " \"zone-name\": \"SAIT1AA9-SAA13\"" +
- " }," +
- " {" +
- " \"zone-id\": \"BHY17\"," +
- " \"zone-name\": \"BHYTFRF3-BHY17\"" +
- " }," +
- " {" +
- " \"zone-id\": \"LIS1\"," +
- " \"zone-name\": \"HOSTPROF-LIS1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"SIP1\"," +
- " \"zone-name\": \"ZXCVBNMK-SIP1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL99\"," +
- " \"zone-name\": \"TEESTAAI-ATL43\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL64\"," +
- " \"zone-name\": \"FORLOAAJ-ATL64\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TAT33\"," +
- " \"zone-name\": \"TESAAISA-TAT33\"" +
- " }," +
- " {" +
- " \"zone-id\": \"RAD10\"," +
- " \"zone-name\": \"INDIPUNE-RAD10\"" +
- " }," +
- " {" +
- " \"zone-id\": \"RTW5\"," +
- " \"zone-name\": \"BHYTFRY4-RTW5\"" +
- " }," +
- " {" +
- " \"zone-id\": \"JGS1\"," +
- " \"zone-name\": \"KSJKKKKK-JGS1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL98\"," +
- " \"zone-name\": \"TEESTAAI-ATL43\"" +
- " }," +
- " {" +
- " \"zone-id\": \"WAN1\"," +
- " \"zone-name\": \"LEIWANGW-WAN1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL44\"," +
- " \"zone-name\": \"ATLSANAB-ATL44\"" +
- " }," +
- " {" +
- " \"zone-id\": \"RTD2\"," +
- " \"zone-name\": \"BHYTFRk4-RTD2\"" +
- " }," +
- " {" +
- " \"zone-id\": \"NIR1\"," +
- " \"zone-name\": \"ORFLMANA-NIR1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL75\"," +
- " \"zone-name\": \"SANAAIRE-ATL75\"" +
- " }," +
- " {" +
- " \"zone-id\": \"NUM1\"," +
- " \"zone-name\": \"QWERTYUI-NUM1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"MTN32\"," +
- " \"zone-name\": \"MDTWNJ21-MTN32\"" +
- " }," +
- " {" +
- " \"zone-id\": \"RTZ4\"," +
- " \"zone-name\": \"BHYTFRZ6-RTZ4\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL56\"," +
- " \"zone-name\": \"ATLSANAC-ATL56\"" +
- " }," +
- " {" +
- " \"zone-id\": \"AMS1\"," +
- " \"zone-name\": \"AMSTNLBW-AMS1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"RCT1\"," +
- " \"zone-name\": \"AMSTERNL-RCT1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"JAN1\"," +
- " \"zone-name\": \"ORFLMATT-JAN1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ABC14\"," +
- " \"zone-name\": \"TESAAISA-ABC14\"" +
- " }," +
- " {" +
- " \"zone-id\": \"TAT37\"," +
- " \"zone-name\": \"TESAAISD-TAT37\"" +
- " }," +
- " {" +
- " \"zone-id\": \"MIC54\"," +
- " \"zone-name\": \"MICHIGAN-MIC54\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ABC11\"," +
- " \"zone-name\": \"ATLSANAI-ABC11\"" +
- " }," +
- " {" +
- " \"zone-id\": \"AMF11\"," +
- " \"zone-name\": \"AMDOCS01-AMF11\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL63\"," +
- " \"zone-name\": \"ATLSANEW-ATL63\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ABC12\"," +
- " \"zone-name\": \"ATLSECIA-ABC12\"" +
- " }," +
- " {" +
- " \"zone-id\": \"MTN20\"," +
- " \"zone-name\": \"MDTWNJ21-MTN20\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ABC15\"," +
- " \"zone-name\": \"AAITESAN-ABC15\"" +
- " }," +
- " {" +
- " \"zone-id\": \"AVT1\"," +
- " \"zone-name\": \"AVTRFLHD-AVT1\"" +
- " }," +
- " {" +
- " \"zone-id\": \"ATL34\"," +
- " \"zone-name\": \"ATLSANAI-ATL34\"" +
- " }" +
- " ]" +
- " }";
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java
deleted file mode 100644
index 1ccf8b9ea..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-public class PresetAAIGetOneVersion extends BasePresetAAIGetVersion {
-
- public PresetAAIGetOneVersion(String modelVersionId1,
- String modelInvariantId) {
- super(modelVersionId1, modelInvariantId);
- }
-
- @Override
- public Object getResponseBody() {
- return "{\"results\": [" +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"" + getModelInvariantId() + "\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"1500138206526\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"" + getModelVersionId1() + "\"," +
- " \"model-name\": \"action-data\"," +
- " \"model-version\": \"1.0\"," +
- " \"model-description\": \"decontamination arm circus ammonia hump edge\"," +
- " \"resource-version\": \"1500137463984\"" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }" +
- " ]}";
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java
deleted file mode 100644
index dd5d0abfc..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-/**
- * Created by itzikliderman on 21/12/2017.
- */
-public class PresetAAIGetPNFByRegionErrorPut extends BaseAAIPreset {
-
- @Override
- public Object getResponseBody() {
- return "{" +
- " \"start\": \"/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911\"," +
- " \"query\": \"query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP\"" +
- " }";
- }
-
- @Override
- public int getResponseCode() {
- return 500;
- }
-
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java
deleted file mode 100644
index 22accac1d..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAIGetPortMirroringSourcePorts extends BaseAAIPreset {
- public PresetAAIGetPortMirroringSourcePorts(String configurationId, String interfaceId, String interfaceName, boolean isPortMirrored) {
- this.configurationId = configurationId;
- this.interfaceId = interfaceId;
- this.interfaceName = interfaceName;
- this.isPortMirrored = isPortMirrored;
- }
-
- private final String configurationId;
- private final String interfaceId;
- private final String interfaceName;
- private final boolean isPortMirrored;
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "format", Collections.singletonList("simple"));
- }
-
- @Override
- public Object getRequestBody() {
- return ImmutableMap.of(
- "start", "/network/configurations/configuration/" + getConfigurationId(),
- "query", "query/pserver-fromConfiguration"
- );
- }
-
- public String getConfigurationId() {
- return configurationId;
- }
-
- public String getInterfaceId() {
- return interfaceId;
- }
-
- public String getInterfaceName() { return interfaceName; }
-
- public boolean getIsPortMirrored() { return isPortMirrored; }
-
- @Override
- public Object getResponseBody() {
- return "{\n" +
- " \"results\": [\n" +
- " {\n" +
- " \"id\": \"4876980240\",\n" +
- " \"node-type\": \"l-interface\",\n" +
- " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm5b/tenants/tenant/460f35aeb53542dc9f77105066483e83/vservers/vserver/15e46e2f-4b98-4e06-9644-f0e6e35cc79a/l-interfaces/l-interface/zrdm5bfprbVLBA005-vlbagent_aff_int_pktmirror_1_port-dr5jhyxva5ib\",\n" +
- " \"properties\": {\n" +
- " \"interface-name\": " + doubleQuoteIfNotNull(getInterfaceName()) + ",\n" +
- " \"selflink\": \"https://network-aic.rdm5b.cci.att.com:9696/v2.0/ports/6de7bf87-6faa-4984-9492-18d1188b3d4a\",\n" +
- " \"interface-id\": " + doubleQuoteIfNotNull(getInterfaceId()) + ",\n" +
- " \"macaddr\": \"02:6d:e7:bf:87:6f\",\n" +
- " \"network-name\": \"APP-C-24595-D-T001-vprobe_int_pktmirror_net_1\",\n" +
- " \"is-port-mirrored\": " + getIsPortMirrored() + ",\n" +
- " \"resource-version\": \"1519383879190\",\n" +
- " \"in-maint\": false,\n" +
- " \"is-ip-unnumbered\": false\n" +
- " },\n" +
- " \"related-to\": [\n" +
- " {\n" +
- " \"id\": \"4999893128\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\",\n" +
- " \"node-type\": \"l3-interface-ipv4-address-list\",\n" +
- " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm5b/tenants/tenant/460f35aeb53542dc9f77105066483e83/vservers/vserver/15e46e2f-4b98-4e06-9644-f0e6e35cc79a/l-interfaces/l-interface/zrdm5bfprbVLBA005-vlbagent_aff_int_pktmirror_1_port-dr5jhyxva5ib/l3-interface-ipv4-address-list/107.244.46.254\"\n" +
- " },\n" +
- " {\n" +
- " \"id\": \"6150074384\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.Source\",\n" +
- " \"node-type\": \"logical-link\",\n" +
- " \"url\": \"/aai/v12/network/logical-links/logical-link/PMC_a22607fb-8392-42f4-bbe7-b8d845a97183_Sourcezrdm5bepdg_147_lb_2_Gn_UntrustedVrf_5_RVMI_Destzrdm5bfprbVLBA005-vlbagent_aff_int_pktmirror_1_port-dr5jhyxva5ib\"\n" +
- " },\n" +
- " {\n" +
- " \"id\": \"6975434912\",\n" +
- " \"relationship-label\": \"tosca.relationships.network.LinksTo\",\n" +
- " \"node-type\": \"logical-link\",\n" +
- " \"url\": \"/aai/v12/network/logical-links/logical-link/PMC_a22607fb-8392-42f4-bbe7-b8d845a97183_Sourcezrdm5bepdg_147_lb_1_Gn_UntrustedVrf_5_RVMI_Destzrdm5bfprbVLBA005-vlbagent_aff_int_pktmirror_1_port-dr5jhyxva5ib\"\n" +
- " },\n" +
- " {\n" +
- " \"id\": \"7007121568\",\n" +
- " \"relationship-label\": \"tosca.relationships.network.LinksTo\",\n" +
- " \"node-type\": \"logical-link\",\n" +
- " \"url\": \"/aai/v12/network/logical-links/logical-link/PMC_9c099448-a0e1-451d-ac20-c5e3ada8cccd_Sourcezrdm5bepdg_147_lb_2_Gn_UntrustedVrf_5_RVMI_Destzrdm5bfprbVLBA005-vlbagent_aff_int_pktmirror_1_port-dr5jhyxva5ib\"\n" +
- " },\n" +
- " {\n" +
- " \"id\": \"7048110232\",\n" +
- " \"relationship-label\": \"tosca.relationships.network.LinksTo\",\n" +
- " \"node-type\": \"logical-link\",\n" +
- " \"url\": \"/aai/v12/network/logical-links/logical-link/PMC_9c099448-a0e1-451d-ac20-c5e3ada8cccd_Sourcezrdm5bepdg_147_lb_1_Gn_UntrustedVrf_5_RVMI_Destzrdm5bfprbVLBA005-vlbagent_aff_int_pktmirror_1_port-dr5jhyxva5ib\"\n" +
- " },\n" +
- " {\n" +
- " \"id\": \"5491453960\",\n" +
- " \"relationship-label\": \"tosca.relationships.network.BindsTo\",\n" +
- " \"node-type\": \"vserver\",\n" +
- " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm5b/tenants/tenant/460f35aeb53542dc9f77105066483e83/vservers/vserver/15e46e2f-4b98-4e06-9644-f0e6e35cc79a\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- "}";
- }
-
- private String doubleQuoteIfNotNull(String str) {
- if (str == null) {
- return null;
- } else {
- return "\"" + str + "\"";
- }
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePortsError.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePortsError.java
deleted file mode 100644
index 0f2332397..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePortsError.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-public class PresetAAIGetPortMirroringSourcePortsError extends PresetAAIGetPortMirroringSourcePorts {
-
- public PresetAAIGetPortMirroringSourcePortsError(String configurationId, String interfaceId, String interfaceName, boolean isPortMirrored) {
- super(configurationId, interfaceId, interfaceName, isPortMirrored);
- }
-
- @Override
- public int getResponseCode() {
- return 503;
- }
-
- @Override
- public Object getResponseBody() {
- return "You are not allowed to do things";
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java
deleted file mode 100644
index a70a43232..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java
+++ /dev/null
@@ -1,129 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAIGetRelatedInstanceGroupsByVnfId extends BaseAAIPreset {
-
- private String vnfId;
-
-
- public String getVnfId() {
- return vnfId;
- }
-
- public void setVnfId(String vnfId) {
- this.vnfId = vnfId;
- }
-
-
- public PresetAAIGetRelatedInstanceGroupsByVnfId(String vnfId){
- this.vnfId = vnfId;
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.GET;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/network/generic-vnfs/generic-vnf/" + getVnfId();
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "depth", Collections.singletonList("0")
- );
- }
-
- @Override
- public Object getResponseBody() {
- return "{\n" +
- " \"vnf-id\": \"vnf-id-3\",\n" +
- " \"vnf-name\": \"zmtn6nf-code-110\",\n" +
- " \"vnf-type\": \"vnf-type\",\n" +
- " \"prov-status\": \"NVTPROV\",\n" +
- " \"operational-status\": \"out-of-service-path\",\n" +
- " \"equipment-role\": \"nf-role-1\",\n" +
- " \"in-maint\": false,\n" +
- " \"is-closed-loop-disabled\": false,\n" +
- " \"resource-version\": \"1524162037142\",\n" +
- " \"model-invariant-id\": \"inv-id-5000\",\n" +
- " \"model-version-id\": \"ver-id-5000\",\n" +
- " \"model-customization-id\": \"vnf-customization-uuid-1\",\n" +
- " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/bgb-instance-2/service-data/vnfs/vnf/vnf-id-3/vnf-data/vnf-topology\",\n" +
- " \"relationship-list\": {\n" +
- " \"relationship\": [\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/bgb-net-inst-group-1\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"bgb-net-inst-group-1\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"test\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"instance group name\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"instance-group\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.MemberOf\",\n" +
- " \"related-link\": \"/aai/v13/network/instance-groups/instance-group/bgb-net-inst-group-2\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"instance-group.id\",\n" +
- " \"relationship-value\": \"bgb-net-inst-group-2\"\n" +
- " }\n" +
- " ],\n" +
- " \"related-to-property\": [\n" +
- " {\n" +
- " \"property-key\": \"instance-group.description\",\n" +
- " \"property-value\": \"test\"\n" +
- " },\n" +
- " {\n" +
- " \"property-key\": \"instance-group.instance-group-name\",\n" +
- " \"property-value\": \"instance group name\"\n" +
- " }\n" +
- " ]\n" +
- " },\n" +
- " {\n" +
- " \"related-to\": \"availability-zone\",\n" +
- " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
- " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/availability-zones/availability-zone/AZ-MN02\",\n" +
- " \"relationship-data\": [\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
- " \"relationship-value\": \"att-aic\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
- " \"relationship-value\": \"mtn6\"\n" +
- " },\n" +
- " {\n" +
- " \"relationship-key\": \"availability-zone.availability-zone-name\",\n" +
- " \"relationship-value\": \"AZ-MN02\"\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- " ]\n" +
- " }\n" +
- "}";
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java
deleted file mode 100644
index 48d630139..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-public class PresetAAIGetServiceModelList extends BasePresetAAIGetVersion {
-
- public String modelInvariant2;
- public String modelInvariant3;
- public PresetAAIGetServiceModelList(String modelVersionId1,
- String modelInvariantId1, String modelInvariant2, String modelInvariant3) {
- super(modelVersionId1, modelInvariantId1);
- this.modelInvariant2 = modelInvariant2;
- this.modelInvariant3 = modelInvariant3;
- }
-
- public String getModelInvariant2() {
- return modelInvariant2;
- }
-
- public void setModelInvariant2(String modelInvariant2) {
- this.modelInvariant2 = modelInvariant2;
- }
-
- public String getModelInvariant3() {
- return modelInvariant3;
- }
-
- public void setModelInvariant3(String modelInvariant3) {
- this.modelInvariant3 = modelInvariant3;
- }
-
- @Override
- public Object getResponseBody() {
- return "{\n" +
- "\"results\": [\n" +
- " {\"model\": { \n" +
- " \"model-invariant-id\": \"" + getModelInvariantId() + "\"," +
- " \"model-type\": \"service\",\n" +
- " \"resource-version\": \"1515103312329\",\n" +
- " \"model-vers\": {\"model-ver\": [\n" +
- " {\n" +
- " \"model-version-id\": \"" + getModelVersionId1() + "\"," +
- " \"model-name\": \"AAAvIRC_mm779p_Service\",\n" +
- " \"model-version\": \"1.0\",\n" +
- " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\",\n" +
- " \"model-description\": \"tbd\",\n" +
- " \"resource-version\": \"1516206395612\"\n" +
- " }\n" +
- " ]}\n" +
- " }},\n" +
- " {\"model\": { \n" +
- " \"model-invariant-id\": \"" + getModelInvariant2() + "\"," +
- " \"model-type\": \"service\",\n" +
- " \"resource-version\": \"1515103312329\",\n" +
- " \"model-vers\": {\"model-ver\": [\n" +
- " {\n" +
- " \"model-version-id\": \"1dae721c-a1ef-435f-b811-760c23f467bf\",\n" +
- " \"model-name\": \"BBBvIRC_mm779p_Service\",\n" +
- " \"model-version\": \"3.0\",\n" +
- " \"model-description\": \"tbd\",\n" +
- " \"resource-version\": \"1516025197086\"\n" +
- " }\n" +
- " ]}\n" +
- " }},\n" +
- " {\"model\": { \n" +
- " \"model-invariant-id\": \"" + getModelInvariant3() + "\"," +
- " \"model-type\": \"service\",\n" +
- " \"resource-version\": \"1515103312329\",\n" +
- " \"model-vers\": {\"model-ver\": [\n" +
- "{\n" +
- " \"model-version-id\": \"29236d45-e790-4c17-a115-1533cc09b7b1\",\n" +
- " \"model-name\": \"CCCvIRC_mm779p_Service\",\n" +
- " \"model-version\": \"4.0\",\n" +
- " \"distribution-status\": \"DISTRIBUTION_COMPLETE_ERROR\",\n" +
- " \"model-description\": \"tbd\",\n" +
- " \"resource-version\": \"1517319724440\"\n" +
- " }\n" +
- " ]}\n" +
- " }}\n" +
- "]}\n";
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java
deleted file mode 100644
index e97e5fe3b..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java
+++ /dev/null
@@ -1,122 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet {
-
- @Override
- public Object getResponseBody() {
- return responseBody;
- }
-
- private String responseBody = "{\"service\":[" +
- " {" +
- " \"service-id\":\"ebc3bc3d-62fd-4a3f-a037-f619df4ff034\"," +
- " \"service-description\":\"DHV\"," +
- " \"resource-version\":\"1494001985150\"" +
- " }," +
- " {" +
- " \"service-id\":\"17cc1042-527b-11e6-beb8-9e71128cae77\"," +
- " \"service-description\":\"FLEXREACH\"," +
- " \"resource-version\":\"1494001922171\"" +
- " }," +
- " {" +
- " \"service-id\":\"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e\"," +
- " \"service-description\":\"Netbond\"," +
- " \"resource-version\":\"1494001855144\"" +
- " }," +
- " {" +
- " \"service-id\":\"a4f6f2ae-9bf5-4ed7-b904-06b2099c4bd7\"," +
- " \"service-description\":\"Enhanced Services\"," +
- " \"resource-version\":\"1494001980153\"" +
- " }," +
- " {" +
- " \"service-id\":\"vRRaaS\"," +
- " \"service-description\":\"vRRaaS\"," +
- " \"resource-version\":\"1484865266\"" +
- " }," +
- " {" +
- " \"service-id\":\"323d69d9-2efe-4r45-ay0a-89ea7ard4e6f\"," +
- " \"service-description\":\"vSCP\"," +
- " \"resource-version\":\"1494001903012\"" +
- " }," +
- " {" +
- " \"service-id\":\"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"," +
- " \"service-description\":\"Mobility\"," +
- " \"resource-version\":\"1503954056794\"" +
- " }," +
- " {" +
- " \"service-id\":\"d8a6ed93-251c-47ca-adc9-86671fd19f4c\"," +
- " \"service-description\":\"BVOIP\"," +
- " \"resource-version\":\"1490910089351\"" +
- " }," +
- " {" +
- " \"service-id\":\"db171b8f-115c-4992-a2e3-ee04cae357e0\"," +
- " \"service-description\":\"FIRSTNET\"," +
- " \"resource-version\":\"1490910095155\"" +
- " }," +
- " {" +
- " \"service-id\":\"LRSI-OSPF\"," +
- " \"service-description\":\"LRSI-OSPF\"," +
- " \"resource-version\":\"1494001863930\"" +
- " }," +
- " {" +
- " \"service-id\":\"vHNGWaas\"," +
- " \"service-description\":\"HNGATEWAY\"," +
- " \"resource-version\":\"1501192849249\"" +
- " }," +
- " {" +
- " \"service-id\":\"vHNPaas\"," +
- " \"service-description\":\"HNPORTAL\"," +
- " \"resource-version\":\"1501192982895\"" +
- " }," +
- " {" +
- " \"service-id\":\"e433710f-9217-458d-a79d-1c7aff376d89\"," +
- " \"service-description\":\"VIRTUAL USP\"," +
- " \"resource-version\":\"1494001802638\"" +
- " }," +
- " {" +
- " \"service-id\":\"b6a3f28c-eebf-494c-a900-055cc7c874ce\"," +
- " \"service-description\":\"VROUTER\"," +
- " \"resource-version\":\"1492533254036\"" +
- " }," +
- " {" +
- " \"service-id\":\"VIPRaaS\"," +
- " \"service-description\":\"vIPRaaS\"," +
- " \"resource-version\":\"1490910058887\"" +
- " }," +
- " {" +
- " \"service-id\":\"0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1\"," +
- " \"service-description\":\"WAN Bonding\"," +
- " \"resource-version\":\"1498053422512\"" +
- " }," +
- " {" +
- " \"service-id\":\"c7611ebe-c324-48f1-8085-94aef0c6ef3d\"," +
- " \"service-description\":\"HOSTED COMMUNICATIONS\"," +
- " \"resource-version\":\"1494001913639\"" +
- " }," +
- " {" +
- " \"service-id\":\"e30755dc-5673-4b6b-9dcf-9abdd96b93d1\"," +
- " \"service-description\":\"Transport\"," +
- " \"resource-version\":\"1506361785997\"" +
- " }," +
- " {" +
- " \"service-id\":\"vVIGaaS\"," +
- " \"service-description\":\"vVIGaaS\"," +
- " \"resource-version\":\"1494001900545\"" +
- " }," +
- " {" +
- " \"service-id\":\"d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4\"," +
- " \"service-description\":\"uCPE-VMS\"," +
- " \"resource-version\":\"1494001941772\"" +
- " }," +
- " {" +
- " \"service-id\":\"vPEaaS\"," +
- " \"service-description\":\"vPEaaS\"," +
- " \"resource-version\":\"1494001988229\"" +
- " }," +
- " {" +
- " \"service-id\":\"12a96a9d-4b4c-4349-a950-fe1159602621\"," +
- " \"service-description\":\"HOSTED COMMUNICATIONS\"," +
- " \"resource-version\":\"1494001817126\"" +
- " }" +
- " ]}";
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java
deleted file mode 100644
index 5b9f2ff96..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import static vid.automation.test.utils.ReadFile.loadResourceAsString;
-
-public class PresetAAIGetSubDetailsGet extends BaseAAIPreset {
- private String subscriberId;
- private String responseBody;
-
- private static final String baseResponseBody = loadResourceAsString("presets_templates/PresetAAIGetSubDetailsGet.json");
- private static final String GLOBAL_CUSTOMER_ID = "GLOBAL_CUSTOMER_ID";
-
- public PresetAAIGetSubDetailsGet(String subscriberId) {
- this.subscriberId = subscriberId == null ? "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" : subscriberId;
- this.responseBody = baseResponseBody.replace(GLOBAL_CUSTOMER_ID, this.subscriberId);
- }
-
- public void mapQueryParams(Map<String, List> map) {
- map.put("depth", Collections.singletonList("2"));
- }
-
- @Override
- public Object getResponseBody() {
- return responseBody;
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.GET;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/business/customers/customer/" + getSubscriberId();
- }
-
- public String getSubscriberId() {
- return subscriberId;
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java
deleted file mode 100644
index 955771295..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.opencomp.simulator.presetGenerator.presets.model.Subscriber;
-import org.springframework.http.HttpMethod;
-
-import java.io.IOException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-public class PresetAAIGetSubscribersGet extends BaseAAIPreset {
-
- private static ObjectMapper objectMapper = new ObjectMapper();
- private List<Subscriber> subscriberList;
-
- public PresetAAIGetSubscribersGet(List<Subscriber> subscriberList) {
- this.subscriberList = subscriberList;
- }
-
- public PresetAAIGetSubscribersGet() {
- TypeReference<List<Subscriber>> typeRef
- = new TypeReference<List<Subscriber>>() {};
-
- // like registration_to_simulator/create_new_instance/aai_get_full_subscribers.json
- String subscribersString = "" +
- "[ " +
- " { " +
- " \"global-customer-id\":\"MSO_1610_ST\", " +
- " \"subscriber-name\":\"MSO_1610_ST\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1494001902987\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"21014aa2-526b-11e6-beb8-9e71128cae77\", " +
- " \"subscriber-name\":\"PACKET CORE\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1494001776295\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"DHV1707-TestSubscriber-2\", " +
- " \"subscriber-name\":\"ICORE CORE\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1498751754450\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"DHV1707-TestSubscriber-1\", " +
- " \"subscriber-name\":\"PACKET1 CORE\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1498595633607\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"jimmy-example\", " +
- " \"subscriber-name\":\"JimmyExampleCust-20161102\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1494001970063\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"jimmy-example2\", " +
- " \"subscriber-name\":\"JimmyExampleCust-20161103\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1494001970225\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"DHV1802-TestSub-PWT-102\", " +
- " \"subscriber-name\":\"DHV1802-TestSub-PWT-102\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1508852495058\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"DHV1802-TestSub-PWT-101\", " +
- " \"subscriber-name\":\"DHV1802-TestSub-PWT-101\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1508179953733\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\", " +
- " \"subscriber-name\":\"Mobility\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1494001894192\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"DHV1802-Subscriber-4\", " +
- " \"subscriber-name\":\"DHV1802-Subscriber-5\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1509134064531\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"DHV1802-TestSub-PWT-103\", " +
- " \"subscriber-name\":\"DHV1802-TestSub-PWT-103\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1509045503736\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"DHV1802-Subscriber-2\", " +
- " \"subscriber-name\":\"DHV1802-Subscriber-2\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1509122065439\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"e433710f-9217-458d-a79d-1c7aff376d89\", " +
- " \"subscriber-name\":\"USP VOICE\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1494001938080\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"DHV1802-Subscriber-3\", " +
- " \"subscriber-name\":\"DHV1802-Subscriber-3\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1509122759407\" " +
- " }, " +
- " { " +
- " \"global-customer-id\":\"31739f3e-526b-11e6-beb8-9e71128cae77\", " +
- " \"subscriber-name\":\"FIREWALL/MISC\", " +
- " \"subscriber-type\":\"INFRA\", " +
- " \"resource-version\":\"1494001772223\" " +
- " } " +
- " ] ";
- try {
- this.subscriberList = objectMapper.readValue(subscribersString, typeRef);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public List<Subscriber> getSubscriberList() {
- return subscriberList;
- }
-
- public void setSubscriberList(List<Subscriber> subscriberList) {
- this.subscriberList = subscriberList;
- }
-
- @Override
- public Object getResponseBody() {
- return ImmutableMap.of("customer", subscriberList);
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of(
- "subscriber-type", Collections.singletonList("INFRA"),
- "depth", Collections.singletonList("0"));
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.GET;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/business/customers";
- }
-
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGetInvalidResponse.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGetInvalidResponse.java
deleted file mode 100644
index d5da2a92a..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGetInvalidResponse.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-public class PresetAAIGetSubscribersGetInvalidResponse extends PresetAAIGetSubscribersGet {
- private int httpCode;
-
- public PresetAAIGetSubscribersGetInvalidResponse(int httpCode) {
- this.httpCode = httpCode;
- }
-
- @Override
- public int getResponseCode() { return httpCode; }
-
- @Override
- public Object getResponseBody() {
- return "this payload is an invalid json";
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java
deleted file mode 100644
index 45b577df4..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import static vid.automation.test.utils.ReadFile.loadResourceAsString;
-
-public class PresetAAIGetTenants extends BaseAAIPreset {
-
- @Override
- public Object getResponseBody() {
- return responseBody;
- }
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.GET;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL USP";
- }
-
- private String responseBody = loadResourceAsString("presets_templates/PresetAAIGetTenants.json");
-
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java
deleted file mode 100644
index 07d7f1df6..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-public class PresetAAIPostNamedQueryForViewEdit extends BaseAAIPreset {
-
- private final String serviceInstanceId;
- private final boolean hasConfigurationInstance;
-
- public PresetAAIPostNamedQueryForViewEdit(String serviceInstanceId) {
- this(serviceInstanceId, true);
- }
-
- public PresetAAIPostNamedQueryForViewEdit(String serviceInstanceId, boolean hasConfigurationInstance) {
- this.serviceInstanceId = serviceInstanceId;
- this.hasConfigurationInstance = hasConfigurationInstance;
- }
-
- // inspired by
- // registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit_test_sssdad.json
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.POST;
- }
-
- @Override
- public String getReqPath() {
- return "/aai/search/named-query";
- }
-
- @Override
- public Object getRequestBody() {
- return "" +
- "{" +
- " \"instance-filters\": {" +
- " \"instance-filter\": [{" +
- " \"customer\": {" +
- " \"global-customer-id\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
- " }," +
- " \"service-instance\": {" +
- //" \"service-instance-id\": \"c187e9fe-40c3-4862-b73e-84ff056205f6\"" +
- " \"service-instance-id\": \"" + serviceInstanceId + "\"" +
- " }," +
- " \"service-subscription\": {" +
- " \"service-type\": \"VIRTUAL USP\"" +
- " }" +
- " }" +
- " ]" +
- " }," +
- " \"query-parameters\": {" +
- " \"named-query\": {" +
- " \"named-query-uuid\": \"0367193e-c785-4d5f-9cb8-7bc89dc9ddb7\"" +
- " }" +
- " }" +
- "}";
- }
-
- @Override
- public Object getResponseBody() {
- String response =
- "{" +
- " \"inventory-response-item\": [{" +
- " \"model-name\": \"0eOHz2Yh8WJcBYzKy079\"," +
- " \"service-instance\": {" +
- " \"service-instance-id\": \"" + serviceInstanceId + "\"," +
- " \"service-instance-name\": \"test_sssdad\"" +
- " }," +
- " \"extra-properties\": {}";
- if(hasConfigurationInstance) {
- response += "," +
- " \"inventory-response-items\": {" +
- " \"inventory-response-item\": [{" +
- " \"model-name\": \"Proxy-Config-Instance\"," +
- " \"configuration\": {" +
- " \"configuration-id\": \"9533-config-LB1113\"," +
- " \"configuration-name\": \"dummy_instance\"," +
- " \"configuration-type\": \"configuration-type-9533\"," +
- " \"configuration-sub-type\": \"configuration-sub-type-9533\"," +
- " \"model-invariant-id\": \"model-invariant-id-9533\"," +
- " \"model-version-id\": \"model-version-id-9533\"," +
- //" \"orchestration-status\": \"<ORCH_STATUS>\"," +
- " \"orchestration-status\": \"Active\"," +
- " \"operational-status\": \"\"," +
- " \"configuration-selflink\": \"\"," +
- " \"model-customization-id\": \"08a181aa-72eb-435f-9593-e88a3ad0a86b\"," +
- " \"resource-version\": \"1504038855716\"" +
- " }," +
- " \"extra-properties\": {}" +
- " }" +
- " ]" +
- " }";
- }
- response += " }" +
- " ]" +
- "}";
- return response;
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java
deleted file mode 100644
index 154aff755..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-public class PresetAAISearchNodeQueryEmptyResult extends PresetAAIBaseSearchNodeQuery {
-
- @Override
- public Object getResponseBody() {
- return "{}";
- }
-
- @Override
- public int getResponseCode() {
- return 200;
- }
-}
diff --git a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java b/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java
deleted file mode 100644
index 6a20c4796..000000000
--- a/vid-automation/src/main/java/org/opencomp/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java
+++ /dev/null
@@ -1,427 +0,0 @@
-package org.opencomp.simulator.presetGenerator.presets.aai;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import org.opencomp.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset {
-
- public PresetAAIServiceDesignAndCreationPut(boolean emptyList) {
- serviceModelIdentifiers = ImmutableList.of();
- this.emptyList = emptyList;
- }
-
- public PresetAAIServiceDesignAndCreationPut(String modelVersionId, String modelInvariantId) {
- serviceModelIdentifiers = ImmutableList.of(new ServiceModelIdentifiers(modelVersionId, modelInvariantId));
- }
-
- public PresetAAIServiceDesignAndCreationPut(List<ServiceModelIdentifiers> serviceModelIdentifiers) {
- this.serviceModelIdentifiers = serviceModelIdentifiers;
- }
-
- public static class ServiceModelIdentifiers {
- public final String modelVersionId;
- public final String modelInvariantId;
-
- public ServiceModelIdentifiers(String modelVersionId, String modelInvariantId) {
- this.modelVersionId = modelVersionId;
- this.modelInvariantId = modelInvariantId;
- }
- }
-
- private List<ServiceModelIdentifiers> serviceModelIdentifiers;
- boolean emptyList;
-
- @Override
- public HttpMethod getReqMethod() {
- return HttpMethod.PUT;
- }
-
- @Override
- public String getReqPath() {
- return getRootPath() + "/query";
- }
-
- @Override
- public Map<String, List> getQueryParams() {
- return ImmutableMap.of("format", Collections.singletonList("resource"));
- }
-
- @Override
- public Object getRequestBody() {
- return "{\"start\" : \"service-design-and-creation/models/\", \"query\" : \"query/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK\"}";
- }
-
-
-
- private String presetModels() {
- return
- serviceModelIdentifiers.stream().map(identifiers ->
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"" + identifiers.modelInvariantId + "\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"1500138206526\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"" + identifiers.modelVersionId + "\"," +
- " \"model-name\": \"action-data\"," +
- " \"model-version\": \"1.0\"," +
- " \"model-description\": \"lustre settler sideways volcanic eight cellular\"," +
- " \"resource-version\": \"1500137463984\"," +
- " \"relationship-list\": {" +
- " \"relationship\": [" +
- " {" +
- " \"related-to\": \"model-element\"," +
- " \"relationship-label\": \"isA\"," +
- " \"related-link\": \"/aai/v12/service-design-and-creation/models/model/l2-bridge-for-wan-connector-model-id-ps-02/model-vers/model-ver/l2-bridge-for-wan-connector-resource-id-ps-02/model-elements/model-element/e874da22-729d-47bd-8c08-d596fd9c213d/model-elements/model-element/ccbb65b8-2faf-4f5f-80d9-804bb50f1455\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"model.model-invariant-id\"," +
- " \"relationship-value\": \"l2-bridge-for-wan-connector-model-id-ps-02\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-ver.model-version-id\"," +
- " \"relationship-value\": \"l2-bridge-for-wan-connector-resource-id-ps-02\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-element.model-element-uuid\"," +
- " \"relationship-value\": \"e874da22-729d-47bd-8c08-d596fd9c213d\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-element.model-element-uuid\"," +
- " \"relationship-value\": \"ccbb65b8-2faf-4f5f-80d9-804bb50f1455\"" +
- " }" +
- " ]" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " },"
- ).collect(Collectors.joining());
- }
-
-
- @Override
- public Object getResponseBody() {
- if(emptyList) {
- return "{\"results\": [{}]}";
- }
- return "{\"results\": [" +
- presetModels()+
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"00beb8f9-6d39-452f-816d-c709b9cbb87d\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"4076846985447\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"0903e1c0-8e03-4936-b5c2-260653b96413\"," +
- " \"model-name\": \"action-data\"," +
- " \"model-version\": \"1.0\"," +
- " \"model-description\": \"honor immunity exile prong below misshapen\"," +
- " \"resource-version\": \"4076846985447\"" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }," +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"ea78c9e3-514d-4a0a-9162-13837fa54c35\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"1500137034452\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"666a06ee-4b57-46df-bacf-908da8f10c3f\"," +
- " \"model-name\": \"multicast-configuration\"," +
- " \"model-version\": \"1.0\"," +
- " \"model-description\": \"python bullwhip appointment computation ambidextrous heaving\"," +
- " \"resource-version\": \"1500136282691\"" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }," +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"78ca26d0-246d-11e7-93ae-92361f002671\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"1492627634298\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"20c4431c-246d-11e7-93ae-92361f002671\"," +
- " \"model-name\": \"vSAMP10aDEV::base::module-0\"," +
- " \"model-version\": \"2\"," +
- " \"model-description\": \"MSO aLaCarte VF vSAMP10aDEV Base\"," +
- " \"resource-version\": \"1492627634300\"" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }," +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"5b607929-6088-4614-97ef-cac817508e0e\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"1492814035001\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"797a6c41-0f80-4d35-a288-3920c4e06baa\"," +
- " \"model-name\": \"CONTRAIL30_L2NODHCP\"," +
- " \"model-version\": \"1.0\"," +
- " \"model-description\": \"contrail 3.0.x L2 network for AIC 3.x sites (and No DHCP).\"," +
- " \"resource-version\": \"1492814035003\"," +
- " \"relationship-list\": {" +
- " \"relationship\": [" +
- " {" +
- " \"related-to\": \"model-element\"," +
- " \"relationship-label\": \"isA\"," +
- " \"related-link\": \"/aai/v12/service-design-and-creation/models/model/52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f/model-vers/model-ver/aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e/model-elements/model-element/2f622421-1c67-4142-be6e-cecad5242af6/model-elements/model-element/2add7556-a23b-46b8-b6b4-ad300b47ceab\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"model.model-invariant-id\"," +
- " \"relationship-value\": \"52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-ver.model-version-id\"," +
- " \"relationship-value\": \"aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-element.model-element-uuid\"," +
- " \"relationship-value\": \"2f622421-1c67-4142-be6e-cecad5242af6\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-element.model-element-uuid\"," +
- " \"relationship-value\": \"2add7556-a23b-46b8-b6b4-ad300b47ceab\"" +
- " }" +
- " ]" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }," +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"0143d57b-a517-4de9-a0a1-eb76db51f402\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"1497897268768\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"f1bde010-cc5f-4765-941f-75f15b24f9fc\"," +
- " \"model-name\": \"BkVmxAv061917..base_vPE_AV..module-0\"," +
- " \"model-version\": \"2\"," +
- " \"resource-version\": \"1497897268769\"," +
- " \"relationship-list\": {" +
- " \"relationship\": [" +
- " {" +
- " \"related-to\": \"model-element\"," +
- " \"relationship-label\": \"isA\"," +
- " \"related-link\": \"/aai/v12/service-design-and-creation/models/model/267ef491-3c1a-4c32-8e69-0e557bfb61e7/model-vers/model-ver/18655c7f-c846-4934-9e25-34378dfd33d6/model-elements/model-element/578492b2-36a4-47da-83dc-91b58c699ad1/model-elements/model-element/6b1fc7a5-fc01-4a9d-a87f-0ad0d8caa13f\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"model.model-invariant-id\"," +
- " \"relationship-value\": \"267ef491-3c1a-4c32-8e69-0e557bfb61e7\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-ver.model-version-id\"," +
- " \"relationship-value\": \"18655c7f-c846-4934-9e25-34378dfd33d6\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-element.model-element-uuid\"," +
- " \"relationship-value\": \"578492b2-36a4-47da-83dc-91b58c699ad1\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-element.model-element-uuid\"," +
- " \"relationship-value\": \"6b1fc7a5-fc01-4a9d-a87f-0ad0d8caa13f\"" +
- " }" +
- " ]" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }," +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"ipe-resource-id-ps-02\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"1493389430122\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"ipe-resource-id-ps-02\"," +
- " \"model-name\": \"abc\"," +
- " \"model-version\": \"v1.0\"," +
- " \"resource-version\": \"1493389520357\"," +
- " \"relationship-list\": {" +
- " \"relationship\": [" +
- " {" +
- " \"related-to\": \"model-element\"," +
- " \"relationship-label\": \"isA\"," +
- " \"related-link\": \"/aai/v12/service-design-and-creation/models/model/l2-bridge-for-wan-connector-model-id-ps-02/model-vers/model-ver/l2-bridge-for-wan-connector-resource-id-ps-02/model-elements/model-element/e874da22-729d-47bd-8c08-d596fd9c213d/model-elements/model-element/ccbb65b8-2faf-4f5f-80d9-804bb50f1455\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"model.model-invariant-id\"," +
- " \"relationship-value\": \"l2-bridge-for-wan-connector-model-id-ps-02\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-ver.model-version-id\"," +
- " \"relationship-value\": \"l2-bridge-for-wan-connector-resource-id-ps-02\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-element.model-element-uuid\"," +
- " \"relationship-value\": \"e874da22-729d-47bd-8c08-d596fd9c213d\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-element.model-element-uuid\"," +
- " \"relationship-value\": \"ccbb65b8-2faf-4f5f-80d9-804bb50f1455\"" +
- " }" +
- " ]" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }," +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"lmoser410-connector-model-id\"," +
- " \"model-type\": \"widget\"," +
- " \"resource-version\": \"1493389512180\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"lmoser410-connector-model-version-id\"," +
- " \"model-name\": \"connector\"," +
- " \"model-version\": \"v1.0\"," +
- " \"resource-version\": \"1493389444766\"" +
- " }" +
- " ]" +
- " }," +
- " \"relationship-list\": {" +
- " \"relationship\": [" +
- " {" +
- " \"related-to\": \"named-query-element\"," +
- " \"relationship-label\": \"isA\"," +
- " \"related-link\": \"/aai/v12/service-design-and-creation/named-queries/named-query/lmoser410-named-query-uuid/named-query-elements/named-query-element/48278a7d-2b1e-454f-89e6-5c0ba145f486\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"named-query.named-query-uuid\"," +
- " \"relationship-value\": \"lmoser410-named-query-uuid\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"named-query-element.named-query-element-uuid\"," +
- " \"relationship-value\": \"48278a7d-2b1e-454f-89e6-5c0ba145f486\"" +
- " }" +
- " ]" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }," +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"3a97db99-c4bb-498a-a13a-38f65f1ced3d\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"1492630209768\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"ff2ae348-214a-11e7-93ae-92361f002673\"," +
- " \"model-name\": \"vSAMP10aDEV::base::module-0\"," +
- " \"model-version\": \"1.0\"," +
- " \"model-description\": \"MACRO_vSAMP_module\"," +
- " \"resource-version\": \"1492630209769\"" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }," +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"3c504d40-b847-424c-9d25-4fb7e0a3e994\"," +
- " \"model-type\": \"widget\"," +
- " \"resource-version\": \"1493389430124\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"204c641a-3494-48c8-979a-86856f5fd32a\"," +
- " \"model-name\": \"named-query-element\"," +
- " \"model-version\": \"1.0\"," +
- " \"resource-version\": \"1493389423212\"" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }," +
- " {" +
- " \"model\": {" +
- " \"model-invariant-id\": \"93e56950-cb19-44e6-ace4-8b50f2d02e45\"," +
- " \"model-type\": \"resource\"," +
- " \"resource-version\": \"1497898974232\"," +
- " \"model-vers\": {" +
- " \"model-ver\": [" +
- " {" +
- " \"model-version-id\": \"acba1f72-c6e0-477f-9426-ad190151e100\"," +
- " \"model-name\": \"RG_6-19_Test\"," +
- " \"model-version\": \"1.0\"," +
- " \"model-description\": \"RG_6-19_Test\"," +
- " \"resource-version\": \"1497898974233\"," +
- " \"relationship-list\": {" +
- " \"relationship\": [" +
- " {" +
- " \"related-to\": \"model-element\"," +
- " \"relationship-label\": \"isA\"," +
- " \"related-link\": \"/aai/v12/service-design-and-creation/models/model/a07220ba-954e-422f-86b5-e8b95fe6b116/model-vers/model-ver/bf6dbd68-2c7d-4ba2-ade1-dfd4476aa505/model-elements/model-element/6e10fe2e-6d04-4198-9124-dd051a5ae65f/model-elements/model-element/cb3c22e1-9dc6-467f-9636-0a7aef10d5d0\"," +
- " \"relationship-data\": [" +
- " {" +
- " \"relationship-key\": \"model.model-invariant-id\"," +
- " \"relationship-value\": \"a07220ba-954e-422f-86b5-e8b95fe6b116\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-ver.model-version-id\"," +
- " \"relationship-value\": \"bf6dbd68-2c7d-4ba2-ade1-dfd4476aa505\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-element.model-element-uuid\"," +
- " \"relationship-value\": \"6e10fe2e-6d04-4198-9124-dd051a5ae65f\"" +
- " }," +
- " {" +
- " \"relationship-key\": \"model-element.model-element-uuid\"," +
- " \"relationship-value\": \"cb3c22e1-9dc6-467f-9636-0a7aef10d5d0\"" +
- " }" +
- " ]" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " ]" +
- " }" +
- " }" +
- " }" +
- " ]}";
- }
-}