aboutsummaryrefslogtreecommitdiffstats
path: root/vid-automation/src/main/java/org
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-07-08 15:46:44 +0300
committerIttay Stern <ittay.stern@att.com>2019-07-08 18:50:38 +0300
commitf4dff328c0386c8901b5841943b11f0c13b3169f (patch)
tree4e64c3ee540410b2593c1ebecd0dddd3a4780592 /vid-automation/src/main/java/org
parentf792671ae247a931f34d902e9276202b5016ef9a (diff)
Merge from ecomp 718fd196 - Integration Tests
Issue-ID: VID-378 Change-Id: Icc0bdb9ef37b1d429d47c2070f76d1ee63ad7489 Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-automation/src/main/java/org')
-rw-r--r--vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java1
-rw-r--r--vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java1
-rw-r--r--vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java1
-rw-r--r--vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java6
-rw-r--r--vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java2
-rw-r--r--vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java1
-rw-r--r--vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java1
-rw-r--r--vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java4
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java10
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java5
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/AAIBaseGetL3NetworksByCloudRegionPreset.java76
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/Placement.java14
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java5
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudOwnersByCloudRegionId.java19
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudRegionFromVnf.java5
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegion.java267
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionSpecificState.java776
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionWithError.java23
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java5
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java5
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java5
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java5
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java5
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java4
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java5
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java5
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java16
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java9
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java17
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGet.java19
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGetSpecificService.java7
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java7
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java4
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetVpnsByType.java370
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGet.java28
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGetForServiceWithCR.java908
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIStandardQueryGet.java156
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/ecompportal_att/PresetGetSessionSlotCheckIntervalGet.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java2
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java18
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java8
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java8
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java4
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java4
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java4
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java56
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java9
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java6
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java14
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java4
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java4
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java6
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java6
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java1
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteMacroService.java33
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java6
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java6
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java35
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java13
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java9
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java21
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOResumeRequest.java48
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java12
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMsoCreateMacroCommonPre1806.java151
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java2
-rw-r--r--vid-automation/src/main/java/org/onap/vid/api/AsyncInstantiationBase.java72
-rw-r--r--vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java5
-rw-r--r--vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java2
68 files changed, 3111 insertions, 257 deletions
diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java
index f85225f36..987e09e61 100644
--- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java
+++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java
@@ -26,6 +26,7 @@ import java.io.InputStreamReader;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
import org.apache.commons.codec.binary.Base64;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java
index 4f831b187..bc62e6673 100644
--- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java
+++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java
@@ -53,7 +53,6 @@ import org.apache.http.entity.mime.content.StringBody;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.onap.sdc.ci.tests.datatypes.http.RestResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java
index e8c386bb2..b7f6dfa9e 100644
--- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java
+++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java
@@ -22,7 +22,6 @@ package org.onap.sdc.ci.tests.execute.setup;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java
index 501faa8de..95443bf0b 100644
--- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java
+++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java
@@ -93,11 +93,7 @@ public class WebDriverThread {
cap.setCapability("browserName","firefox");
cap.setCapability(FirefoxDriver.PROFILE, initFirefoxProfile());
cap.setCapability(MARIONETTE_CAPABILITY, true);
-
- firefoxProfile.setPreference("network.proxy.type", 2);
- firefoxProfile.setPreference("network.proxy.autoconfig_url", "http://emea.onap.org:8001/");
- firefoxProfile.setPreference("network.proxy.no_proxies_on", "localhost");
-
+
webdriver = new FirefoxDriver(cap);
}
} else {
diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java
index 727876f27..cb6adc295 100644
--- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java
+++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java
@@ -22,8 +22,6 @@ package org.onap.sdc.ci.tests.execute.setup;
import java.util.HashMap;
-import com.aventstack.extentreports.ExtentTest;
-
public class WindowTestManager {
private static HashMap<Long, WindowTest> windowMap = new HashMap<Long, WindowTest>();
diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java
index eb93a619e..2ff28dabd 100644
--- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java
+++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java
@@ -21,7 +21,6 @@
package org.onap.sdc.ci.tests.utilities;
import org.apache.commons.lang3.tuple.ImmutablePair;
-import org.onap.sdc.ci.tests.datatypes.DataTestIdEnum.LeftPanelCanvasItems;
import org.openqa.selenium.WebElement;
public final class CanvasElement {
diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java
index d5d5540a9..029555a91 100644
--- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java
+++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java
@@ -45,7 +45,6 @@ import java.util.zip.ZipFile;
import java.util.zip.ZipInputStream;
import org.apache.commons.io.FileUtils;
-import org.onap.sdc.ci.tests.datatypes.UserCredentials;
import org.onap.sdc.ci.tests.execute.setup.ExtentTestActions;
import org.onap.sdc.ci.tests.execute.setup.SetupCDTest;
import org.yaml.snakeyaml.Yaml;
diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java
index 8885e1c3f..b10636bf1 100644
--- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java
+++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java
@@ -20,6 +20,7 @@
package org.onap.sdc.ci.tests.utilities;
+//import com.automation.common.report_portal_integration.annotations.Step;
import com.aventstack.extentreports.Status;
import org.apache.commons.io.FileUtils;
import org.junit.Assert;
@@ -600,12 +601,14 @@ public final class GeneralUIUtils {
wait.until(ExpectedConditions.textToBePresentInElementValue(element, text));
}
+ //@Step
public static void waitForAngular(){
WebDriverWait wait = newWait(90);
wait.until(AdditionalConditions.pageLoadWait());
wait.until(AdditionalConditions.angularHasFinishedProcessing());
}
+ //@Step
public static void waitForAngular2(){
WebDriverWait wait = newWait(90);
wait.until(AdditionalConditions.pageLoadWait());
@@ -645,6 +648,7 @@ public final class GeneralUIUtils {
waitForElementVisibilityByTestId(dataTestId));
}
+ //@Step
public static void ultimateWait(){
logger.info("ultimateWait: starting");
long startTime = System.nanoTime();
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java
index 4f4779d8e..8ad111849 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java
@@ -1,8 +1,9 @@
package org.onap.simulator.presetGenerator.presets.BasePresets;
-import java.util.Map;
import vid.automation.test.infra.Features;
+import java.util.Map;
+
/**
* Created by itzikliderman on 27/12/2017.
*/
@@ -33,6 +34,13 @@ public abstract class BaseMSOPreset extends BasePreset {
"\"cloudOwner\": \""+cloudOwner+"\"," : "";
}
+ protected String addPlatformIfNeeded(String platform) {
+ return platform != "" ?
+ " \"platform\": {" +
+ " \"platformName\": \""+platform+"\"," +
+ "}," : "";
+ }
+
@Override
protected String getRootPath() {
return "/mso";
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java
index 662677e83..aded77ccf 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java
@@ -1,10 +1,11 @@
package org.onap.simulator.presetGenerator.presets.BasePresets;
+import org.onap.simulator.presetGenerator.presets.model.RegistrationRequest;
+import org.springframework.http.HttpMethod;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.model.RegistrationRequest;
-import org.springframework.http.HttpMethod;
/**
* Created by itzikliderman on 13/12/2017.
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/AAIBaseGetL3NetworksByCloudRegionPreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/AAIBaseGetL3NetworksByCloudRegionPreset.java
new file mode 100644
index 000000000..e20c09ba1
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/AAIBaseGetL3NetworksByCloudRegionPreset.java
@@ -0,0 +1,76 @@
+package org.onap.simulator.presetGenerator.presets.aai;
+
+import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
+import java.util.*;
+
+public class AAIBaseGetL3NetworksByCloudRegionPreset extends BaseAAIPreset {
+
+ public static final String DEFAULT_TENANT_ID = "b530fc990b6d4334bd45518bebca6a51";
+ public static final String DEFAULT_TENANT_NAME = "ecomp_ispt";
+ public static final String DEFAULT_CLOUD_REGION_ID = PresetAAIGetCloudOwnersByCloudRegionId.AUK51A;
+ private static final String DEFAULT_CLOUD_OWNER = PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC;
+ protected String tenantId;
+ protected String tenantName;
+ protected String cloudRegionId;
+ protected String cloudOwner;
+ protected String networkRole;
+
+ public AAIBaseGetL3NetworksByCloudRegionPreset(String tenentId, String tenantName, String cloudRegionId, String cloudOwner, String networkRole) {
+ this.tenantId = tenentId;
+ this.tenantName = tenantName;
+ this.cloudRegionId = cloudRegionId;
+ this.cloudOwner = cloudOwner;
+ this.networkRole = networkRole;
+ }
+
+ public AAIBaseGetL3NetworksByCloudRegionPreset() {
+ this.tenantId = DEFAULT_TENANT_ID;
+ this.tenantName = DEFAULT_TENANT_NAME;
+ this.cloudRegionId = DEFAULT_CLOUD_REGION_ID;
+ this.cloudOwner = DEFAULT_CLOUD_OWNER;
+ }
+
+ public String getTenantName() {
+ return tenantName;
+ }
+
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ public String getCloudRegionId() {
+ return cloudRegionId;
+ }
+
+ public String getCloudOwner() {
+ return cloudOwner;
+ }
+
+ @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", "/cloud-infrastructure/cloud-regions/cloud-region/" + cloudOwner + "/" + cloudRegionId,
+ "query", "query/l3-networks-by-cloud-region?tenantId=" + tenantId + (networkRole == null ? "" : "&networkRole=" + networkRole)
+ );
+ }
+}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/Placement.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/Placement.java
new file mode 100644
index 000000000..b665fc30f
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/Placement.java
@@ -0,0 +1,14 @@
+package org.onap.simulator.presetGenerator.presets.aai;
+
+public class Placement {
+ public final String cloudOwner;
+ public final String lcpRegionId;
+ public final String tenantId;
+
+ public Placement(String cloudOwner, String lcpRegionId, String tenantId) {
+ this.cloudOwner = cloudOwner;
+ this.lcpRegionId = lcpRegionId;
+ this.tenantId = tenantId;
+ }
+}
+
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java
index 66562ed63..c43843179 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java
@@ -2,11 +2,12 @@ package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAICloudRegionAndSourceFromConfigurationPut extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudOwnersByCloudRegionId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudOwnersByCloudRegionId.java
index be075b481..22c0cfef5 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudOwnersByCloudRegionId.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudOwnersByCloudRegionId.java
@@ -1,15 +1,16 @@
package org.onap.simulator.presetGenerator.presets.aai;
-import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
-import static org.apache.commons.lang3.RandomStringUtils.randomNumeric;
-
import com.google.common.collect.ImmutableMap;
+import org.onap.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;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
+
+import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
+import static org.apache.commons.lang3.RandomStringUtils.randomNumeric;
public class PresetAAIGetCloudOwnersByCloudRegionId extends BaseAAIPreset {
public static final String SOME_LEGACY_REGION = "some legacy region";
@@ -23,9 +24,10 @@ public class PresetAAIGetCloudOwnersByCloudRegionId extends BaseAAIPreset {
public static final String olson3 = "olson3";
public static final String olson5B = "olson5b";
public static final String ATT_SABABA = "att-sababa";
- public static final String AAIAIC_25 = "JANET25";
+ public static final String AAIAIC_25 = "AAIAIC25";
public static final String ONE = "One";
public static final String hvf6 = "hvf6";
+ public static final String AUK51A = "auk51a";
private final String cloudRegionId;
private final String cloudOwner;
@@ -61,7 +63,10 @@ public class PresetAAIGetCloudOwnersByCloudRegionId extends BaseAAIPreset {
public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_LCP_REGION_TEXT_TO_ATT_AIC =
new PresetAAIGetCloudOwnersByCloudRegionId(LCP_REGION_TEXT, ATT_AIC);
- private PresetAAIGetCloudOwnersByCloudRegionId(String cloudRegionId, String cloudOwnerResult) {
+ public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_AUK51A_TO_ATT_NC =
+ new PresetAAIGetCloudOwnersByCloudRegionId(AUK51A, ATT_NC);
+
+ public PresetAAIGetCloudOwnersByCloudRegionId(String cloudRegionId, String cloudOwnerResult) {
this.cloudRegionId = cloudRegionId;
this.cloudOwner = cloudOwnerResult;
}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudRegionFromVnf.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudRegionFromVnf.java
index 976228bf0..06b853578 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudRegionFromVnf.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudRegionFromVnf.java
@@ -2,11 +2,12 @@ package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetCloudRegionFromVnf extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegion.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegion.java
new file mode 100644
index 000000000..6b47fe004
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegion.java
@@ -0,0 +1,267 @@
+package org.onap.simulator.presetGenerator.presets.aai;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class PresetAAIGetL3NetworksByCloudRegion extends AAIBaseGetL3NetworksByCloudRegionPreset {
+
+ private static final int NUMBER_OF_VALID_NETWORKS = 3;
+ private static final String NETWORK_NAME_TEMPLATE = "AUK51a_oam_calea_net_";
+ private static final String NETWORK_TYPE_TEMPLATE = "SR-IOV-PROVIDER2-";
+ private static final String NETWORK_PHYSICAL_NAME_TEMPLATE = "sriovnet";
+ private static final String NETWORK_MODEL_ID = "77010093-df36-4dcb-8428-c3d02bf3f88d";
+ private static final String ACTIVE = "Active";
+ private static final String SERVICE_INSTANCE_NAME_TEMPLATE = "AUK51a_oam_calea_net_service_";
+ private static final String NETWORK_ROLE_TEMPLATE = "oam_calea_net_";
+ private List<Network> networks = new ArrayList<>();
+
+
+ private void initNetworks() {
+ // Valid networks
+ for (int i=0; i <= NUMBER_OF_VALID_NETWORKS; i++) {
+ networks.add(new Network(
+ NETWORK_NAME_TEMPLATE + i,
+ UUID.randomUUID().toString(),
+ NETWORK_TYPE_TEMPLATE + i,
+ networkRole == null? NETWORK_ROLE_TEMPLATE + i : networkRole,
+ ACTIVE,
+ NETWORK_PHYSICAL_NAME_TEMPLATE + i,
+ NETWORK_MODEL_ID,
+ SERVICE_INSTANCE_NAME_TEMPLATE + i,
+ UUID.randomUUID().toString(),
+ tenantName,
+ cloudRegionId,
+ true
+ ));
+ }
+ // Not Active
+ int i = NUMBER_OF_VALID_NETWORKS + 1;
+ networks.add(new Network(
+ NETWORK_NAME_TEMPLATE + i,
+ UUID.randomUUID().toString(),
+ NETWORK_TYPE_TEMPLATE + i,
+ networkRole == null? NETWORK_ROLE_TEMPLATE + i : networkRole,
+ "Assigned",
+ NETWORK_PHYSICAL_NAME_TEMPLATE + i,
+ NETWORK_MODEL_ID,
+ SERVICE_INSTANCE_NAME_TEMPLATE + i,
+ UUID.randomUUID().toString(),
+ tenantName,
+ cloudRegionId,
+ true
+ ));
+ // Empty name
+ i++;
+ networks.add(new Network(
+ "",
+ UUID.randomUUID().toString(),
+ NETWORK_TYPE_TEMPLATE + i,
+ networkRole == null? NETWORK_ROLE_TEMPLATE + i : networkRole,
+ ACTIVE,
+ NETWORK_PHYSICAL_NAME_TEMPLATE + i,
+ NETWORK_MODEL_ID,
+ SERVICE_INSTANCE_NAME_TEMPLATE + i,
+ UUID.randomUUID().toString(),
+ tenantName,
+ cloudRegionId,
+ true
+ ));
+ // No name
+ i++;
+ networks.add(new Network(
+ null,
+ UUID.randomUUID().toString(),
+ NETWORK_TYPE_TEMPLATE + i,
+ networkRole == null? NETWORK_ROLE_TEMPLATE + i : networkRole,
+ ACTIVE,
+ NETWORK_PHYSICAL_NAME_TEMPLATE + i,
+ NETWORK_MODEL_ID,
+ SERVICE_INSTANCE_NAME_TEMPLATE + i,
+ UUID.randomUUID().toString(),
+ tenantName,
+ cloudRegionId,
+ true
+ ));
+ // Not related to VPN binding
+ i++;
+ networks.add(new Network(
+ NETWORK_NAME_TEMPLATE + i,
+ UUID.randomUUID().toString(),
+ NETWORK_TYPE_TEMPLATE + i,
+ networkRole == null? NETWORK_ROLE_TEMPLATE + i : networkRole,
+ ACTIVE,
+ NETWORK_PHYSICAL_NAME_TEMPLATE + i,
+ NETWORK_MODEL_ID,
+ SERVICE_INSTANCE_NAME_TEMPLATE + i,
+ UUID.randomUUID().toString(),
+ tenantName,
+ cloudRegionId,
+ false
+ ));
+ }
+
+ public PresetAAIGetL3NetworksByCloudRegion(String tenentId, String tenantId, String cloudRegionId, String cloudOwner, String networkRole) {
+ super(tenantId, tenantId, cloudRegionId, cloudOwner, networkRole);
+ initNetworks();
+ }
+
+ public PresetAAIGetL3NetworksByCloudRegion() {
+ super();
+ initNetworks();
+ }
+
+ public PresetAAIGetL3NetworksByCloudRegion(String networkRole) {
+ super();
+ this.networkRole = networkRole;
+ initNetworks();
+ }
+
+ public String getActiveNetworksWithNameAndRelatedToVpnBindingAsJsonString() throws JsonProcessingException {
+ ObjectMapper mapper = new ObjectMapper();
+ return mapper.writeValueAsString(networks.stream().filter(network -> network.networkName != null && !network.networkName.isEmpty() && network.orchStatus.equals(ACTIVE) && network.isBoundToVpn).collect(Collectors.toList()));
+ }
+
+ @Override
+ public Object getResponseBody() {
+ StringJoiner stringJoiner = new StringJoiner(",", "[", "]");
+ for (Network network : networks) {
+ stringJoiner.add(network.toString());
+ }
+ return "{\"results\": " + stringJoiner.toString() + "}";
+ }
+
+ private class Network {
+ @JsonProperty("instanceName")
+ public String networkName;
+ @JsonProperty("instanceId")
+ public String networkId;
+ @JsonProperty("instanceType")
+ public String networkType;
+ public String role;
+ public String orchStatus;
+ public String physicalName;
+ @JsonProperty("uuid")
+ public String modelUUID;
+ public String serviceName;
+ public String serviceUUID;
+ public String tenantName;
+ @JsonProperty("lcpCloudRegionId")
+ public String region;
+ private boolean isBoundToVpn;
+
+
+ public Network(String networkName, String networkId, String networkType, String role, String orchStatus, String physicalName,
+ String modelUUID, String serviceName, String serviceUUID, String tenantName, String region, boolean isBoundToVpn) {
+ this.networkName = networkName;
+ this.networkId = networkId;
+ this.networkType = networkType;
+ this.role = role;
+ this.orchStatus = orchStatus;
+ this.physicalName = physicalName;
+ this.modelUUID = modelUUID;
+ this.serviceName = serviceName;
+ this.serviceUUID = serviceUUID;
+ this.tenantName = tenantName;
+ this.region = region;
+ this.isBoundToVpn = isBoundToVpn;
+ }
+
+ @Override
+ public String toString (){
+ return "{\"l3-network\": " +
+ "{\n" +
+ " \"network-id\": \"" + networkId + "\",\n" +
+ (networkName == null ? "" : " \"network-name\": \"" + networkName + "\",\n") +
+ " \"network-type\": \"" + networkType + "\",\n" +
+ " \"network-role\": \"" + role + "\",\n" +
+ " \"network-technology\": \"STANDARD-SR-IOV\",\n" +
+ " \"is-bound-to-vpn\": " + isBoundToVpn + ",\n" +
+ " \"resource-version\": \"1540925016770\",\n" +
+ " \"orchestration-status\": \"" + orchStatus + "\",\n" +
+ " \"model-invariant-id\": \"b9a9b549-0ee4-49fc-b4f2-5edc6701da68\",\n" +
+ " \"model-version-id\": \"" + modelUUID + "\",\n" +
+ " \"model-customization-id\": \"e5f33853-f84c-4cdd-99f2-93846957aa18\",\n" +
+ " \"physical-network-name\": \"" + physicalName + "\",\n" +
+ " \"is-provider-network\": true,\n" +
+ " \"is-shared-network\": true,\n" +
+ " \"is-external-network\": false,\n" +
+ " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/" + serviceUUID + "/service-data/networks/network/" + networkId + "/network-data/network-topology/\",\n" +
+ " \"relationship-list\": {\n" +
+ " \"relationship\": [{\n" +
+ " \"related-to\": \"service-instance\",\n" +
+ " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\",\n" +
+ " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/" + serviceUUID + "\",\n" +
+ " \"relationship-data\": [{\n" +
+ " \"relationship-key\": \"customer.global-customer-id\",\n" +
+ " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"\n" +
+ " }, {\n" +
+ " \"relationship-key\": \"service-subscription.service-type\",\n" +
+ " \"relationship-value\": \"Emanuel\"\n" +
+ " }, {\n" +
+ " \"relationship-key\": \"service-instance.service-instance-id\",\n" +
+ " \"relationship-value\": \"" + serviceUUID + "\"\n" +
+ " }],\n" +
+ " \"related-to-property\": [{\n" +
+ " \"property-key\": \"service-instance.service-instance-name\",\n" +
+ " \"property-value\": \"" + serviceName + "\"\n" +
+ " }]\n" +
+ " }, {\n" +
+ " \"related-to\": \"tenant\",\n" +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
+ " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/" + cloudOwner + "/" + cloudRegionId + "/tenants/tenant/" + tenantId + "\",\n" +
+ " \"relationship-data\": [{\n" +
+ " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
+ " \"relationship-value\": \"" + cloudOwner + "\"\n" +
+ " }, {\n" +
+ " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
+ " \"relationship-value\": \"" + region + "\"\n" +
+ " }, {\n" +
+ " \"relationship-key\": \"tenant.tenant-id\",\n" +
+ " \"relationship-value\": \"" + tenantId + "\"\n" +
+ " }],\n" +
+ " \"related-to-property\": [{\n" +
+ " \"property-key\": \"tenant.tenant-name\",\n" +
+ " \"property-value\": \"" + tenantName +"\"\n" +
+ " }]\n" +
+ " }, {\n" +
+ " \"related-to\": \"cloud-region\",\n" +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" +
+ " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/" + cloudOwner + "/" + cloudRegionId + "\",\n" +
+ " \"relationship-data\": [{\n" +
+ " \"relationship-key\": \"cloud-region.cloud-owner\",\n" +
+ " \"relationship-value\": \"" + cloudOwner + "\"\n" +
+ " }, {\n" +
+ " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" +
+ " \"relationship-value\": \"" + region + "\"\n" +
+ " }],\n" +
+ " \"related-to-property\": [{\n" +
+ " \"property-key\": \"cloud-region.owner-defined-type\",\n" +
+ " \"property-value\": \"lcp\"\n" +
+ " }]\n" +
+ " }, {\n" +
+ " \"related-to\":\"" + (isBoundToVpn ? "vpn-binding" : "something-else") + "\",\n" +
+ " \"relationship-label\":\"org.onap.relationships.inventory.Uses\",\n" +
+ " \"related-link\":\"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\",\n" +
+ " \"relationship-data\":[{\n" +
+ " \"relationship-key\":\"vpn-binding.vpn-id\",\n" +
+ " \"relationship-value\":\"3e7834fb-a8e0-4243-a837-5352ccab4602\"\n" +
+ " }],\n" +
+ " \"related-to-property\": [{\n" +
+ " \"property-key\":\"vpn-binding.vpn-name\",\n" +
+ " \"property-value\":\"LPPVPN\"\n" +
+ " }, {\n" +
+ " \"property-key\":\"vpn-binding.vpn-type\",\n" +
+ " \"property-value\":\"CUSTOMER\"\n" +
+ " }]\n" +
+ " }]\n" +
+ " }\n" +
+ " }\n" +
+ " }";
+ }
+ }
+
+}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionSpecificState.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionSpecificState.java
new file mode 100644
index 000000000..01a4fb9b4
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionSpecificState.java
@@ -0,0 +1,776 @@
+package org.onap.simulator.presetGenerator.presets.aai;
+
+public class PresetAAIGetL3NetworksByCloudRegionSpecificState extends AAIBaseGetL3NetworksByCloudRegionPreset {
+ private int stateNum = 1;
+
+ public PresetAAIGetL3NetworksByCloudRegionSpecificState(int stateNum) {
+ super();
+ this.stateNum = stateNum;
+ }
+
+ public PresetAAIGetL3NetworksByCloudRegionSpecificState(String cloudOwner, String cloudRegionId, String tenantId) {
+ super(tenantId, null, cloudRegionId, cloudOwner, null);
+ }
+
+ @Override
+ public Object getResponseBody() {
+ if (stateNum == 1) {
+ return STATE_1;
+ } else
+ return STATE_2;
+ }
+
+ private static final String STATE_1 = "{ "
+ + " \"results\": [{ "
+ + " \"l3-network\": { "
+ + " \"network-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861131\", "
+ + " \"network-name\": \"AUK51a_oam_calea_net_0\", "
+ + " \"network-type\": \"SR-IOV-PROVIDER2-0\", "
+ + " \"network-role\": \"oam_calea_net_0\", "
+ + " \"network-technology\": \"STANDARD-SR-IOV\", "
+ + " \"is-bound-to-vpn\": true, "
+ + " \"resource-version\": \"1540925016770\", "
+ + " \"orchestration-status\": \"Active\", "
+ + " \"model-invariant-id\": \"b9a9b549-0ee4-49fc-b4f2-5edc6701da68\", "
+ + " \"model-version-id\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", "
+ + " \"model-customization-id\": \"e5f33853-f84c-4cdd-99f2-93846957aa18\", "
+ + " \"physical-network-name\": \"sriovnet0\", "
+ + " \"is-provider-network\": true, "
+ + " \"is-shared-network\": true, "
+ + " \"is-external-network\": false, "
+ + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/ddd91e3d-7cd1-4010-958d-94c729937d2d/service-data/networks/network/dbd80094-df1a-4831-8699-a96949dbca5c/network-data/network-topology/\", "
+ + " \"relationship-list\": { "
+ + " \"relationship\": [{ "
+ + " \"related-to\": \"service-instance\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", "
+ + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/ddd91e3d-7cd1-4010-958d-94c729937d2d\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"customer.global-customer-id\", "
+ + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" "
+ + " }, { "
+ + " \"relationship-key\": \"service-subscription.service-type\", "
+ + " \"relationship-value\": \"Emanuel\" "
+ + " }, { "
+ + " \"relationship-key\": \"service-instance.service-instance-id\", "
+ + " \"relationship-value\": \"1c98917b-8255-43c6-98f1-7a2942e75ce1\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"service-instance.service-instance-name\", "
+ + " \"property-value\": \"AUK51a_oam_calea_net_service_0\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"tenant\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"cloud-region.cloud-owner\", "
+ + " \"relationship-value\": \"att-nc\" "
+ + " }, { "
+ + " \"relationship-key\": \"cloud-region.cloud-region-id\", "
+ + " \"relationship-value\": \"auk51a\" "
+ + " }, { "
+ + " \"relationship-key\": \"tenant.tenant-id\", "
+ + " \"relationship-value\": \"b530fc990b6d4334bd45518bebca6a51\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"tenant.tenant-name\", "
+ + " \"property-value\": \"ecomp_ispt\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"cloud-region\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"cloud-region.cloud-owner\", "
+ + " \"relationship-value\": \"att-nc\" "
+ + " }, { "
+ + " \"relationship-key\": \"cloud-region.cloud-region-id\", "
+ + " \"relationship-value\": \"auk51a\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"cloud-region.owner-defined-type\", "
+ + " \"property-value\": \"lcp\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"vpn-binding\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"vpn-binding.vpn-id\", "
+ + " \"relationship-value\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"vpn-binding.vpn-name\", "
+ + " \"property-value\": \"LPPVPN\" "
+ + " }, { "
+ + " \"property-key\": \"vpn-binding.vpn-type\", "
+ + " \"property-value\": \"CUSTOMER\" "
+ + " } "
+ + " ] "
+ + " } "
+ + " ] "
+ + " } "
+ + " } "
+ + " }, { "
+ + " \"l3-network\": { "
+ + " \"network-id\": \"b45cdb14-7a80-4ebd-b979-b1d7c7620851\", "
+ + " \"network-name\": \"AUK51a_oam_calea_net_1\", "
+ + " \"network-type\": \"SR-IOV-PROVIDER2-1\", "
+ + " \"network-role\": \"oam_calea_net_1\", "
+ + " \"network-technology\": \"STANDARD-SR-IOV\", "
+ + " \"is-bound-to-vpn\": true, "
+ + " \"resource-version\": \"1540925016770\", "
+ + " \"orchestration-status\": \"Active\", "
+ + " \"model-invariant-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", "
+ + " \"model-version-id\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", "
+ + " \"model-customization-id\": \"3b45cdb14-7a80-4ebd-b979-b1d7c7620851\", "
+ + " \"physical-network-name\": \"sriovnet1\", "
+ + " \"is-provider-network\": true, "
+ + " \"is-shared-network\": true, "
+ + " \"is-external-network\": false, "
+ + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/ee1b756e-3c9c-4ee0-974b-6218f377b20d/service-data/networks/network/fa1d9589-478d-41ea-96e6-39714ddc6aa5/network-data/network-topology/\", "
+ + " \"relationship-list\": { "
+ + " \"relationship\": [{ "
+ + " \"related-to\": \"service-instance\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", "
+ + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/ee1b756e-3c9c-4ee0-974b-6218f377b20d\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"customer.global-customer-id\", "
+ + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" "
+ + " }, { "
+ + " \"relationship-key\": \"service-subscription.service-type\", "
+ + " \"relationship-value\": \"Emanuel\" "
+ + " }, { "
+ + " \"relationship-key\": \"service-instance.service-instance-id\", "
+ + " \"relationship-value\": \"fc21e453-7ff4-438e-bc69-df1f9474b00a\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"service-instance.service-instance-name\", "
+ + " \"property-value\": \"AUK51a_oam_calea_net_service_1\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"tenant\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"cloud-region.cloud-owner\", "
+ + " \"relationship-value\": \"att-nc\" "
+ + " }, { "
+ + " \"relationship-key\": \"cloud-region.cloud-region-id\", "
+ + " \"relationship-value\": \"auk51a\" "
+ + " }, { "
+ + " \"relationship-key\": \"tenant.tenant-id\", "
+ + " \"relationship-value\": \"b530fc990b6d4334bd45518bebca6a51\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"tenant.tenant-name\", "
+ + " \"property-value\": \"ecomp_ispt\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"cloud-region\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"cloud-region.cloud-owner\", "
+ + " \"relationship-value\": \"att-nc\" "
+ + " }, { "
+ + " \"relationship-key\": \"cloud-region.cloud-region-id\", "
+ + " \"relationship-value\": \"auk51a\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"cloud-region.owner-defined-type\", "
+ + " \"property-value\": \"lcp\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"vpn-binding\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"vpn-binding.vpn-id\", "
+ + " \"relationship-value\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"vpn-binding.vpn-name\", "
+ + " \"property-value\": \"LPPVPN\" "
+ + " }, { "
+ + " \"property-key\": \"vpn-binding.vpn-type\", "
+ + " \"property-value\": \"CUSTOMER\" "
+ + " } "
+ + " ] "
+ + " } "
+ + " ] "
+ + " } "
+ + " } "
+ + " }, { "
+ + " \"l3-network\": { "
+ + " \"network-id\": \"10a74149-c9d7-4918-bbcf-d5fb9b1799ce\", "
+ + " \"network-name\": \"AUK51a_oam_calea_net_2\", "
+ + " \"network-type\": \"SR-IOV-PROVIDER2-2\", "
+ + " \"network-role\": \"oam_calea_net_2\", "
+ + " \"network-technology\": \"STANDARD-SR-IOV\", "
+ + " \"is-bound-to-vpn\": true, "
+ + " \"resource-version\": \"1540925016770\", "
+ + " \"orchestration-status\": \"Active\", "
+ + " \"model-invariant-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", "
+ + " \"model-version-id\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", "
+ + " \"model-customization-id\": \"10a74149-c9d7-4918-bbcf-d5fb9b1799ce\", "
+ + " \"physical-network-name\": \"sriovnet2\", "
+ + " \"is-provider-network\": true, "
+ + " \"is-shared-network\": true, "
+ + " \"is-external-network\": false, "
+ + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/315ccdb4-5a11-499f-95dc-25ae4be37dad/service-data/networks/network/2d4f97f5-702a-4707-b9e5-aa9d3e35deeb/network-data/network-topology/\", "
+ + " \"relationship-list\": { "
+ + " \"relationship\": [{ "
+ + " \"related-to\": \"service-instance\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", "
+ + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/315ccdb4-5a11-499f-95dc-25ae4be37dad\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"customer.global-customer-id\", "
+ + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" "
+ + " }, { "
+ + " \"relationship-key\": \"service-subscription.service-type\", "
+ + " \"relationship-value\": \"Emanuel\" "
+ + " }, { "
+ + " \"relationship-key\": \"service-instance.service-instance-id\", "
+ + " \"relationship-value\": \"b28d8a84-7d93-4b56-b525-c239c1e780a4\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"service-instance.service-instance-name\", "
+ + " \"property-value\": \"AUK51a_oam_calea_net_service_2\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"tenant\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"cloud-region.cloud-owner\", "
+ + " \"relationship-value\": \"att-nc\" "
+ + " }, { "
+ + " \"relationship-key\": \"cloud-region.cloud-region-id\", "
+ + " \"relationship-value\": \"auk51a\" "
+ + " }, { "
+ + " \"relationship-key\": \"tenant.tenant-id\", "
+ + " \"relationship-value\": \"b530fc990b6d4334bd45518bebca6a51\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"tenant.tenant-name\", "
+ + " \"property-value\": \"ecomp_ispt\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"cloud-region\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"cloud-region.cloud-owner\", "
+ + " \"relationship-value\": \"att-nc\" "
+ + " }, { "
+ + " \"relationship-key\": \"cloud-region.cloud-region-id\", "
+ + " \"relationship-value\": \"auk51a\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"cloud-region.owner-defined-type\", "
+ + " \"property-value\": \"lcp\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"vpn-binding\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"vpn-binding.vpn-id\", "
+ + " \"relationship-value\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"vpn-binding.vpn-name\", "
+ + " \"property-value\": \"LPPVPN\" "
+ + " }, { "
+ + " \"property-key\": \"vpn-binding.vpn-type\", "
+ + " \"property-value\": \"CUSTOMER\" "
+ + " } "
+ + " ] "
+ + " } "
+ + " ] "
+ + " } "
+ + " } "
+ + " }, { "
+ + " \"l3-network\": { "
+ + " \"network-id\": \"95380967-0f1c-41e9-a47f-9baa3f90860c\", "
+ + " \"network-name\": \"AUK51a_oam_calea_net_3\", "
+ + " \"network-type\": \"SR-IOV-PROVIDER2-3\", "
+ + " \"network-role\": \"oam_calea_net_3\", "
+ + " \"network-technology\": \"STANDARD-SR-IOV\", "
+ + " \"is-bound-to-vpn\": true, "
+ + " \"resource-version\": \"1540925016770\", "
+ + " \"orchestration-status\": \"Active\", "
+ + " \"model-invariant-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", "
+ + " \"model-version-id\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", "
+ + " \"model-customization-id\": \"95380967-0f1c-41e9-a47f-9baa3f90860c\", "
+ + " \"physical-network-name\": \"sriovnet3\", "
+ + " \"is-provider-network\": true, "
+ + " \"is-shared-network\": true, "
+ + " \"is-external-network\": false, "
+ + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/c44ad6cc-639a-4c6b-a327-583afd656a0d/service-data/networks/network/cf18fbb3-ddcb-4774-bd30-e0e895c0e35e/network-data/network-topology/\", "
+ + " \"relationship-list\": { "
+ + " \"relationship\": [{ "
+ + " \"related-to\": \"service-instance\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", "
+ + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/c44ad6cc-639a-4c6b-a327-583afd656a0d\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"customer.global-customer-id\", "
+ + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" "
+ + " }, { "
+ + " \"relationship-key\": \"service-subscription.service-type\", "
+ + " \"relationship-value\": \"Emanuel\" "
+ + " }, { "
+ + " \"relationship-key\": \"service-instance.service-instance-id\", "
+ + " \"relationship-value\": \"f09bbb55-8942-4621-892f-4690a8e5570a\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"service-instance.service-instance-name\", "
+ + " \"property-value\": \"AUK51a_oam_calea_net_service_3\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"tenant\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"cloud-region.cloud-owner\", "
+ + " \"relationship-value\": \"att-nc\" "
+ + " }, { "
+ + " \"relationship-key\": \"cloud-region.cloud-region-id\", "
+ + " \"relationship-value\": \"auk51a\" "
+ + " }, { "
+ + " \"relationship-key\": \"tenant.tenant-id\", "
+ + " \"relationship-value\": \"b530fc990b6d4334bd45518bebca6a51\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"tenant.tenant-name\", "
+ + " \"property-value\": \"ecomp_ispt\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"cloud-region\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"cloud-region.cloud-owner\", "
+ + " \"relationship-value\": \"att-nc\" "
+ + " }, { "
+ + " \"relationship-key\": \"cloud-region.cloud-region-id\", "
+ + " \"relationship-value\": \"auk51a\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"cloud-region.owner-defined-type\", "
+ + " \"property-value\": \"lcp\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"vpn-binding\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"vpn-binding.vpn-id\", "
+ + " \"relationship-value\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"vpn-binding.vpn-name\", "
+ + " \"property-value\": \"LPPVPN\" "
+ + " }, { "
+ + " \"property-key\": \"vpn-binding.vpn-type\", "
+ + " \"property-value\": \"CUSTOMER\" "
+ + " } "
+ + " ] "
+ + " } "
+ + " ] "
+ + " } "
+ + " } "
+ + " }, { "
+ + " \"l3-network\": { "
+ + " \"network-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", "
+ + " \"network-name\": \"AUK51a_oam_calea_net_0\", "
+ + " \"network-type\": \"SR-IOV-PROVIDER2-0\", "
+ + " \"network-technology\": \"STANDARD-SR-IOV\", "
+ + " \"is-bound-to-vpn\": true, "
+ + " \"resource-version\": \"1540925016770\", "
+ + " \"orchestration-status\": \"Active\", "
+ + " \"model-invariant-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", "
+ + " \"model-version-id\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", "
+ + " \"model-customization-id\": \"95380967-0f1c-41e9-a47f-9baa3f90860c\", "
+ + " \"physical-network-name\": \"sriovnet0\", "
+ + " \"is-provider-network\": true, "
+ + " \"is-shared-network\": true, "
+ + " \"is-external-network\": false, "
+ + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/74141179-b5b9-4383-aab4-45f5b9f70127/service-data/networks/network/62cecd1b-f4bf-4e16-add9-2b6f5181e595/network-data/network-topology/\", "
+ + " \"relationship-list\": { "
+ + " \"relationship\": [{ "
+ + " \"related-to\": \"service-instance\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", "
+ + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/74141179-b5b9-4383-aab4-45f5b9f70127\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"customer.global-customer-id\", "
+ + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" "
+ + " }, { "
+ + " \"relationship-key\": \"service-subscription.service-type\", "
+ + " \"relationship-value\": \"Emanuel\" "
+ + " }, { "
+ + " \"relationship-key\": \"service-instance.service-instance-id\", "
+ + " \"relationship-value\": \"1c98917b-8255-43c6-98f1-7a2942e75ce1\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"service-instance.service-instance-name\", "
+ + " \"property-value\": \"AUK51a_oam_calea_net_service_0\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"tenant\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"cloud-region.cloud-owner\", "
+ + " \"relationship-value\": \"att-nc\" "
+ + " }, { "
+ + " \"relationship-key\": \"cloud-region.cloud-region-id\", "
+ + " \"relationship-value\": \"auk51a\" "
+ + " }, { "
+ + " \"relationship-key\": \"tenant.tenant-id\", "
+ + " \"relationship-value\": \"b530fc990b6d4334bd45518bebca6a51\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"tenant.tenant-name\", "
+ + " \"property-value\": \"ecomp_ispt\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"cloud-region\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"cloud-region.cloud-owner\", "
+ + " \"relationship-value\": \"att-nc\" "
+ + " }, { "
+ + " \"relationship-key\": \"cloud-region.cloud-region-id\", "
+ + " \"relationship-value\": \"auk51a\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"cloud-region.owner-defined-type\", "
+ + " \"property-value\": \"lcp\" "
+ + " } "
+ + " ] "
+ + " }, { "
+ + " \"related-to\": \"vpn-binding\", "
+ + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", "
+ + " \"related-link\": \"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\", "
+ + " \"relationship-data\": [{ "
+ + " \"relationship-key\": \"vpn-binding.vpn-id\", "
+ + " \"relationship-value\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\" "
+ + " } "
+ + " ], "
+ + " \"related-to-property\": [{ "
+ + " \"property-key\": \"vpn-binding.vpn-name\", "
+ + " \"property-value\": \"LPPVPN\" "
+ + " }, { "
+ + " \"property-key\": \"vpn-binding.vpn-type\", "
+ + " \"property-value\": \"CUSTOMER\" "
+ + " } "
+ + " ] "
+ + " } "
+ + " ] "
+ + " } "
+ + " } "
+ + " } "
+ + " ] "
+ + "}";
+
+ private static final String STATE_2 = "{\"results\": [" +
+ " {\"l3-network\": {" +
+ " \"network-id\": \"CC-l3network_1\"," +
+ " \"is-bound-to-vpn\": false," +
+ " \"resource-version\": \"1556206041065\"," +
+ " \"is-provider-network\": false," +
+ " \"is-shared-network\": false," +
+ " \"is-external-network\": false," +
+ " \"relationship-list\": {\"relationship\": [ {" +
+ " \"related-to\": \"tenant\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528T1\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-owner\"," +
+ " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-region-id\"," +
+ " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"tenant.tenant-id\"," +
+ " \"relationship-value\": \"tenant-id-CC-ANAI-528T1\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [ {" +
+ " \"property-key\": \"tenant.tenant-name\"," +
+ " \"property-value\": \"tenant-name-CC-ANAI-528T1\"" +
+ " }]" +
+ " }]}" +
+ " }}," +
+ " {\"l3-network\": {" +
+ " \"network-id\": \"CC-l3network_3\"," +
+ " \"network-name\": \"DLLSTXRNDS3\"," +
+ " \"network-role\": \"Backup\"," +
+ " \"is-bound-to-vpn\": true," +
+ " \"resource-version\": \"1556139217403\"," +
+ " \"is-provider-network\": false," +
+ " \"is-shared-network\": false," +
+ " \"is-external-network\": false," +
+ " \"relationship-list\": {\"relationship\": [" +
+ " {" +
+ " \"related-to\": \"tenant\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528T1\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-owner\"," +
+ " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-region-id\"," +
+ " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"tenant.tenant-id\"," +
+ " \"relationship-value\": \"tenant-id-CC-ANAI-528T1\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [ {" +
+ " \"property-key\": \"tenant.tenant-name\"," +
+ " \"property-value\": \"tenant-name-CC-ANAI-528T1\"" +
+ " }]" +
+ " }," +
+ " {" +
+ " \"related-to\": \"tenant\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528-T2\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-owner\"," +
+ " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-region-id\"," +
+ " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"tenant.tenant-id\"," +
+ " \"relationship-value\": \"tenant-id-CC-ANAI-528-T2\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [ {" +
+ " \"property-key\": \"tenant.tenant-name\"," +
+ " \"property-value\": \"tenant-name-CC-ANAI-528T2\"" +
+ " }]" +
+ " }," +
+ " {" +
+ " \"related-to\": \"tenant\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528T3\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-owner\"," +
+ " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-region-id\"," +
+ " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"tenant.tenant-id\"," +
+ " \"relationship-value\": \"tenant-id-CC-ANAI-528T3\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [ {" +
+ " \"property-key\": \"tenant.tenant-name\"," +
+ " \"property-value\": \"tenant-name-CC-ANAI-528T3\"" +
+ " }]" +
+ " }" +
+ " ]}" +
+ " }}," +
+ " {\"l3-network\": {" +
+ " \"network-id\": \"l3network2-550-as988q\"," +
+ " \"network-name\": \"CHICGIL01VDBE01_SubIntNtwk043\"," +
+ " \"network-type\": \"K6VD\"," +
+ " \"network-role\": \"X92XE0j\"," +
+ " \"network-technology\": \"ZYbPEnCjX6Oqd\"," +
+ " \"neutron-network-id\": \"fpFvDje\"," +
+ " \"is-bound-to-vpn\": false," +
+ " \"service-id\": \"NJnzYaRlz0Test\"," +
+ " \"network-role-instance\": 162," +
+ " \"resource-version\": \"1556823012443\"," +
+ " \"orchestration-status\": \"active\"," +
+ " \"heat-stack-id\": \"0GmDeg\"," +
+ " \"mso-catalog-key\": \"la5ylhZ5g0D\"," +
+ " \"contrail-network-fqdn\": \"EaeexDk47\"," +
+ " \"model-customization-id\": \"wgmn6PrJ5\"," +
+ " \"widget-model-id\": \"e0yNr\"," +
+ " \"widget-model-version\": \"yKpry3J0VVLn\"," +
+ " \"physical-network-name\": \"wq6OKbZMTY\"," +
+ " \"is-provider-network\": false," +
+ " \"is-shared-network\": false," +
+ " \"is-external-network\": false," +
+ " \"selflink\": \"9xtMu4EPuTi\"," +
+ " \"operational-status\": \"W8aj\"," +
+ " \"is-trunked\": true," +
+ " \"relationship-list\": {\"relationship\": [" +
+ " {" +
+ " \"related-to\": \"tenant\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528T1\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-owner\"," +
+ " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-region-id\"," +
+ " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"tenant.tenant-id\"," +
+ " \"relationship-value\": \"tenant-id-CC-ANAI-528T1\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [ {" +
+ " \"property-key\": \"tenant.tenant-name\"," +
+ " \"property-value\": \"tenant-name-CC-ANAI-528T1\"" +
+ " }]" +
+ " }," +
+ " {" +
+ " \"related-to\": \"configuration\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.PartOf\"," +
+ " \"related-link\": \"/aai/v17/network/configurations/configuration/configuration2-550-as988q\"," +
+ " \"relationship-data\": [ {" +
+ " \"relationship-key\": \"configuration.configuration-id\"," +
+ " \"relationship-value\": \"configuration2-550-as988q\"" +
+ " }]" +
+ " }," +
+ " {" +
+ " \"related-to\": \"configuration\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.PartOf\"," +
+ " \"related-link\": \"/aai/v17/network/configurations/configuration/configuration1-550-as988q\"," +
+ " \"relationship-data\": [ {" +
+ " \"relationship-key\": \"configuration.configuration-id\"," +
+ " \"relationship-value\": \"configuration1-550-as988q\"" +
+ " }]" +
+ " }," +
+ " {" +
+ " \"related-to\": \"vpn-binding\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v17/network/vpn-bindings/vpn-binding/VPNbinding3-550-as988q\"," +
+ " \"relationship-data\": [ {" +
+ " \"relationship-key\": \"vpn-binding.vpn-id\"," +
+ " \"relationship-value\": \"VPNbinding3-550-as988q\"" +
+ " }]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"vpn-binding.vpn-name\"," +
+ " \"property-value\": \"SZ2A5L_VPNTest\"" +
+ " }," +
+ " {" +
+ " \"property-key\": \"vpn-binding.vpn-type\"," +
+ " \"property-value\": \"1903e94v\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]}" +
+ " }}," +
+ " {\"l3-network\": {" +
+ " \"network-id\": \"CC-l3network_2\"," +
+ " \"network-name\": \"DLLSTXRNDS2\"," +
+ " \"network-role\": \"Primary\"," +
+ " \"is-bound-to-vpn\": true," +
+ " \"resource-version\": \"1556136783141\"," +
+ " \"is-provider-network\": true," +
+ " \"is-shared-network\": true," +
+ " \"is-external-network\": true," +
+ " \"relationship-list\": {\"relationship\": [" +
+ " {" +
+ " \"related-to\": \"tenant\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528T1\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-owner\"," +
+ " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-region-id\"," +
+ " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"tenant.tenant-id\"," +
+ " \"relationship-value\": \"tenant-id-CC-ANAI-528T1\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [ {" +
+ " \"property-key\": \"tenant.tenant-name\"," +
+ " \"property-value\": \"tenant-name-CC-ANAI-528T1\"" +
+ " }]" +
+ " }," +
+ " {" +
+ " \"related-to\": \"tenant\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528-T2\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-owner\"," +
+ " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-region-id\"," +
+ " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"tenant.tenant-id\"," +
+ " \"relationship-value\": \"tenant-id-CC-ANAI-528-T2\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [ {" +
+ " \"property-key\": \"tenant.tenant-name\"," +
+ " \"property-value\": \"tenant-name-CC-ANAI-528T2\"" +
+ " }]" +
+ " }" +
+ " ]}" +
+ " }}" +
+ "]}";
+
+
+
+
+}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionWithError.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionWithError.java
new file mode 100644
index 000000000..1d74b0f39
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionWithError.java
@@ -0,0 +1,23 @@
+package org.onap.simulator.presetGenerator.presets.aai;
+
+public class PresetAAIGetL3NetworksByCloudRegionWithError extends AAIBaseGetL3NetworksByCloudRegionPreset {
+ private int errorCode;
+ private String errorText;
+
+
+ public PresetAAIGetL3NetworksByCloudRegionWithError(int errorCode, String errorText) {
+ super();
+ this.errorCode = errorCode;
+ this.errorText = errorText;
+ }
+
+ @Override
+ public int getResponseCode() {
+ return errorCode;
+ }
+
+ @Override
+ public Object getResponseBody() {
+ return "{\"status\":\"Error\", \"text\":\"" + errorText + "\"}";
+ }
+}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java
index 41c35b8a5..ae921fd79 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java
@@ -1,11 +1,12 @@
package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetModelsByOwningEntity extends BaseAAIPreset {
String oeName;
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java
index cb80fd6ce..4da5c0567 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java
@@ -1,12 +1,13 @@
package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableMap;
+import org.onap.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;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetModelsByProject extends BaseAAIPreset {
private String projectName;
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java
index b99f58bda..3758d3f3b 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java
@@ -2,11 +2,12 @@ package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetNetworkCollectionDetails extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java
index 0d447c2c2..31cd6fdd0 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java
@@ -2,11 +2,12 @@ package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetNetworkCollectionDetailsInvalidRequest extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java
index 23b35d204..b3f34bb3e 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java
@@ -2,11 +2,12 @@ package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetNetworkCollectionDetailsRequiredMissing extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java
index 0676217a1..8bc0fe63a 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java
@@ -11,8 +11,8 @@ 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=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP\"" +
+ " \"start\": \"/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/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\"" +
" }";
}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java
index fdb387d71..9fad964d8 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java
@@ -1,11 +1,12 @@
package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetPortMirroringSourcePorts extends BaseAAIPreset {
public PresetAAIGetPortMirroringSourcePorts(String configurationId, String interfaceId, String interfaceName, boolean isPortMirrored) {
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java
index da1a120b4..c75155273 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java
@@ -1,11 +1,12 @@
package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetRelatedInstanceGroupsByVnfId extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java
index 615879e18..2d59cd633 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java
@@ -10,17 +10,17 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet {
private String responseBody = "{\"service\":[" +
" {" +
" \"service-id\":\"ebc3bc3d-62fd-4a3f-a037-f619df4ff034\"," +
- " \"service-description\":\"DHV\"," +
+ " \"service-description\":\"ERICA\"," +
" \"resource-version\":\"1494001985150\"" +
" }," +
" {" +
" \"service-id\":\"17cc1042-527b-11e6-beb8-9e71128cae77\"," +
- " \"service-description\":\"FLEXREACH\"," +
+ " \"service-description\":\"IGNACIO\"," +
" \"resource-version\":\"1494001922171\"" +
" }," +
" {" +
" \"service-id\":\"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e\"," +
- " \"service-description\":\"Netbond\"," +
+ " \"service-description\":\"Christie\"," +
" \"resource-version\":\"1494001855144\"" +
" }," +
" {" +
@@ -50,7 +50,7 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet {
" }," +
" {" +
" \"service-id\":\"db171b8f-115c-4992-a2e3-ee04cae357e0\"," +
- " \"service-description\":\"FIRSTNET\"," +
+ " \"service-description\":\"LINDSEY\"," +
" \"resource-version\":\"1490910095155\"" +
" }," +
" {" +
@@ -85,12 +85,12 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet {
" }," +
" {" +
" \"service-id\":\"0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1\"," +
- " \"service-description\":\"WAN Bonding\"," +
+ " \"service-description\":\"CARA Griffin\"," +
" \"resource-version\":\"1498053422512\"" +
" }," +
" {" +
" \"service-id\":\"c7611ebe-c324-48f1-8085-94aef0c6ef3d\"," +
- " \"service-description\":\"HOSTED COMMUNICATIONS\"," +
+ " \"service-description\":\"DARREN MCGEE\"," +
" \"resource-version\":\"1494001913639\"" +
" }," +
" {" +
@@ -105,7 +105,7 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet {
" }," +
" {" +
" \"service-id\":\"d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4\"," +
- " \"service-description\":\"uCPE-VMS\"," +
+ " \"service-description\":\"JOSEFINA\"," +
" \"resource-version\":\"1494001941772\"" +
" }," +
" {" +
@@ -115,7 +115,7 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet {
" }," +
" {" +
" \"service-id\":\"12a96a9d-4b4c-4349-a950-fe1159602621\"," +
- " \"service-description\":\"HOSTED COMMUNICATIONS\"," +
+ " \"service-description\":\"DARREN MCGEE\"," +
" \"resource-version\":\"1494001817126\"" +
" }" +
" ]}";
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java
index db41b9518..c14c1c7df 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java
@@ -1,13 +1,14 @@
package org.onap.simulator.presetGenerator.presets.aai;
-import static vid.automation.test.utils.ReadFile.loadResourceAsString;
-
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
+
+import static vid.automation.test.utils.ReadFile.loadResourceAsString;
public class PresetAAIGetSubDetailsGet extends BaseAAIPreset {
private String subscriberId;
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java
index 615c196a9..291f0b722 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java
@@ -1,15 +1,16 @@
package org.onap.simulator.presetGenerator.presets.aai;
-import static vid.automation.test.infra.ModelInfo.serviceFabricSriovService;
-
import com.google.common.collect.ImmutableMap;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
import org.springframework.http.HttpMethod;
import vid.automation.test.infra.ModelInfo;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static vid.automation.test.infra.ModelInfo.serviceFabricSriovService;
+
public class PresetAAIGetSubDetailsGetSpecificService extends BaseAAIPreset {
private String subscriberId;
private String subscriberName = "Emanuel";
@@ -60,13 +61,13 @@ public class PresetAAIGetSubDetailsGetSpecificService extends BaseAAIPreset {
" \"service-subscriptions\":{" +
" \"service-subscription\":[" +
" {" +
- " \"service-type\":\"vFlowLogic\"," +
+ " \"service-type\":\"vRichardson\"," +
" \"resource-version\":\"1501700976809\"," +
" \"service-instances\":{" +
" \"service-instance\":[" +
" {" +
" \"service-instance-id\":\"414db2d4-18d0-415e-aac2-f255b586cfb5\"," +
- " \"service-instance-name\":\"vFlowLogic-vflf_080117\"," +
+ " \"service-instance-name\":\"vRichardson-vflf_080117\"," +
" \"persona-model-id\":null," +
" \"persona-model-version\":null," +
" \"resource-version\":\"1502391806301\"," +
@@ -76,7 +77,7 @@ public class PresetAAIGetSubDetailsGetSpecificService extends BaseAAIPreset {
" }," +
" {" +
" \"service-instance-id\":\"769be44e-981a-4da8-af3b-ca5fa76b7fb1\"," +
- " \"service-instance-name\":\"vFlowLogic-vflp_080117\"," +
+ " \"service-instance-name\":\"vRichardson-vflp_080117\"," +
" \"persona-model-id\":null," +
" \"persona-model-version\":null," +
" \"resource-version\":\"1501712783617\"," +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGet.java
index f6ce3e86d..95a7c87d7 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGet.java
@@ -1,11 +1,12 @@
package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset {
private String subscriberId;
@@ -52,7 +53,7 @@ public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset {
" \"service-subscriptions\":{" +
" \"service-subscription\":[" +
" {" +
- " \"service-type\":\"vFlowLogic\"," +
+ " \"service-type\":\"vRichardson\"," +
" \"resource-version\":\"1501700976809\"," +
" \"is-permitted\":false" +
" }," +
@@ -67,7 +68,7 @@ public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset {
" \"is-permitted\":false" +
" }," +
" {" +
- " \"service-type\":\"vBNG\"," +
+ " \"service-type\":\"vJamie\"," +
" \"resource-version\":\"1498068165053\"," +
" \"is-permitted\":false" +
" }," +
@@ -82,7 +83,7 @@ public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset {
" \"is-permitted\":true" +
" }," +
" {" +
- " \"service-type\":\"vSEGW\"," +
+ " \"service-type\":\"vPorfirio\"," +
" \"resource-version\":\"1494254851983\"," +
" \"is-permitted\":false" +
" }," +
@@ -97,7 +98,7 @@ public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset {
" \"is-permitted\":false" +
" }," +
" {" +
- " \"service-type\":\"vMME\"," +
+ " \"service-type\":\"vFLORENCE\"," +
" \"resource-version\":\"1497729820723\"," +
" \"is-permitted\":false" +
" }," +
@@ -132,17 +133,17 @@ public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset {
" \"is-permitted\":false" +
" }," +
" {" +
- " \"service-type\":\"FIRSTNET\"," +
+ " \"service-type\":\"LINDSEY\"," +
" \"resource-version\":\"1509387060781\"," +
" \"is-permitted\":false" +
" }," +
" {" +
- " \"service-type\":\"ACTIVE_CHARGE\"," +
+ " \"service-type\":\"JOHANNA_SANTOS\"," +
" \"resource-version\":\"1494255101364\"," +
" \"is-permitted\":false" +
" }," +
" {" +
- " \"service-type\":\"vHSS\"," +
+ " \"service-type\":\"vCarroll\"," +
" \"resource-version\":\"1494254877333\"," +
" \"is-permitted\":false" +
" }" +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGetSpecificService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGetSpecificService.java
index 62a587001..44941ade8 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGetSpecificService.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGetSpecificService.java
@@ -1,11 +1,12 @@
package org.onap.simulator.presetGenerator.presets.aai;
import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
import java.util.Collections;
import java.util.List;
import java.util.Map;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetSubDetailsWithoutInstancesGetSpecificService extends BaseAAIPreset {
private String subscriberId;
@@ -49,7 +50,7 @@ public class PresetAAIGetSubDetailsWithoutInstancesGetSpecificService extends Ba
" \"service-subscriptions\":{" +
" \"service-subscription\":[" +
" {" +
- " \"service-type\":\"vFlowLogic\"," +
+ " \"service-type\":\"vRichardson\"," +
" \"resource-version\":\"1501700976809\"," +
" \"is-permitted\":false" +
" }," +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java
index 0517fd788..c6a5f3063 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java
@@ -3,13 +3,14 @@ package org.onap.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.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.onap.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;
-import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
-import org.onap.simulator.presetGenerator.presets.model.Subscriber;
-import org.springframework.http.HttpMethod;
public class PresetAAIGetSubscribersGet extends BaseAAIPreset {
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java
index 638cc3911..0808eaba6 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java
@@ -1,10 +1,10 @@
package org.onap.simulator.presetGenerator.presets.aai;
-import static vid.automation.test.utils.ReadFile.loadResourceAsString;
-
import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
import org.springframework.http.HttpMethod;
+import static vid.automation.test.utils.ReadFile.loadResourceAsString;
+
public class PresetAAIGetTenants extends BaseAAIPreset {
private final String subscriberId;
private final String serviceType;
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetVpnsByType.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetVpnsByType.java
new file mode 100644
index 000000000..70700f366
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetVpnsByType.java
@@ -0,0 +1,370 @@
+package org.onap.simulator.presetGenerator.presets.aai;
+
+import com.google.common.collect.ImmutableMap;
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
+import org.springframework.http.HttpMethod;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+public class PresetAAIGetVpnsByType extends BaseAAIPreset {
+
+ private String vpnType;
+
+ public PresetAAIGetVpnsByType() {
+ this.vpnType = "SERVICE-INFRASTRUCTURE";
+ }
+
+ public PresetAAIGetVpnsByType(String vpnType) {
+ this.vpnType = vpnType;
+ }
+
+ @Override
+ public Map<String, List> getQueryParams() {
+ return ImmutableMap.of("vpn-type", Collections.singletonList(vpnType));
+ }
+
+ @Override
+ public Object getResponseBody() {
+ return "{" +
+ " \"vpn-binding\": [" +
+ " {" +
+ " \"vpn-id\": \"120d39fb-3627-473d-913c-d228dd0f8e5b\"," +
+ " \"vpn-name\": \"LPPVPN\"," +
+ " \"vpn-platform\": \"AVPN\"," +
+ " \"vpn-type\": \"" + vpnType + "\"," +
+ " \"vpn-region\": \"USA,EMEA\"," +
+ " \"customer-vpn-id\": \"VPN1260\"," +
+ " \"resource-version\": \"1551904539767\"," +
+ " \"route-targets\" : [" +
+ " {" +
+ " \"global-route-target\":\"mock-global-1\"," +
+ " \"route-target-role\" : \"mock-role-x\"" +
+ " }," +
+ " {" +
+ " \"global-route-target\":\"mock-global-2\"," +
+ " \"route-target-role\" : \"mock-role-y\"" +
+ " }" +
+ " ],"+
+ " \"relationship-list\": {" +
+ " \"relationship\": [" +
+ " {" +
+ " \"related-to\": \"configuration\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v14/network/configurations/configuration/f1e81ceb-ce90-4d54-b181-e1ce8552250e\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"configuration.configuration-id\"," +
+ " \"relationship-value\": \"f1e81ceb-ce90-4d54-b181-e1ce8552250e\"" +
+ " }" +
+ " ]" +
+ " }," +
+ " {" +
+ " \"related-to\": \"customer\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"customer.global-customer-id\"," +
+ " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"customer.subscriber-name\"," +
+ " \"property-value\": \"SILVIA ROBBINS\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }," +
+ " {" +
+ " \"vpn-id\": \"c70391f3-a6e3-4874-9834-cbe12d7bf8b6\"," +
+ " \"vpn-name\": \"LPPVPN\"," +
+ " \"vpn-platform\": \"AVPN\"," +
+ " \"vpn-type\": \"" + vpnType + "\"," +
+ " \"vpn-region\": \"USA,EMEA\"," +
+ " \"customer-vpn-id\": \"VPN1274\"," +
+ " \"resource-version\": \"1552507588857\"," +
+ " \"model-customization-id\" : \"cc3bff3f-cd4d-49bb-aac3-77e8e1168297\"," +
+ " \"model-invariant-id\" : \"e73127d5-c2de-43b2-bc02-602fa5c9aa29\"," +
+ " \"model-version-id\" : \"94209bf1-67fa-4741-96fe-a2b3f86f84b2\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [" +
+ " {" +
+ " \"related-to\": \"customer\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"customer.global-customer-id\"," +
+ " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"customer.subscriber-name\"," +
+ " \"property-value\": \"SILVIA ROBBINS\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }," +
+ " {" +
+ " \"vpn-id\": \"4776516b-7da2-446c-9ba7-47ca8c30c571\"," +
+ " \"vpn-name\": \"LPPVPN\"," +
+ " \"vpn-platform\": \"AVPN\"," +
+ " \"vpn-type\": \"" + vpnType + "\"," +
+ " \"vpn-region\": \"USA,EMEA\"," +
+ " \"customer-vpn-id\": \"VPN1275\"," +
+ " \"resource-version\": \"1552591517864\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [" +
+ " {" +
+ " \"related-to\": \"customer\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"customer.global-customer-id\"," +
+ " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"customer.subscriber-name\"," +
+ " \"property-value\": \"SILVIA ROBBINS\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }," +
+ " {" +
+ " \"vpn-id\": \"46fcb25a-e7ba-4d96-99ba-3bb6eae6aba7\"," +
+ " \"vpn-name\": \"LPPVPN\"," +
+ " \"vpn-platform\": \"AVPN\"," +
+ " \"vpn-type\": \"" + vpnType + "\"," +
+ " \"vpn-region\": \"USA,EMEA\"," +
+ " \"customer-vpn-id\": \"VPN1271\"," +
+ " \"resource-version\": \"1552331549256\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [" +
+ " {" +
+ " \"related-to\": \"customer\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"customer.global-customer-id\"," +
+ " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"customer.subscriber-name\"," +
+ " \"property-value\": \"SILVIA ROBBINS\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }," +
+ " {" +
+ " \"vpn-id\": \"ffefbe38-3087-418a-87ae-f6582a15be78\"," +
+ " \"vpn-name\": \"LPPVPN\"," +
+ " \"vpn-platform\": \"AVPN\"," +
+ " \"vpn-type\": \"" + vpnType + "\"," +
+ " \"vpn-region\": \"USA,EMEA\"," +
+ " \"customer-vpn-id\": \"VPN1272\"," +
+ " \"resource-version\": \"1552469097776\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [" +
+ " {" +
+ " \"related-to\": \"customer\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"customer.global-customer-id\"," +
+ " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"customer.subscriber-name\"," +
+ " \"property-value\": \"SILVIA ROBBINS\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }," +
+ " {" +
+ " \"vpn-id\": \"961d05be-ee41-40a2-8653-f603fc495175\"," +
+ " \"vpn-name\": \"LPPVPN\"," +
+ " \"vpn-platform\": \"AVPN\"," +
+ " \"vpn-type\": \"" + vpnType + "\"," +
+ " \"vpn-region\": \"USA,EMEA\"," +
+ " \"customer-vpn-id\": \"VPN1273\"," +
+ " \"resource-version\": \"1552481667950\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [" +
+ " {" +
+ " \"related-to\": \"customer\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"customer.global-customer-id\"," +
+ " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"customer.subscriber-name\"," +
+ " \"property-value\": \"SILVIA ROBBINS\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }," +
+ " {" +
+ " \"vpn-id\": \"14bcfc2f-bbee-4fd9-89a5-42eb5dbb08d5\"," +
+ " \"vpn-name\": \"LPPVPN\"," +
+ " \"vpn-platform\": \"AVPN\"," +
+ " \"vpn-type\": \"" + vpnType + "\"," +
+ " \"vpn-region\": \"USA,EMEA\"," +
+ " \"customer-vpn-id\": \"913443\"," +
+ " \"resource-version\": \"1553182405707\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [" +
+ " {" +
+ " \"related-to\": \"customer\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"customer.global-customer-id\"," +
+ " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"customer.subscriber-name\"," +
+ " \"property-value\": \"SILVIA ROBBINS\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }," +
+ " {" +
+ " \"vpn-id\": \"89d4c968-158c-4722-a22c-c5c2ccc17fd5\"," +
+ " \"vpn-name\": \"LPPVPN\"," +
+ " \"vpn-platform\": \"AVPN\"," +
+ " \"vpn-type\": \"" + vpnType + "\"," +
+ " \"vpn-region\": \"USA,EMEA\"," +
+ " \"customer-vpn-id\": \"VPN1276\"," +
+ " \"resource-version\": \"1553018006071\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [" +
+ " {" +
+ " \"related-to\": \"customer\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"customer.global-customer-id\"," +
+ " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"customer.subscriber-name\"," +
+ " \"property-value\": \"SILVIA ROBBINS\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }," +
+ " {" +
+ " \"vpn-id\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\"," +
+ " \"vpn-name\": \"LPPVPN\"," +
+ " \"vpn-platform\": \"AVPN\"," +
+ " \"vpn-type\": \"" + vpnType + "\"," +
+ " \"vpn-region\": \"USA,EMEA\"," +
+ " \"customer-vpn-id\": \"VPN1259\"," +
+ " \"resource-version\": \"1551967976427\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [" +
+ " {" +
+ " \"related-to\": \"customer\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"customer.global-customer-id\"," +
+ " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"customer.subscriber-name\"," +
+ " \"property-value\": \"SILVIA ROBBINS\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }," +
+ " {" +
+ " \"vpn-id\": \"844a1ea7-556a-4e49-8aa3-171f1db4ea02\"," +
+ " \"vpn-name\": \"LPPVPN\"," +
+ " \"vpn-platform\": \"AVPN\"," +
+ " \"vpn-type\": \"" + vpnType + "\"," +
+ " \"vpn-region\": \"USA,EMEA\"," +
+ " \"customer-vpn-id\": \"VPN1277\"," +
+ " \"resource-version\": \"1553086769917\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [" +
+ " {" +
+ " \"related-to\": \"l3-network\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v15/network/l3-networks/l3-network/ac5224b1-71cc-4237-a401-c00b2fd65a78\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"l3-network.network-id\"," +
+ " \"relationship-value\": \"ac5224b1-71cc-4237-a401-c00b2fd65a78\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"l3-network.network-name\"," +
+ " \"property-value\": \"APP-C-24595-T-IST-04B_int_SUB-INTERFACE_net_051\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ "}";
+ }
+
+ @Override
+ public HttpMethod getReqMethod() {
+ return HttpMethod.GET;
+ }
+
+ @Override
+ public String getReqPath() {
+ return getRootPath() + "/network/vpn-bindings";
+ }
+
+}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGet.java
index 429d17647..d5a9bafb6 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGet.java
@@ -118,6 +118,34 @@ public class PresetAAIModelsByInvariantIdGet extends BaseAAIPreset {
" }" +
" }," +
" {" +
+ " \"model-version-id\": \"f028b2e2-7080-4b13-91b2-94944d4c42d8\"," +
+ " \"model-name\": \"Service with VRF\"," +
+ " \"model-version\": \"5.0\"," +
+ " \"model-description\": \"vEPDG\"," +
+ " \"resource-version\": \"1507472057702\"" +
+ " }," +
+ " {" +
+ " \"model-version-id\": \"9cac02be-2489-4374-888d-2863b4511a59\"," +
+ " \"model-name\": \"VRF Entry Configuration\"," +
+ " \"model-version\": \"5.0\"," +
+ " \"model-description\": \"vEPDG\"," +
+ " \"resource-version\": \"1507472057702\"" +
+ " }," +
+ " {" +
+ " \"model-version-id\": \"network-instance-model-version-id\"," +
+ " \"model-name\": \"Network Entry\"," +
+ " \"model-version\": \"6.0\"," +
+ " \"model-description\": \"vEPDG\"," +
+ " \"resource-version\": \"1507472057702\"" +
+ " }," +
+ " {" +
+ " \"model-version-id\": \"vpn-model-version-id\"," +
+ " \"model-name\": \"vf_vEPDG\"," +
+ " \"model-version\": \"6.0\"," +
+ " \"model-description\": \"vEPDG\"," +
+ " \"resource-version\": \"1507472057702\"" +
+ " }," +
+ " {" +
" \"model-version-id\": \"eb5f56bf-5855-4e61-bd00-3e19a953bf02\"," +
" \"model-name\": \"vf_vEPDG\"," +
" \"model-version\": \"1.0\"," +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGetForServiceWithCR.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGetForServiceWithCR.java
new file mode 100644
index 000000000..b2e7b18aa
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGetForServiceWithCR.java
@@ -0,0 +1,908 @@
+package org.onap.simulator.presetGenerator.presets.aai;
+
+import com.google.common.collect.ImmutableList;
+
+public class PresetAAIModelsByInvariantIdGetForServiceWithCR extends PresetAAIModelsByInvariantIdGet {
+ public PresetAAIModelsByInvariantIdGetForServiceWithCR(ImmutableList<String> modelInvariantIds) {
+ super(modelInvariantIds);
+ }
+
+ @Override
+ public Object getResponseBody() {
+ return "{" +
+ " \"model\": [{" +
+ " \"model-invariant-id\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"," +
+ " \"model-type\": \"service\"," +
+ " \"resource-version\": \"1534274421300\"," +
+ " \"model-vers\": {" +
+ " \"model-ver\": [{" +
+ " \"model-version-id\": \"a92f899d-a3ec-465b-baed-1663b0a5aee1\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"3.0\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1534788756086\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"901e2641-c66c-4178-a6e8-cbe2877b0a2a\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534463243387\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"d2fda667-e92e-4cfa-9620-5da5de01a319\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"1.0\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1534444087221\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"d291ed5e-4f50-4f57-956d-ce0e67a059e5\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534274421311\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"d4a447e5-9791-47b9-b365-1abb19b4b626\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"4.0\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1534863624237\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"0ef29f1f-836a-4fab-986c-5f1b96310a3d\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534863624242\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"0e97a118-b1b6-40d5-bbad-98cdd51b1c48\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"11.0\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1550783120267\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"0ea8ac21-64b8-4489-9d62-12e625d66995\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1543961990189\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"46093d8f-6dfa-4332-9c00-7e822c681b59\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"7.0\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1534885144462\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"d74a5dff-ef7f-4e32-9c13-d82fb2c617c9\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534885014144\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"12930bcc-5276-42bb-8ed6-1e43d7acae2c\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"10.0\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1539613511543\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"4d57798e-81b7-490e-bee8-48bd382a1349\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1539613450903\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"f8783bb2-6135-4c35-8320-64fa7deae76b\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"2.0\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1534450229751\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"c666f1dd-99ff-442a-9ba2-1ee2dabb9e25\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534450167963\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"0148e4c5-629b-4fef-9728-1e13fd630679\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"9.0\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1537901614540\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"6ae6fd91-2086-470d-8c36-9d668c41fd32\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1537882880185\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"1ceab842-7ded-49f1-a129-dce2ecef8c71\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"6.0\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1534883213652\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"5ca853fc-2984-45c7-b2e7-8514a56785ba\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534883154090\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"fd21f6b5-02f6-4ac0-9515-e1f01112da95\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"5.0\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1534872246413\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"0812b47d-7ef1-4a65-b6fb-9f3ff3bc3eee\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534872174141\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"6e0bec91-09f3-43aa-9cf3-e617cd0146be\"," +
+ " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," +
+ " \"model-version\": \"8.0\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"model-description\": \"Network Collection service for vLAN tagging\"," +
+ " \"resource-version\": \"1536098608209\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"a0247d2e-3843-4753-be2f-4c252c99390e\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1536098548388\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"service-instance\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-invariant-id\": \"868b109c-9481-4a18-891b-af974db7705a\"," +
+ " \"model-type\": \"resource\"," +
+ " \"resource-version\": \"1534795610752\"," +
+ " \"model-vers\": {" +
+ " \"model-ver\": [{" +
+ " \"model-version-id\": \"dd182d7d-6949-4b90-b3cc-5befe400742e\"," +
+ " \"model-name\": \"ncm_vlan_ym161f..NetworkCollection..0\"," +
+ " \"model-version\": \"1\"," +
+ " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," +
+ " \"resource-version\": \"1534795610763\"" +
+ " }, {" +
+ " \"model-version-id\": \"e5fc56b7-e14c-45e5-b127-978c36a921c0\"," +
+ " \"model-name\": \"ncm_vlan_ym161f..NetworkCollection..0\"," +
+ " \"model-version\": \"1\"," +
+ " \"resource-version\": \"1543961989136\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"9001ff96-1142-49c6-af5b-df4e2b23a305\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1543961989136\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd/model-vers/model-ver/8e6ee9dc-9017-444a-83b3-219edb018128\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"8e6ee9dc-9017-444a-83b3-219edb018128\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"instance-group\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-element\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/081ceb56-eb71-4566-a72d-3e7cbee5cdf1/model-vers/model-ver/a580855f-8d1b-40d5-a75b-50709fbd17d3/model-elements/model-element/06014449-69d3-4aef-a96b-0a5130ba9483/model-elements/model-element/a050dc96-2c35-45c7-ba23-9279215d501e\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"081ceb56-eb71-4566-a72d-3e7cbee5cdf1\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"a580855f-8d1b-40d5-a75b-50709fbd17d3\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"06014449-69d3-4aef-a96b-0a5130ba9483\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"a050dc96-2c35-45c7-ba23-9279215d501e\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-invariant-id\": \"081ceb56-eb71-4566-a72d-3e7cbee5cdf1\"," +
+ " \"model-type\": \"resource\"," +
+ " \"resource-version\": \"1534788713816\"," +
+ " \"model-vers\": {" +
+ " \"model-ver\": [{" +
+ " \"model-version-id\": \"747d2a17-5771-4fd6-879d-c2e9e4c5cd4f\"," +
+ " \"model-name\": \"NCM_VLAN_ym161f\"," +
+ " \"model-version\": \"2.0\"," +
+ " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," +
+ " \"resource-version\": \"1534863623891\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"0dd28c63-cadf-48b2-afb0-a7bf7184ef5a\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534863623895\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"425b2158-e51d-4509-9945-dad4556474a3\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"2a160989-b202-47dd-874b-4a0f275998f7\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"cloud-region\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-element\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/d4a447e5-9791-47b9-b365-1abb19b4b626/model-elements/model-element/0ef29f1f-836a-4fab-986c-5f1b96310a3d/model-elements/model-element/700f890b-05c9-471a-b859-956655d28f47\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"d4a447e5-9791-47b9-b365-1abb19b4b626\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"0ef29f1f-836a-4fab-986c-5f1b96310a3d\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"700f890b-05c9-471a-b859-956655d28f47\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"a580855f-8d1b-40d5-a75b-50709fbd17d3\"," +
+ " \"model-name\": \"NCM_VLAN_ym161f\"," +
+ " \"model-version\": \"6.0\"," +
+ " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," +
+ " \"resource-version\": \"1543961989670\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"06014449-69d3-4aef-a96b-0a5130ba9483\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1543961989670\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/8bac3599-9a1c-4b7f-80e5-c1838f744c23/model-vers/model-ver/3f908abc-3a15-40d0-b674-2a639e52884d\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"8bac3599-9a1c-4b7f-80e5-c1838f744c23\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"3f908abc-3a15-40d0-b674-2a639e52884d\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"collection\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-element\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/0e97a118-b1b6-40d5-bbad-98cdd51b1c48/model-elements/model-element/0ea8ac21-64b8-4489-9d62-12e625d66995/model-elements/model-element/d614653c-5f19-4668-ad98-cfbe012308e1\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"0e97a118-b1b6-40d5-bbad-98cdd51b1c48\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"0ea8ac21-64b8-4489-9d62-12e625d66995\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"d614653c-5f19-4668-ad98-cfbe012308e1\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"b84e2233-37bf-4c8d-b613-eb8a8820b725\"," +
+ " \"model-name\": \"NCM_VLAN_ym161f\"," +
+ " \"model-version\": \"4.0\"," +
+ " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," +
+ " \"resource-version\": \"1534883153714\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"f7c3f5bb-777a-4d9f-9401-a652f5006152\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534883153720\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"425b2158-e51d-4509-9945-dad4556474a3\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"2a160989-b202-47dd-874b-4a0f275998f7\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"cloud-region\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-element\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/1ceab842-7ded-49f1-a129-dce2ecef8c71/model-elements/model-element/5ca853fc-2984-45c7-b2e7-8514a56785ba/model-elements/model-element/030553aa-8d82-4b03-a3dc-bc210daadd5e\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"1ceab842-7ded-49f1-a129-dce2ecef8c71\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"5ca853fc-2984-45c7-b2e7-8514a56785ba\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"030553aa-8d82-4b03-a3dc-bc210daadd5e\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"5ededaad-905c-4356-b30d-471b0ae2a12a\"," +
+ " \"model-name\": \"NCM_VLAN_ym161f\"," +
+ " \"model-version\": \"3.0\"," +
+ " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," +
+ " \"resource-version\": \"1534872173817\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"31f558c6-d73a-43e4-aab0-c863ccd6b110\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534872173821\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"425b2158-e51d-4509-9945-dad4556474a3\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"2a160989-b202-47dd-874b-4a0f275998f7\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"cloud-region\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-element\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/fd21f6b5-02f6-4ac0-9515-e1f01112da95/model-elements/model-element/0812b47d-7ef1-4a65-b6fb-9f3ff3bc3eee/model-elements/model-element/110a5ba4-997b-45f0-8e53-d64d6b342be1\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"fd21f6b5-02f6-4ac0-9515-e1f01112da95\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"0812b47d-7ef1-4a65-b6fb-9f3ff3bc3eee\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"110a5ba4-997b-45f0-8e53-d64d6b342be1\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"67b91dcd-4fa5-4111-80c9-60d524740667\"," +
+ " \"model-name\": \"NCM_VLAN_ym161f\"," +
+ " \"model-version\": \"1.0\"," +
+ " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," +
+ " \"resource-version\": \"1534788713822\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"6fdf228e-89ce-4cf6-9bd7-399aa1b690b3\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534788713833\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"425b2158-e51d-4509-9945-dad4556474a3\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"2a160989-b202-47dd-874b-4a0f275998f7\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"cloud-region\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }, {" +
+ " \"model-version-id\": \"ce8c98bc-4691-44fb-8ff0-7a47487c11c4\"," +
+ " \"model-name\": \"NCM_VLAN_ym161f\"," +
+ " \"model-version\": \"5.0\"," +
+ " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," +
+ " \"resource-version\": \"1534885013739\"," +
+ " \"model-elements\": {" +
+ " \"model-element\": [{" +
+ " \"model-element-uuid\": \"4bd10473-a9de-4399-abe7-c9b24e48e0ee\"," +
+ " \"new-data-del-flag\": \"T\"," +
+ " \"cardinality\": \"unbounded\"," +
+ " \"resource-version\": \"1534885013745\"," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-ver\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"425b2158-e51d-4509-9945-dad4556474a3\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"2a160989-b202-47dd-874b-4a0f275998f7\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [{" +
+ " \"property-key\": \"model-ver.model-name\"," +
+ " \"property-value\": \"cloud-region\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }," +
+ " \"relationship-list\": {" +
+ " \"relationship\": [{" +
+ " \"related-to\": \"model-element\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/12930bcc-5276-42bb-8ed6-1e43d7acae2c/model-elements/model-element/4d57798e-81b7-490e-bee8-48bd382a1349/model-elements/model-element/93eafb42-11b5-471d-8f8a-333408114a9a\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"12930bcc-5276-42bb-8ed6-1e43d7acae2c\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"4d57798e-81b7-490e-bee8-48bd382a1349\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"93eafb42-11b5-471d-8f8a-333408114a9a\"" +
+ " }" +
+ " ]" +
+ " }, {" +
+ " \"related-to\": \"model-element\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/6e0bec91-09f3-43aa-9cf3-e617cd0146be/model-elements/model-element/a0247d2e-3843-4753-be2f-4c252c99390e/model-elements/model-element/cb986adf-5ca8-48a5-ac9b-b222d6d2e280\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"6e0bec91-09f3-43aa-9cf3-e617cd0146be\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"a0247d2e-3843-4753-be2f-4c252c99390e\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"cb986adf-5ca8-48a5-ac9b-b222d6d2e280\"" +
+ " }" +
+ " ]" +
+ " }, {" +
+ " \"related-to\": \"model-element\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/0148e4c5-629b-4fef-9728-1e13fd630679/model-elements/model-element/6ae6fd91-2086-470d-8c36-9d668c41fd32/model-elements/model-element/a520808b-b8bc-4969-9eba-c85e2797f3dd\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"0148e4c5-629b-4fef-9728-1e13fd630679\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"6ae6fd91-2086-470d-8c36-9d668c41fd32\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"a520808b-b8bc-4969-9eba-c85e2797f3dd\"" +
+ " }" +
+ " ]" +
+ " }, {" +
+ " \"related-to\": \"model-element\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/ca26a7e6-064d-4e90-a5b9-32ffe819f826/model-vers/model-ver/e9a290ca-41f0-4117-a1b5-8b7cd5595ff7/model-elements/model-element/ff3fdeb9-24e9-406f-8761-1334c9ea29d1/model-elements/model-element/bc6ddc86-f948-4f47-a4e6-bededd8d5780\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"ca26a7e6-064d-4e90-a5b9-32ffe819f826\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"e9a290ca-41f0-4117-a1b5-8b7cd5595ff7\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"ff3fdeb9-24e9-406f-8761-1334c9ea29d1\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"bc6ddc86-f948-4f47-a4e6-bededd8d5780\"" +
+ " }" +
+ " ]" +
+ " }, {" +
+ " \"related-to\": \"model-element\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," +
+ " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/46093d8f-6dfa-4332-9c00-7e822c681b59/model-elements/model-element/d74a5dff-ef7f-4e32-9c13-d82fb2c617c9/model-elements/model-element/f7bd32b4-bbbf-4788-9137-9dfa299e6111\"," +
+ " \"relationship-data\": [{" +
+ " \"relationship-key\": \"model.model-invariant-id\"," +
+ " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-ver.model-version-id\"," +
+ " \"relationship-value\": \"46093d8f-6dfa-4332-9c00-7e822c681b59\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"d74a5dff-ef7f-4e32-9c13-d82fb2c617c9\"" +
+ " }, {" +
+ " \"relationship-key\": \"model-element.model-element-uuid\"," +
+ " \"relationship-value\": \"f7bd32b4-bbbf-4788-9137-9dfa299e6111\"" +
+ " }" +
+ " ]" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ " }" +
+ " }" +
+ " ]" +
+ "}";
+ }
+}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIStandardQueryGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIStandardQueryGet.java
index 13ee91e2b..642f941e8 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIStandardQueryGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIStandardQueryGet.java
@@ -1,18 +1,23 @@
package org.onap.simulator.presetGenerator.presets.aai;
-import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
-import static org.apache.commons.text.StringEscapeUtils.escapeJson;
-
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
-import java.util.UUID;
-import java.util.stream.Collectors;
import org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StrSubstitutor;
import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
import org.springframework.http.HttpMethod;
+import java.util.UUID;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import static org.apache.commons.lang3.ObjectUtils.defaultIfNull;
+import static org.apache.commons.text.StringEscapeUtils.escapeJson;
+import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.ATT_AIC;
+import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.hvf6;
+
public class PresetAAIStandardQueryGet extends BaseAAIPreset {
private final String instanceId;
private final String instanceName;
@@ -22,8 +27,9 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
private final String uri;
private final String typeInResponse;
private final Multimap<String, String> relationshipsUris;
+ private Placement placement;
- private PresetAAIStandardQueryGet(String typeInResponse, String instanceId, String instanceName, String instanceType, String instanceRole, String uri, Multimap<String, String> relationshipsUris, String additionalProperties) {
+ private PresetAAIStandardQueryGet(String typeInResponse, String instanceId, String instanceName, String instanceType, String instanceRole, String uri, Multimap<String, String> relationshipsUris, String additionalProperties, Placement placement) {
this.instanceId = defaultIfNull(instanceId, randomUUID());
this.instanceName = defaultIfNull(instanceName, randomAlphanumeric());
this.instanceType = defaultIfNull(instanceType, randomAlphanumeric());
@@ -32,15 +38,23 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
this.typeInResponse = typeInResponse;
this.additionalProperties = additionalProperties;
this.relationshipsUris = relationshipsUris;
+ this.placement = placement;
}
- private PresetAAIStandardQueryGet(String typeInResponse, String instanceId, String uri, Multimap<String, String> relationshipsUris, String additionalProperties) {
- this(typeInResponse, instanceId, randomAlphanumeric(), randomAlphanumeric(), randomAlphanumeric(), uri, relationshipsUris, additionalProperties);
+ private PresetAAIStandardQueryGet(String typeInResponse, String instanceId, String uri, Multimap<String, String> relationshipsUris, String additionalProperties, Placement placement) {
+ this(typeInResponse, instanceId, randomAlphanumeric(), randomAlphanumeric(), randomAlphanumeric(), uri, relationshipsUris, additionalProperties, placement);
}
public static PresetAAIStandardQueryGet ofServiceInstance(String instanceId, final String modelVersionId, final String modelInvariantId, String subscriberId, String serviceType, Multimap<String, String> relationshipsUris) {
+ return ofServiceInstance(instanceId, "", "", modelVersionId, modelInvariantId, subscriberId, serviceType, "GARBAGE DATA", relationshipsUris);
+ }
+
+ public static PresetAAIStandardQueryGet ofServiceInstance(String instanceId, String instanceType, String instanceRole, final String modelVersionId, final String modelInvariantId, String subscriberId, String serviceType, String orchStatus, Multimap<String, String> relationshipsUris) {
return new PresetAAIStandardQueryGet(
"service-instance", instanceId,
+ randomAlphanumeric(),
+ instanceType,
+ instanceRole,
new StrSubstitutor(ImmutableMap.of(
"global-customer-id", subscriberId,
"service-type", serviceType,
@@ -53,37 +67,44 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
"\"model-invariant-id\": \"" + modelInvariantId + "\", " +
"\"model-version-id\": \"" + modelVersionId + "\", " +
"\"resource-version\": \"GARBAGE DATA\", " +
- "\"orchestration-status\": \"GARBAGE DATA\", "
+ "\"orchestration-status\": \"" + orchStatus + "\", ", null
);
}
public static PresetAAIStandardQueryGet ofInstanceGroup(String groupType, String groupRole, Multimap<String, String> relationshipsUris) {
+ return ofInstanceGroup(groupType, groupRole, relationshipsUris, "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", "daeb6568-cef8-417f-9075-ed259ce59f48");
+ }
+
+ public static PresetAAIStandardQueryGet ofInstanceGroup(String groupType, String groupRole, Multimap<String, String> relationshipsUris, String modelInvariantId, String modelVersionId) {
final String instanceId = randomUUID();
return new PresetAAIStandardQueryGet(
"instance-group", instanceId, randomAlphanumeric(), groupType, groupRole,
"/network/instance-groups/instance-group/" + instanceId,
relationshipsUris, "" +
" \"id\": \"" + instanceId + "\"," +
- " \"model-invariant-id\": \"4bb2e27e-ddab-4790-9c6d-1f731bc14a45\"," +
- " \"model-version-id\": \"daeb6568-cef8-417f-9075-ed259ce59f48\"," +
+ addModelIds(modelInvariantId, modelVersionId) +
" \"description\": \"vTSBC Customer Landing Network Collection Desc\"," +
" \"resource-version\": \"1536169790853\"," +
- " \"instance-group-function\": \"vTSBC Customer Landing Network Collection\","
+ " \"instance-group-function\": \"vTSBC Customer Landing Network Collection\",", null
);
}
- public static PresetAAIStandardQueryGet ofVnf(String instanceId, Multimap<String, String> relationshipsUris) {
- return ofVnf(instanceId, "vnf-instance-model-version-id", "vnf-instance-model-customization-id", "", relationshipsUris);
+ public static PresetAAIStandardQueryGet ofVnf(String instanceId, Multimap<String, String> relationshipsUris, Placement placement) {
+ return ofVnf(instanceId, "vnf-instance-model-version-id", "vnf-instance-model-customization-id", "", relationshipsUris, placement);
+ }
+
+ public static Placement defaultPlacement() {
+ return new Placement(ATT_AIC, hvf6, "bae71557c5bb4d5aac6743a4e5f1d054");
}
- public static PresetAAIStandardQueryGet ofVnf(String instanceId, String modelVersionId,String modelCustomizationId, String additionalProperties, Multimap<String, String> relationshipsUris) {
+ public static PresetAAIStandardQueryGet ofVnf(String instanceId, String modelVersionId, String modelCustomizationId, String additionalProperties, Multimap<String, String> relationshipsUris, Placement placement) {
return new PresetAAIStandardQueryGet(
"vnf", instanceId,
"/network/generic-vnfs/generic-vnf/" + instanceId,
relationshipsUris, additionalProperties +
"\"model-invariant-id\": \"vnf-instance-model-invariant-id\", " +
- "\"model-customization-id\": \"" + modelCustomizationId + "\", "+
- "\"model-version-id\": \"" + modelVersionId + "\", "
+ "\"model-customization-id\": \"" + modelCustomizationId + "\", " +
+ "\"model-version-id\": \"" + modelVersionId + "\", ", placement
);
}
@@ -93,7 +114,7 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
"/network/generic-vnfs/generic-vnf/" + instanceId,
relationshipsUris, additionalProperties +
"\"model-invariant-id\": \"vnf-instance-model-invariant-id\", " +
- "\"model-version-id\": \"" + modelVersionId + "\", "
+ "\"model-version-id\": \"" + modelVersionId + "\", ", null
);
}
@@ -109,7 +130,7 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
return ofL3Network(randomUUID(), randomAlphanumeric(), instanceType, relationshipsUris, orchStatus, "prov", "network-instance-model-version-id", "network-instance-model-customization-id");
}
- public static PresetAAIStandardQueryGet ofL3Network(String instanceType, String orchStatus, String provStatus, String modelVersionId, String modelCustomizationId,Multimap<String, String> relationshipsUris) {
+ public static PresetAAIStandardQueryGet ofL3Network(String instanceType, String orchStatus, String provStatus, String modelVersionId, String modelCustomizationId, Multimap<String, String> relationshipsUris) {
return ofL3Network(randomUUID(), randomAlphanumeric(), instanceType, relationshipsUris, orchStatus, provStatus, modelVersionId, modelCustomizationId);
}
@@ -130,7 +151,7 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
"\"is-external-network\": true, " +
"\"model-invariant-id\": \"network-instance-model-invariant-id\", " +
"\"model-customization-id\": \"" + modelCustomizationId + "\", " +
- "\"model-version-id\": \"" + modelVersionId + "\", "
+ "\"model-version-id\": \"" + modelVersionId + "\", ", null
);
}
@@ -144,19 +165,59 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
" \"orchestration-status\": \"Active\"," +
" \"model-customization-id\": \"bc3bbdcc-42f3-4682-b151-99c308d15255\"," +
" \"vf-module-model-customization-id\": \"bc3bbdcc-42f3-4682-b151-99c308d15255\"," +
- " \"resource-version\": \"1533679899735\","
+ " \"resource-version\": \"1533679899735\",", null
);
}
- public static PresetAAIStandardQueryGet ofCollectionResource(String orchStatus, Multimap<String, String> relationshipsUris) {
+
+ public static PresetAAIStandardQueryGet ofCollectionResource(String orchStatus, Multimap<String, String> relationshipsUris, String modelInvariantId, String modelVersionId) {
final String instanceId = randomUUID();
return new PresetAAIStandardQueryGet(
"collection", instanceId, randomAlphanumeric(), "L3-NETWORK", randomAlphanumeric(),
"/network/collections/collection/" + instanceId,
relationshipsUris, "" +
"\"orchestration-status\": \"" + orchStatus + "\", " +
- "\"model-invariant-id\": \"081ceb56-eb71-4566-a72d-3e7cbee5cdf1\", " +
- "\"model-version-id\": \"ce8c98bc-4691-44fb-8ff0-7a47487c11c4\", "
+ addModelIds(modelInvariantId, modelVersionId), null
+ );
+ }
+
+ private static String addModelIds(String modelInvariantId, String modelVersionId) {
+ return "\"model-invariant-id\": \"" + modelInvariantId + "\", " +
+ "\"model-version-id\": \"" + modelVersionId + "\", ";
+ }
+
+ public static PresetAAIStandardQueryGet ofVrf(String orchStatus, Multimap<String, String> relationshipsUris) {
+ final String instanceId = randomUUID();
+ return new PresetAAIStandardQueryGet(
+ "configuration", instanceId, randomAlphanumeric(), "COLLECTION", randomAlphanumeric(),
+ "/network/configurations/configuration/" + instanceId,
+ relationshipsUris, "" +
+ "\"orchestration-status\": \"" + orchStatus + "\", " +
+ "\"model-invariant-id\": \"b67a289b-1688-496d-86e8-1583c828be0a\", " +
+ "\"model-customization-id\": \"dd024d73-9bd1-425d-9db5-476338d53433\", " +
+ "\"model-version-id\": \"9cac02be-2489-4374-888d-2863b4511a59\", ", null
+ );
+ }
+
+ public static PresetAAIStandardQueryGet ofVpn(String orchStatus, Multimap<String, String> relationshipsUris, String globalRoutTarget, String routeTargetRole, String customerId, String region) {
+ final String instanceId = randomUUID();
+ return new PresetAAIStandardQueryGet(
+ "vpn", instanceId, randomAlphanumeric(), "SERVICE-INFRASTRUCTURE", randomAlphanumeric(),
+ "/network/collections/collection/" + instanceId,
+ relationshipsUris, "" +
+ "\"orchestration-status\": \"" + orchStatus + "\", " +
+ "\"prov-status\": \"" + "prov" + "\"," +
+ "\"model-invariant-id\": \"vpn-model-invariant-id\", " +
+ "\"model-customization-id\": \"vpn-model-customization-id\", " +
+ "\"customer-vpn-id\": \"" + customerId + "\", " +
+ "\"vpn-region\": \"" + region + "\", " +
+ "\"route-targets\" : [" +
+ " {" +
+ " \"global-route-target\":\"" + globalRoutTarget + "\"," +
+ " \"route-target-role\" : \"" + routeTargetRole + "\"" +
+ " }" +
+ " ],"+
+ "\"model-version-id\": \"vpn-model-version-id\", ", null
);
}
@@ -171,7 +232,7 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
"\"vlan-id-outer\": " + vlanIdOuter + ", " +
"\"resource-version\": \"1518934744675\", " +
"\"in-maint\": false, " +
- "\"is-ip-unnumbered\": false, "
+ "\"is-ip-unnumbered\": false, ", null
);
}
@@ -202,9 +263,10 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
additionalProperties +
" \"relationship-list\": { " +
" \"relationship\": [ " +
- relationshipsUris.entries().stream().map(
- entry -> buildRelationship(entry.getKey(), entry.getValue())
- ).collect(Collectors.joining(",")) +
+ Stream.concat(
+ placement !=null ? Stream.of(buildPlacementRelationship()) : Stream.empty(),
+ relationshipsUris.entries().stream().map(entry -> buildRelationship(entry.getKey(), entry.getValue())
+ )).collect(Collectors.joining(",")) +
" ] " +
" } " +
"} ";
@@ -225,6 +287,40 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
"}";
}
+ private String buildPlacementRelationship() {
+ String relatedTo = StringUtils.equals(instanceType,"vf-module")? "vserver": "tenant";
+ return "" +
+ " {" +
+ " \"related-to\": \"" + relatedTo + "\"," +
+ " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," +
+ " \"related-link\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/" + this.placement.lcpRegionId + "/tenants/tenant/" + this.placement.tenantId+ "/vservers/vserver/5eef9f6d-9933-4bc6-9a1a-862d61309437\"," +
+ " \"relationship-data\": [" +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-owner\"," +
+ " \"relationship-value\": \""+ this.placement.cloudOwner+"\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"cloud-region.cloud-region-id\"," +
+ " \"relationship-value\": \"" + this.placement.lcpRegionId + "\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"tenant.tenant-id\"," +
+ " \"relationship-value\": \"" + this.placement.tenantId + "\"" +
+ " }," +
+ " {" +
+ " \"relationship-key\": \"vserver.vserver-id\"," +
+ " \"relationship-value\": \"5eef9f6d-9933-4bc6-9a1a-862d61309437\"" +
+ " }" +
+ " ]," +
+ " \"related-to-property\": [" +
+ " {" +
+ " \"property-key\": \"vserver.vserver-name\"," +
+ " \"property-value\": \"zolson5bfapn01dns002\"" +
+ " }" +
+ " ]" +
+ " }" ;
+ }
+
@Override
public HttpMethod getReqMethod() {
return HttpMethod.GET;
@@ -234,6 +330,4 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset {
public String getReqPath() {
return getRootPath() + uri;
}
-
-
-}
+} \ No newline at end of file
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/ecompportal_att/PresetGetSessionSlotCheckIntervalGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/ecompportal_att/PresetGetSessionSlotCheckIntervalGet.java
index 02ff1c159..e32ed8b34 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/ecompportal_att/PresetGetSessionSlotCheckIntervalGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/ecompportal_att/PresetGetSessionSlotCheckIntervalGet.java
@@ -13,6 +13,6 @@ public class PresetGetSessionSlotCheckIntervalGet extends BaseEcompPortalPreset
}
public String getReqPath() {
- return getRootPath() + "/v3/getSessionSlotCheckInterval";
+ return getRootPath() + "/*v3/getSessionSlotCheckInterval";
}
}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java
index 42b1578f4..0b7c6517f 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java
@@ -54,7 +54,7 @@ public class PresetMSOCreateNetworkALaCarte5G extends PresetMSOBaseCreateInstanc
" \"platformName\": \"platform\"" +
" }," +
" \"lineOfBusiness\": {" +
- " \"lineOfBusinessName\": \"ECOMP\"" +
+ " \"lineOfBusinessName\": \"ONAP\"" +
" }," +
" \"relatedInstanceList\": [{" +
" \"relatedInstance\": {" +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java
index bccb07251..307aef2c0 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java
@@ -3,11 +3,13 @@ package org.onap.simulator.presetGenerator.presets.mso;
public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCreateInstancePost {
private final String networkInstanceName;
private final String serviceInstanceId;
+ private final String platform;
- public PresetMSOCreateNetworkALaCarteOldViewEdit(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String networkInstanceName) {
+ public PresetMSOCreateNetworkALaCarteOldViewEdit(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String networkInstanceName, String platform) {
super(overrideRequestId, responseInstanceId);
this.serviceInstanceId = serviceInstanceId;
this.networkInstanceName = networkInstanceName;
+ this.platform = platform == null ? "" : platform;
}
@Override
@@ -17,12 +19,12 @@ public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCrea
@Override
public Object getRequestBody() {
- return "{\"requestDetails\": {" +
+ return "{\"requestDetails\": {" +
" \"requestInfo\": {" +
- " \"instanceName\": \""+networkInstanceName+"\"," +
+ " \"instanceName\": \"" + networkInstanceName + "\"," +
" \"source\": \"VID\"," +
" \"suppressRollback\": false," +
- " \"requestorId\": \"mo57174000\"," +
+ " \"requestorId\": \"em1536000\"," +
" \"productFamilyId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" +
" }," +
" \"modelInfo\": {" +
@@ -40,16 +42,14 @@ public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCrea
" }," +
" \"cloudConfiguration\": {" +
" \"lcpCloudRegionId\": \"One\"," +
- addCloudOwnerIfNeeded() +
+ addCloudOwnerIfNeeded() +
" \"tenantId\": \"c630e297a3ae486497d63eacec1d7c14\"" +
" }," +
- " \"platform\": {" +
- " \"platformName\": \"xxx1\"" +
- " }," +
+ addPlatformIfNeeded(platform) +
" \"relatedInstanceList\": [" +
" {" +
" \"relatedInstance\": {" +
- " \"instanceId\": \""+serviceInstanceId+"\"," +
+ " \"instanceId\": \"" + serviceInstanceId + "\"," +
" \"modelInfo\": {" +
" \"modelType\": \"service\"," +
" \"modelName\": \"Using VID for VoIP Network Instantiations Shani\"," +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java
index afd96a46f..40c18fa55 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java
@@ -1,9 +1,9 @@
package org.onap.simulator.presetGenerator.presets.mso;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME;
-
import java.util.Map;
+import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME;
+
public class PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork extends PresetMSOCreateServiceInstanceGen2WithNames {
private final String requestorId;
@@ -31,13 +31,13 @@ public class PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork extends
" }," +
" \"owningEntity\": {" +
" \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\"," +
- " \"owningEntityName\": \"MetroPacketCore\"" +
+ " \"owningEntityName\": \"WayneHolland\"" +
" }," +
" \"subscriberInfo\": {" +
" \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" +
" }," +
" \"project\": {" +
- " \"projectName\": \"DFW\"" +
+ " \"projectName\": \"WATKINS\"" +
" }," +
" \"requestInfo\": {" +
" \"instanceName\": \""+names.get(SERVICE_NAME)+"\"," +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java
index 3a7b09b43..0fd70b765 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java
@@ -26,13 +26,13 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateInsta
" }, " +
" \"owningEntity\": { " +
" \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " +
- " \"owningEntityName\": \"MetroPacketCore\" " +
+ " \"owningEntityName\": \"WayneHolland\" " +
" }, " +
" \"subscriberInfo\": { " +
" \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " +
" }, " +
" \"project\": { " +
- " \"projectName\": \"DFW\" " +
+ " \"projectName\": \"WATKINS\" " +
" }, " +
" \"requestInfo\": { " +
// " \"instanceName\": \"some instance name_0" + suffix + "\", " +
@@ -73,7 +73,7 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateInsta
" \"platformName\": \"platform\" " +
" }, " +
" \"lineOfBusiness\": { " +
- " \"lineOfBusinessName\": \"ECOMP\" " +
+ " \"lineOfBusinessName\": \"ONAP\" " +
" }, " +
" \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " +
" \"instanceParams\": [], " +
@@ -82,7 +82,7 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateInsta
" \"modelInfo\": { " +
" \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " +
" \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " +
- " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " +
+ " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " +
" \"modelType\": \"vfModule\", " +
" \"modelVersion\": \"6\" " +
" }, " +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java
index f76293f1d..f80f6bb57 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java
@@ -26,11 +26,11 @@ public class PresetMSOCreateServiceInstanceGen2AlacarteService extends PresetMSO
" \"modelVersion\": \"1.0\" " +
" }, " +
" \"owningEntity\": { " +
- " \"owningEntityName\": \"MetroPacketCore\", " +
+ " \"owningEntityName\": \"WayneHolland\", " +
" \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\" " +
" }, " +
" \"project\": { " +
- " \"projectName\": \"DFW\" " +
+ " \"projectName\": \"WATKINS\" " +
" }, " +
" \"subscriberInfo\": { " +
" \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java
index 8f0b14115..28705ad89 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java
@@ -35,10 +35,10 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService
" }, " +
" \"owningEntity\": { " +
" \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " +
- " \"owningEntityName\": \"MetroPacketCore\" " +
+ " \"owningEntityName\": \"WayneHolland\" " +
" }, " +
" \"project\": { " +
- " \"projectName\": \"DFW\" " +
+ " \"projectName\": \"WATKINS\" " +
" }, " +
" \"subscriberInfo\": { " +
" \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java
index a864b0d10..e4c14fc01 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java
@@ -28,11 +28,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress e
" \"modelVersion\": \"1.0\" " +
" }, " +
" \"owningEntity\": { " +
- " \"owningEntityName\": \"MetroPacketCore\", " +
+ " \"owningEntityName\": \"WayneHolland\", " +
" \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\" " +
" }, " +
" \"project\": { " +
- " \"projectName\": \"DFW\" " +
+ " \"projectName\": \"WATKINS\" " +
" }, " +
" \"subscriberInfo\": { " +
" \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java
index 2a8d7586e..d983a6152 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java
@@ -1,14 +1,10 @@
package org.onap.simulator.presetGenerator.presets.mso;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME1;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME2;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VG_NAME;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME2;
+import vid.automation.test.infra.Features;
import java.util.Map;
-import vid.automation.test.infra.Features;
+
+import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.*;
public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends PresetMSOCreateServiceInstanceGen2WithNames {
@@ -60,10 +56,6 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
}
protected String getVnfInstanceParams() {
- if (!Features.FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF.isActive()) {
- return "";
- }
-
if (Features.FLAG_SUPPLEMENTARY_FILE.isActive()) {
return INSTANCE_PARAMS_WITH_SUPP_FILE_VNF;
}
@@ -91,13 +83,13 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
" }, " +
" \"owningEntity\": { " +
" \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " +
- " \"owningEntityName\": \"MetroPacketCore\" " +
+ " \"owningEntityName\": \"WayneHolland\" " +
" }, " +
" \"subscriberInfo\": { " +
" \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " +
" }, " +
" \"project\": { " +
- " \"projectName\": \"DFW\" " +
+ " \"projectName\": \"WATKINS\" " +
" }, " +
" \"requestInfo\": { " +
" \"instanceName\": \"" + names.get(SERVICE_NAME) + suffix + "\", " +
@@ -118,7 +110,7 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
" \"modelType\": \"service\" " +
" }, " +
" \"instanceParams\": [{ " +
- " \"2017488_PASQUALEvpe0_ASN\": \"AV_vPE\"" +
+ " \"2017488_pasqualevpe0_ASN\": \"AV_vPE\"" +
" }" +
" ], " +
" \"resources\": { " +
@@ -142,7 +134,7 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
" \"platformName\": \"platform\" " +
" }, " +
" \"lineOfBusiness\": { " +
- " \"lineOfBusinessName\": \"ECOMP\" " +
+ " \"lineOfBusinessName\": \"ONAP\" " +
" }, " +
" \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " +
" \"instanceParams\": [" + INSTANCE_PARAMS_VNF + "] " +
@@ -167,18 +159,18 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
" \"platformName\": \"platform\" " +
" }, " +
" \"lineOfBusiness\": { " +
- " \"lineOfBusinessName\": \"ECOMP\" " +
+ " \"lineOfBusinessName\": \"ONAP\" " +
" }, " +
" \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " +
" \"instanceParams\": [" + getVnfInstanceParams() + "], " +
" \"vfModules\": [{ " +
" \"instanceName\": \"" + names.get(VFM_NAME1) + suffix + "\", " +
" \"modelInfo\": { " +
- " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " +
+ " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " +
" \"modelCustomizationId\": \"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\", " +
" \"modelInvariantId\": \"b34833bb-6aa9-4ad6-a831-70b06367a091\", " +
" \"modelVersionId\": \"f8360508-3f17-4414-a2ed-6bc71161e8db\", " +
- " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " +
+ " \"modelName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " +
" \"modelType\": \"vfModule\", " +
" \"modelVersion\": \"5\" " +
" }, " +
@@ -187,11 +179,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
" \"instanceName\": \"" + names.get(VFM_NAME2) + suffix + "\", " +
" \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + suffix + "\", " +
" \"modelInfo\": { " +
- " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " +
+ " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " +
" \"modelCustomizationId\": \"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\", " +
" \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " +
" \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " +
- " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " +
+ " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " +
" \"modelType\": \"vfModule\", " +
" \"modelVersion\": \"6\" " +
" }, " +
@@ -212,10 +204,6 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
}
private String addDuplicatedVnfIfFeatureOn() {
- if (!Features.FLAG_DUPLICATE_VNF.isActive()) {
- return "";
- }
-
return
" ,{ " + //start of vnf
" \"instanceName\": \"" + names.get(VNF_NAME)+ "_001" + suffix + "\", " +
@@ -237,18 +225,18 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
" \"platformName\": \"platform\" " +
" }, " +
" \"lineOfBusiness\": { " +
- " \"lineOfBusinessName\": \"ECOMP\" " +
+ " \"lineOfBusinessName\": \"ONAP\" " +
" }, " +
" \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " +
" \"instanceParams\": [" + getVnfInstanceParams() + "], " +
" \"vfModules\": [{ " +
" \"instanceName\": \"" + names.get(VFM_NAME1) + "_001" + suffix + "\", " +
" \"modelInfo\": { " +
- " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " +
+ " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " +
" \"modelCustomizationId\": \"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\", " +
" \"modelInvariantId\": \"b34833bb-6aa9-4ad6-a831-70b06367a091\", " +
" \"modelVersionId\": \"f8360508-3f17-4414-a2ed-6bc71161e8db\", " +
- " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " +
+ " \"modelName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " +
" \"modelType\": \"vfModule\", " +
" \"modelVersion\": \"5\" " +
" }, " +
@@ -257,11 +245,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
" \"instanceName\": \"" + names.get(VFM_NAME2) + "_001" + suffix + "\", " +
" \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + "_001" + suffix + "\", " +
" \"modelInfo\": { " +
- " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " +
+ " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " +
" \"modelCustomizationId\": \"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\", " +
" \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " +
" \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " +
- " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " +
+ " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " +
" \"modelType\": \"vfModule\", " +
" \"modelVersion\": \"6\" " +
" }, " +
@@ -289,18 +277,18 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
" \"platformName\": \"platform\" " +
" }, " +
" \"lineOfBusiness\": { " +
- " \"lineOfBusinessName\": \"ECOMP\" " +
+ " \"lineOfBusinessName\": \"ONAP\" " +
" }, " +
" \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " +
" \"instanceParams\": [" + getVnfInstanceParams() + "], " +
" \"vfModules\": [{ " +
" \"instanceName\": \"" + names.get(VFM_NAME1) + "_002" + suffix + "\", " +
" \"modelInfo\": { " +
- " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " +
+ " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " +
" \"modelCustomizationId\": \"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\", " +
" \"modelInvariantId\": \"b34833bb-6aa9-4ad6-a831-70b06367a091\", " +
" \"modelVersionId\": \"f8360508-3f17-4414-a2ed-6bc71161e8db\", " +
- " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " +
+ " \"modelName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " +
" \"modelType\": \"vfModule\", " +
" \"modelVersion\": \"5\" " +
" }, " +
@@ -309,11 +297,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends
" \"instanceName\": \"" + names.get(VFM_NAME2) + "_002" + suffix + "\", " +
" \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + "_002" + suffix + "\", " +
" \"modelInfo\": { " +
- " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " +
+ " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " +
" \"modelCustomizationId\": \"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\", " +
" \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " +
" \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " +
- " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " +
+ " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " +
" \"modelType\": \"vfModule\", " +
" \"modelVersion\": \"6\" " +
" }, " +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java
index dabc526c7..7b434d559 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java
@@ -1,6 +1,7 @@
package org.onap.simulator.presetGenerator.presets.mso;
import com.google.common.collect.ImmutableMap;
+
import java.util.Map;
public class PresetMSOCreateVfModuleALaCarteCypress extends PresetMSOBaseCreateInstancePost {
@@ -16,20 +17,20 @@ public class PresetMSOCreateVfModuleALaCarteCypress extends PresetMSOBaseCreateI
.put(Keys.instanceName, "mimazepubi")
.put(Keys.modelInvariantId, "b34833bb-6aa9-4ad6-a831-70b06367a091")
.put(Keys.modelVersionId, "f8360508-3f17-4414-a2ed-6bc71161e8db")
- .put(Keys.modelName, "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0")
+ .put(Keys.modelName, "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0")
.put(Keys.modelVersion, "5")
.put(Keys.modelCustomizationId, "a55961b2-2065-4ab0-a5b7-2fcee1c227e3")
- .put(Keys.modelCustomizationName, "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0")
+ .put(Keys.modelCustomizationName, "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0")
.build();
public static final Map<Keys, String> module2Names = ImmutableMap.<Keys, String>builder()
.put(Keys.instanceName, "bnmgtrx")
.put(Keys.modelInvariantId, "eff8cc59-53a1-4101-aed7-8cf24ecf8339")
.put(Keys.modelVersionId, "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a")
- .put(Keys.modelName, "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2")
+ .put(Keys.modelName, "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2")
.put(Keys.modelVersion, "6")
.put(Keys.modelCustomizationId, "3cd946bb-50e0-40d8-96d3-c9023520b557")
- .put(Keys.modelCustomizationName, "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2")
+ .put(Keys.modelCustomizationName, "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2")
.build();
public PresetMSOCreateVfModuleALaCarteCypress(String overrideRequestId, String serviceInstanceId, String vnfInstanceId, Map<Keys, String> names, String testApi, boolean withTestApi) {
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java
index bf085cae5..61601eef2 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java
@@ -29,16 +29,16 @@ public class PresetMSOCreateVfModuleOldViewEdit extends PresetMSOBaseCreateInsta
" \"instanceName\": \""+instanceName+"\"," +
" \"source\": \"VID\"," +
" \"suppressRollback\": false," +
- " \"requestorId\": \"mo37915000\"" +
+ " \"requestorId\": \"em35993000\"" +
" }," +
" \"modelInfo\": {" +
" \"modelType\": \"vfModule\"," +
" \"modelInvariantId\": \"d9f9c851-9543-476e-b3c2-a2e5284a26aa\"," +
" \"modelVersionId\": \"d205e01d-e5da-4e68-8c52-f95cb0607959\"," +
- " \"modelName\": \"Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8\"," +
+ " \"modelName\": \"Vsp1710pid298109Vwinifred..mmsc_mod1_ltm..module-8\"," +
" \"modelVersion\": \"1\"," +
" \"modelCustomizationId\": \"e81b58ce-ae9b-4bde-9f81-9962a5007756\"," +
- " \"modelCustomizationName\": \"Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8\"" +
+ " \"modelCustomizationName\": \"Vsp1710pid298109Vwinifred..mmsc_mod1_ltm..module-8\"" +
" }," +
" \"requestParameters\": {" +
addTestApi() +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java
index c8fb7fcf9..764237e18 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java
@@ -44,10 +44,10 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese
" \"modelType\":\"" + select("volumeGroup", "vfModule") + "\"," +
" \"modelInvariantId\":\"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\"," +
" \"modelVersionId\":\"25284168-24bb-4698-8cb4-3f509146eca5\"," +
- " \"modelName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," +
+ " \"modelName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"," +
" \"modelVersion\":\"6\"," +
" \"modelCustomizationId\":\"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\"," +
- " \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"" +
+ " \"modelCustomizationName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"" +
" }," +
" \"cloudConfiguration\":{" +
" \"lcpCloudRegionId\":\"my region\"," +
@@ -97,11 +97,11 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese
" \"requestParameters\":{" +
addTestApi()+
" \"userParams\":[{" +
- " \"2017488_PASQUALEvpe0_vnf_instance_name\":\"mtnj309me6\"," +
- " \"2017488_PASQUALEvpe0_vnf_config_template_version\":\"17.2\"," +
- " \"PASQUALEvpe0_bandwidth\":\"10\"," +
- " \"2017488_PASQUALEvpe0_AIC_CLLI\":\"ATLMY8GA\"," +
- " \"PASQUALEvpe0_bandwidth_units\":\"Gbps\"" +
+ " \"2017488_pasqualevpe0_vnf_instance_name\":\"mtnj309me6\"," +
+ " \"2017488_pasqualevpe0_vnf_config_template_version\":\"17.2\"," +
+ " \"pasqualevpe0_bandwidth\":\"10\"," +
+ " \"2017488_pasqualevpe0_AIC_CLLI\":\"ATLMY8GA\"," +
+ " \"pasqualevpe0_bandwidth_units\":\"Gbps\"" +
" }" +
" ]," +
" \"usePreload\":true" +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java
index 7947c5b83..d4eaa6dd5 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java
@@ -21,7 +21,7 @@ public class PresetMSOCreateVnfALaCarteOldViewEdit extends PresetMSOCreateVnfBas
" \"instanceName\": \""+vnfInstanceName+"\"," +
" \"source\": \"VID\"," +
" \"suppressRollback\": false," +
- " \"requestorId\": \"mo37915000\"," +
+ " \"requestorId\": \"em35993000\"," +
" \"productFamilyId\": \"ebc3bc3d-62fd-4a3f-a037-f619df4ff034\"" +
" }," +
" \"modelInfo\": {" +
@@ -42,7 +42,7 @@ public class PresetMSOCreateVnfALaCarteOldViewEdit extends PresetMSOCreateVnfBas
addCloudOwnerIfNeeded() +
" \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" +
" }," +
- selectLob("\"lineOfBusiness\": {\"lineOfBusinessName\": \"ECOMP\"},", "") +
+ selectLob("\"lineOfBusiness\": {\"lineOfBusinessName\": \"ONAP\"},", "") +
" \"platform\": {" +
" \"platformName\": \"platform\"" +
" }," +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java
index 9fd0a678f..d5faa3f1c 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java
@@ -34,10 +34,10 @@ public class PresetMSOCreateVnfVlanTagging extends PresetMSOBaseCreateInstancePo
" \"requestorId\": \"us16807000\"" +
" }," +
" \"lineOfBusiness\": {" +
- " \"lineOfBusinessName\": \"ECOMP\"" +
+ " \"lineOfBusinessName\": \"ONAP\"" +
" }," +
" \"cloudConfiguration\": {" +
- " \"lcpCloudRegionId\": \"JANET25\"," +
+ " \"lcpCloudRegionId\": \"AAIAIC25\"," +
addCloudOwnerIfNeeded() +
" \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" +
" }," +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java
index ed5bee788..42e2a7097 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java
@@ -27,16 +27,16 @@ public class PresetMSOCreateVolumeGroupOldViewEdit extends PresetMSOBaseCreateIn
" \"instanceName\": \""+instanceName+"\"," +
" \"source\": \"VID\"," +
" \"suppressRollback\": false," +
- " \"requestorId\": \"mo37915000\"" +
+ " \"requestorId\": \"em35993000\"" +
" }," +
" \"modelInfo\": {" +
" \"modelType\": \"volumeGroup\"," +
" \"modelInvariantId\": \"6931e88a-fbcc-4ca9-8583-876b669c3106\"," +
" \"modelVersionId\": \"13f022c4-651e-4326-b8e1-61e9a8c7a7ad\"," +
- " \"modelName\": \"Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3\"," +
+ " \"modelName\": \"Vsp1710pid298109Vwinifred..mmsc_mod6_eca_oam..module-3\"," +
" \"modelVersion\": \"1\"," +
" \"modelCustomizationId\": \"020af091-cc66-46db-876c-02f14b4a795f\"," +
- " \"modelCustomizationName\": \"Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3\"" +
+ " \"modelCustomizationName\": \"Vsp1710pid298109Vwinifred..mmsc_mod6_eca_oam..module-3\"" +
" }," +
" \"requestParameters\": {" +
addTestApi() +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java
index fc9cc3c5c..2f8d218a6 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java
@@ -15,16 +15,16 @@ public class PresetMSODeleteBaseVfModuleCypress extends PresetMSODeleteVfModule
return "{" +
" \"requestDetails\":{" +
" \"modelInfo\":{" +
- " \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\"," +
+ " \"modelCustomizationName\":\"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\"," +
" \"modelCustomizationId\":\"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\"," +
" \"modelInvariantId\":\"b34833bb-6aa9-4ad6-a831-70b06367a091\"," +
" \"modelVersionId\":\"f8360508-3f17-4414-a2ed-6bc71161e8db\"," +
- " \"modelName\":\"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\"," +
+ " \"modelName\":\"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\"," +
" \"modelType\":\"vfModule\"," +
" \"modelVersion\":\"5\"" +
" }," +
" \"cloudConfiguration\":{" +
- " \"lcpCloudRegionId\":\"JANET25\"," +
+ " \"lcpCloudRegionId\":\"AAIAIC25\"," +
addCloudOwnerIfNeeded() +
" \"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"," +
" }," +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java
index 9174cd2bb..bf18ab31b 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java
@@ -22,7 +22,6 @@ public class PresetMSODeleteInstanceGroup extends PresetMSOBaseDelete {
Map<String, String> map = super.getRequestHeaders();
map.put("X-RequestorID", userId);
return map;
-
}
}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteMacroService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteMacroService.java
new file mode 100644
index 000000000..10f1c04aa
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteMacroService.java
@@ -0,0 +1,33 @@
+package org.onap.simulator.presetGenerator.presets.mso;
+
+public class PresetMSODeleteMacroService extends PresetMSODeleteService {
+
+ public PresetMSODeleteMacroService(String requestId, String serviceInstanceId)
+ {
+ super(requestId, serviceInstanceId);
+ }
+
+ @Override
+ public Object getRequestBody()
+ {
+ return "{ " +
+ " \"requestDetails\":{ " +
+ " \"modelInfo\":{ " +
+ " \"modelInvariantId\":\"dfc2c44c-2429-44ca-ae26-1e6dc1f207fb\"," +
+ " \"modelVersionId\":\"f028b2e2-7080-4b13-91b2-94944d4c42d8\"," +
+ " \"modelName\":\"Service with VRF\"," +
+ " \"modelType\":\"service\"," +
+ " \"modelVersion\":\"5.0\"" +
+ " }," +
+ " \"requestInfo\":{ " +
+ " \"source\":\"VID\"," +
+ " \"requestorId\":\"us16807000\"" +
+ " }," +
+ " \"requestParameters\":{ " +
+ " \"aLaCarte\":false" +
+ " }" +
+ " }" +
+ "}";
+
+ }
+}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java
index b407b167a..c7b4fa899 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java
@@ -1,7 +1,5 @@
package org.onap.simulator.presetGenerator.presets.mso;
-import vid.automation.test.infra.Features;
-
public class PresetMSODeleteService extends PresetMSOBaseDelete {
private final String serviceInstanceId;
public static final String DEFAULT_SERVICE_INSTANCE_ID = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d";
@@ -22,9 +20,7 @@ public class PresetMSODeleteService extends PresetMSOBaseDelete {
@Override
protected String getRootPath() {
- return Features.FLAG_UNASSIGN_SERVICE.isActive() ?
- "/mso/serviceInstantiation/v./serviceInstances/" :
- "/mso/serviceInstances/v./";
+ return "/mso/serviceInstantiation/v./serviceInstances/" ;
}
}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java
index d4a21cc36..c3ea07f2b 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java
@@ -15,16 +15,16 @@ public class PresetMSODeleteVfModuleCypress extends PresetMSODeleteVfModule {
return "{" +
" \"requestDetails\":{" +
" \"modelInfo\":{" +
- " \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," +
+ " \"modelCustomizationName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"," +
" \"modelCustomizationId\":\"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\"," +
" \"modelInvariantId\":\"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\"," +
" \"modelVersionId\":\"25284168-24bb-4698-8cb4-3f509146eca5\"," +
- " \"modelName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," +
+ " \"modelName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"," +
" \"modelType\":\"vfModule\"," +
" \"modelVersion\":\"6\"" +
" }," +
" \"cloudConfiguration\":{" +
- " \"lcpCloudRegionId\":\"JANET25\"," +
+ " \"lcpCloudRegionId\":\"AAIAIC25\"," +
addCloudOwnerIfNeeded() +
" \"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"," +
" }," +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java
index 381ac856b..602e32df4 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java
@@ -1,16 +1,23 @@
package org.onap.simulator.presetGenerator.presets.mso;
+import com.google.common.collect.ImmutableMap;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset;
import org.springframework.http.HttpMethod;
+import vid.automation.test.infra.Features;
import java.time.Instant;
import java.time.ZoneOffset;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.temporal.ChronoUnit;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Collections.singletonList;
/**
* Created by itzikliderman on 13/12/2017.
@@ -26,6 +33,7 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset {
private String statusMessage;
private String requestState;
private int startedHoursAgo = 1;
+ private boolean isDetailed = true;
public PresetMSOOrchestrationRequestGet() {
@@ -38,6 +46,16 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset {
this.requestId = DEFAULT_REQUEST_ID;
}
+ /**
+ * @param requestState
+ * @param isDetailed - is expect to query param format=detail. Angular1 flows dont' expect it
+ */
+ public PresetMSOOrchestrationRequestGet(String requestState, boolean isDetailed) {
+ this.requestState = requestState;
+ this.requestId = DEFAULT_REQUEST_ID;
+ this.isDetailed = isDetailed;
+ }
+
public PresetMSOOrchestrationRequestGet(String requestState, String overrideRequestId) {
this.requestState = requestState;
this.requestId = overrideRequestId;
@@ -49,6 +67,16 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset {
this.statusMessage = statusMessage;
}
+ /**
+ * @param isDetailed - is expect to query param format=detail. Angular1 flows dont' expect it
+ */
+ public PresetMSOOrchestrationRequestGet(String requestState, String overrideRequestId, String statusMessage, boolean isDetailed) {
+ this.requestState = requestState;
+ this.requestId = overrideRequestId;
+ this.statusMessage = statusMessage;
+ this.isDetailed = isDetailed;
+ }
+
public PresetMSOOrchestrationRequestGet(String requestState, String overrideRequestId, String statusMessage, int startedHoursAgo) {
this.requestState = requestState;
this.requestId = overrideRequestId;
@@ -72,6 +100,13 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset {
}
@Override
+ public Map<String, List> getQueryParams() {
+ return (isDetailed && Features.FLAG_1908_RESUME_MACRO_SERVICE.isActive()) ?
+ ImmutableMap.of("format", singletonList("detail")) :
+ Collections.emptyMap();
+ }
+
+ @Override
public Object getResponseBody() {
String body = "{" +
" \"request\": {" +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java
index 3d83ca55d..1d3b8c00a 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java
@@ -1,13 +1,14 @@
package org.onap.simulator.presetGenerator.presets.mso;
-import static java.util.Collections.singletonList;
-
import com.google.common.collect.ImmutableMap;
-import java.util.List;
-import java.util.Map;
import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset;
import org.springframework.http.HttpMethod;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Collections.singletonList;
+
public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extends BaseMSOPreset {
public PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork(ResponseDetails parentDetails, ResponseDetails childDetails, String parentInstanceId) {
@@ -84,7 +85,7 @@ public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extend
" \"testApi\": \"VNF_API\"" +
" }," +
" \"project\": {" +
- " \"projectName\": \"DFW\"" +
+ " \"projectName\": \"WATKINS\"" +
" }," +
" \"owningEntity\": {" +
" \"owningEntityId\": \"3f592a6f-459b-435e-b0d4-59959ab1d385\"," +
@@ -155,7 +156,7 @@ public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extend
" \"platformName\": \"plat1\"" +
" }," +
" \"lineOfBusiness\": {" +
- " \"lineOfBusinessName\": \"ECOMP\"" +
+ " \"lineOfBusinessName\": \"ONAP\"" +
" }" +
" }," +
" \"instanceReferences\": {" +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java
index 69780d0aa..8524d92cd 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java
@@ -1,13 +1,14 @@
package org.onap.simulator.presetGenerator.presets.mso;
-import static java.util.Collections.singletonList;
-
import com.google.common.collect.ImmutableMap;
-import java.util.List;
-import java.util.Map;
import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset;
import org.springframework.http.HttpMethod;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Collections.singletonList;
+
public class PresetMSOOrchestrationRequestsGetByRequestId extends BaseMSOPreset {
@Override
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java
index 58686f26b..921776569 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java
@@ -1,15 +1,26 @@
package org.onap.simulator.presetGenerator.presets.mso;
-import static java.util.Collections.singletonList;
-
import com.google.common.collect.ImmutableMap;
-import java.util.List;
-import java.util.Map;
import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset;
import org.springframework.http.HttpMethod;
+import java.util.List;
+import java.util.Map;
+
+import static java.util.Collections.singletonList;
+
public class PresetMSOOrchestrationRequestsGetByServiceInstanceId extends BaseMSOPreset {
+ private final String instanceId;
+
+ public PresetMSOOrchestrationRequestsGetByServiceInstanceId() {
+ this.instanceId = "bc305d54-75b4-431b-adb2-eb6b9e546014";
+ }
+
+ public PresetMSOOrchestrationRequestsGetByServiceInstanceId(String instanceId) {
+ this.instanceId = instanceId;
+ }
+
@Override
public HttpMethod getReqMethod() {
return HttpMethod.GET;
@@ -22,7 +33,7 @@ public class PresetMSOOrchestrationRequestsGetByServiceInstanceId extends BaseMS
@Override
public Map<String, List> getQueryParams() {
- return ImmutableMap.of("filter", singletonList("serviceInstanceId:EQUALS:bc305d54-75b4-431b-adb2-eb6b9e546014"));
+ return ImmutableMap.of("filter", singletonList("serviceInstanceId:EQUALS:" + instanceId));
}
@Override
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOResumeRequest.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOResumeRequest.java
new file mode 100644
index 000000000..ca13f6ad7
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOResumeRequest.java
@@ -0,0 +1,48 @@
+package org.onap.simulator.presetGenerator.presets.mso;
+
+import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset;
+import org.springframework.http.HttpMethod;
+
+import java.util.Map;
+
+public class PresetMSOResumeRequest extends BaseMSOPreset {
+
+ private final String originalRequestId;
+ private final String requestId;
+ private final String instanceId;
+ private final String userId;
+
+ public PresetMSOResumeRequest(String originalRequestId, String requestId, String instanceId, String userId) {
+ this.originalRequestId = originalRequestId;
+ this.requestId = requestId;
+ this.instanceId = instanceId;
+ this.userId = userId;
+ }
+
+ @Override
+ public HttpMethod getReqMethod() {
+ return HttpMethod.POST;
+ }
+
+ @Override
+ public String getReqPath() {
+ return super.getRootPath() + "/orchestrationRequests/v./" + originalRequestId + "/resume";
+ }
+
+ @Override
+ public int getResponseCode() {
+ return 202;
+ }
+
+ @Override
+ public Object getResponseBody() {
+ return "{\"requestReferences\":{\"instanceId\":\"" + instanceId + "\",\"requestId\":\"" + requestId + "\"}}";
+ }
+
+ @Override
+ public Map<String, String> getRequestHeaders() {
+ Map<String, String> map = super.getRequestHeaders();
+ map.put("X-RequestorID", userId);
+ return map;
+ }
+}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java
index b851da2d2..793037dbf 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java
@@ -1,13 +1,8 @@
package org.onap.simulator.presetGenerator.presets.mso;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME1;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME2;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VG_NAME;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME;
-
import java.util.Map;
-import vid.automation.test.infra.Features;
+
+import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.*;
public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBaseCreateInstancePost {
@@ -42,9 +37,6 @@ public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBas
}
protected String getVnfInstanceParams() {
- if (!Features.FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF.isActive()) {
- return "";
- }
return " {" +
" \"vmx_int_net_len\": \"24\"," +
" \"vre_a_volume_size_0\": \"100\"," +
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMsoCreateMacroCommonPre1806.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMsoCreateMacroCommonPre1806.java
new file mode 100644
index 000000000..8a1e37f45
--- /dev/null
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMsoCreateMacroCommonPre1806.java
@@ -0,0 +1,151 @@
+package org.onap.simulator.presetGenerator.presets.mso;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class PresetMsoCreateMacroCommonPre1806 extends PresetMSOBaseCreateInstancePost {
+
+ private String modelInfo;
+ private String cloudConfiguration;
+ private String relatedInstanceList;
+ private String instanceName;
+
+ private PresetMsoCreateMacroCommonPre1806(String requestId, String responseInstanceId, String instanceName, String modelInfo, String relatedInstanceList, String cloudConfiguration) {
+ super(requestId, responseInstanceId);
+ this.modelInfo = modelInfo;
+ this.cloudConfiguration = cloudConfiguration;
+ this.relatedInstanceList = relatedInstanceList;
+ this.instanceName = instanceName;
+ }
+
+ public static PresetMsoCreateMacroCommonPre1806 ofTransportService(String requestId, String responseInstanceId) {
+ return new PresetMsoCreateMacroCommonPre1806(requestId, responseInstanceId, "", transportServiceModelInfo(), "", "");
+ }
+
+ public static PresetMsoCreateMacroCommonPre1806 ofCollectionResource(String requestId, String responseInstanceId) {
+ return new PresetMsoCreateMacroCommonPre1806(
+ requestId,
+ responseInstanceId,
+ "",
+ collectionResourceModelInfo(),
+ "",
+ hvf6CloudConfiguration());
+ }
+
+ public static PresetMsoCreateMacroCommonPre1806 ofServiceWithVRF(String requestId, String responseInstanceId, String instanceName) {
+ return new PresetMsoCreateMacroCommonPre1806(
+ requestId,
+ responseInstanceId,
+ instanceName,
+ ""
+ + " \"modelInfo\": { "
+ + " \"modelInvariantId\": \"dfc2c44c-2429-44ca-ae26-1e6dc1f207fb\", "
+ + " \"modelVersionId\": \"f028b2e2-7080-4b13-91b2-94944d4c42d8\", "
+ + " \"modelName\": \"infraVPN\", "
+ + " \"modelType\": \"service\", "
+ + " \"modelVersion\": \"1.0\" "
+ + " }, ",
+ ""
+ + ", "
+ + " \"relatedInstanceList\": [{ "
+ + " \"relatedInstance\": { "
+ + " \"modelInfo\": { "
+ + " \"modelType\": \"vpnBinding\" "
+ + " }, "
+ + " \"instanceId\": \"120d39fb-3627-473d-913c-d228dd0f8e5b\", "
+ + " \"instanceName\": \"LPPVPN\" "
+ + " } "
+ + " }, { "
+ + " \"relatedInstance\": { "
+ + " \"modelInfo\": { "
+ + " \"modelCustomizationId\": \"10a74149-c9d7-4918-bbcf-d5fb9b1799ce\", "
+ + " \"modelInvariantId\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", "
+ + " \"modelVersionId\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", "
+ + " \"modelType\": \"network\" "
+ + " }, "
+ + " \"instanceId\": \"10a74149-c9d7-4918-bbcf-d5fb9b1799ce\", "
+ + " \"instanceName\": \"AUK51a_oam_calea_net_2\" "
+ + " } "
+ + " } "
+ + " ] ",
+ hvf6CloudConfiguration());
+ }
+
+ @Override
+ public String getReqPath() {
+ return getRootPath() + "/serviceInstantiation/v./serviceInstances";
+ }
+
+ @Override
+ public boolean isStrictMatch() {
+ return true;
+ }
+
+ @Override
+ public Object getRequestBody() {
+ return "{" +
+ " \"requestDetails\": {" +
+ modelInfo +
+ " \"owningEntity\": {" +
+ " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\"," +
+ " \"owningEntityName\": \"WayneHolland\"" +
+ " }," +
+ " \"subscriberInfo\": {" +
+ " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"subscriberName\": \"SILVIA ROBBINS\"" +
+ " }," +
+ " \"project\": {" +
+ " \"projectName\": \"WATKINS\"" +
+ " }," +
+ " \"requestParameters\": {" +
+ " \"subscriptionServiceType\": \"TYLER SILVIA\"," +
+ " \"aLaCarte\": false," +
+ " \"userParams\": []" +
+ " }," +
+ " \"requestInfo\": {" +
+ (StringUtils.isEmpty(instanceName) ? "" : "\"instanceName\": \"" + instanceName + "\",") +
+ " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"," +
+ " \"source\": \"VID\"," +
+ " \"suppressRollback\": false," +
+ " \"requestorId\": \"us16807000\"" +
+ " }" +
+ relatedInstanceList +
+ cloudConfiguration +
+ " }" +
+ "}";
+ }
+
+ private String addModelInfo() {
+ return modelInfo;
+ }
+
+ private static String transportServiceModelInfo() {
+ return " \"modelInfo\": {" +
+ " \"modelInvariantId\": \"561faa57-7bbb-40ec-a81c-c0d4133e98d4\"," +
+ " \"modelVersionId\": \"12550cd7-7708-4f53-a09e-41d3d6327ebc\"," +
+ " \"modelName\": \"AIM Transport SVC_ym161f\"," +
+ " \"modelType\": \"service\"," +
+ " \"modelVersion\": \"1.0\"" +
+ " },";
+ }
+
+ private static String hvf6CloudConfiguration() {
+ return
+ ","+
+ "\"cloudConfiguration\": {" +
+ " \"lcpCloudRegionId\": \"hvf6\"," +
+ " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\"," +
+ " \"cloudOwner\": \"irma-aic\"" +
+ " }";
+ }
+
+ private static String collectionResourceModelInfo() {
+ return
+ "\"modelInfo\": {" +
+ " \"modelInvariantId\": \"04bdd793-32ed-4045-adea-4e096304a067\"," +
+ " \"modelVersionId\": \"abd0cb02-5f97-42cd-be93-7dd3e31a6a64\"," +
+ " \"modelName\": \"CR_sanity\"," +
+ " \"modelType\": \"service\"," +
+ " \"modelVersion\": \"1.0\"" +
+ " },";
+ }
+}
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java
index bba0f20d8..2a7e262a4 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java
@@ -63,7 +63,7 @@ public class PresetMSOCreateConfiguration extends PresetMSOBaseCreateInstancePos
" }," +
" \"cloudConfiguration\": {" +
addCloudOwnerIfNeeded() +
- " \"lcpCloudRegionId\": \"JANET25\"" +
+ " \"lcpCloudRegionId\": \"AAIAIC25\"" +
" }," +
" \"requestInfo\": {" +
" \"instanceName\": \"dummy_instance\"," +
diff --git a/vid-automation/src/main/java/org/onap/vid/api/AsyncInstantiationBase.java b/vid-automation/src/main/java/org/onap/vid/api/AsyncInstantiationBase.java
index 2a6b012fe..66bde727e 100644
--- a/vid-automation/src/main/java/org/onap/vid/api/AsyncInstantiationBase.java
+++ b/vid-automation/src/main/java/org/onap/vid/api/AsyncInstantiationBase.java
@@ -1,34 +1,8 @@
package org.onap.vid.api;
-import static java.lang.Boolean.FALSE;
-import static java.lang.Boolean.TRUE;
-import static java.util.Collections.emptyList;
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toMap;
-import static org.hamcrest.CoreMatchers.hasItem;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.Matchers.hasSize;
-import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
-import static vid.automation.test.utils.ExtendedHamcrestMatcher.hasItemsFromCollection;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.util.concurrent.Uninterruptibles;
-import java.time.Instant;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-import java.util.stream.IntStream;
-import java.util.stream.Stream;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
@@ -64,6 +38,33 @@ import vid.automation.test.model.ServiceAction;
import vid.automation.test.services.AsyncJobsService;
import vid.automation.test.services.SimulatorApi;
+import java.time.Instant;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+import java.util.stream.Stream;
+
+import static java.lang.Boolean.FALSE;
+import static java.lang.Boolean.TRUE;
+import static java.util.Collections.emptyList;
+import static java.util.stream.Collectors.joining;
+import static java.util.stream.Collectors.toMap;
+import static org.hamcrest.CoreMatchers.hasItem;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.Matchers.hasSize;
+import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+import static vid.automation.test.utils.ExtendedHamcrestMatcher.hasItemsFromCollection;
+
public class AsyncInstantiationBase extends BaseMsoApiTest {
public static final String CREATE_BULK_OF_ALACARTE_REQUEST_WITH_VNF = "asyncInstantiation/vidRequestCreateALaCarteWithVnf.json";
@@ -408,10 +409,12 @@ public class AsyncInstantiationBase extends BaseMsoApiTest {
}
protected void assertExpectedStatusAndServiceInfo(JobStatus finalState, String jobId, ServiceInfo expectedServiceInfo) {
- assertExpectedStatusAndServiceInfo(finalState, jobId, false, expectedServiceInfo);
+ assertExpectedStatusAndServiceInfo(finalState, jobId, PATIENCE_LEVEL.FAIL_FAST, expectedServiceInfo);
}
- protected void assertExpectedStatusAndServiceInfo(JobStatus finalState, String jobId, boolean longWait, ServiceInfo expectedServiceInfo) {
+ enum PATIENCE_LEVEL { FAIL_FAST, FAIL_SLOW, FAIL_VERY_SLOW }
+
+ protected void assertExpectedStatusAndServiceInfo(JobStatus finalState, String jobId, PATIENCE_LEVEL patienceLevel, ServiceInfo expectedServiceInfo) {
JobInfoChecker<Integer> jobInfoChecker = new JobInfoChecker<>(
restTemplate, ImmutableSet.of(JobStatus.PENDING, JobStatus.IN_PROGRESS, finalState), jobId, expectedServiceInfo);
boolean result = jobInfoChecker.test(null);
@@ -421,10 +424,21 @@ public class AsyncInstantiationBase extends BaseMsoApiTest {
if (ImmutableList.of(JobStatus.COMPLETED, JobStatus.PAUSE).contains(finalState) && expectedServiceInfo.serviceInstanceId==null) {
expectedServiceInfo.serviceInstanceId = BaseMSOPreset.DEFAULT_INSTANCE_ID;
}
- result = Wait.waitFor(jobInfoChecker, null, 30, longWait ? 2 : 1);
+ result = Wait.waitFor(jobInfoChecker, null, 30, waitIntervalBy(patienceLevel));
assertTrue("service info of jobId: " + jobId + " was in status: " + jobInfoChecker.lastStatus, result);
}
+ private int waitIntervalBy(PATIENCE_LEVEL patienceLevel) {
+ switch (patienceLevel) {
+ case FAIL_SLOW:
+ return 2;
+ case FAIL_VERY_SLOW:
+ return 3;
+ default:
+ return 1;
+ }
+ }
+
protected List<String> createBulkOfMacroInstances(ImmutableList<BasePreset> presets, boolean isPause, int bulkSize, Map<Keys, String> names) {
SimulatorApi.registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET);
return createBulkOfInstances(isPause, bulkSize, names, CREATE_BULK_OF_MACRO_REQUEST);
diff --git a/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java b/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java
index 5b7b1b214..7ce29446c 100644
--- a/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java
+++ b/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java
@@ -8,6 +8,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.isEmptyOrNullString;
import static org.hamcrest.Matchers.not;
+//import com.automation.common.report_portal_integration.listeners.ReportPortalListener;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
@@ -33,10 +34,12 @@ import org.springframework.web.client.DefaultResponseErrorHandler;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Listeners;
import vid.automation.test.infra.FeaturesTogglingConfiguration;
import vid.automation.test.services.UsersService;
import vid.automation.test.utils.CookieAndJsonHttpHeadersInterceptor;
+//@Listeners(ReportPortalListener.class)
public class BaseApiTest {
protected static final Logger LOGGER = LogManager.getLogger(BaseApiTest.class);
@@ -63,7 +66,7 @@ public class BaseApiTest {
}
private URI getUri() {
- String host = System.getProperty("VID_HOST", "10.0.0.10");
+ String host = System.getProperty("VID_HOST", "127.0.0.1");
int port = Integer.valueOf(System.getProperty("VID_PORT", "8080"));
return new JerseyUriBuilder().host(host).port(port).scheme("http").path("vid").build();
}
diff --git a/vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java b/vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java
index 175638008..caece3217 100644
--- a/vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java
+++ b/vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java
@@ -1,5 +1,6 @@
package org.onap.vid.api;
+//import com.automation.common.report_portal_integration.annotations.Step;
import com.google.common.collect.ImmutableMap;
import org.json.JSONException;
import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset;
@@ -82,6 +83,7 @@ public class BaseMsoApiTest extends BaseApiTest {
}
}
+ //@Step(description = "method: ${method}, uri: ${uri}, body: ${body}")
protected MsoResponseWrapper2 callMsoForResponseWrapper(HttpMethod method, String uri, String body) {
MsoResponseWrapper2 responseWrapper;
switch (method) {