diff options
490 files changed, 46106 insertions, 57746 deletions
diff --git a/vid-automation/conf/services b/vid-automation/conf/services index 85e0552f6..36139d7fa 100644 --- a/vid-automation/conf/services +++ b/vid-automation/conf/services @@ -6,7 +6,7 @@ "invariantUuid": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", "name": "1707vidnf", "version": "9.0", - "category": "Mobility", + "category": "Emanuel", "description": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code.", "serviceRole" : "pnf" }, @@ -37,7 +37,7 @@ "name": "action-data", "version": "1.0", "category": "Network L1-3", - "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", + "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", "serviceRole": "Testing" }, "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd": { @@ -47,7 +47,7 @@ "name": "action-data", "version": "1.0", "category": "Network L1-3", - "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", + "description": "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", "serviceRole": "Testing" }} }
\ No newline at end of file diff --git a/vid-automation/conf/users b/vid-automation/conf/users index e2bc05a85..757b04c78 100644 --- a/vid-automation/conf/users +++ b/vid-automation/conf/users @@ -13,19 +13,19 @@ "userId": "1", "password": "1" }, - "roles": ["USP VOICE___VIRTUAL USP", "USP VOICE___HOSTED COMMUNICATIONS", "MSO_1610_ST___HOSTED COMMUNICATIONS", "MSO_1610_ST___MSO-dev-service-type", "MSO_1610_ST___VIRTUAL USP"], - "subscriberNames": ["USP VOICE", "MSO_1610_ST"], - "serviceTypes": ["VIRTUAL USP", "HOSTED COMMUNICATIONS", "MSO-dev-service-type"], + "roles": ["SILVIA ROBBINS___TYLER SILVIA", "SILVIA ROBBINS___HOSTED COMMUNICATIONS", "CAR_2020_ER___HOSTED COMMUNICATIONS", "CAR_2020_ER___MSO-dev-service-type", "CAR_2020_ER___TYLER SILVIA"], + "subscriberNames": ["SILVIA ROBBINS", "CAR_2020_ER"], + "serviceTypes": ["TYLER SILVIA", "DARREN MCGEE", "MSO-dev-service-type"], "tenants": ["092eb9e8e4b7412e8787dd091bc58e86"] }, - "mobilityMobility": { + "emanuelEmanuel": { "credentials": { "userId": "3", "password": "3" }, - "roles": ["Mobility___Mobility"], - "subscriberNames": ["Mobility"], - "serviceTypes": ["Mobility"], + "roles": ["Emanuel___Emanuel"], + "subscriberNames": ["Emanuel"], + "serviceTypes": ["Emanuel"], "tenants": ["c630e297a3ae486497d63eacec1d7c14", "d3b49834f7164cbe831bfbfa35ef649b"] }, "FIREWALL_AIM_Trans": { @@ -33,19 +33,19 @@ "userId": "667", "password": "667" }, - "roles": ["FIREWALL/MISC___AIM Transport"], - "subscriberNames": ["FIREWALL/MISC"], + "roles": ["CRAIG/ROBERTS___AIM Transport"], + "subscriberNames": ["CRAIG/ROBERTS"], "serviceTypes": ["AIM Transport"], "tenants": null }, - "mobilityVMMSC": { + "emanuelvWINIFRED": { "credentials": { "userId": "4", "password": "4" }, - "roles": ["Mobility___vMMSC", "Mobility___vFlowLogic"], - "subscriberNames": ["Mobility"], - "serviceTypes": ["vMMSC", "vFlowLogic"], + "roles": ["Emanuel___vWINIFRED", "Emanuel___vFlowLogic"], + "subscriberNames": ["Emanuel"], + "serviceTypes": ["vWINIFRED", "vRichardson"], "tenants": ["092eb9e8e4b7412e8787dd091bc58e86"] }, "Porfirio Gerhardt": { @@ -54,36 +54,36 @@ "password": "822" }, "roles": [ - "PACKET CORE___Mobility", - "PACKET CORE___vFlowLogic" + "JULIO ERICKSON___Emanuel", + "JULIO ERICKSON___vFlowLogic" ], - "subscriberNames": ["PACKET CORE"], - "serviceTypes": ["Mobility", "vFlowLogic"], + "subscriberNames": ["JULIO ERICKSON"], + "serviceTypes": ["Emanuel", "vRichardson"], "tenants": null }, - "Mobility vFlowLogic": { + "Emanuel vFlowLogic": { "credentials": { "userId": "321", "password": "312" }, "roles": [ - "Mobility___vFlowLogic" + "Emanuel___vFlowLogic" ], - "subscriberNames": ["Mobility"], - "serviceTypes": ["vFlowLogic"], + "subscriberNames": ["Emanuel"], + "serviceTypes": ["vRichardson"], "tenants": null }, - "Mobility_with_tenant" : { + "Emanuel_with_tenant" : { "credentials": { "userId": "321", "password": "312" }, "roles": [ - "Mobility___vMMSC___test-mtn6-09" + "Emanuel___vWINIFRED___test-hvf6-09" ], - "subscriberNames": ["Mobility"], - "serviceTypes": ["vFlowLogic"], + "subscriberNames": ["Emanuel"], + "serviceTypes": ["vRichardson"], "tenants": null } } diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml index dfd61aae2..21c8c6462 100644 --- a/vid-automation/pom.xml +++ b/vid-automation/pom.xml @@ -7,9 +7,12 @@ <version>1.0-SNAPSHOT</version> <properties> <springframework.version>4.2.9.RELEASE</springframework.version> - <jersey.version>2.23.1</jersey.version> - <jackson.version>2.6.3</jackson.version> + <jersey.version>2.27</jersey.version> + <jackson.version>2.9.7</jackson.version> <aspectj.version>1.8.10</aspectj.version> + <selenium.version>3.6.0</selenium.version> + <log4j.version>2.9.1</log4j.version> + <apachehttp.version>4.4.1</apachehttp.version> </properties> @@ -20,16 +23,14 @@ <version>23.0</version> </dependency> <dependency> - <groupId>org.openecomp.sdc</groupId> - <artifactId>ui-ci</artifactId> - <version>1.0.5-SNAPSHOT</version> - <scope>compile</scope> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-api</artifactId> + <version>${log4j.version}</version> + </dependency> + <dependency> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${log4j.version}</version> </dependency> <dependency> <groupId>log4j</groupId> @@ -39,19 +40,93 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>6.14.2</version> + <version>6.14.3</version> </dependency> <dependency> <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> <version>2.0.1</version> </dependency> + <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0.1</version> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>RELEASE</version> + </dependency> + <dependency> + <groupId>com.aventstack</groupId> + <artifactId>extentreports</artifactId> + <version>3.0.7</version> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-java</artifactId> + <version>${selenium.version}</version> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-server</artifactId> + <version>${selenium.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-api</artifactId> + <version>${selenium.version}</version> + </dependency> + + <dependency> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + <version>LATEST</version> + </dependency> + <dependency> + <groupId>com.github.markusbernhardt</groupId> + <artifactId>proxy-vole</artifactId> + <version>1.0.2</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <version>${apachehttp.version}</version> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + <version>${apachehttp.version}</version> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpmime</artifactId> + <version>${apachehttp.version}</version> + </dependency> + <dependency> + <groupId>com.paulhammant</groupId> + <artifactId>ngwebdriver</artifactId> + <version>0.9.7</version> + </dependency> + <dependency> + <groupId>org.yaml</groupId> + <artifactId>snakeyaml</artifactId> + <version>1.14</version> + </dependency> + <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>2.9.9</version> + </dependency> + <dependency> + <groupId>net.lightbody.bmp</groupId> + <artifactId>browsermob-core</artifactId> + <version>2.1.4</version> + </dependency> + <dependency> + <groupId>org.functionaljava</groupId> + <artifactId>functionaljava</artifactId> + <version>RELEASE</version> + </dependency> + + <dependency> <groupId>org.glassfish.jersey.core</groupId> <artifactId>jersey-common</artifactId> <version>${jersey.version}</version> @@ -66,6 +141,12 @@ <artifactId>jersey-media-json-jackson</artifactId> <version>${jersey.version}</version> </dependency> + <!--https://stackoverflow.com/questions/44088493/jersey-stopped-working-with-injectionmanagerfactory-not-found--> + <dependency> + <groupId>org.glassfish.jersey.inject</groupId> + <artifactId>jersey-hk2</artifactId> + <version>${jersey.version}</version> + </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-annotations</artifactId> @@ -108,11 +189,6 @@ <version>1.5.0</version> </dependency> <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0</version> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.5</version> @@ -140,7 +216,7 @@ <dependency> <groupId>net.javacrumbs.json-unit</groupId> <artifactId>json-unit</artifactId> - <version>1.23.0</version> + <version>2.2.0</version> </dependency> <!--<dependency>--> <!--<groupId>org.openecomp.vid</groupId>--> @@ -158,12 +234,6 @@ <version>1.0</version> </dependency> <dependency> - <groupId>net.code-story</groupId> - <artifactId>http</artifactId> - <version>2.105</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>2.2.11</version> @@ -177,7 +247,6 @@ <configuration> <source>1.8</source> <target>1.8</target> - <compilerArgument>-g:vars</compilerArgument> <debug>true</debug> <debuglevel>lines,vars,source</debuglevel> </configuration> @@ -209,7 +278,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.19.1</version> + <version>2.22.1</version> <configuration> <includes> <include>${test}</include> @@ -223,8 +292,8 @@ <argLine> -javaagent:${settings.localRepository}/org/aspectj/aspectjweaver/${aspectj.version}/aspectjweaver-${aspectj.version}.jar </argLine> - <useSystemClassLoader>false</useSystemClassLoader> - </configuration> + <useSystemClassLoader>false</useSystemClassLoader> + </configuration> </plugin> </plugins> </build> 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 new file mode 100644 index 000000000..f85225f36 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java @@ -0,0 +1,263 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.api; + +import java.io.BufferedReader; +import java.io.IOException; +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; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.impl.client.CloseableHttpClient; +import org.apache.http.impl.client.HttpClients; +import org.onap.sdc.ci.tests.datatypes.http.HttpHeaderEnum; +import org.onap.sdc.ci.tests.datatypes.http.HttpRequest; +import org.onap.sdc.ci.tests.datatypes.http.RestResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class BaseRestUtils { + public static final String contentTypeHeaderData = "application/json"; + public static final String acceptHeaderData = "application/json"; + public static final String acceptJsonHeader = "application/json"; + public static final String acceptOctetHeader = "application/octet-stream"; + public static final String authorizationHeader = "Basic " + Base64.encodeBase64String("ci:123456".getBytes()); + public static final String acceptOctetStream = "application/octet-stream"; + public static final String ecomp = "onap"; + public static final String authorizationPrefixString = "Basic "; + + public static final String RESOURCE_COMPONENT_TYPE = "resources"; + public static final String PRODUCT_COMPONENT_TYPE = "products"; + public static final String SERVICE_COMPONENT_TYPE = "services"; + + public static final int STATUS_CODE_SUCCESS = 200; + public static final int STATUS_CODE_CREATED = 201; + public static final int STATUS_CODE_DELETE = 204; + public static final int STATUS_CODE_NOT_FOUND = 404; + public static final int STATUS_CODE_SUCCESS_NO_CONTENT = 204; + public static final int STATUS_CODE_SUCCESS_DELETE = 204; + public static final int STATUS_CODE_INVALID_CONTENT = 400; + public static final int STATUS_CODE_MISSING_DATA = 400; + public static final int STATUS_CODE_MISSING_INFORMATION = 403; + public static final int STATUS_CODE_RESTRICTED_ACCESS = 403; + public static final int STATUS_CODE_ALREADY_EXISTS = 409; + public static final int STATUS_CODE_RESTRICTED_OPERATION = 409; + public static final int STATUS_CODE_COMPONENT_NAME_EXCEEDS_LIMIT = 400; + public static final int STATUS_CODE_MISSING_COMPONENT_NAME = 400; + public static final int STATUS_CODE_UNSUPPORTED_ERROR = 400; + public static final int STATUS_CODE_IMPORT_SUCCESS = 201; + public static final int STATUS_CODE_UPDATE_SUCCESS = 200; + public static final int RESTRICTED_OPERATION = 409; + public static final int STATUS_CODE_GET_SUCCESS = 200; + + public static final String SUCCESS_MESSAGE = "OK"; + private static Logger logger = LoggerFactory.getLogger(BaseRestUtils.class.getName()); + + private static byte[] encodeBase64; + + // ************* PRIVATE METHODS ************************ + + protected static Map<String, String> prepareHeadersMap(String userId) { + return prepareHeadersMap(userId, acceptHeaderData); + } + + protected static Map<String, String> prepareHeadersMap(String userId, String accept) { + Map<String, String> headersMap = new HashMap<String, String>(); + if (contentTypeHeaderData != null) { + headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), contentTypeHeaderData); + } + if (accept != null) { + headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), accept); + } + if (userId != null) { + headersMap.put(HttpHeaderEnum.USER_ID.getValue(), userId); + } + + return headersMap; + } + + // send request + // GET + protected static RestResponse sendGet(String url, String userId) throws IOException { + return sendGet(url, userId, null); + } + + protected static RestResponse sendGet(String url, String userId, Map<String, String> additionalHeaders) + throws IOException { + Map<String, String> headersMap = prepareHeadersMap(userId); + if (additionalHeaders != null) { + headersMap.putAll(additionalHeaders); + } + + HttpRequest http = new HttpRequest(); + RestResponse getResourceResponse = http.httpSendGet(url, headersMap); + return getResourceResponse; + } + + public static RestResponse sendGetAndRemoveHeaders(String url, String userId, List<String> headersToRemove) + throws IOException { + Map<String, String> headersMap = prepareHeadersMap(userId); + if (headersToRemove != null) { + for (String header : headersToRemove) { + headersMap.remove(header); + } + } + + HttpRequest http = new HttpRequest(); + RestResponse getResourceResponse = http.httpSendGet(url, headersMap); + return getResourceResponse; + } + + // PUT + protected static RestResponse sendPut(String url, String userBodyJson, String userId, String cont) + throws IOException { + Map<String, String> headersMap = prepareHeadersMap(userId, cont); + + HttpRequest http = new HttpRequest(); + RestResponse updateResourceResponse = http.httpSendByMethod(url, "PUT", userBodyJson, headersMap); + return updateResourceResponse; + } + + // POST + public static RestResponse sendPost(String url, String userBodyJson, String userId, String accept) + throws IOException { + return sendPost(url, userBodyJson, userId, accept, null); + } + + protected static RestResponse sendPost(String url, String userBodyJson, String userId, String accept, + Map<String, String> additionalHeaders) throws IOException { + Map<String, String> headersMap = prepareHeadersMap(userId, accept); + if (additionalHeaders != null) { + headersMap.putAll(additionalHeaders); + } + HttpRequest http = new HttpRequest(); + RestResponse postResourceResponse = http.httpSendPost(url, userBodyJson, headersMap); + return postResourceResponse; + } + + // used form complex requests like import categories.. + protected static RestResponse sendPost(String url, HttpEntity entity, String userId, String accept) + throws IOException { + RestResponse postResponse = new RestResponse(); + CloseableHttpResponse response = null; + CloseableHttpClient client = null; + try { + client = HttpClients.createDefault(); + HttpPost httpPost = new HttpPost(url); + + httpPost.addHeader("USER_ID", userId); + httpPost.setEntity(entity); + response = client.execute(httpPost); + HttpEntity responseEntity = response.getEntity(); + int statusCode = response.getStatusLine().getStatusCode(); + + postResponse.setStatusCode(statusCode); + StringBuffer sb = new StringBuffer(); + try { + BufferedReader in = new BufferedReader(new InputStreamReader(responseEntity.getContent())); + String inputLine; + while ((inputLine = in.readLine()) != null) { + sb.append(inputLine); + } + in.close(); + } catch (Exception e) { + logger.debug("response body is null"); + } + postResponse.setResponse(sb.toString()); + } finally { + try { + if (response != null) { + response.close(); + } + + } catch (IOException e) { + logger.debug("failed to close client or response: ", e); + } + try { + if (client != null) { + client.close(); + } + } catch (IOException e) { + logger.debug("failed to close client or response: ", e); + } + } + return postResponse; + } + + // DELETE + protected static RestResponse sendDelete(String url, String userId) throws IOException { +// Map<String, String> headersMap = prepareHeadersMap(userId); + + return sendDelete(url, userId, null); + } + + protected static RestResponse sendDelete(String url, String userId, Map<String, String> additionalHeaders) throws IOException { + Map<String, String> headersMap = prepareHeadersMap(userId); + if (additionalHeaders != null) { + headersMap.putAll(additionalHeaders); + } + + HttpRequest http = new HttpRequest(); + RestResponse deleteResourceResponse = http.httpSendDelete(url, headersMap); + return deleteResourceResponse; + } + + /* + * // ------ protected static Boolean checkErrorCode(RestResponse + * deleteResponse) { if (deleteResponse.getErrorCode() == + * STATUS_CODE_SUCCESS || deleteResponse.getErrorCode() == + * STATUS_CODE_DELETE) { return true; } return false; } + * + * // *** STATUS CODE VALIDATION UTIITIES **** public static void + * checkStatusCode(RestResponse response, String assertMessage, boolean AND, + * int... statuses) { int statusCode = response.getErrorCode(); for (int + * status : statuses) { if (AND && statusCode != status) { + * Assert.fail(assertMessage + " status: " + statusCode); } else if + * (statusCode == status) { return; } } if (!AND) { + * Assert.fail(assertMessage + " status: " + statusCode); } } + * + * public static void checkDeleteResponse(RestResponse response) { + * checkStatusCode(response,"delete request failed",false,STATUS_CODE_DELETE + * ,STATUS_CODE_NOT_FOUND, STATUS_CODE_SUCCESS); // STATUS_CODE_SUCCESS for + * deActivate user } + * + * public static void checkCreateResponse(RestResponse response) { + * checkStatusCode(response, "create request failed", false, + * STATUS_CODE_CREATED); } + */ + public static String encodeUrlForDownload(String url) { + return url.replaceAll(" ", "%20"); + } + + public static Map<String, String> addAuthorizeHeader(String userName, String password) { + String userCredentials = userName + ":" + password; + encodeBase64 = Base64.encodeBase64(userCredentials.getBytes()); + String encodedUserCredentials = authorizationPrefixString + new String(encodeBase64); + Map<String, String> authorizationHeader = new HashMap<String, String>(); + authorizationHeader.put(HttpHeaderEnum.AUTHORIZATION.getValue(), encodedUserCredentials); + return authorizationHeader; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ArtifactAssetStructure.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ArtifactAssetStructure.java new file mode 100644 index 000000000..8eb4fa38b --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ArtifactAssetStructure.java @@ -0,0 +1,135 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +public class ArtifactAssetStructure { + + String artifactName; + String artifactType; + String artifactURL; + String artifactDescription; + int artifactTimeout;// optional + String artifactChecksum; + String artifactUUID; + String artifactVersion; + String generatedFromUUID;// optional + + public ArtifactAssetStructure(String artifactName, String artifactType, String artifactURL, + String artifactDescription, int artifactTimeout, String artifactChecksum, String artifactUUID, + String artifactVersion, String generatedFromUUID) { + super(); + this.artifactName = artifactName; + this.artifactType = artifactType; + this.artifactURL = artifactURL; + this.artifactDescription = artifactDescription; + this.artifactTimeout = artifactTimeout; + this.artifactChecksum = artifactChecksum; + this.artifactUUID = artifactUUID; + this.artifactVersion = artifactVersion; + this.generatedFromUUID = generatedFromUUID; + } + + public ArtifactAssetStructure() { + super(); + // TODO Auto-generated constructor stub + } + + public String getArtifactName() { + return artifactName; + } + + public void setArtifactName(String artifactName) { + this.artifactName = artifactName; + } + + public String getArtifactType() { + return artifactType; + } + + public void setArtifactType(String artifactType) { + this.artifactType = artifactType; + } + + public String getArtifactURL() { + return artifactURL; + } + + public void setArtifactURL(String artifactURL) { + this.artifactURL = artifactURL; + } + + public String getArtifactDescription() { + return artifactDescription; + } + + public void setArtifactDescription(String artifactDescription) { + this.artifactDescription = artifactDescription; + } + + public int getArtifactTimeout() { + return artifactTimeout; + } + + public void setArtifactTimeout(int artifactTimeout) { + this.artifactTimeout = artifactTimeout; + } + + public String getArtifactChecksum() { + return artifactChecksum; + } + + public void setArtifactChecksum(String artifactChecksum) { + this.artifactChecksum = artifactChecksum; + } + + public String getArtifactUUID() { + return artifactUUID; + } + + public void setArtifactUUID(String artifactUUID) { + this.artifactUUID = artifactUUID; + } + + public String getArtifactVersion() { + return artifactVersion; + } + + public void setArtifactVersion(String artifactVersion) { + this.artifactVersion = artifactVersion; + } + + public String getGeneratedFromUUID() { + return generatedFromUUID; + } + + public void setGeneratedFromUUID(String generatedFromUUID) { + this.generatedFromUUID = generatedFromUUID; + } + + @Override + public String toString() { + return "ArtifactAssetStructure [artifactName=" + artifactName + ", artifactType=" + artifactType + + ", artifactURL=" + artifactURL + ", artifactDescription=" + artifactDescription + ", artifactTimeout=" + + artifactTimeout + ", artifactChecksum=" + artifactChecksum + ", artifactUUID=" + artifactUUID + + ", artifactVersion=" + artifactVersion + ", generatedFromUUID=" + generatedFromUUID + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/AssetStructure.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/AssetStructure.java new file mode 100644 index 000000000..345181d6c --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/AssetStructure.java @@ -0,0 +1,122 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +public class AssetStructure { + + private String uuid; + private String invariantUUID; + private String name; + private String version; + private String toscaModelURL; + private String category; + private String lifecycleState; + private String lastUpdaterUserId; + + public AssetStructure() { + super(); + } + + public AssetStructure(String uuid, String invariantUUID, String name, String version, String toscaModelURL, + String category, String lifecycleState, String lastUpdaterUserId) { + super(); + this.uuid = uuid; + this.invariantUUID = invariantUUID; + this.name = name; + this.version = version; + this.toscaModelURL = toscaModelURL; + this.category = category; + this.lifecycleState = lifecycleState; + this.lastUpdaterUserId = lastUpdaterUserId; + } + + @Override + public String toString() { + return "AssetStructure [uuid=" + uuid + ", invariantUUID=" + invariantUUID + ", name=" + name + ", version=" + + version + ", toscaModelURL=" + toscaModelURL + ", category=" + category + ", lifecycleState=" + + lifecycleState + ", lastUpdaterUserId=" + lastUpdaterUserId + "]"; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getInvariantUUID() { + return invariantUUID; + } + + public void setInvariantUUID(String invariantUUID) { + this.invariantUUID = invariantUUID; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getToscaModelURL() { + return toscaModelURL; + } + + public void setToscaModelURL(String toscaModelURL) { + this.toscaModelURL = toscaModelURL; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getLifecycleState() { + return lifecycleState; + } + + public void setLifecycleState(String lifecycleState) { + this.lifecycleState = lifecycleState; + } + + public String getLastUpdaterUserId() { + return lastUpdaterUserId; + } + + public void setLastUpdaterUserId(String lastUpdaterUserId) { + this.lastUpdaterUserId = lastUpdaterUserId; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/CanvasElement.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/CanvasElement.java new file mode 100644 index 000000000..a17c38c7f --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/CanvasElement.java @@ -0,0 +1,65 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.onap.sdc.ci.tests.datatypes.DataTestIdEnum.LeftPanelCanvasItems; + +public final class CanvasElement { + private final String uniqueId; + private ImmutablePair<Integer, Integer> location; + private LeftPanelCanvasItems normativeElementType; + private String elementType; + + CanvasElement(String name, ImmutablePair<Integer, Integer> location, LeftPanelCanvasItems canvasItem) { + super(); + this.uniqueId = name; + this.location = location; + normativeElementType = canvasItem; + } + + CanvasElement(String name, ImmutablePair<Integer, Integer> location, String canvasItem) { + super(); + this.uniqueId = name; + this.location = location; + elementType = canvasItem; + } + + public String getUniqueId() { + return uniqueId; + } + + public ImmutablePair<Integer, Integer> getLocation() { + return location; + } + + public void setLocation(ImmutablePair<Integer, Integer> location) { + this.location = location; + } + + public LeftPanelCanvasItems getNormativeElementType() { + return normativeElementType; + } + + public String getElementType() { + return elementType; + } +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/CanvasManager.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/CanvasManager.java new file mode 100644 index 000000000..999a63bb3 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/CanvasManager.java @@ -0,0 +1,268 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.UUID; +import java.util.stream.Collectors; + +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.onap.sdc.ci.tests.datatypes.DataTestIdEnum.LeftPanelCanvasItems; +import org.onap.sdc.ci.tests.execute.setup.ExtentTestActions; +import org.onap.sdc.ci.tests.execute.setup.SetupCDTest; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.openqa.selenium.By; +import org.openqa.selenium.StaleElementReferenceException; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.interactions.Actions; +import org.testng.Assert; + +import com.aventstack.extentreports.Status; + +public final class CanvasManager { + private Map<String, CanvasElement> canvasElements; + private Actions actions; + private WebElement canvas; + private int reduceCanvasWidthFactor; + private CanvasElement canvasElement; + // Offsets Are used to find upper right corner of canvas element in order to + // connect links + private static final int CANVAS_ELEMENT_Y_OFFSET = 30; + private static final int CANVAS_ELEMENT_X_OFFSET = 18; // 14 - 27 + + private CanvasManager() { + canvasElements = new HashMap<>(); + actions = new Actions(GeneralUIUtils.getDriver()); + canvas = GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralCanvasItems.CANVAS.getValue()); + try { + WebElement webElement = GeneralUIUtils + .getWebElementByTestID(DataTestIdEnum.GeneralCanvasItems.CANVAS_RIGHT_PANEL.getValue()); + reduceCanvasWidthFactor = webElement.getSize().width; + } catch (Exception e) { + reduceCanvasWidthFactor = 0; + } + } + + public static CanvasManager getCanvasManager() { + return new CanvasManager(); + } + + public List<CanvasElement> getCanvasElements() { + return canvasElements.values().stream().collect(Collectors.toList()); + } + + private void addCanvasElement(CanvasElement element) { + canvasElements.put(element.getUniqueId(), element); + } + + private void moveElementOnCanvas(CanvasElement canvasElement, ImmutablePair<Integer, Integer> newLocation) + throws Exception { + GeneralUIUtils.waitForLoader(); + actions.moveToElement(canvas, canvasElement.getLocation().left, canvasElement.getLocation().right); + actions.clickAndHold(); + actions.moveToElement(canvas, newLocation.left, newLocation.right); + actions.release(); + actions.perform(); + canvasElement.setLocation(newLocation); + GeneralUIUtils.waitForLoader(); + + } + + public void moveToFreeLocation(String containerName) { + int maxWait = 5000; + int sumOfWaiting = 0; + int napPeriod = 200; + boolean isKeepWaiting = false; + while (!isKeepWaiting) { + ImmutablePair<Integer, Integer> freePosition = getFreePosition(); + actions.moveToElement(canvas, freePosition.left, freePosition.right); + actions.clickAndHold(); + actions.release(); + actions.perform(); + isKeepWaiting = GeneralUIUtils.getWebElementByTestID("selectedCompTitle").getText() + .equals(containerName); + sumOfWaiting += napPeriod; + if (sumOfWaiting > maxWait) { + Assert.fail("Can't click on VF"); + } + } + } + + public void clickOnCanvaElement(CanvasElement canvasElement) { + actions.moveToElement(canvas, canvasElement.getLocation().left, canvasElement.getLocation().right); + actions.clickAndHold(); + actions.release(); + actions.perform(); + actions.click().perform(); + GeneralUIUtils.ultimateWait(); + ExtentTestActions.log(Status.INFO, String.format("Canvas element %s selected", canvasElement.getElementType())); + } + + public void moveElementOnCanvas(CanvasElement canvasElement) throws Exception { + moveElementOnCanvas(canvasElement, getFreePosition()); + } + + public void deleteElementFromCanvas(CanvasElement canvasElement) throws Exception { + GeneralUIUtils.waitForLoader(); + actions.moveToElement(canvas, canvasElement.getLocation().left, canvasElement.getLocation().right); + actions.click(); + actions.perform(); + GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralCanvasItems.DELETE_INSTANCE_BUTTON.getValue()) + .click(); + GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.ModalItems.OK.getValue()).click(); + canvasElements.remove(canvasElement.getUniqueId()); + GeneralUIUtils.ultimateWait(); + if (canvasElement.getElementType().contains("-")){ + ExtentTestActions.log(Status.INFO, String.format("Canvas element %s removed", canvasElement.getElementType().split("-")[4])); + } + else{ + ExtentTestActions.log(Status.INFO, String.format("Canvas element %s removed", canvasElement.getElementType())); + } + } + + private WebElement findClickElement(String dataTestId) { + int attempts = 0; + while (attempts < 2) { + try { + return GeneralUIUtils.getWebElementByTestID(dataTestId); + } catch (StaleElementReferenceException e) { + } + attempts++; + } + return null; + } + + public CanvasElement createElementOnCanvas(String elementName) throws Exception { + String actionDuration = GeneralUIUtils.getActionDuration(() -> { + try { + canvasElement = createElementOnCanvasWithoutDuration(elementName); + } catch (Exception e) { + e.printStackTrace(); + } + }); + + if (canvasElement != null){ + ExtentTestActions.log(Status.INFO, String.format("The element %s should now be on the canvas", elementName), actionDuration); + } + return canvasElement; + } + + private CanvasElement createElementOnCanvasWithoutDuration(String elementDataTestId) throws Exception { + try { + WebElement element = findClickElement(elementDataTestId); + ImmutablePair<Integer, Integer> freePosition = getFreePosition(); + actions.moveToElement(element, 20, 20); + actions.clickAndHold(); + actions.moveToElement(canvas, freePosition.left, freePosition.right); + actions.release(); + actions.perform(); + GeneralUIUtils.ultimateWait(); + String uniqueId = elementDataTestId + "_" + UUID.randomUUID().toString(); + CanvasElement canvasElement = new CanvasElement(uniqueId, freePosition, elementDataTestId); + addCanvasElement(canvasElement); + GeneralUIUtils.ultimateWait(); + return canvasElement; + } + catch (Exception e) { + System.out.println("Can't create element on canvas"); + e.printStackTrace(); + } + return null; + } + + public CanvasElement createElementOnCanvas(LeftPanelCanvasItems canvasItem) throws Exception { + return createElementOnCanvas(canvasItem.getValue()); + } + + private ImmutablePair<Integer, Integer> getFreePosition() { + ImmutablePair<Integer, Integer> randomPosition = null; + boolean freePosition = false; + int minSpace = 150; + while (!freePosition) { + ImmutablePair<Integer, Integer> tempRandomPosition = getRandomPosition(); + freePosition = !canvasElements.values().stream().map(e -> e.getLocation()) + .filter(e -> Math.abs(e.left - tempRandomPosition.left) < minSpace + && Math.abs(e.right - tempRandomPosition.right) < minSpace) + .findAny().isPresent(); + randomPosition = tempRandomPosition; + } + return randomPosition; + } + + private ImmutablePair<Integer, Integer> getRandomPosition() { + int edgeBuffer = 50; + Random random = new Random(); + int xElement = random.nextInt(canvas.getSize().width - 2 * edgeBuffer - reduceCanvasWidthFactor) + edgeBuffer; + int yElement = random.nextInt(canvas.getSize().height - 2 * edgeBuffer) + edgeBuffer; + return new ImmutablePair<Integer, Integer>(xElement, yElement); + } + + public void linkElements(CanvasElement firstElement, CanvasElement secondElement) throws Exception { + ExtentTestActions.log(Status.INFO, String.format("Linking between the %s instance and the %s instance.", firstElement.getElementType(), secondElement.getElementType())); + drawSimpleLink(firstElement, secondElement); + selectReqAndCapAndConnect(); + ExtentTestActions.log(Status.INFO, String.format("The instances %s and %s should now be connected.", firstElement.getElementType(), secondElement.getElementType())); + } + + private void selectReqAndCapAndConnect() throws Exception { + // Select First Cap + GeneralUIUtils.getWebElementsListByTestID(DataTestIdEnum.LinkMenuItems.LINK_ITEM_CAP.getValue()).get(0).click(); + // Select First Req + GeneralUIUtils.getWebElementsListByTestID(DataTestIdEnum.LinkMenuItems.LINK_ITEM_REQ.getValue()).get(0).click(); + // Connect + GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.LinkMenuItems.CONNECT_BUTTON.getValue()).click(); + + GeneralUIUtils.waitForLoader(); + } + + private void drawSimpleLink(CanvasElement firstElement, CanvasElement secondElement) throws Exception { + int yOffset = CANVAS_ELEMENT_Y_OFFSET; + int xOffset = CANVAS_ELEMENT_X_OFFSET; + + actions.moveToElement(canvas, firstElement.getLocation().left + xOffset, + firstElement.getLocation().right - yOffset); + + actions.clickAndHold(); + actions.moveToElement(canvas, secondElement.getLocation().left + xOffset, secondElement.getLocation().right - yOffset); + actions.release(); + actions.perform(); + GeneralUIUtils.ultimateWait(); + } + + public String updateElementNameInCanvas(CanvasElement canvasElement, String newInstanceName) throws Exception { + GeneralUIUtils.ultimateWait();; + clickOnCanvaElement(canvasElement); + WebElement updateInstanceName = GeneralUIUtils.getWebElementBy(By.id("editPencil")); + updateInstanceName.click(); + WebElement instanceNameField = GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralCanvasItems.INSTANCE_NAME_FIELD.getValue()); + String oldInstanceName = instanceNameField.getAttribute("value"); + instanceNameField.clear(); + instanceNameField.sendKeys(newInstanceName); + GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.ModalItems.OK.getValue()).click(); + GeneralUIUtils.ultimateWait(); + GeneralUIUtils.waitForElementInVisibilityByTestId(By.className("w-sdc-modal-resource-instance-name")); + SetupCDTest.getExtendTest().log(Status.INFO, String.format("Name of element instance changed from %s to %s", oldInstanceName, newInstanceName)); + return oldInstanceName; + } +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ComponentReqDetails.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ComponentReqDetails.java new file mode 100644 index 000000000..86d23e870 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ComponentReqDetails.java @@ -0,0 +1,272 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.ArrayList; +import java.util.List; + +import org.onap.sdc.ci.tests.devObjects.CategoryDefinition; +import org.onap.sdc.ci.tests.devObjects.LifecycleStateEnum; +import org.onap.sdc.ci.tests.devObjects.SubCategoryDefinition; + +public abstract class ComponentReqDetails { + + protected String name; + protected String description; + protected List<String> tags = new ArrayList<>(); + protected String contactId; + protected String icon; + protected String uniqueId; + protected String creatorUserId; + protected String creatorFullName; + protected String lastUpdaterUserId; + protected String lastUpdaterFullName; + protected Long creationDate; + protected Long lastUpdateDate; + protected LifecycleStateEnum lifecycleState; + protected String version; + protected String UUID; + protected List<CategoryDefinition> categories; + protected String projectCode; + protected String csarUUID; + protected String csarVersion; + protected String importedToscaChecksum; + protected String invariantUUID; + + public String getCsarVersion() { + return csarVersion; + } + + public void setCsarVersion(String csarVersion) { + this.csarVersion = csarVersion; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + tags.add(name); + } + + public List<String> getTags() { + return tags; + } + + public void setTags(List<String> tags) { + this.tags = tags; + } + + // public String getCategory() { + // return category; + // } + // + public String getContactId() { + return contactId; + } + + public void setContactId(String contactId) { + this.contactId = contactId; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getUniqueId() { + return uniqueId; + } + + public void setUniqueId(String uniqueId) { + this.uniqueId = uniqueId; + } + + public void setCreatorUserId(String creatorUserId) { + this.creatorUserId = creatorUserId; + } + + public void setCreatorFullName(String creatorFullName) { + this.creatorFullName = creatorFullName; + } + + public void setLastUpdaterUserId(String lastUpdaterUserId) { + this.lastUpdaterUserId = lastUpdaterUserId; + } + + public void setLastUpdaterFullName(String lastUpdaterFullName) { + this.lastUpdaterFullName = lastUpdaterFullName; + } + + public void setCreationDate(Long creationDate) { + this.creationDate = creationDate; + } + + public void setLastUpdateDate(Long lastUpdateDate) { + this.lastUpdateDate = lastUpdateDate; + } + + public void setLifecycleState(LifecycleStateEnum lifecycleState) { + this.lifecycleState = lifecycleState; + } + + public void setUUID(String uUID) { + this.UUID = uUID; + } + + public String getCreatorUserId() { + return creatorUserId; + } + + public String getCreatorFullName() { + return creatorFullName; + } + + public String getLastUpdaterUserId() { + return lastUpdaterUserId; + } + + public String getLastUpdaterFullName() { + return lastUpdaterFullName; + } + + public Long getCreationDate() { + return creationDate; + } + + public Long getLastUpdateDate() { + return lastUpdateDate; + } + + public LifecycleStateEnum getLifecycleState() { + return lifecycleState; + } + + public String getUUID() { + return UUID; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public List<CategoryDefinition> getCategories() { + return categories; + } + + public void setCategories(List<CategoryDefinition> categories) { + this.categories = categories; + } + + public void removeAllCategories() { + this.categories = new ArrayList<>(); + } + + public void addCategoryChain(String category, String subCategory) { + if (category != null || subCategory != null) { + if (categories == null) { + categories = new ArrayList<>(); + } + CategoryDefinition selectedCategory = null; + for (CategoryDefinition categoryDef : categories) { + if (categoryDef.getName().equals(category)) { + selectedCategory = categoryDef; + } + } + if (selectedCategory == null) { + selectedCategory = new CategoryDefinition(); + selectedCategory.setName(category); + categories.add(selectedCategory); + } + if (subCategory != null) { + List<SubCategoryDefinition> subcategories = selectedCategory.getSubcategories(); + if (subcategories == null) { + subcategories = new ArrayList<>(); + selectedCategory.setSubcategories(subcategories); + } + SubCategoryDefinition selectedSubcategory = null; + for (SubCategoryDefinition subcategory : subcategories) { + if (subcategory.getName().equals(subCategory)) { + selectedSubcategory = subcategory; + } + } + if (selectedSubcategory == null) { + selectedSubcategory = new SubCategoryDefinition(); + selectedSubcategory.setName(subCategory); + subcategories.add(selectedSubcategory); + } + } + } + } + + public void addCategory(String category) { + addCategoryChain(category, null); + } + + public String getProjectCode() { + return projectCode; + } + + public void setProjectCode(String projectCode) { + this.projectCode = projectCode; + } + + public String getCsarUUID() { + return csarUUID; + } + + public void setCsarUUID(String csarUUID) { + this.csarUUID = csarUUID; + } + + public String getImportedToscaChecksum() { + return importedToscaChecksum; + } + + public void setImportedToscaChecksum(String importedToscaChecksum) { + this.importedToscaChecksum = importedToscaChecksum; + } + + public String getInvariantUUID() { + return invariantUUID; + } + + public void setInvariantUUID(String invariantUUID) { + this.invariantUUID = invariantUUID; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/Configuration.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/Configuration.java new file mode 100644 index 000000000..d6a6c1f17 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/Configuration.java @@ -0,0 +1,325 @@ +package org.onap.sdc.ci.tests.datatypes; + +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Paths; + +import org.yaml.snakeyaml.Yaml; + +public class Configuration { + + private String beHost; + private String feHost; + private int bePort; + private int fePort; + private String url; + private String remoteTestingMachineIP; + private int remoteTestingMachinePort; + private boolean remoteTesting; + private String browser; + private String systemUnderDebug; + private String reportDBhost; + private int reportDBport; + private boolean captureTraffic; + private boolean useBrowserMobProxy; + private String stopOnClassFailure; + private String reportFileName; + private String reportFolder; + private int numOfAttemptsToRefresh; + private boolean rerun; + private String windowsDownloadDirectory; + private String screenshotFolder; + private String harFilesFolder; + private boolean useCustomLogin; + private String geckoDriverPath; + + public Configuration(String url) { + super(); + basicInit(url, false); + } + + public Configuration(String url, boolean useCustomLogin) { + super(); + basicInit(url, useCustomLogin); + } + + private void basicInit(String url, boolean useCustomLogin) { + this.remoteTesting = false; + this.captureTraffic = false; + this.useBrowserMobProxy = false; + this.reportFolder = "." + File.separator + "ExtentReport" + File.separator; + this.reportFileName = "UI_Extent_Report.html"; + this.screenshotFolder = reportFolder + "screenshots" + File.separator; + this.harFilesFolder = reportFolder + "har_files" + File.separator; + this.browser = "firefox"; + this.url = url; + this.numOfAttemptsToRefresh = 2; + this.useCustomLogin = useCustomLogin; + this.geckoDriverPath = null; + } + + public String getGeckoDriverPath(){ + return this.geckoDriverPath; } + + public void setGeckoDriverPath(String geckoDriverPath){ this.geckoDriverPath = geckoDriverPath; } + + public String getBeHost() { + return beHost; + } + + public void setBeHost(String beHost) { + this.beHost = beHost; + } + + + public String getFeHost() { + return feHost; + } + + + public void setFeHost(String feHost) { + this.feHost = feHost; + } + + + public int getBePort() { + return bePort; + } + + + public void setBePort(int bePort) { + this.bePort = bePort; + } + + + public int getFePort() { + return fePort; + } + + + public void setFePort(int fePort) { + this.fePort = fePort; + } + + + public String getUrl() { + return url; + } + + + public void setUrl(String url) { + this.url = url; + } + + + public String getRemoteTestingMachineIP() { + return remoteTestingMachineIP; + } + + + public void setRemoteTestingMachineIP(String remoteTestingMachineIP) { + this.remoteTestingMachineIP = remoteTestingMachineIP; + } + + + public int getRemoteTestingMachinePort() { + return remoteTestingMachinePort; + } + + + public void setRemoteTestingMachinePort(int remoteTestingMachinePort) { + this.remoteTestingMachinePort = remoteTestingMachinePort; + } + + + public boolean isRemoteTesting() { + return remoteTesting; + } + + + public void setRemoteTesting(boolean remoteTesting) { + this.remoteTesting = remoteTesting; + } + + + public String getBrowser() { + return browser; + } + + + public void setBrowser(String browser) { + this.browser = browser; + } + + + public String getSystemUnderDebug() { + return systemUnderDebug; + } + + + public void setSystemUnderDebug(String systemUnderDebug) { + this.systemUnderDebug = systemUnderDebug; + } + + + public String getReportDBhost() { + return reportDBhost; + } + + + public void setReportDBhost(String reportDBhost) { + this.reportDBhost = reportDBhost; + } + + + public int getReportDBport() { + return reportDBport; + } + + + public void setReportDBport(int reportDBport) { + this.reportDBport = reportDBport; + } + + + public boolean isCaptureTraffic() { + return captureTraffic; + } + + + public void setCaptureTraffic(boolean captureTraffic) { + this.captureTraffic = captureTraffic; + } + + + public boolean isUseBrowserMobProxy() { + return useBrowserMobProxy; + } + + + public void setUseBrowserMobProxy(boolean useBrowserMobProxy) { + this.useBrowserMobProxy = useBrowserMobProxy; + } + + + public String getStopOnClassFailure() { + return stopOnClassFailure; + } + + + public void setStopOnClassFailure(String stopOnClassFailure) { + this.stopOnClassFailure = stopOnClassFailure; + } + + + public String getReportFileName() { + return reportFileName; + } + + + public void setReportFileName(String reportFileName) { + this.reportFileName = reportFileName; + } + + + public String getReportFolder() { + return reportFolder; + } + + + public void setReportFolder(String reportFolder) { + this.reportFolder = reportFolder; + } + + + public int getNumOfAttemptsToRefresh() { + return numOfAttemptsToRefresh; + } + + + public void setNumOfAttemptsToRefresh(int numOfAttemptsToRefresh) { + this.numOfAttemptsToRefresh = numOfAttemptsToRefresh; + } + + + public boolean isRerun() { + return rerun; + } + + + public void setRerun(boolean rerun) { + this.rerun = rerun; + } + + + + + public String getWindowsDownloadDirectory() { + return windowsDownloadDirectory; + } + + public void setWindowsDownloadDirectory(String windowsDownloadDirectory) { + this.windowsDownloadDirectory = windowsDownloadDirectory; + } + + public String getScreenshotFolder() { + return screenshotFolder; + } + + public void setScreenshotFolder(String screenshotFolder) { + this.screenshotFolder = screenshotFolder; + } + + public String getHarFilesFolder() { + return harFilesFolder; + } + + public void setHarFilesFolder(String harFilesFolder) { + this.harFilesFolder = harFilesFolder; + } + + public boolean isUseCustomLogin() { + return useCustomLogin; + } + + public void setUseCustomLogin(boolean useCustomLogin) { + this.useCustomLogin = useCustomLogin; + } + + public synchronized static Configuration loadConfigFile(File configFile) { + return loadConfigFile(configFile, Configuration.class); + } + + public Configuration(){ + super(); + } + + public synchronized static <T> T loadConfigFile(File configFile, Class<T> clazz){ + InputStream in = null; + T config = null; + try { + String absolutePath = configFile.getAbsolutePath(); + in = Files.newInputStream(Paths.get(absolutePath)); + Yaml yaml = new Yaml(); + config = yaml.loadAs(in, clazz); + + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + return config; + } + + + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/CsarArtifacts.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/CsarArtifacts.java new file mode 100644 index 000000000..43dd8dfe3 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/CsarArtifacts.java @@ -0,0 +1,59 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +public class CsarArtifacts { + + private String artifactType; + private String artifactName; + + public CsarArtifacts() { + super(); + } + + public CsarArtifacts(String artifactName, String artifactType) { + super(); + this.artifactName = artifactName; + this.artifactType = artifactType; + } + + @Override + public String toString() { + return "AssetStructure [artifactName=" + artifactName + ", artifactType=" + artifactType + "]"; + } + + public String getArtifactType() { + return artifactType; + } + + public void setArtifactType(String artifactType) { + this.artifactType = artifactType; + } + + public String getArtifactName() { + return artifactName; + } + + public void setArtifactName(String artifactName) { + this.artifactName = artifactName; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/DataTestIdEnum.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/DataTestIdEnum.java new file mode 100644 index 000000000..98b184b93 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/DataTestIdEnum.java @@ -0,0 +1,835 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.Arrays; +import java.util.List; + +public final class DataTestIdEnum { + private DataTestIdEnum() { + } + + public enum Dashboard { + IMPORT_AREA("importButtonsArea"), + ADD_AREA("AddButtonsArea"), + BUTTON_ADD_VF("createResourceButton"), + BUTTON_ADD_SERVICE("createServiceButton"), + IMPORT_VFC("importVFCbutton"), + IMPORT_VF("importVFbutton"), + IMPORT_VFC_FILE("file-importVFCbutton"), + IMPORT_VF_FILE("file-importVFbutton"), + BUTTON_ADD_PRODUCT("createProductButton"); + + private String value; + + public String getValue() { + return value; + } + + private Dashboard(String value) { + this.value = value; + } + } + + public enum LifeCyleChangeButtons { + CREATE("create/save"), + CHECK_IN("check_in"), + SUBMIT_FOR_TESTING("submit_for_testing"), + START_TESTING("start_testing"), + ACCEPT("accept"), + CHECKOUT("check_out"); + + private String value; + + public String getValue() { + return value; + } + + private LifeCyleChangeButtons(String value) { + this.value = value; + } + } + + public enum DistributionChangeButtons { + APPROVE("approve"), + REJECT("reject"), + DISTRIBUTE("distribute"), + MONITOR("monitor"), + APPROVE_MESSAGE("checkindialog"), + RE_DISTRIBUTE("redistribute"); + + private String value; + + public String getValue() { + return value; + } + + private DistributionChangeButtons(String value) { + this.value = value; + } + } + + public enum InformationalArtifactsPlaceholders { + CLOUD_QUESTIONNAIRE("Cloud Questionnaire (completed)"), + FEATURES("Features"), + VENDOR_TEST_RESULT("Vendor Test Result"), + TEST_SCRIPTS("Test Scripts"), + RESOURCE_SECURITY_TEMPLATE("Resource Security Template"), + HEAT_TEMPLATE_FROM_VENDOR("HEAT Template from Vendor"), + CAPACITY("Capacity"); + + private String value; + + public String getValue() { + return value; + } + + private InformationalArtifactsPlaceholders(String value) { + this.value = value; + } + } + + public enum ModalItems { + BROWSE_BUTTON("browseButton"), + ADD("Add"), + DESCRIPTION("description"), + SUMBIT_FOR_TESTING_MESSAGE("changeLifeCycleMessage"), + OK("OK"), + CANCEL("Cancel"), + ACCEP_TESTING_MESSAGE("checkindialog"); + + private String value; + + public String getValue() { + return value; + } + + private ModalItems(String value) { + this.value = value; + } + } + + public enum LeftPanelCanvasItems { + BLOCK_STORAGE("BlockStorage"), + CINDER_VOLUME("CinderVolume"), + COMPUTE("Compute"), + LOAD_BALANCER("LoadBalancer"), + NOVA_SERVER("NovaServer"), + OBJECT_STORAGE("ObjectStorage"), + NEUTRON_PORT("NeutronPort"), + PORT("Port"), DATABASE("Database"), + NETWORK("Network"); + + private String value; + + public String getValue() { + return value; + } + + private LeftPanelCanvasItems(String value) { + this.value = value; + } + } + + public enum LinkMenuItems { + CANCEL_BUTTON("link-menu-button-cancel"), + CONNECT_BUTTON("link-menu-button-connect"), + LINK_ITEM_CAP("link-item-capabilities"), + LINK_ITEM_REQ("link-item-requirements"), + LINK_MENU("link-menu-open"); + + private String value; + + public String getValue() { + return value; + } + + private LinkMenuItems(String value) { + this.value = value; + } + } + + public enum GeneralCanvasItems { + CANVAS("canvas"), + CANVAS_RIGHT_PANEL("w-sdc-designer-sidebar-head"), + DELETE_INSTANCE_BUTTON("e-sdc-small-icon-delete"), + UPDATE_INSTANCE_NAME("e-sdc-small-icon-update"), + INSTANCE_NAME_FIELD("instanceName"); + + private String value; + + public String getValue() { + return value; + } + + private GeneralCanvasItems(String value) { + this.value = value; + } + } + + public enum ResourceMetadataEnum { + RESOURCE_NAME("name"), + DESCRIPTION("description"), + CATEGORY("selectGeneralCategory"), + VENDOR_NAME("vendorName"), + VENDOR_RELEASE("vendorRelease"), + TAGS("i-sdc-tag-input"), + CONTACT_ID("contactId"), + ICON(" iconBox"), + TAGS_TABLE("i-sdc-tag-text"); + private String value; + + public String getValue() { + return value; + } + + private ResourceMetadataEnum(String value) { + this.value = value; + } + } + + public enum GeneralElementsEnum { + CREATE_BUTTON("create/save"), + CHECKIN_BUTTON("check_in"), + CHECKOUT_BUTTON("check_out"), + SUBMIT_FOR_TESTING_BUTTON("submit_for_testing"), + DELETE_VERSION_BUTTON("delete_version"), + REVERT_BUTTON("revert"), + LIFECYCLE_STATE("formlifecyclestate"), + VERSION_HEADER("versionHeader"), + OK("OK"), + UPLOAD_FILE_INPUT("browseButton"); + + private String value; + + public String getValue() { + return value; + } + + private GeneralElementsEnum(String value) { + this.value = value; + } + } + + public enum ArtifactPageEnum { + ADD_DEPLOYMENT_ARTIFACT("add-deployment-artifact-button"), + ADD_INFORMATIONAL_ARTIFACT("add-information-artifact-button"), + DOWNLOAD_ARTIFACT_ENV("download_env_"), + ADD_ANOTHER_ARTIFACT("add-another-artifact-button"), + EDIT_ARTIFACT("edit_"), //upload env file by its label(via deployment artifact view)/displayName(via Canvas) + DELETE_ARTIFACT("delete_"), + DOWNLOAD_ARTIFACT("download_"), + GET_DEPLOYMENT_ARTIFACT_DESCRIPTION("description"), + GET_INFORMATIONAL_ARTIFACT_DESCRIPTION("Description"), + OK("OK"), + TYPE("artifactType_"), + DEPLOYMENT_TIMEOUT("timeout_"), + VERSION("artifactVersion_"), + UUID("artifactUUID_"), + EDIT_PARAMETERS_OF_ARTIFACT("edit-parameters-of-"), + ARTIFACT_NAME("artifactDisplayName_"), + UPLOAD_HEAT_ENV_PARAMETERS("uplaodEnv_"), + VERSION_ENV("artifactEnvVersion_"); + private String value; + + public String getValue() { + return value; + } + + private ArtifactPageEnum(String value) { + this.value = value; + } + } + + public enum PropertiesPageEnum { + + ADD_NEW_PROPERTY("addGrey"), + EDIT_PROPERTY("edit_"), + DELETE_PROPERTY("delete_"), + PROPERTY_NAME("propertyName_"), + PROPERTY_DESCRIPTION("propertyDescription_"), + PROPERTY_TYPE("propertyType_"), + ENTRY_SCHEMA("propertySchema_"), + ADD("Add"), CANCEL("Cancel"), + DONE("Done"), + PROPERTY_ROW("propertyRow"), + SAVE("Save"), + POPUP_FORM("sdc-edit-property-container"); + private String value; + + public String getValue() { + return value; + } + + private PropertiesPageEnum(String value) { + this.value = value; + } + } + + public enum PropertiesPopupEnum { + + PROPERTY_NAME("propertyName"), + PROPERTY_VALUE("defaultvalue"), + PROPERTY_BOOLEAN_VALUE("booleantype"), + PROPERTY_DESCRIPTION("description"), + PROPERTY_TYPE("propertyType"), + ENTRY_SCHEMA("schema-type"), + CANCEL("Cancel"), + SAVE("Save"), + POPUP_FORM("sdc-edit-property-container"), + ADD("Add"), + DONE("Done"), + PROPERTY_RADIO_BUTTON_CONTAINER("propertyRadioButton_"), + RADIO_BUTTON_CLASS("tlv-radio-label"); + private String value; + + public String getValue() { + return value; + } + + private PropertiesPopupEnum(String value) { + this.value = value; + } + } + + public enum AdminPageTabs { + USER_MANAGEMENT("usermanagmenttab"), + CATEGORY_MANAGEMENT("categorymanagmenttab"); + + private String value; + + public String getValue() { + return value; + } + + private AdminPageTabs(String value) { + this.value = value; + } + } + + public enum UserManagementEnum { + + SEARCH_BOX("searchbox"), + NEW_USER_FIELD("newuserId"), + ROLE_SELECT("selectrole"), + CREATE_BUTTON("creategreen"), + CLASS__USER_MANAGEMENT_TABLE("sdc-user-management-table"), + ROW_TABLE("row_"), + FIRST_NAME("firstName_"), + LAST_NAME("lastName__"), + USER_ID("userId_"), + EMAIL("email_"), + ROLE("role_"), + LAST_ACTIVE("lastActive_"), + UPDATE_ROLE("selectRole_"), + UPDATE_USER_BUTTON("updateUser_"), + SAVE_USER("save_"), + DELETE_USER("delete_"), + ; + + + private String value; + + public String getValue() { + return value; + } + + private UserManagementEnum(String value) { + this.value = value; + } + } + + public enum CategoryManagement { + + SERVICE_CATEGORY_HEADER("servicecategoryheader"), + RESOURCE_CATEGORY_HEADER("resourcecategoryheader"), + SERVICE_CATEGORY_LIST("servicecategory"), + RESOURCE_CATEGORY_LIST("resourcecategory"), + NEW_CATEGORY_BUTTON("newcategory"), + NEW_SUB_CATEGORY_BUTTON("newsubcategory"), + NEW_CATEGORY_NAME("i-sdc-form-input"); + + private String value; + + public String getValue() { + return value; + } + + private CategoryManagement(String value) { + this.value = value; + } + } + + + + public enum MainMenuButtons { + HOME_BUTTON("main-menu-button-home"), + CATALOG_BUTTON("main-menu-button-catalog"), + ONBOARD_BUTTON("main-menu-button-onboard"), + SEARCH_BOX("main-menu-input-search"), + REPOSITORY_ICON("repository-icon"); + private String value; + + public String getValue() { + return value; + } + + private MainMenuButtons(String value) { + this.value = value; + } + } + + public enum MainMenuButtonsFromInsideFrame { + HOME_BUTTON("breadcrumbs-button-0"); + private String value; + + public String getValue() { + return value; + } + + private MainMenuButtonsFromInsideFrame(String value) { + this.value = value; + } + } + + public enum MenuOptionsEnum { + EDIT("Edit"), + CHECK_IN("Check in"), + CHECK_OUT("Check out"), + VIEW("View"), + SUBMIT_FOR_TEST("Submit For Test"), + ACCEPT("Accept"), + REJECT("Reject"), + START_TEST("Start test"), + DISTREBUTE("Distribute"); + + private String value; + + public String getValue() { + return value; + } + + private MenuOptionsEnum(String value) { + this.value = value; + } + } + + public enum StepsEnum { + GENERAL("Generalstep"), + ICON("Iconstep"), + DEPLOYMENT_ARTIFACT("Deployment Artifactstep"), + INFORMATION_ARTIFACT("Information Artifactstep"), + PROPERTIES("Propertiesstep"), + COMPOSITION("Compositionstep"), + ACTIVITY_LOG("Activity Logstep"), + DEPLOYMENT_VIEW("Deploymentstep"), + TOSCA_ARTIFACTS("TOSCA Artifactsstep"), + MONITOR("Monitor step"), + MANAGEMENT_WORKFLOW("Management Workflowstep"), + INPUTS("Inputsstep"), + HIERARCHY("Hierarchystep"); + + private String value; + + public String getValue() { + return value; + } + + private StepsEnum(String value) { + this.value = value; + } + } + + public enum ArtifactPopup { + + BROWSE("browseButton"), + ARTIFACT_DESCRIPTION("description"), + ARTIFACT_LABEL("artifactLabel"), + ARTIFACT_TYPE("artifacttype"), + OK("OK"), + SAVE("Save"), + DONE_BUTTON("Done"), + CANCEL_BUTTON("Cancel"), + URL("input[class^='i-sdc-form-input']"), + MODAL_WINDOW("sdc-add-artifact"); + + private String value; + + public String getValue() { + return value; + } + + private ArtifactPopup(String value) { + this.value = value; + } + } + + public enum ServiceMetadataEnum { + SERVICE_NAME("name"), DESCRIPTION("description"), CATEGORY("selectGeneralCategory"), PROJECT_CODE("projectCode"), TAGS("i-sdc-tag-input"), CONTACT_ID("contactId"), ICON(" iconBox"); + + private String value; + + public String getValue() { + return value; + } + + private ServiceMetadataEnum(String value) { + this.value = value; + } + } + + public enum ProductMetadataEnum { + PRODUCT_NAME("name"), + FULL_NAME("fullName"), + DESCRIPTION("description"), + PROJECT_CODE("projectCode"), + TAGS("i-sdc-tag-input"), + ATT_CONTACT("attContact"), + ICON(" iconBox"); + + private String value; + + public String getValue() { + return value; + } + + private ProductMetadataEnum(String value) { + this.value = value; + } + } + + public enum DashboardCardEnum { + ASSET_TYPE("asset-type"), LIFECYCLE_STATE("span[class^='w-sdc-dashboard-card-info-lifecycleState']"), + INFO_NAME("div.sdc-tile-content-info-item-name"), + VERSION("div[class^='w-sdc-dashboard-card-info-user']"), + DASHBOARD_CARD("div[class^='w-sdc-dashboard-card ']"), + ASSET_TYPE_CSS("span[data-tests-id='asset-type']"); + + private String value; + + public String getValue() { + return value; + } + + private DashboardCardEnum(String value) { + this.value = value; + } + } + + public enum CatalogPageLeftPanelCategoryCheckbox { + GENERIC_CHECKBOX("span[data-tests-id='checkbox-resourcenewcategory.generic']"), + NETWORK_L2_3("span[data-tests-id='checkbox-resourcenewcategory.networkl2-3']"), + NETWORK_L4_PLUS("span[data-tests-id='checkbox-resourcenewcategory.networkl4+']"), + NETWORK_CONNECTIVITY("span[data-tests-id='checkbox-resourcenewcategory.networkconnectivity']"), + APPLICATION_L4_PLUS("span[data-tests-id='checkbox-resourcenewcategory.applicationl4+']"), + DCAE("span[data-tests-id='checkbox-resourcenewcategory.dcaecomponent']"); + + private String value; + + public String getValue() { + return value; + } + + private CatalogPageLeftPanelCategoryCheckbox(String value) { + this.value = value; + } + } + + public enum CatalogPageLeftPanelFilterTitle { + TYPE("span[data-tests-id='typeFilterTitle']"), + CATEGORIES("span[data-tests-id='categoriesFilterTitle']"), + STATUS("span[data-tests-id='statusFilterTitle']"); + + private String value; + + public String getValue() { + return value; + } + + private CatalogPageLeftPanelFilterTitle(String value) { + this.value = value; + } + } + + public enum CatalogPageLeftPanelSubCategoryCheckbox { + COMMON_NETWORK_RESOURCES("span[data-tests-id='checkbox-resourcenewcategory.networkl4+.commonnetworkresources']"), + ROUTER("span[data-tests-id='checkbox-resourcenewcategory.networkl2-3.router']"), + WAN_CONNECTORS("span[data-tests-id='checkbox-resourcenewcategory.networkl2-3.wanconnectors']"), + LAN_CONNECTORS("span[data-tests-id='checkbox-resourcenewcategory.networkl2-3.lanconnectors']"), + INFRASTRUCTERE_NETWORKl2_3("span[data-tests-id='checkbox-resourcenewcategory.networkl2-3.infrastructure']"), + GATEWAY("span[data-tests-id='checkbox-resourcenewcategory.networkl2-3.gateway']"), + NETWORK_ELEMENTS("span[data-tests-id='checkbox-resourcenewcategory.generic.networkelements']"), + ABSTRACT("span[data-tests-id='checkbox-resourcenewcategory.generic.abstract']"), + RULES("span[data-tests-id='checkbox-resourcenewcategory.generic.rules']"), + DATABASE("span[data-tests-id='checkbox-resourcenewcategory.generic.database']"), + INFRASTRUCTERE_GENERIC("span[data-tests-id='checkbox-resourcenewcategory.generic.infrastructure']"), + VIRTUAL_LINKS("span[data-tests-id='checkbox-resourcenewcategory.networkconnectivity.virtuallinks']"), + CONNECTION_POINTS("span[data-tests-id='checkbox-resourcenewcategory.networkconnectivity.connectionpoints']"), + APPLICATION_SERVER("span[data-tests-id='checkbox-resourcenewcategory.applicationl4+.applicationserver']"), + CALL_CONTROL("span[data-tests-id='checkbox-resourcenewcategory.applicationl4+.callcontrol']"), + MEDIASERVERS("span[data-tests-id='checkbox-resourcenewcategory.applicationl4+.mediaservers']"), + WEBSERVER("span[data-tests-id='checkbox-resourcenewcategory.applicationl4+.webserver']"), + LOAD_BALANCER("span[data-tests-id='checkbox-resourcenewcategory.applicationl4+.loadbalancer']"), + BORDER_ELEMENT("span[data-tests-id='checkbox-resourcenewcategory.applicationl4+.borderelement']"), + DATABASE_APPLIVATION_L4_PLUS("span[data-tests-id='checkbox-resourcenewcategory.applicationl4+.database']"), + FIREWALL("span[data-tests-id='checkbox-resourcenewcategory.applicationl4+.firewall']"), + DATABASE_DCAE("span[data-tests-id='checkbox-resourcenewcategory.dcaecomponent.database']"), + POLICY("span[data-tests-id='checkbox-resourcenewcategory.dcaecomponent.policy']"), + MICROSERVICE("span[data-tests-id='checkbox-resourcenewcategory.dcaecomponent.microservice']"), + SOURCE("span[data-tests-id='checkbox-resourcenewcategory.dcaecomponent.source']"), + COLLECTOR("span[data-tests-id='checkbox-resourcenewcategory.dcaecomponent.collector']"), + UTILITY("span[data-tests-id='checkbox-resourcenewcategory.dcaecomponent.utility']"), + ANALYTICS("span[data-tests-id='checkbox-resourcenewcategory.dcaecomponent.analytics']"); + + private String value; + + public String getValue() { + return value; + } + + private CatalogPageLeftPanelSubCategoryCheckbox(String value) { + this.value = value; + } + } + + public enum CompositionScreenEnum { + + CHANGE_VERSION("changeVersion", Arrays.asList()), + DEPLOYMENT_ARTIFACT_TAB("deployment-artifact-tab", Arrays.asList("Deployment Artifacts")), + ADD_ARTIFACT("add_Artifact_Button", Arrays.asList()), + SEARCH_ASSET("searchAsset", Arrays.asList()), + PROPERTIES_AND_ATTRIBUTES_TAB("properties-and-attributes-tab",Arrays.asList()), + MENU_INPUTS("sub-menu-button-inputs",Arrays.asList()), + MENU_TRIANGLE_DROPDOWN("triangle-dropdown", Arrays.asList()), + ARTIFACTS_LIST("artifactName", Arrays.asList()), + INFORMATION_ARTIFACTS("button[tooltip-content='Information Artifacts']", Arrays.asList("Informational Artifacts")), + API("button[tooltip-content='API']", Arrays.asList("API Artifacts")), + INFORMATION("button[tooltip-content='Information']", Arrays.asList("General Info", "Additional Information", "Tags")), + COMPOSITION("button[tooltip-content='Composition']", Arrays.asList("Composition")), + INPUTS("button[tooltip-content='Inputs']", Arrays.asList("")), + REQUIREMENTS_AND_CAPABILITIES("button[tooltip-content='Requirements and Capabilities']", Arrays.asList()), + INFORMATION_TAB("information-tab", Arrays.asList()), + CUSTOMIZATION_UUID("rightTab_customizationModuleUUID", Arrays.asList()); + + private String value; + private List<String> title; + + public String getValue() { + return value; + } + + public List<String> getTitle() { + return title; + } + + private CompositionScreenEnum(String value, List<String> title) { + this.value = value; + this.title = title; + } + } + + public enum ToscaArtifactsScreenEnum { + + TOSCA_MODEL("download-Tosca Model"), + TOSCA_TEMPLATE("download-Tosca Template"), + ARTIFACT_VERSION("version-"), + ARTIFACT_NAME("name-"), + ARTIFACT_TYPE("type-"), + ARTIFACT_DETAILS("details-"), + DOWNLOAD_ARTIFACT("download-"), + DOWNLOAD_CSAR("download-Tosca Model"); + + private String value; + + public String getValue() { + return value; + } + + private ToscaArtifactsScreenEnum(String value) { + this.value = value; + } + } + + public enum InformationalArtifactsService { + AFFINITY_RULES("artifact_Display_Name-Affinity Rules"), + CONTROL_LOOP_FUNCTIONS("artifact_Display_Name-Control Loop Functions"), + DEPLOYMENT_VOTING_RECORD("artifact_Display_Name-Deployment Voting Record"), + DIMENSIONING_INFO("artifact_Display_Name-Dimensioning Info"), + DISTRIBUTION_INSTRUCTION("artifact_Display_Name-Distribution Instructions"), + ENGINEERING_RULES("artifact_Display_Name-Engineering Rules (ERD)"), + OPERATIONAL_POLICES("artifact_Display_Name-Operational Policies"), + SERVICE_ARTIFACT_PLAN("artifact_Display_Name-Service Artifact Plan"), + SERVICE_QUESTIONNAIRE("artifact_Display_Name-Service Questionnaire"), + SERVICE_SECURITY_TEMPLATE("artifact_Display_Name-Service Security Template"), + SERVICE_SPECIFIC_POLICIES("artifact_Display_Name-Service-specific Policies"), + SUMMARY_OF_IMPACTS_TO_ECOMP("artifact_Display_Name-Summary of impacts to ECOMP elements,OSSs, BSSs"), + TD_CERTIFICATION_TEST_RESULTS("artifact_Display_Name-TD Certification Test Results"); + + private String value; + + public String getValue() { + return value; + } + + private InformationalArtifactsService(String value) { + this.value = value; + } + } + + public enum APIArtifactsService { + + CONFIGURATION("artifact_Display_Name-Configuration"), + INSTANTIATION("artifact_Display_Name-Instantiation"), + LOGGING("artifact_Display_Name-Logging"), + MONITORING("artifact_Display_Name-Monitoring"), + REPORTING("artifact_Display_Name-Reporting"), + TESTING("artifact_Display_Name-Testing"); + + private String value; + + public String getValue() { + return value; + } + + private APIArtifactsService(String value) { + this.value = value; + } + } + + public enum DeploymentArtifactCompositionRightMenu { + ARTIFACT_NAME("artifactName-"), + ARTIFACT_DISPLAY_NAME("artifact_Display_Name-"), + DOWNLOAD("download_"), + DELETE("delete_"), + ADD_ARTIFACT_BUTTON("add_Artifact_Button"), + EDIT_PARAMETERS_OF_ARTIFACT("edit-parameters-of-"), + ARTIFACT_ITEM("artifact-item-"), + ARTIFACT_ENV("heat_env_"); + + private String value; + + public String getValue() { + return value; + } + + private DeploymentArtifactCompositionRightMenu(String value) { + this.value = value; + } + + } + + public enum InputsScreenService { + ADD_SELECTED_INPUTS_BTN("add-inputs-to-service-button"), + VF_INSTANCE_ROWS("expand-collapse[expanded-selector^='.vf-instance-list.']"), + VF_INSTANCE_ROW_NAME("span[class^='title-text']"), + VF_INSTANCE_INPUTS("div[class^='vf-instance-list ']"), + VF_INSTANCE_INPUT("div[class^='input-row ng-scope']"), + VF_INSTNCE_PROPERTY_NAME("div[class^='title-text']"), + INPUT_CHECKBOX("span[class^='tlv-checkbox-label']"), + SERVICE_INPUT_ROW("div[class^='service-input-row input-row']"), + DELETE_INPUT_BTN("span[class$='remove-input-icon']"), + RESOURCE_INSTANCE_PROPERTY_NAME("propertyName_"), + RESOURCE_INSTANCE_PROPERTY_TYPE("propertyType_"), + RESOURCE_INSTANCE_PROPERTY_CHECKBOX("propertyCheckbox_"), + SERVICE_INPUTS_DELETE_BUTTON("deleteInput_") + ; + + private String value; + + public String getValue() { + return value; + } + + private InputsScreenService(String value) { + this.value = value; + } + + } + + public enum DeploymentScreen { + MODULES("span[class^='expand-collapse-title-text']"), + MEMBERS("div[class^='expand-collapse-sub-title']"), + PROPERTIES("list-of-Properties"), + ARTIFACTS("list-of-Artifacts"), + BUTTON_PROPERTIES("div[data-tests-id='list-of-Properties'] span[class^='hand']"), + BUTTON_ARTIFACTS("div[data-tests-id='list-of-Artifacts'] span[class^='hand']"), + PROPERTY_NAMES("div[data-tests-id='selected-module-property-name'] span"), + PROPERTY_TYPES("selected-module-property-type"), + PROPERTY_SCHEMA_TYPE("selected-module-property-schema-type"), + ARTIFACT_NAME("selected-module-artifact-name"), + ARTIFACT_UUID("selected-module-artifact-uuid"), + ARTIFACT_VERSION("selected-module-artifact-version"), + PENCIL_ICON("edit-name-popover-icon"), + MODULE_NAME("selected-module-name"), + MODULE_ID("selected-module-group-uuid"), + RESOURCE_NAME_ON_POPOVER("popover-vfinstance-name"), + MODULE_NAME_ON_POPOVER("popover-module-name"), + NAME_INPUT("popover-heat-name"), + SAVE("popover-save-button"), + CANCEL("popover-close-button"), + X_BUTTON("popover-x-button"); + + private String value; + + public String getValue() { + return value; + } + + private DeploymentScreen(String value) { + this.value = value; + } + } + + public enum ImportVfRepository { + SEARCH("onboarding-search"), + IMPORT_VSP("import-csar"), + DOWNLOAD_CSAR("download-csar"), + UPDATE_VSP("update-csar"); + + private String value; + + public String getValue() { + return value; + } + + private ImportVfRepository(String value) { + this.value = value; + } + } + + public enum EnvParameterView { + SEARCH_ENV_PARAM_NAME("search-env-param-name"), + ENV_CURRENT_VALUE("value-field-of-"),//value-field-of-oam_volume_name_0 - parameter name + ENV_DEFAULT_VALUE("default-value-of-");// default-value-of-vnf_name + + private String value; + + public String getValue() { + return value; + } + + private EnvParameterView(String value) { + this.value = value; + } + } + + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/LocalLoginFieldsIds.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/LocalLoginFieldsIds.java new file mode 100644 index 000000000..a3ede39cb --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/LocalLoginFieldsIds.java @@ -0,0 +1,30 @@ +package org.onap.sdc.ci.tests.datatypes; + +public class LocalLoginFieldsIds { + + private String userIdFieldName; + private String passwordFieldName; + + + public LocalLoginFieldsIds(String userIdFieldName, String passwordFieldName) { + super(); + this.userIdFieldName = userIdFieldName; + this.passwordFieldName = passwordFieldName; + } + + + public String getUserIdFieldName() { + return userIdFieldName; + } + public void setUserIdFieldName(String userIdFieldName) { + this.userIdFieldName = userIdFieldName; + } + public String getPasswordFieldName() { + return passwordFieldName; + } + public void setPasswordFieldName(String passwordFieldName) { + this.passwordFieldName = passwordFieldName; + } + + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/PropertyHeatMetaDefinition.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/PropertyHeatMetaDefinition.java new file mode 100644 index 000000000..a39dffc13 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/PropertyHeatMetaDefinition.java @@ -0,0 +1,63 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +public class PropertyHeatMetaDefinition { + + String name; + boolean value; + + public PropertyHeatMetaDefinition() { + super(); + } + + + + public String getName() { + return name; + } + + + + public void setName(String name) { + this.name = name; + } + + + + public boolean getValue() { + return value; + } + + + + public void setValue(boolean value) { + this.value = value; + } + + + + @Override + public String toString() { + return "PropertyHeatMetaDefinition [name=" + name + ", value=" + value + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceAssetStructure.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceAssetStructure.java new file mode 100644 index 000000000..3fef99183 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceAssetStructure.java @@ -0,0 +1,76 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +public class ResourceAssetStructure extends AssetStructure { + + private String subCategory; + private String resourceType; + protected String lastUpdaterFullName; + protected String toscaResourceName; + + public ResourceAssetStructure() { + super(); + } + + public ResourceAssetStructure(String uuid, String invariantUUID, String name, String version, String toscaModelURL, + String category, String lifecycleState, String lastUpdaterUserId) { + super(uuid, invariantUUID, name, version, toscaModelURL, category, lifecycleState, lastUpdaterUserId); + } + + @Override + public String toString() { + return "ResourceAssetStructure [subCategory=" + subCategory + ", resourceType=" + resourceType + "]"; + } + + public String getLastUpdaterFullName() { + return lastUpdaterFullName; + } + + public void setLastUpdaterFullName(String lastUpdaterFullName) { + this.lastUpdaterFullName = lastUpdaterFullName; + } + + public String getToscaResourceName() { + return toscaResourceName; + } + + public void setToscaResourceName(String toscaResourceName) { + this.toscaResourceName = toscaResourceName; + } + + public String getSubCategory() { + return subCategory; + } + + public void setSubCategory(String subCategory) { + this.subCategory = subCategory; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceDetailedAssetStructure.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceDetailedAssetStructure.java new file mode 100644 index 000000000..7d5914b00 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceDetailedAssetStructure.java @@ -0,0 +1,71 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.List; + +public class ResourceDetailedAssetStructure extends ResourceAssetStructure { + + private List<ResourceInstanceAssetStructure> resources; + private List<ArtifactAssetStructure> artifacts; + + public ResourceDetailedAssetStructure() { + super(); + } + + public ResourceDetailedAssetStructure(String lastUpdaterFullName, String toscaResourceName, + List<ResourceInstanceAssetStructure> resources, List<ArtifactAssetStructure> artifacts) { + super(); + this.lastUpdaterFullName = lastUpdaterFullName; + this.toscaResourceName = toscaResourceName; + this.resources = resources; + this.artifacts = artifacts; + } + + public List<ResourceInstanceAssetStructure> getResources() { + return resources; + } + + public void setResources(List<ResourceInstanceAssetStructure> resources) { + this.resources = resources; + } + + public List<ArtifactAssetStructure> getArtifacts() { + return artifacts; + } + + public void setArtifacts(List<ArtifactAssetStructure> artifacts) { + this.artifacts = artifacts; + } + + @Override + public String toString() { + return "ResourceDetailedAssetStructure [lastUpdaterFullName=" + lastUpdaterFullName + ", toscaResourceName=" + + toscaResourceName + ", resources=" + resources + ", artifacts=" + artifacts + ", toString()=" + + super.toString() + ", getSubCategory()=" + getSubCategory() + ", getResourceType()=" + + getResourceType() + ", getUuid()=" + getUuid() + ", getInvariantUUID()=" + getInvariantUUID() + + ", getName()=" + getName() + ", getVersion()=" + getVersion() + ", getToscaModelURL()=" + + getToscaModelURL() + ", getCategory()=" + getCategory() + ", getLifecycleState()=" + + getLifecycleState() + ", getLastUpdaterUserId()=" + getLastUpdaterUserId() + ", getClass()=" + + getClass() + ", hashCode()=" + hashCode() + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java new file mode 100644 index 000000000..f6d354c1e --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceExternalReqDetails.java @@ -0,0 +1,104 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.List; + +import org.onap.sdc.ci.tests.devObjects.ResourceTypeEnum; + +public class ResourceExternalReqDetails extends ComponentReqDetails { + String vendorName; + String vendorRelease; + String category; + String subcategory; + + private String resourceType = ResourceTypeEnum.VFC.toString(); // Default + // value + public ResourceExternalReqDetails() { + super(); + } + + + public ResourceExternalReqDetails(String resourceName, String description, List<String> tags, + String vendorName, String vendorRelease, String contactId, String icon, + String resourceType, String resourceCategory, String resourceSubcategory) { + super(); + this.resourceType = resourceType; + this.name = resourceName; + this.description = description; + this.tags = tags; + this.vendorName = vendorName; + this.vendorRelease = vendorRelease; + this.contactId = contactId; + this.icon = icon; + this.category = resourceCategory; + this.subcategory = resourceSubcategory; + } + + public String getVendorName() { + return vendorName; + } + + public void setVendorName(String vendorName) { + this.vendorName = vendorName; + } + + public String getVendorRelease() { + return vendorRelease; + } + + public void setVendorRelease(String vendorRelease) { + this.vendorRelease = vendorRelease; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getSubcategory() { + return subcategory; + } + + public void setSubcategory(String subcategory) { + this.subcategory = subcategory; + } + + + @Override + public String toString() { + return "ResourceReqDetails [name=" + name + ", vendorName=" + vendorName + + ", vendorRelease=" + vendorRelease + ", version=" + version + + ", resourceType=" + resourceType + ", category=" + category + ", subcategory=" + subcategory +"]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java new file mode 100644 index 000000000..5019d19b7 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceInstanceAssetStructure.java @@ -0,0 +1,116 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.List; + +public class ResourceInstanceAssetStructure { + + String resourceInstanceName; + String resourceName; + String resourceInvariantUUID; + String resourceVersion; + String resoucreType; + String resourceUUID; + List<ArtifactAssetStructure> artifacts; + + public ResourceInstanceAssetStructure() { + super(); + } + + public ResourceInstanceAssetStructure(String resourceInstanceName, String resourceName, + String resourceInvariantUUID, String resourceVersion, String resoucreType, String resourceUUID, + List<ArtifactAssetStructure> artifacts) { + super(); + this.resourceInstanceName = resourceInstanceName; + this.resourceName = resourceName; + this.resourceInvariantUUID = resourceInvariantUUID; + this.resourceVersion = resourceVersion; + this.resoucreType = resoucreType; + this.resourceUUID = resourceUUID; + this.artifacts = artifacts; + } + + public String getResourceInstanceName() { + return resourceInstanceName; + } + + public void setResourceInstanceName(String resourceInstanceName) { + this.resourceInstanceName = resourceInstanceName; + } + + public String getResourceName() { + return resourceName; + } + + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + + public String getResourceInvariantUUID() { + return resourceInvariantUUID; + } + + public void setResourceInvariantUUID(String resourceInvariantUUID) { + this.resourceInvariantUUID = resourceInvariantUUID; + } + + public String getResourceVersion() { + return resourceVersion; + } + + public void setResourceVersion(String resourceVersion) { + this.resourceVersion = resourceVersion; + } + + public String getResoucreType() { + return resoucreType; + } + + public void setResoucreType(String resoucreType) { + this.resoucreType = resoucreType; + } + + public String getResourceUUID() { + return resourceUUID; + } + + public void setResourceUUID(String resourceUUID) { + this.resourceUUID = resourceUUID; + } + + public List<ArtifactAssetStructure> getArtifacts() { + return artifacts; + } + + public void setArtifacts(List<ArtifactAssetStructure> artifacts) { + this.artifacts = artifacts; + } + + @Override + public String toString() { + return "ResourceInstanceAssetStructure [resourceInstanceName=" + resourceInstanceName + ", resourceName=" + + resourceName + ", resourceInvariantUUID=" + resourceInvariantUUID + ", resourceVersion=" + + resourceVersion + ", resoucreType=" + resoucreType + ", resourceUUID=" + resourceUUID + ", artifacts=" + + artifacts + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceReqDetails.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceReqDetails.java new file mode 100644 index 000000000..7a3dbd469 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceReqDetails.java @@ -0,0 +1,194 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.List; + +import org.onap.sdc.ci.tests.devObjects.ResourceTypeEnum; + +public class ResourceReqDetails extends ComponentReqDetails { + List<String> derivedFrom; + String vendorName; + String vendorRelease; + + // Unsettable/unupdatable fields + + Boolean isAbstract; + Boolean isHighestVersion; + String cost; + String licenseType; + String toscaResourceName; + + private String resourceType = ResourceTypeEnum.VFC.toString(); // Default + // value + + public ResourceReqDetails() { + super(); + } + + + public ResourceReqDetails(String resourceName, String description, List<String> tags, String category, + List<String> derivedFrom, String vendorName, String vendorRelease, String contactId, String icon) { + this(resourceName, description, tags, category, derivedFrom, vendorName, vendorRelease, contactId, icon, + ResourceTypeEnum.VFC.toString()); + } + + // new + public ResourceReqDetails(String resourceName, String description, List<String> tags, String category, + List<String> derivedFrom, String vendorName, String vendorRelease, String contactId, String icon, + String resourceType) { + super(); + this.resourceType = resourceType; + this.name = resourceName; + this.description = description; + this.tags = tags; + // this.category = category; + this.derivedFrom = derivedFrom; + this.vendorName = vendorName; + this.vendorRelease = vendorRelease; + this.contactId = contactId; + this.icon = icon; + if (category != null) { + String[] arr = category.split("/"); + if (arr.length == 2) { + addCategoryChain(arr[0], arr[1]); + } + } + this.toscaResourceName = resourceName; + } + + public ResourceReqDetails(ResourceReqDetails originalResource, String version) { + super(); + this.name = originalResource.getName(); + this.description = originalResource.getDescription(); + this.tags = originalResource.getTags(); + // this.category = originalResource.getCategory(); + this.derivedFrom = originalResource.getDerivedFrom(); + this.vendorName = originalResource.getVendorName(); + this.vendorRelease = originalResource.getVendorRelease(); + this.contactId = originalResource.getContactId(); + this.icon = originalResource.getIcon(); + this.version = version; + this.uniqueId = originalResource.getUniqueId(); + this.categories = originalResource.getCategories(); + this.toscaResourceName = originalResource.getToscaResourceName(); + this.resourceType = originalResource.getResourceType(); + } + + public ResourceReqDetails(String resourceName, List<String> derivedFrom, String vendorName, String vendorRelease, + String resourceVersion, Boolean isAbstract, Boolean isHighestVersion, String cost, String licenseType, + String resourceType) { + super(); + this.name = resourceName; + this.derivedFrom = derivedFrom; + this.vendorName = vendorName; + this.vendorRelease = vendorRelease; + this.version = resourceVersion; + this.isAbstract = isAbstract; + this.isHighestVersion = isHighestVersion; + this.cost = cost; + this.licenseType = licenseType; + this.resourceType = resourceType; + this.toscaResourceName = resourceName; + } + + public String getToscaResourceName() { + return toscaResourceName; + } + + public void setToscaResourceName(String toscaResourceName) { + this.toscaResourceName = toscaResourceName; + } + + public List<String> getDerivedFrom() { + return derivedFrom; + } + + public void setDerivedFrom(List<String> derivedFrom) { + this.derivedFrom = derivedFrom; + } + + public String getVendorName() { + return vendorName; + } + + public void setVendorName(String vendorName) { + this.vendorName = vendorName; + } + + public String getVendorRelease() { + return vendorRelease; + } + + public void setVendorRelease(String vendorRelease) { + this.vendorRelease = vendorRelease; + } + + public String getCost() { + return cost; + } + + public void setCost(String cost) { + this.cost = cost; + } + + public String getLicenseType() { + return licenseType; + } + + public void setLicenseType(String licenseType) { + this.licenseType = licenseType; + } + + // Unupdatable fields - to check that they are not updated + public void setIsAbstract(Boolean isAbstract) { + this.isAbstract = isAbstract; + } + + public void setIsHighestVersion(Boolean isHighestVersion) { + this.isHighestVersion = isHighestVersion; + } + + public Boolean getIsAbstract() { + return isAbstract; + } + + public Boolean getIsHighestVersion() { + return isHighestVersion; + } + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + @Override + public String toString() { + return "ResourceReqDetails [name=" + name + ", derivedFrom=" + derivedFrom + ", vendorName=" + vendorName + + ", vendorRelease=" + vendorRelease + ", version=" + version + ", isAbstract=" + isAbstract + + ", isHighestVersion=" + isHighestVersion + ", cost=" + cost + ", licenseType=" + licenseType + + ", resourceType=" + resourceType + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceRespJavaObject.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceRespJavaObject.java new file mode 100644 index 000000000..525ca794c --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ResourceRespJavaObject.java @@ -0,0 +1,369 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.List; + +import org.onap.sdc.ci.tests.devObjects.CategoryDefinition; + +public class ResourceRespJavaObject { + String uniqueId; + String name; + String version; + String creatorUserId; + String creatorFullName; + String lastUpdaterUserId; + String lastUpdaterFullName; + String description; + String icon; + List<String> tags; + String isHighestVersion; + String creationDate; + String lastUpdateDate; + // String category; + String lifecycleState; + List<String> derivedFrom; + String vendorName; + String vendorRelease; + String contactId; + String abstractt; + String highestVersion; + List<String> artifacts; + List<String> interfaces; + String uuid; + String cost; + String licenseType; + String resourceType; + List<CategoryDefinition> categories; + + public String getResourceType() { + return resourceType; + } + + public void setResourceType(String resourceType) { + this.resourceType = resourceType; + } + + public ResourceRespJavaObject(String uniqueId, String resourceName, String resourceVersion, String creatorUserId, + String creatorFullName, String lastUpdaterUserId, String lastUpdaterFullName, String description, + String icon, List<String> tags, String isHighestVersion, String creationDate, String lastUpdateDate, + String category, String lifecycleState, List<String> derivedFrom, String vendorName, String vendorRelease, + String contactId, String abstractt, String highestVersion, List<String> artifacts, List<String> interfaces, + String uuid, String cost, String licenseType, String resourceType) { + super(); + this.uniqueId = uniqueId; + this.name = resourceName; + this.version = resourceVersion; + this.creatorUserId = creatorUserId; + this.creatorFullName = creatorFullName; + this.lastUpdaterUserId = lastUpdaterUserId; + this.lastUpdaterFullName = lastUpdaterFullName; + this.description = description; + this.icon = icon; + this.tags = tags; + this.isHighestVersion = isHighestVersion; + this.creationDate = creationDate; + this.lastUpdateDate = lastUpdateDate; + // this.category = category; + this.lifecycleState = lifecycleState; + this.derivedFrom = derivedFrom; + this.vendorName = vendorName; + this.vendorRelease = vendorRelease; + this.contactId = contactId; + this.abstractt = abstractt; + this.highestVersion = highestVersion; + this.artifacts = artifacts; + this.interfaces = interfaces; + this.uuid = uuid; + this.cost = cost; + this.licenseType = licenseType; + this.resourceType = resourceType; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + public String getCost() { + return cost; + } + + public void setCost(String cost) { + this.cost = cost; + } + + public String getLicenseType() { + return licenseType; + } + + public void setLicenseType(String licenseType) { + this.licenseType = licenseType; + } + + public String getUuid() { + return uuid; + } + + public String setUuid() { + return uuid; + } + + public List<String> getInterfaces() { + return interfaces; + } + + public void setInterfaces(List<String> interfaces) { + this.interfaces = interfaces; + } + + public List<String> getArtifacts() { + return artifacts; + } + + public void setArtifacts(List<String> artifacts) { + this.artifacts = artifacts; + } + + public ResourceRespJavaObject() { + super(); + // TODO Auto-generated constructor stub + } + + // public ResourceRespJavaObject(String uniqueId, String resourceName, + // String resourceVersion, String creatorUserId, + // String creatorFullName, String lastUpdaterUserId, + // String lastUpdaterFullName, String description, String icon, + // List<String> tags, String isHighestVersion, String creationDate, + // String lastUpdateDate, String category, String lifecycleState, + // List<String> derivedFrom, String vendorName, String vendorRelease, + // String contactId, String abstractt, String highestVersion) { + // super(); + // this.uniqueId = uniqueId; + // this.resourceName = resourceName; + // this.resourceVersion = resourceVersion; + // this.creatorUserId = creatorUserId; + // this.creatorFullName = creatorFullName; + // this.lastUpdaterUserId = lastUpdaterUserId; + // this.lastUpdaterFullName = lastUpdaterFullName; + // this.description = description; + // this.icon = icon; + // this.tags = tags; + // this.isHighestVersion = isHighestVersion; + // this.creationDate = creationDate; + // this.lastUpdateDate = lastUpdateDate; + // this.category = category; + // this.lifecycleState = lifecycleState; + // this.derivedFrom = derivedFrom; + // this.vendorName = vendorName; + // this.vendorRelease = vendorRelease; + // this.contactId = contactId; + // this.abstractt = abstractt; + // this.highestVersion = highestVersion; + // } + public String getUniqueId() { + return uniqueId; + } + + public void setUniqueId(String uniqueId) { + this.uniqueId = uniqueId; + } + + public String getName() { + return name; + } + + public void setName(String resourceName) { + this.name = resourceName; + } + + public String getVersion() { + return version; + } + + public void setVersion(String resourceVersion) { + this.version = resourceVersion; + } + + public String getCreatorUserId() { + return creatorUserId; + } + + public void setCreatorUserId(String creatorUserId) { + this.creatorUserId = creatorUserId; + } + + public String getCreatorFullName() { + return creatorFullName; + } + + public void setCreatorFullName(String creatorFullName) { + this.creatorFullName = creatorFullName; + } + + public String getLastUpdaterUserId() { + return lastUpdaterUserId; + } + + public void setLastUpdaterUserId(String lastUpdaterUserId) { + this.lastUpdaterUserId = lastUpdaterUserId; + } + + public String getLastUpdaterFullName() { + return lastUpdaterFullName; + } + + public void setLastUpdaterFullName(String lastUpdaterFullName) { + this.lastUpdaterFullName = lastUpdaterFullName; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public List<String> getTags() { + return tags; + } + + public void setTags(List<String> tags) { + this.tags = tags; + } + + public String getIsHighestVersion() { + return isHighestVersion; + } + + public void setIsHighestVersion(String isHighestVersion) { + this.isHighestVersion = isHighestVersion; + } + + public String getCreationDate() { + return creationDate; + } + + public void setCreationDate(String creationDate) { + this.creationDate = creationDate; + } + + public String getLastUpdateDate() { + return lastUpdateDate; + } + + public void setLastUpdateDate(String lastUpdateDate) { + this.lastUpdateDate = lastUpdateDate; + } + + // public String getCategory() { + // return category; + // } + // public void setCategory(String category) { + // this.category = category; + // } + public String getLifecycleState() { + return lifecycleState; + } + + public void setLifecycleState(String lifecycleState) { + this.lifecycleState = lifecycleState; + } + + public List<String> getDerivedFrom() { + return derivedFrom; + } + + public void setDerivedFrom(List<String> derivedFrom) { + this.derivedFrom = derivedFrom; + } + + public String getVendorName() { + return vendorName; + } + + public void setVendorName(String vendorName) { + this.vendorName = vendorName; + } + + public String getVendorRelease() { + return vendorRelease; + } + + public void setVendorRelease(String vendorRelease) { + this.vendorRelease = vendorRelease; + } + + public String getContactId() { + return contactId; + } + + public void setContactId(String contactId) { + this.contactId = contactId; + } + + public String getAbstractt() { + return abstractt; + } + + public void setAbstractt(String abstractt) { + this.abstractt = abstractt; + } + + public String getHighestVersion() { + return highestVersion; + } + + public void setHighestVersion(String highestVersion) { + this.highestVersion = highestVersion; + } + + public List<CategoryDefinition> getCategories() { + return categories; + } + + public void setCategories(List<CategoryDefinition> categories) { + this.categories = categories; + } + + @Override + public String toString() { + return "ResourceRespJavaObject [uniqueId=" + uniqueId + ", resourceName=" + name + ", resourceVersion=" + + version + ", creatorUserId=" + creatorUserId + ", creatorFullName=" + creatorFullName + + ", lastUpdaterUserId=" + lastUpdaterUserId + ", lastUpdaterFullName=" + lastUpdaterFullName + + ", description=" + description + ", icon=" + icon + ", tags=" + tags + ", isHighestVersion=" + + isHighestVersion + ", creationDate=" + creationDate + ", lastUpdateDate=" + lastUpdateDate + + ", lifecycleState=" + lifecycleState + ", derivedFrom=" + derivedFrom + ", vendorName=" + vendorName + + ", vendorRelease=" + vendorRelease + ", contactId=" + contactId + ", abstractt=" + abstractt + + ", highestVersion=" + highestVersion + ", artifacts=" + artifacts + ", interfaces=" + interfaces + + ", uuid=" + uuid + ", cost=" + cost + ", licenseType=" + licenseType + ", resourceType=" + + resourceType + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceAssetStructure.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceAssetStructure.java new file mode 100644 index 000000000..cfe7addbe --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceAssetStructure.java @@ -0,0 +1,49 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +public class ServiceAssetStructure extends AssetStructure { + + private String distributionStatus; + + public ServiceAssetStructure() { + super(); + } + + public ServiceAssetStructure(String uuid, String invariantUUID, String name, String version, String toscaModelURL, + String category, String lifecycleState, String lastUpdaterUserId) { + super(uuid, invariantUUID, name, version, toscaModelURL, category, lifecycleState, lastUpdaterUserId); + } + + @Override + public String toString() { + return "ServiceAssetStructure [distributionStatus=" + distributionStatus + "]"; + } + + public String getDistributionStatus() { + return distributionStatus; + } + + public void setDistributionStatus(String distributionStatus) { + this.distributionStatus = distributionStatus; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceDetailedAssetStructure.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceDetailedAssetStructure.java new file mode 100644 index 000000000..f699aa3f0 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceDetailedAssetStructure.java @@ -0,0 +1,78 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.List; + +public class ServiceDetailedAssetStructure extends ServiceAssetStructure { + + String lastUpdaterFullName; + List<ResourceInstanceAssetStructure> resources; + List<ArtifactAssetStructure> artifacts; + + public ServiceDetailedAssetStructure() { + super(); + } + + public ServiceDetailedAssetStructure(String uuid, String invariantUUID, String name, String version, + String toscaModelURL, String category, String lifecycleState, String lastUpdaterUserId) { + super(uuid, invariantUUID, name, version, toscaModelURL, category, lifecycleState, lastUpdaterUserId); + } + + public ServiceDetailedAssetStructure(String lastUpdaterFullName, List<ResourceInstanceAssetStructure> resources, + List<ArtifactAssetStructure> artifacts) { + super(); + this.lastUpdaterFullName = lastUpdaterFullName; + this.resources = resources; + this.artifacts = artifacts; + } + + public String getLastUpdaterFullName() { + return lastUpdaterFullName; + } + + public void setLastUpdaterFullName(String lastUpdaterFullName) { + this.lastUpdaterFullName = lastUpdaterFullName; + } + + public List<ResourceInstanceAssetStructure> getResources() { + return resources; + } + + public void setResources(List<ResourceInstanceAssetStructure> resources) { + this.resources = resources; + } + + public List<ArtifactAssetStructure> getArtifacts() { + return artifacts; + } + + public void setArtifacts(List<ArtifactAssetStructure> artifacts) { + this.artifacts = artifacts; + } + + @Override + public String toString() { + return "ServiceDetailedAssetStructure [lastUpdaterFullName=" + lastUpdaterFullName + ", resources=" + resources + + ", artifacts=" + artifacts + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceDistributionStatus.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceDistributionStatus.java new file mode 100644 index 000000000..783e0175d --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceDistributionStatus.java @@ -0,0 +1,80 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +public class ServiceDistributionStatus { + + private String distributionID; + private String timestamp; + private String userId; + private String deployementStatus; + + public ServiceDistributionStatus() { + super(); + // TODO Auto-generated constructor stub + } + + public ServiceDistributionStatus(String distributionID, String timestamp, String userId, String deployementStatus) { + super(); + this.distributionID = distributionID; + this.timestamp = timestamp; + this.userId = userId; + this.deployementStatus = deployementStatus; + } + + @Override + public String toString() { + return "ServiceDistributionStatus [distributionID=" + distributionID + ", timestamp=" + timestamp + ", userId=" + userId + ", deployementStatus=" + deployementStatus + "]"; + } + + public String getDistributionID() { + return distributionID; + } + + public void setDistributionID(String distributionID) { + this.distributionID = distributionID; + } + + public String getTimestamp() { + return timestamp; + } + + public void setTimestamp(String timestamp) { + this.timestamp = timestamp; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getDeployementStatus() { + return deployementStatus; + } + + public void setDeployementStatus(String deployementStatus) { + this.deployementStatus = deployementStatus; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceReqDetails.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceReqDetails.java new file mode 100644 index 000000000..6dc804987 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceReqDetails.java @@ -0,0 +1,74 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.ArrayList; + +import org.onap.sdc.ci.tests.devObjects.CategoryDefinition; + +public class ServiceReqDetails extends ComponentReqDetails { + + public ServiceReqDetails(String serviceName, String category, ArrayList<String> tags, String description, + String contactId, String icon) { + this.name = serviceName; + // this.category = category; + this.tags = tags; + this.description = description; + this.contactId = contactId; + this.icon = icon; + projectCode = "12345"; + CategoryDefinition categoryDefinition = new CategoryDefinition(); + categoryDefinition.setName(category); + categories = new ArrayList<>(); + categories.add(categoryDefinition); + + } + + public ServiceReqDetails() { + contactId = "aa1234"; + projectCode = "12345"; + } + + public ServiceReqDetails(ServiceReqDetails a, String newServiceName) { + a.setName(newServiceName); + } + + @Override + public String toString() { + return "ServiceDetails [name=" + name + ", category=" + getCategory() + ", tags=" + tags + ", description=" + + description + ", contactId=" + contactId + ", icon=" + icon + "]"; + } + + public ServiceReqDetails(ServiceReqDetails aService) { + this(aService.getName(), aService.getCategory(), (ArrayList<String>) aService.getTags(), + aService.getDescription(), aService.getContactId(), aService.getIcon()); + uniqueId = aService.getUniqueId(); + version = aService.getVersion(); + } + + public String getCategory() { + if (categories != null && categories.size() >= 1) { + return categories.get(0).getName(); + } + return null; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceRespJavaObject.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceRespJavaObject.java new file mode 100644 index 000000000..c401c4ec0 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/ServiceRespJavaObject.java @@ -0,0 +1,267 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import java.util.ArrayList; + +public class ServiceRespJavaObject { + + String category; + String creatorUserId; + String creatorFullName; + String lastUpdaterUserId; + String lastUpdaterFullName; + String serviceName; + String version; + String creationDate; + String icon; + String name; + String description; + ArrayList<String> tags; + String uniqueId; + String lastUpdateDate; + String contactId; + String vendorName; + String vendorRelease; + String lifecycleState; + String highestVersion; + ArrayList<String> artifacts; + ArrayList<String> ResourceInstances; + ArrayList<String> ResourceInstancesRelations; + + public ServiceRespJavaObject() { + super(); + // TODO Auto-generated constructor stub + } + + public ServiceRespJavaObject(String category, String creatorUserId, String creatorFullName, + String lastUpdaterUserId, String lastUpdaterFullName, String serviceName, String version, + String creationDate, String icon, String name, String description, ArrayList<String> tags, String uniqueId, + String lastUpdateDate, String contactId, String vendorName, String vendorRelease, String lifecycleState, + String highestVersion, ArrayList<String> artifacts, ArrayList<String> resourceInstances, + ArrayList<String> resourceInstancesRelations) { + super(); + this.category = category; + this.creatorUserId = creatorUserId; + this.creatorFullName = creatorFullName; + this.lastUpdaterUserId = lastUpdaterUserId; + this.lastUpdaterFullName = lastUpdaterFullName; + this.serviceName = serviceName; + this.version = version; + this.creationDate = creationDate; + this.icon = icon; + this.name = name; + this.description = description; + this.tags = tags; + this.uniqueId = uniqueId; + this.lastUpdateDate = lastUpdateDate; + this.contactId = contactId; + this.vendorName = vendorName; + this.vendorRelease = vendorRelease; + this.lifecycleState = lifecycleState; + this.highestVersion = highestVersion; + this.artifacts = artifacts; + ResourceInstances = resourceInstances; + ResourceInstancesRelations = resourceInstancesRelations; + } + + public String getCategory() { + return category; + } + + public void setCategory(String category) { + this.category = category; + } + + public String getCreatorUserId() { + return creatorUserId; + } + + public void setCreatorUserId(String creatorUserId) { + this.creatorUserId = creatorUserId; + } + + public String getCreatorFullName() { + return creatorFullName; + } + + public void setCreatorFullName(String creatorFullName) { + this.creatorFullName = creatorFullName; + } + + public String getLastUpdaterUserId() { + return lastUpdaterUserId; + } + + public void setLastUpdaterUserId(String lastUpdaterUserId) { + this.lastUpdaterUserId = lastUpdaterUserId; + } + + public String getLastUpdaterFullName() { + return lastUpdaterFullName; + } + + public void setLastUpdaterFullName(String lastUpdaterFullName) { + this.lastUpdaterFullName = lastUpdaterFullName; + } + + public String getVersion() { + return version; + } + + public void setVersion(String version) { + this.version = version; + } + + public String getCreationDate() { + return creationDate; + } + + public void setCreationDate(String creationDate) { + this.creationDate = creationDate; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public ArrayList<String> getTags() { + return tags; + } + + public void setTags(ArrayList<String> tags) { + this.tags = tags; + } + + public String getUniqueId() { + return uniqueId; + } + + public void setUniqueId(String uniqueId) { + this.uniqueId = uniqueId; + } + + public String getLastUpdateDate() { + return lastUpdateDate; + } + + public void setLastUpdateDate(String lastUpdateDate) { + this.lastUpdateDate = lastUpdateDate; + } + + public String getContactId() { + return contactId; + } + + public void setContactId(String contactId) { + this.contactId = contactId; + } + + public String getVendorName() { + return vendorName; + } + + public void setVendorName(String vendorName) { + this.vendorName = vendorName; + } + + public String getVendorRelease() { + return vendorRelease; + } + + public void setVendorRelease(String vendorRelease) { + this.vendorRelease = vendorRelease; + } + + public String getLifecycleState() { + return lifecycleState; + } + + public void setLifecycleState(String lifecycleState) { + this.lifecycleState = lifecycleState; + } + + public String getHighestVersion() { + return highestVersion; + } + + public void setHighestVersion(String highest) { + this.highestVersion = highest; + } + + public ArrayList<String> getArtifacts() { + return artifacts; + } + + public void setArtifacts(ArrayList<String> artifacts) { + this.artifacts = artifacts; + } + + public ArrayList<String> getResourceInstances() { + return ResourceInstances; + } + + public void setResourceInstances(ArrayList<String> resourceInstances) { + ResourceInstances = resourceInstances; + } + + public ArrayList<String> getResourceInstancesRelations() { + return ResourceInstancesRelations; + } + + public void setResourceInstancesRelations(ArrayList<String> resourceInstancesRelations) { + ResourceInstancesRelations = resourceInstancesRelations; + } + + @Override + public String toString() { + return "ServiceRespJavaObject [category=" + category + ", creatorUserId=" + creatorUserId + ", creatorFullName=" + + creatorFullName + ", lastUpdaterUserId=" + lastUpdaterUserId + ", lastUpdaterFullName=" + + lastUpdaterFullName + ", serviceName=" + serviceName + ", version=" + version + ", creationDate=" + + creationDate + ", icon=" + icon + ", name=" + name + ", description=" + description + ", tags=" + tags + + ", uniqueId=" + uniqueId + ", lastUpdateDate=" + lastUpdateDate + ", contactId=" + contactId + + ", vendorName=" + vendorName + ", vendorRelease=" + vendorRelease + ", lifecycleState=" + + lifecycleState + ", lifecycleState=" + lifecycleState + ", artifacts=" + artifacts + + ", ResourceInstances=" + ResourceInstances + ", ResourceInstancesRelations=" + + ResourceInstancesRelations + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/TopMenuButtonsEnum.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/TopMenuButtonsEnum.java new file mode 100644 index 000000000..f688d33b0 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/TopMenuButtonsEnum.java @@ -0,0 +1,38 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +public enum TopMenuButtonsEnum { + + HOME("main-menu-button-home"), CATALOG("main-menu-button-catalog"), ON_BOARDING("main-menu-button-onboard"); + + private String value; + private String value2; + + public String getButton() { + return value; + } + + private TopMenuButtonsEnum(String value) { + this.value = value; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/User.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/User.java new file mode 100644 index 000000000..5201de0f1 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/User.java @@ -0,0 +1,189 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; + +public class User { + public static final String FORCE_DELETE_HEADER_FLAG = "FORCE_DELETE"; + + private String firstName; + + private String lastName; + + private String userId; + + private String email; + + private String role; + + private Long lastLoginTime; + + + public User() { + } + + public User(String firstName, String lastName, String userId, String emailAddress, String role, + Long lastLoginTime) { + this.firstName = firstName; + this.lastName = lastName; + this.userId = userId; + this.email = emailAddress; + this.role = role; + this.lastLoginTime = lastLoginTime; + + } + + public void copyData(User other) { + this.firstName = other.getFirstName(); + this.lastName = other.getLastName(); + this.userId = other.getUserId(); + this.email = other.getEmail(); + this.role = other.getRole(); + this.lastLoginTime = other.getLastLoginTime(); + + } + + public User(User aUser) { + this(aUser.getFirstName(), aUser.getLastName(), aUser.getUserId(), aUser.getEmail(), aUser.getRole(), + aUser.getLastLoginTime()); + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + public String getRole() { + return role; + } + + public void setRole(String role) { + this.role = role; + } + + public String getFullName() { + return this.getFirstName() + " " + this.getLastName(); + } + + public void setLastLoginTime() { + DateTime now = new DateTime(DateTimeZone.UTC); + this.lastLoginTime = now.getMillis(); + } + + public void setLastLoginTime(Long time) { + this.lastLoginTime = time; + } + + public Long getLastLoginTime() { + return this.lastLoginTime; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((userId == null) ? 0 : userId.hashCode()); + result = prime * result + ((email == null) ? 0 : email.hashCode()); + result = prime * result + ((firstName == null) ? 0 : firstName.hashCode()); + result = prime * result + ((lastName == null) ? 0 : lastName.hashCode()); + result = prime * result + ((role == null) ? 0 : role.hashCode()); + result = prime * result + ((lastLoginTime == null) ? 0 : lastLoginTime.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + User other = (User) obj; + if (userId == null) { + if (other.userId != null) + return false; + } else if (!userId.equals(other.userId)) + return false; + if (email == null) { + if (other.email != null) + return false; + } else if (!email.equals(other.email)) + return false; + if (firstName == null) { + if (other.firstName != null) + return false; + } else if (!firstName.equals(other.firstName)) + return false; + if (lastName == null) { + if (other.lastName != null) + return false; + } else if (!lastName.equals(other.lastName)) + return false; + if (role == null) { + if (other.role != null) + return false; + } else if (!role.equals(other.role)) + return false; + if (lastLoginTime == null) { + if (other.lastLoginTime != null) + return false; + } else if (!lastLoginTime.equals(other.lastLoginTime)) + return false; + return true; + } + + @Override + public String toString() { + return "User [firstName=" + firstName + ", lastName=" + lastName + ", userId=" + userId + ", email=" + email + + ", role=" + role + ", last login time=" + lastLoginTime + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/UserCredentials.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/UserCredentials.java new file mode 100644 index 000000000..5dec39541 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/UserCredentials.java @@ -0,0 +1,53 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +public class UserCredentials extends User { + + private String password; + + public UserCredentials(String userId, String password, String firstname, String lastname, String role) { + super(); + setUserId(userId); + this.password = password; + setFirstName(firstname); + setLastName(lastname); + setRole(role); + } + + public UserCredentials() { + super(); + } + + public UserCredentials(User user) { + super(); + this.copyData(user); + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/UserRoleEnum.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/UserRoleEnum.java new file mode 100644 index 000000000..793280aa0 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/UserRoleEnum.java @@ -0,0 +1,77 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes; + +public enum UserRoleEnum { + + ADMIN("jh0003", "Jimmy", "Hendrix"), DESIGNER("cs0008", "Carlos", "Santana"), DESIGNER2("me0009", "Melissa","Etheridge"), TESTER("jm0007", "Joni", "Mitchell"), ADMIN4("km2000", "Kot", "May"), + GOVERNOR("gv0001","David", "Shadmi"), OPS("op0001", "Steve", "Regev"), PRODUCT_STRATEGIST1("ps0001", "Eden","Rozin"), PRODUCT_STRATEGIST2("ps0002", "Ella", "Kvetny"), PRODUCT_STRATEGIST3("ps0003", "Geva", "Alon"), + PRODUCT_MANAGER1("pm0001", "Teddy", "Isashar"), PRODUCT_MANAGER2("pm0002", "Sarah", "Bettens"); + private String userId; + private String firstName; + private String lastName; + private String userName; + + private UserRoleEnum(String userId, String userName) { + this.userId = userId; + this.userName = userName; + } + + private UserRoleEnum(String userId, String firstName, String lastName) { + this.userId = userId; + this.firstName = firstName; + this.lastName = lastName; + this.userName = firstName + " " + lastName; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getUserName() { + return userName; + } + + public void setUserName(String userName) { + this.userName = userName; + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HeaderData.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HeaderData.java new file mode 100644 index 000000000..4dfdbad8b --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HeaderData.java @@ -0,0 +1,114 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes.http; + +public class HeaderData { + String contentMd5; + String contentType; + String HttpCspUserId; + String HttpCspFirstName; + String HttpCspLastName; + String HttpCspWsType; + String HttpIvRemoteAddress; + String HttpIvUser; + + public HeaderData() { + super(); + } + + public HeaderData(String contentMd5, String contentType, String httpCspUserId, String httpCspFirstName, + String httpCspLastName, String httpCspWsType, String httpIvRemoteAddress, String httpIvUser) { + super(); + this.contentMd5 = contentMd5; + this.contentType = contentType; + HttpCspUserId = httpCspUserId; + HttpCspFirstName = httpCspFirstName; + HttpCspLastName = httpCspLastName; + HttpCspWsType = httpCspWsType; + HttpIvRemoteAddress = httpIvRemoteAddress; + HttpIvUser = httpIvUser; + } + + public String getContentMd5() { + return contentMd5; + } + + public void setContentMd5(String contentMd5) { + this.contentMd5 = contentMd5; + } + + public String getContentType() { + return contentType; + } + + public void setContentType(String contentType) { + this.contentType = contentType; + } + + public String getHttpCspUserId() { + return HttpCspUserId; + } + + public void setHttpCspUserId(String httpCspUserId) { + HttpCspUserId = httpCspUserId; + } + + public String getHttpCspFirstName() { + return HttpCspFirstName; + } + + public void setHttpCspFirstName(String httpCspFirstName) { + HttpCspFirstName = httpCspFirstName; + } + + public String getHttpCspLastName() { + return HttpCspLastName; + } + + public void setHttpCspLastName(String httpCspLastName) { + HttpCspLastName = httpCspLastName; + } + + public String getHttpCspWsType() { + return HttpCspWsType; + } + + public void setHttpCspWsType(String httpCspWsType) { + HttpCspWsType = httpCspWsType; + } + + public String getHttpIvRemoteAddress() { + return HttpIvRemoteAddress; + } + + public void setHttpIvRemoteAddress(String httpIvRemoteAddress) { + HttpIvRemoteAddress = httpIvRemoteAddress; + } + + public String getHttpIvUser() { + return HttpIvUser; + } + + public void setHttpIvUser(String httpIvUser) { + HttpIvUser = httpIvUser; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HeaderValue.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HeaderValue.java new file mode 100644 index 000000000..e09a97251 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HeaderValue.java @@ -0,0 +1,38 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes.http; + +public enum HeaderValue { + + APPLICATION_JSON("application/json"); + + String value; + + private HeaderValue(String value) { + this.value = value; + } + + public String getValue() { + + return value; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpHeaderEnum.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpHeaderEnum.java new file mode 100644 index 000000000..e57c5a449 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpHeaderEnum.java @@ -0,0 +1,58 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes.http; + +public enum HttpHeaderEnum { + + Content_MD5("Content-MD5"), + USER_ID("USER_ID"), + HTTP_CSP_FIRSTNAME("HTTP_CSP_FIRSTNAME"), + HTTP_CSP_LASTNAME("HTTP_CSP_LASTNAME"), + HTTP_CSP_WSTYPE("HTTP_CSP_WSTYPE"), + HTTP_IV_REMOTE_ADDRESS("HTTP_IV_REMOTE_ADDRESS"), + HTTP_IV_USER("HTTP_IV_USER"), + HTTP_CSP_EMAIL("HTTP_CSP_EMAIL"), + CONTENT_TYPE("Content-Type"), + ACCEPT("Accept"), + X_ECOMP_REQUEST_ID_HEADER("X-ECOMP-RequestID"), + CACHE_CONTROL("Cache-Control"), + X_ECOMP_INSTANCE_ID("X-ECOMP-InstanceID"), + AUTHORIZATION("Authorization"), + CONTENT_LENGTH("Content-Length"), + CONTENT_DISPOSITION("Content-Disposition"), + HOST("Host"), + X_ECOMP_SERVICE_ID_HEADER("X-ECOMP-ServiceID"), + WWW_AUTHENTICATE("WWW-Authenticate"), + ECOMP_PASSWORD("password"), + ECOMP_USERNAME("username"); + + String value; + + private HttpHeaderEnum(String value) { + this.value = value; + } + + public String getValue() { + + return value; + } + +} 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 new file mode 100644 index 000000000..4f831b187 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java @@ -0,0 +1,889 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes.http; + +import java.io.BufferedReader; +import java.io.DataOutputStream; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.StringWriter; +import java.net.HttpURLConnection; +import java.net.URI; +import java.net.URL; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Scanner; + +import javax.net.ssl.HttpsURLConnection; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.IOUtils; +import org.apache.http.HttpEntity; +import org.apache.http.annotation.NotThreadSafe; +import org.apache.http.client.ClientProtocolException; +import org.apache.http.client.methods.CloseableHttpResponse; +import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; +import org.apache.http.client.methods.HttpPost; +import org.apache.http.entity.ContentType; +import org.apache.http.entity.StringEntity; +import org.apache.http.entity.mime.MultipartEntityBuilder; +import org.apache.http.entity.mime.content.FileBody; +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; + +import com.google.gson.Gson; + +public class HttpRequest { + static Logger logger = LoggerFactory.getLogger(HttpRequest.class.getName()); + + public RestResponse httpSendGet(String url, Map<String, String> headers) throws IOException { + + RestResponse restResponse = new RestResponse(); + url = url.replaceAll("\\s", "%20"); + URL obj = new URL(url); + HttpURLConnection con = (HttpURLConnection) obj.openConnection(); + // optional default is GET + con.setRequestMethod("GET"); + // add request header + if (headers != null) { + for (Entry<String, String> header : headers.entrySet()) { + String key = header.getKey(); + String value = header.getValue(); + con.setRequestProperty(key, value); + } + + } + + int responseCode = con.getResponseCode(); + logger.debug("Send GET http request, url: {}",url); + logger.debug("Response Code: {}",responseCode); + + StringBuffer response = new StringBuffer(); + String result; + + try { + + result = IOUtils.toString(con.getInputStream()); + response.append(result); + + } catch (Exception e) { + } + + try { + + result = IOUtils.toString(con.getErrorStream()); + response.append(result); + + } catch (Exception e) { + } + + logger.debug("Response body: {}" ,response); + + // print result + + restResponse.setStatusCode(responseCode); + + if (response != null) { + restResponse.setResponse(response.toString()); + } + + restResponse.setStatusCode(responseCode); + Map<String, List<String>> headerFields = con.getHeaderFields(); + restResponse.setHeaderFields(headerFields); + String responseMessage = con.getResponseMessage(); + restResponse.setResponseMessage(responseMessage); + + con.disconnect(); + + return restResponse; + } + + public RestResponse httpsSendGet(String url, Map<String, String> headers) throws IOException { + + RestResponse restResponse = new RestResponse(); + URL obj = new URL(url); + HttpsURLConnection con = (HttpsURLConnection) obj.openConnection(); + // optional default is GET + con.setRequestMethod("GET"); + // add request header + if (headers != null) { + for (Entry<String, String> header : headers.entrySet()) { + String key = header.getKey(); + String value = header.getValue(); + con.setRequestProperty(key, value); + } + + } + + int responseCode = con.getResponseCode(); + logger.debug("Send GET http request, url: {}",url); + logger.debug("Response Code: {}",responseCode); + + StringBuffer response = new StringBuffer(); + try { + BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); + String inputLine; + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + } catch (Exception e) { + logger.debug("response body is null"); + } + + String result; + + try { + + result = IOUtils.toString(con.getErrorStream()); + response.append(result); + + } catch (Exception e2) { + // result = null; + } + logger.debug("Response body: {}",response); + + // print result + + restResponse.setStatusCode(responseCode); + + if (response != null) { + restResponse.setResponse(response.toString()); + } + + restResponse.setStatusCode(responseCode); + // restResponse.setResponse(result); + Map<String, List<String>> headerFields = con.getHeaderFields(); + restResponse.setHeaderFields(headerFields); + String responseMessage = con.getResponseMessage(); + restResponse.setResponseMessage(responseMessage); + + con.disconnect(); + + return restResponse; + } + + public RestResponse httpSendByMethod(String url, String method, String body, Map<String, String> headers) + throws IOException { + + RestResponse restResponse = new RestResponse(); + URL obj = new URL(url); + HttpURLConnection con = (HttpURLConnection) obj.openConnection(); + + // add request method + con.setRequestMethod(method); + + // add request headers + if (headers != null) { + for (Entry<String, String> header : headers.entrySet()) { + String key = header.getKey(); + String value = header.getValue(); + con.setRequestProperty(key, value); + } + + } + if (body != null && !body.isEmpty() && !method.equals("DELETE")) { + // Send post request + con.setDoOutput(true); + DataOutputStream wr = new DataOutputStream(con.getOutputStream()); + wr.writeBytes(body); + wr.flush(); + wr.close(); + } + + // con.connect(); + + int responseCode = con.getResponseCode(); + logger.debug("Send {} http request, url: {}",method,url); + logger.debug("Response Code: {}",responseCode); + + StringBuffer response = new StringBuffer(); + + try { + BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); + String inputLine; + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + } catch (Exception e) { + // response = null; + logger.debug("response body is null"); + } + + String result; + try { + + result = IOUtils.toString(con.getErrorStream()); + response.append(result); + + } catch (Exception e2) { + result = null; + } + logger.debug("Response body: {}",response); + + // print result + + restResponse.setStatusCode(responseCode); + // if (response == null) { + // restResponse.setResponse(null); + // } else { + // restResponse.setResponse(response.toString()); + // } + + if (response != null) { + restResponse.setResponse(response.toString()); + } + Map<String, List<String>> headerFields = con.getHeaderFields(); + restResponse.setHeaderFields(headerFields); + String responseMessage = con.getResponseMessage(); + restResponse.setResponseMessage(responseMessage); + + con.disconnect(); + return restResponse; + + } + + public RestResponse sendHttpPost(String url, String body, Map<String, String> headers) throws IOException { + + RestResponse restResponse = new RestResponse(); + URL obj = new URL(url); + HttpURLConnection con = (HttpURLConnection) obj.openConnection(); + + // add request method + con.setRequestMethod("POST"); + + // add request headers + if (headers != null) { + for (Entry<String, String> header : headers.entrySet()) { + String key = header.getKey(); + String value = header.getValue(); + con.setRequestProperty(key, value); + } + } + + // Send post request + if (body != null) { + con.setDoOutput(true); + DataOutputStream wr = new DataOutputStream(con.getOutputStream()); + wr.writeBytes(body); + wr.flush(); + wr.close(); + } + + // con.connect(); + + int responseCode = con.getResponseCode(); + logger.debug("Send POST http request, url: {}",url); + logger.debug("Response Code: {}",responseCode); + + StringBuffer response = new StringBuffer(); + try { + BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); + String inputLine; + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + } catch (Exception e) { + logger.debug("response body is null"); + } + + String result; + + try { + + result = IOUtils.toString(con.getErrorStream()); + response.append(result); + + } catch (Exception e2) { + result = null; + } + logger.debug("Response body: {}",response); + + // print result + + restResponse.setStatusCode(responseCode); + + if (response != null) { + restResponse.setResponse(response.toString()); + } + + Map<String, List<String>> headerFields = con.getHeaderFields(); + restResponse.setHeaderFields(headerFields); + String responseMessage = con.getResponseMessage(); + restResponse.setResponseMessage(responseMessage); + + con.disconnect(); + return restResponse; + + } + + public RestResponse httpSendPost(String url, String body, Map<String, String> headers) throws IOException { + return httpSendPost(url, body, headers, "POST"); + } + + public RestResponse httpSendPut(String url, String body, Map<String, String> headers) throws IOException { + return httpSendPost(url, body, headers, "PUT"); + } + + public RestResponse httpSendPost(String url, String body, Map<String, String> headers, String methodType) + throws IOException { + + RestResponse restResponse = new RestResponse(); + URL obj = new URL(url); + HttpURLConnection con = (HttpURLConnection) obj.openConnection(); + + // add request method + con.setRequestMethod(methodType); + + // add request headers + if (headers != null) { + for (Entry<String, String> header : headers.entrySet()) { + String key = header.getKey(); + String value = header.getValue(); + con.setRequestProperty(key, value); + } + } + + // Send post request + if (body != null) { + con.setDoOutput(true); + DataOutputStream wr = new DataOutputStream(con.getOutputStream()); + wr.writeBytes(body); + wr.flush(); + wr.close(); + } + + // con.connect(); + + int responseCode = con.getResponseCode(); + logger.debug("Send POST http request, url: {}",url); + logger.debug("Response Code: {}",responseCode); + + StringBuffer response = new StringBuffer(); + try { + BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); + String inputLine; + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + } catch (Exception e) { + logger.debug("response body is null"); + } + + String result; + + try { + + result = IOUtils.toString(con.getErrorStream()); + response.append(result); + + } catch (Exception e2) { + result = null; + } + logger.debug("Response body: {}",response); + + // print result + + restResponse.setStatusCode(responseCode); + + if (response != null) { + restResponse.setResponse(response.toString()); + } + + Map<String, List<String>> headerFields = con.getHeaderFields(); + restResponse.setHeaderFields(headerFields); + String responseMessage = con.getResponseMessage(); + restResponse.setResponseMessage(responseMessage); + + con.disconnect(); + return restResponse; + + } + + public RestResponse httpSendDeleteWithBody2(String url, String body, Map<String, String> headers) + throws ClientProtocolException, IOException { + + CloseableHttpClient httpclient = HttpClients.createDefault(); + RestResponse restResponse = new RestResponse(); + HttpDeleteWithBody httpDelete = new HttpDeleteWithBody(url); + + // add request headers + if (headers != null) { + for (Entry<String, String> header : headers.entrySet()) { + String key = header.getKey(); + String value = header.getValue(); + httpDelete.addHeader(key, value); + } + } + + // add body to request + StringEntity input = new StringEntity(body, ContentType.APPLICATION_JSON); + httpDelete.setEntity(input); + + // execute request + CloseableHttpResponse response = httpclient.execute(httpDelete); + + restResponse.setStatusCode(response.getStatusLine().getStatusCode()); + + return restResponse; + } + + public RestResponse httpSendDeleteWithBody(String url, String body, Map<String, String> headers) + throws IOException { + + RestResponse restResponse = new RestResponse(); + URL obj = new URL(url); + HttpURLConnection con = (HttpURLConnection) obj.openConnection(); + + // add request method + con.setRequestMethod("DELETE"); + + // add request headers + if (headers != null) { + for (Entry<String, String> header : headers.entrySet()) { + String key = header.getKey(); + String value = header.getValue(); + con.setRequestProperty(key, value); + } + } + + // Send post request + con.setDoOutput(true); + DataOutputStream wr = new DataOutputStream(con.getOutputStream()); + wr.writeBytes(body); + wr.flush(); + wr.close(); + + // con.connect(); + + int responseCode = con.getResponseCode(); + logger.debug("Send DELETE http request, url: {}",url); + logger.debug("Response Code: {}",responseCode); + + StringBuffer response = new StringBuffer(); + try { + BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); + String inputLine; + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + } catch (Exception e) { + logger.debug("response body is null"); + } + + String result; + + try { + + result = IOUtils.toString(con.getErrorStream()); + response.append(result); + + } catch (Exception e2) { + result = null; + } + logger.debug("Response body: {}", response); + + // print result + + restResponse.setStatusCode(responseCode); + + if (response != null) { + restResponse.setResponse(response.toString()); + } + + Map<String, List<String>> headerFields = con.getHeaderFields(); + restResponse.setHeaderFields(headerFields); + String responseMessage = con.getResponseMessage(); + restResponse.setResponseMessage(responseMessage); + + con.disconnect(); + return restResponse; + + } + + public RestResponse httpSendPostWithOutBody(String url, Map<String, String> headers) throws IOException { + + RestResponse restResponse = new RestResponse(); + URL obj = new URL(url); + HttpURLConnection con = (HttpURLConnection) obj.openConnection(); + + // add request method + con.setRequestMethod("POST"); + + // add request headers + if (headers != null) { + for (Entry<String, String> header : headers.entrySet()) { + String key = header.getKey(); + String value = header.getValue(); + con.setRequestProperty(key, value); + } + } + + // con.connect(); + + int responseCode = con.getResponseCode(); + logger.debug("Send POST http request, url: {}",url); + logger.debug("Response Code: {}",responseCode); + + StringBuffer response = new StringBuffer(); + + try { + BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); + String inputLine; + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + } catch (Exception e) { + // response = null; + logger.debug("response body is null"); + } + + String result; + try { + + result = IOUtils.toString(con.getErrorStream()); + response.append(result); + + } catch (Exception e2) { + result = null; + } + logger.debug("Response body: {}",response); + + // print result + + restResponse.setStatusCode(responseCode); + // if (response == null) { + // restResponse.setResponse(null); + // } else { + // restResponse.setResponse(response.toString()); + // } + + if (response != null) { + restResponse.setResponse(response.toString()); + } + + Map<String, List<String>> headerFields = con.getHeaderFields(); + restResponse.setHeaderFields(headerFields); + String responseMessage = con.getResponseMessage(); + restResponse.setResponseMessage(responseMessage); + + con.disconnect(); + return restResponse; + + } + + public RestResponse httpSendPostMultipart(String url, Map<String, String> headers, String jsonLocation, + String zipLocation) throws IOException { + + Gson gson = new Gson(); + String gsonToSend = null; + RestResponse restResponse = new RestResponse(); + BufferedReader br = null; + // + // + // + // + // try { + // + // String sCurrentLine; + // + // br = new BufferedReader(new FileReader(jsonLocation)); + // + // while ((sCurrentLine = br.readLine()) != null) { + // System.out.println(sCurrentLine); + // } + // + // } catch (IOException e) { + // e.printStackTrace(); + // } finally { + // try { + // if (br != null)br.close(); + // gsonToSend = br.toString(); + // } catch (IOException ex) { + // ex.printStackTrace(); + // } + // } + + gsonToSend = new Scanner(new File(jsonLocation)).useDelimiter("\\Z").next(); + logger.debug("gsonToSend: {}",gsonToSend); + + MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create(); + mpBuilder.addPart("resourceZip", new FileBody(new File(zipLocation))); + mpBuilder.addPart("resourceMetadata", new StringBody(gsonToSend, ContentType.APPLICATION_JSON)); + + HttpPost httpPost = new HttpPost(url); + httpPost.addHeader("USER_ID", "adminid"); + httpPost.setEntity(mpBuilder.build()); + + CloseableHttpClient client = HttpClients.createDefault(); + CloseableHttpResponse response = client.execute(httpPost); + try { + logger.debug("----------------------------------------"); + logger.debug("response.getStatusLine(): {}",response.getStatusLine()); + HttpEntity resEntity = response.getEntity(); + if (resEntity != null) { + logger.debug("Response content length: {}",resEntity.getContentLength()); + } + EntityUtils.consume(resEntity); + } finally { + + response.close(); + client.close(); + } + + restResponse.setStatusCode(response.getStatusLine().getStatusCode()); + restResponse.setResponse(response.getEntity().toString()); + + return restResponse; + + } + + public RestResponse httpSendPostWithAuth(String url, String body, Map<String, String> headers, String username, + String password) throws IOException { + + String userPassword = username + ":" + password; + String encoding = Base64.encodeBase64String(userPassword.getBytes()); + RestResponse restResponse = new RestResponse(); + URL obj = new URL(url); + HttpURLConnection con = (HttpURLConnection) obj.openConnection(); + + // add request method + con.setRequestMethod("POST"); + + con.setRequestProperty("Authorization", "Basic " + encoding); + + // add request headers + if (headers != null) { + for (Entry<String, String> header : headers.entrySet()) { + String key = header.getKey(); + String value = header.getValue(); + con.setRequestProperty(key, value); + } + + } + + // Send post request + con.setDoOutput(true); + DataOutputStream wr = new DataOutputStream(con.getOutputStream()); + wr.writeBytes(body); + wr.flush(); + wr.close(); + + // con.connect(); + + int responseCode = con.getResponseCode(); + logger.debug("Send POST http request, url: {}",url); + logger.debug("Response Code: {}",responseCode); + + StringBuffer response = new StringBuffer(); + try { + BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); + String inputLine; + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + } catch (Exception e) { + response = null; + + } + logger.debug("Response body: {}",response); + + // print result + + restResponse.setStatusCode(responseCode); + if (response == null) { + restResponse.setResponse(null); + } else { + restResponse.setResponse(response.toString()); + } + + Map<String, List<String>> headerFields = con.getHeaderFields(); + restResponse.setHeaderFields(headerFields); + String responseMessage = con.getResponseMessage(); + restResponse.setResponseMessage(responseMessage); + + con.disconnect(); + return restResponse; + + } + + public RestResponse httpSendDelete(String url, Map<String, String> headers) throws IOException { + + RestResponse restResponse = new RestResponse(); + URL obj = new URL(url); + HttpURLConnection con = (HttpURLConnection) obj.openConnection(); + + if (headers != null) { + for (Entry<String, String> header : headers.entrySet()) { + String key = header.getKey(); + String value = header.getValue(); + con.setRequestProperty(key, value); + } + + } + + con.setDoOutput(true); + con.setRequestMethod("DELETE"); + int responseCode = con.getResponseCode(); + logger.debug("Send DELETE http request, url: {}",url); + logger.debug("Response Code: {}",responseCode); + + StringBuffer response = new StringBuffer(); + + try { + BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream())); + String inputLine; + while ((inputLine = in.readLine()) != null) { + response.append(inputLine); + } + in.close(); + } catch (Exception e) { + logger.debug("response body is null"); + } + + String result; + + try { + + result = IOUtils.toString(con.getErrorStream()); + response.append(result); + + } catch (Exception e2) { + result = null; + } + logger.debug("Response body: {}",response); + + // print result + + restResponse.setStatusCode(responseCode); + + if (response != null) { + restResponse.setResponse(response.toString()); + } + + restResponse.setStatusCode(con.getResponseCode()); + Map<String, List<String>> headerFields = con.getHeaderFields(); + restResponse.setHeaderFields(headerFields); + String responseMessage = con.getResponseMessage(); + restResponse.setResponseMessage(responseMessage); + + con.disconnect(); + + return restResponse; + } + + public static RestResponse sendHttpPostWithEntity(HttpEntity requestEntity, String url, Map<String, String> headers) + throws IOException, ClientProtocolException { + CloseableHttpResponse response = null; + CloseableHttpClient client = HttpClients.createDefault(); + try { + HttpPost httpPost = new HttpPost(url); + RestResponse restResponse = new RestResponse(); + for (Entry<String, String> entry : headers.entrySet()) { + httpPost.addHeader(entry.getKey(), entry.getValue()); + } + + httpPost.setEntity(requestEntity); + response = client.execute(httpPost); + HttpEntity responseEntity = response.getEntity(); + String responseBody = null; + if (responseEntity != null) { + InputStream instream = responseEntity.getContent(); + StringWriter writer = new StringWriter(); + IOUtils.copy(instream, writer); + responseBody = writer.toString(); + try { + + } finally { + instream.close(); + } + } + + restResponse.setStatusCode(response.getStatusLine().getStatusCode()); + restResponse.setResponse(responseBody); + + return restResponse; + + } finally { + closeResponse(response); + closeHttpClient(client); + + } + } + + private static void closeHttpClient(CloseableHttpClient client) { + try { + if (client != null) { + client.close(); + } + } catch (IOException e) { + logger.debug("failed to close client or response: ", e); + } + } + + private static void closeResponse(CloseableHttpResponse response) { + try { + if (response != null) { + response.close(); + } + } catch (IOException e) { + logger.debug("failed to close client or response: ", e); + } + } + + @NotThreadSafe + class HttpDeleteWithBody extends HttpEntityEnclosingRequestBase { + public static final String METHOD_NAME = "DELETE"; + + public String getMethod() { + return METHOD_NAME; + } + + public HttpDeleteWithBody(final String uri) { + super(); + setURI(URI.create(uri)); + } + + public HttpDeleteWithBody(final URI uri) { + super(); + setURI(uri); + } + + public HttpDeleteWithBody() { + super(); + } + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/MustHeaders.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/MustHeaders.java new file mode 100644 index 000000000..e9a87ed1d --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/MustHeaders.java @@ -0,0 +1,53 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes.http; + +import java.util.HashMap; +import java.util.Map; + +public class MustHeaders { + + private Map<String, String> headers = new HashMap<String, String>(); + + public MustHeaders(HeaderData headerData) { + + super(); + headers.put(HttpHeaderEnum.Content_MD5.getValue(), headerData.getContentMd5()); + headers.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), headerData.getContentType()); + headers.put(HttpHeaderEnum.ACCEPT.getValue(), headerData.getContentType()); + headers.put(HttpHeaderEnum.USER_ID.getValue(), headerData.getHttpCspUserId()); + headers.put(HttpHeaderEnum.HTTP_CSP_FIRSTNAME.getValue(), headerData.getHttpCspFirstName()); + headers.put(HttpHeaderEnum.HTTP_CSP_LASTNAME.getValue(), headerData.getHttpCspLastName()); + headers.put(HttpHeaderEnum.HTTP_CSP_WSTYPE.getValue(), headerData.getHttpCspWsType()); + headers.put(HttpHeaderEnum.HTTP_IV_REMOTE_ADDRESS.getValue(), headerData.getHttpIvRemoteAddress()); + headers.put(HttpHeaderEnum.HTTP_IV_USER.getValue(), headerData.getHttpIvUser()); + + } + + public MustHeaders() { + super(); + } + + public Map<String, String> getMap() { + return headers; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/RestResponse.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/RestResponse.java new file mode 100644 index 000000000..8974b74c1 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/RestResponse.java @@ -0,0 +1,84 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.datatypes.http; + +import java.util.List; +import java.util.Map; + +public class RestResponse { + + Integer statusCode; + String response; + Map<String, List<String>> headerFields; + String responseMessage; + + public RestResponse() { + super(); + } + + public RestResponse(Integer errorCode, String response, Map<String, List<String>> headerFields, + String responseMessage) { + super(); + this.statusCode = errorCode; + this.response = response; + this.headerFields = headerFields; + this.responseMessage = responseMessage; + } + + public Integer getStatusCode() { + return statusCode; + } + + public void setStatusCode(Integer errorCode) { + this.statusCode = errorCode; + } + + public String getResponse() { + return response; + } + + public void setResponse(String response) { + this.response = response; + } + + public Map<String, List<String>> getHeaderFields() { + return headerFields; + } + + public void setHeaderFields(Map<String, List<String>> headerFields) { + this.headerFields = headerFields; + } + + public String getResponseMessage() { + return responseMessage; + } + + public void setResponseMessage(String responseMessage) { + this.responseMessage = responseMessage; + } + + @Override + public String toString() { + return "RestResponse [errorCode=" + statusCode + ", response=" + response + ", headerFields=" + headerFields + + ", responseMessage=" + responseMessage + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/CategoryDataDefinition.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/CategoryDataDefinition.java new file mode 100644 index 000000000..0c673e62d --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/CategoryDataDefinition.java @@ -0,0 +1,111 @@ +package org.onap.sdc.ci.tests.devObjects; + + +import java.io.Serializable; +import java.util.List; + +public class CategoryDataDefinition extends ToscaDataDefinition implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 2882352060242714427L; + + private String name; + private String normalizedName; + private String uniqueId; + private List<String> icons; + + public CategoryDataDefinition() { + + } + + public CategoryDataDefinition(CategoryDataDefinition c) { + this.name = c.name; + this.normalizedName = c.normalizedName; + this.uniqueId = c.uniqueId; + this.icons = c.icons; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNormalizedName() { + return normalizedName; + } + + public void setNormalizedName(String normalizedName) { + this.normalizedName = normalizedName; + } + + public String getUniqueId() { + return uniqueId; + } + + public void setUniqueId(String uniqueId) { + this.uniqueId = uniqueId; + } + + public List<String> getIcons() { + return icons; + } + + public void setIcons(List<String> icons) { + this.icons = icons; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((normalizedName == null) ? 0 : normalizedName.hashCode()); + result = prime * result + ((uniqueId == null) ? 0 : uniqueId.hashCode()); + result = prime * result + ((icons == null) ? 0 : icons.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + CategoryDataDefinition other = (CategoryDataDefinition) obj; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (normalizedName == null) { + if (other.normalizedName != null) + return false; + } else if (!normalizedName.equals(other.normalizedName)) + return false; + if (uniqueId == null) { + if (other.uniqueId != null) + return false; + } else if (!uniqueId.equals(other.uniqueId)) + return false; + if (icons == null) { + if (other.icons != null) + return false; + } else if (!icons.equals(other.icons)) + return false; + return true; + } + + @Override + public String toString() { + return "CategoryDataDefinition [name=" + name + ", normalizedName=" + normalizedName + ", uniqueId=" + uniqueId + + ", icons=" + icons + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/CategoryDefinition.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/CategoryDefinition.java new file mode 100644 index 000000000..ef65a2de2 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/CategoryDefinition.java @@ -0,0 +1,64 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.devObjects; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +public class CategoryDefinition extends CategoryDataDefinition implements Serializable { + + /** + * + */ + private static final long serialVersionUID = 6552733796860992476L; + + List<SubCategoryDefinition> subcategories; + + public CategoryDefinition() { + super(); + } + + public CategoryDefinition(CategoryDataDefinition c) { + super(c); + } + + public List<SubCategoryDefinition> getSubcategories() { + return subcategories; + } + + public void setSubcategories(List<SubCategoryDefinition> subcategories) { + this.subcategories = subcategories; + } + + public void addSubCategory(SubCategoryDefinition subcategory) { + if (subcategories == null) { + subcategories = new ArrayList<SubCategoryDefinition>(); + } + subcategories.add(subcategory); + } + + @Override + public String toString() { + return super.toString() + " CategoryDefinition [subcategories=" + subcategories + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/GraphPropertyEnum.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/GraphPropertyEnum.java new file mode 100644 index 000000000..b393b9160 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/GraphPropertyEnum.java @@ -0,0 +1,103 @@ +package org.onap.sdc.ci.tests.devObjects; + +import java.util.ArrayList; +import java.util.List; + + + +public enum GraphPropertyEnum { +// field name class type unique indexed +// stored in graph index + UNIQUE_ID ("uid", String.class, true, true), + LABEL ("nodeLabel", String.class, false, true), + JSON ("json", String.class, false, false), + METADATA ("metadata", String.class, false, false), + VERSION ("version", String.class, false, true), + STATE ("state", String.class, false, true), + IS_HIGHEST_VERSION ("highestVersion", Boolean.class, false, true), + IS_DELETED ("deleted", Boolean.class, false, true), + NORMALIZED_NAME ("normalizedName", String.class, false, true), + NAME ("name", String.class, false, true), + TOSCA_RESOURCE_NAME ("toscaResourceName", String.class, false, true), + DISTRIBUTION_STATUS ("distributionStatus", String.class, false, false), + RESOURCE_TYPE ("resourceType", String.class, false, true), + COMPONENT_TYPE ("componentType", String.class, false, true), + UUID ("uuid", String.class, false, true), + SYSTEM_NAME ("systemName", String.class, false, true), + IS_ABSTRACT ("abstract", Boolean.class, false, true), + INVARIANT_UUID ("invariantUuid", String.class, false, true), + CSAR_UUID ("csarUuid", String.class, false, true), + //used for user (old format, no json for users) + USERID ("userId", String.class, true, true), + ROLE ("role", String.class, false, false), + FIRST_NAME ("firstName", String.class, false, false), + LAST_NAME ("lastName", String.class, false, false), + EMAIL ("email", String.class, false, false), + LAST_LOGIN_TIME ("lastLoginTime", Long.class, false, false), + //used for category (old format, no json for categories) + ICONS ("icons", String.class, false, false); + + private String property; + private Class clazz; + private boolean unique; + private boolean indexed; + + GraphPropertyEnum(String property, Class clazz, boolean unique, boolean indexed) { + this.property = property; + this.clazz = clazz; + this.unique = unique; + this.indexed = indexed; + } + + public static GraphPropertyEnum getByProperty(String property){ + for(GraphPropertyEnum currProperty :GraphPropertyEnum.values()){ + if(currProperty.getProperty().equals(property)){ + return currProperty; + } + } + return null; + } + + public String getProperty() { + return property; + } + + public void setProperty(String property) { + this.property = property; + } + + public Class getClazz() { + return clazz; + } + + public void setClazz(Class clazz) { + this.clazz = clazz; + } + + public boolean isUnique() { + return unique; + } + + public void setUnique(boolean unique) { + this.unique = unique; + } + + public boolean isIndexed() { + return indexed; + } + + public void setIndexed(boolean indexed) { + this.indexed = indexed; + } + + public static List<String> getAllProperties() { + + List<String> arrayList = new ArrayList<String>(); + + for (GraphPropertyEnum graphProperty : GraphPropertyEnum.values()) { + arrayList.add(graphProperty.getProperty()); + } + + return arrayList; + } +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/GroupingDataDefinition.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/GroupingDataDefinition.java new file mode 100644 index 000000000..cdb45c5c6 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/GroupingDataDefinition.java @@ -0,0 +1,112 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.devObjects; + +import java.io.Serializable; + +public class GroupingDataDefinition extends ToscaDataDefinition implements Serializable { + /** + * + */ + private static final long serialVersionUID = 2641475929148843849L; + + private String name; + private String normalizedName; + private String uniqueId; + + public GroupingDataDefinition() { + + } + + public GroupingDataDefinition(GroupingDataDefinition c) { + this.name = c.name; + this.normalizedName = c.normalizedName; + this.uniqueId = c.uniqueId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNormalizedName() { + return normalizedName; + } + + public void setNormalizedName(String normalizedName) { + this.normalizedName = normalizedName; + } + + public String getUniqueId() { + return uniqueId; + } + + public void setUniqueId(String uniqueId) { + this.uniqueId = uniqueId; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((normalizedName == null) ? 0 : normalizedName.hashCode()); + result = prime * result + ((uniqueId == null) ? 0 : uniqueId.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + GroupingDataDefinition other = (GroupingDataDefinition) obj; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (normalizedName == null) { + if (other.normalizedName != null) + return false; + } else if (!normalizedName.equals(other.normalizedName)) + return false; + if (uniqueId == null) { + if (other.uniqueId != null) + return false; + } else if (!uniqueId.equals(other.uniqueId)) + return false; + return true; + } + + @Override + public String toString() { + return "GroupingDataDefinition [name=" + name + ", normalizedName=" + normalizedName + ", uniqueId=" + uniqueId + + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/GroupingDefinition.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/GroupingDefinition.java new file mode 100644 index 000000000..7b04d2307 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/GroupingDefinition.java @@ -0,0 +1,33 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.devObjects; + +public class GroupingDefinition extends GroupingDataDefinition { + + public GroupingDefinition() { + super(); + } + + public GroupingDefinition(GroupingDataDefinition g) { + super(g); + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/JsonPresentationFields.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/JsonPresentationFields.java new file mode 100644 index 000000000..d17755207 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/JsonPresentationFields.java @@ -0,0 +1,193 @@ +package org.onap.sdc.ci.tests.devObjects; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; + + +//@JsonDeserialize(using = MyDeserializer.class) + +public enum JsonPresentationFields { + UNIQUE_ID ("uniqueId", GraphPropertyEnum.UNIQUE_ID), + HIGHEST_VERSION ("highestVersion", GraphPropertyEnum.IS_HIGHEST_VERSION), + LIFECYCLE_STATE ("lifecycleState", GraphPropertyEnum.STATE), + CREATION_DATE ("creationDate", null), + LAST_UPDATE_DATE ("lastUpdateDate", null), + SYSTEM_NAME ("systemName", GraphPropertyEnum.SYSTEM_NAME), + NAME ("name", GraphPropertyEnum.NAME), + VERSION ("version", GraphPropertyEnum.VERSION), + NORMALIZED_NAME ("normalizedName", GraphPropertyEnum.NORMALIZED_NAME), + UUID ("UUID", GraphPropertyEnum.UUID), + RESOURCE_TYPE ("resourceType", GraphPropertyEnum.RESOURCE_TYPE), + COMPONENT_TYPE ("componentType", GraphPropertyEnum.COMPONENT_TYPE), + IS_DELETED ("isDeleted", GraphPropertyEnum.IS_DELETED), + ECOMP_GENERATED_NAMING ("ecompGeneratedNaming", null), + NAMING_POLICY ("namingPolicy", null), + TOSCA_RESOURCE_NAME ("toscaResourceName", GraphPropertyEnum.TOSCA_RESOURCE_NAME), + DESCRIPTION ("description", null), + TYPE ("type", null), + DERIVED_FROM ("derivedFrom", null), + VENDOR_NAME ("vendorName", null), + VENDOR_RELEASE ("vendorRelease", null), + CONFORMANCE_LEVEL ("conformanceLevel", null), + ICON ("icon", null), + TAGS ("tags", null), + INVARIANT_UUID ("invariantUuid", GraphPropertyEnum.INVARIANT_UUID), + CSAR_UUID ("csarUuid", GraphPropertyEnum.CSAR_UUID), + CSAR_VERSION ("csarVersion", null), + IMPORTED_TOSCA_CHECKSUM ("importedToscaChecksum", null), + CONTACT_ID ("contactId", null), + PROJECT_CODE ("projectCode", null), + DISTRIBUTION_STATUS ("distributionStatus", GraphPropertyEnum.DISTRIBUTION_STATUS), + DERIVED_FROM_GENERIC_TYPE ("derivedFromGenericType", null), + DERIVED_FROM_GENERIC_VERSION ("derivedFromGenericVersion", null), + + ////Artifact + ARTIFACT_TYPE ("artifactType", null), + ARTIFACT_REF ("artifactRef", null), + ARTIFACT_REPOSITORY ("artifactRepository", null), + ARTIFACT_CHECKSUM ("artifactChecksum", null), + ARTIFACT_CREATOR ("artifactCreator", null), + USER_ID_CREATOR ("userIdCreator", null), + USER_ID_LAST_UPDATER ("userIdLastUpdater", null), + CREATOR_FULL_NAME ("creatorFullName", null), + UPDATER_FULL_NAME ("updaterFullName", null), + + ES_ID ("esId", null), + ARTIFACT_LABEL ("artifactLabel", null), + IS_ABSTRACT ("mandatory", null), + ARTIFACT_DISPLAY_NAME ("artifactDisplayName", null), + API_URL ("apiUrl", null), + SERVICE_API ("serviceApi", null), + ARTIFACT_VERSION ("artifactVersion", null), + ARTIFACT_UUID ("artifactUUID", null), + PAYLOAD_UPDATE_DATE ("payloadUpdateDate", null), + HEAT_PARAMS_UPDATE_DATE ("heatParamsUpdateDate", null), + GENERATED ("generated", null), + ARTIFACT_GROUP_TYPE ("artifactGroupType", null), + ARTIFACT_TIMEOUT ("timeout", null), + REQUIRED_ARTIFACTS ("requiredArtifacts", null), + DUPLICATED ("duplicated", null), + HEAT_PARAMETERS ("heatParameters", null), + GENERATED_FROM_ID ("generatedFromId", null), + + + // end artifacts + + + //property + DEFINITION ("definition", null), + DEFAULT_VALUE ("defaultValue", null), + REQUIRED ("required", null), + PASSWORD ("password", null), + CONSTRAINTS ("constraints", null), + PROPERTIES ("properties", null), + PROPERTY ("property", null), + SCHEMA ("schema", null), + VALUE ("value", null), + PARENT_UNIQUE_ID ("parentUniqueId", null), + + COMPONENT_INSTANCES ("componentInstances", null), + RELATIONS ("relations", null), + + //attribute + STATUS ("status", null), + //capability + VALID_SOURCE_TYPE ("validSourceTypes", null), + CREATION_TIME ("creationTime", null), + MODIFICATION_TIME ("modificationTime", null), + CAPABILITY_SOURCES ("capabilitySources", null), + MAX_OCCURRENCES ("maxOccurrences", null), + MIN_OCCURRENCES ("minOccurrences", null), + OWNER_NAME ("ownerName", null), + OWNER_ID ("ownerId", null), + LEFT_OCCURRENCES ("leftOccurences", null), + CAPABILITY_ID ("capabiltyId", null), + PATH ("path", null), + SOURCE ("source", null), + + //Requirement + CAPAPILITY ("capability", null), + NODE ("node", null), + RELATIONSHIP ("relationship", null), + VALID_SOURCE_TYPES ("validSourceTypes", null), + REQUIREMENT_ID ("requirementId", null), + + //Relation + CAPABILTY_OWNER_ID ("capabilityOwnerId", null), + REQUIREMENT_OWNER_ID ("requirementOwnerId", null), + FROM_ID ("fromId", null), + TO_ID ("toId", null), + REQUIREMENT ("requirement", null), + + //Groups + + GROUP_INVARIANT_UUID ("invariantUUID", null), + GROUP_UUID ("groupUUID", null), + GROUP_MEMBER ("members", null), + GROUP_ARTIFACTS ("artifacts", null), + GROUP_ARTIFACTS_UUID ("artifactsUuid", null), + GROUP_PROPERTIES ("properties", null), + GROUP_UNIQUE_ID ("groupUid", null), + POS_X ("posX", null), + POS_Y ("posY", null), + PROPERTY_VALUE_COUNTER ("propertyValueCounter", null), + CUSTOMIZATION_UUID ("customizationUUID", null), + GROUP_NAME ("groupName", null), + GROUP_INSTANCE_ARTIFACTS ("groupInstanceArtifacts", null), + GROUP_INSTANCE_ARTIFACTS_UUID ("groupInstanceArtifactsUuid", null), + GROUP_INSTANCE_PROPERTIES ("groupInstancesProperties", null), + + ; + + + private String presentation; + private GraphPropertyEnum storedAs; + + JsonPresentationFields(String presentation, GraphPropertyEnum storedAs) { + this.presentation = presentation; + this.storedAs = storedAs; + } + + @JsonValue + public String getPresentation() { + return presentation; + } + + public void setPresentation(String presentation) { + this.presentation = presentation; + } + + public GraphPropertyEnum getStoredAs() { + return storedAs; + } + + public void setStoredAs(GraphPropertyEnum storedAs) { + this.storedAs = storedAs; + } + + public static String getPresentationByGraphProperty(GraphPropertyEnum property) { + for(JsonPresentationFields currPresentation : JsonPresentationFields.values()){ + if(currPresentation.getStoredAs() == property){ + return currPresentation.getPresentation(); + } + } + return null; + } + + @Override + public String toString() { + // TODO Auto-generated method stub + return presentation; + } + + @JsonCreator + public static JsonPresentationFields getByPresentation(String presentation) { + for (JsonPresentationFields inst : JsonPresentationFields.values()) { + if (inst.getPresentation().equals(presentation)) { + return inst; + } + } + return null; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/LifecycleStateEnum.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/LifecycleStateEnum.java new file mode 100644 index 000000000..e17222cf2 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/LifecycleStateEnum.java @@ -0,0 +1,44 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.devObjects; + +public enum LifecycleStateEnum { + + READY_FOR_CERTIFICATION, + + CERTIFICATION_IN_PROGRESS, + + CERTIFIED, + + NOT_CERTIFIED_CHECKIN, + + NOT_CERTIFIED_CHECKOUT; + + public static LifecycleStateEnum findState(String state) { + + for (LifecycleStateEnum lifecycleStateEnum : LifecycleStateEnum.values()) { + if (lifecycleStateEnum.name().equals(state)) { + return lifecycleStateEnum; + } + } + return null; + } +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/ResourceTypeEnum.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/ResourceTypeEnum.java new file mode 100644 index 000000000..549968205 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/ResourceTypeEnum.java @@ -0,0 +1,101 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.devObjects; + +/** + * Resource Type Enum + * @author mshitrit + * + */ +public enum ResourceTypeEnum { + + VFC("VFC (Virtual Function Component)"), VF("VF"/* (Virtual Function)" */), CP("CP (Connection Point)"), + VL( "VL (Virtual Link)"), VFCMT("VFCMT (VFC Monitoring Template)"), ABSTRACT("Abstract (Generic VFC/VF/Service Type)"); + + private String value; + + private ResourceTypeEnum(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public static ResourceTypeEnum getType(String type) { + for (ResourceTypeEnum e : ResourceTypeEnum.values()) { + if (e.name().equals(type)) { + return e; + } + } + return null; + } + + public static ResourceTypeEnum getTypeByName(String type) { + for (ResourceTypeEnum e : ResourceTypeEnum.values()) { + if (e.name().equalsIgnoreCase(type)) { + return e; + } + } + return null; + } +/** + * Returns ResourceTypeEnum matching to received String ignore case + * @param type + * @return + */ + public static ResourceTypeEnum getTypeIgnoreCase(String type) { + for (ResourceTypeEnum e : ResourceTypeEnum.values()) { + if (e.name().toLowerCase().equals(type.toLowerCase())) { + return e; + } + } + return null; + } + /** + * Checks if enum exist with given type + * @param type + * @return + */ + public static boolean containsName(String type) { + + for (ResourceTypeEnum e : ResourceTypeEnum.values()) { + if (e.name().equals(type)) { + return true; + } + } + return false; + } + /** + * Checks if enum exist with given type ignare case + * @param type + * @return + */ + public static boolean containsIgnoreCase(String type) { + + for (ResourceTypeEnum e : ResourceTypeEnum.values()) { + if (e.name().toLowerCase().equals(type.toLowerCase())) { + return true; + } + } + return false; + } +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/SubCategoryDataDefinition.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/SubCategoryDataDefinition.java new file mode 100644 index 000000000..0eb76014e --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/SubCategoryDataDefinition.java @@ -0,0 +1,128 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.devObjects; + +import java.io.Serializable; +import java.util.List; + +public class SubCategoryDataDefinition extends ToscaDataDefinition implements Serializable { + /** + * + */ + private static final long serialVersionUID = 8279397988497086676L; + + private String name; + private String normalizedName; + private String uniqueId; + private List<String> icons; + + public SubCategoryDataDefinition() { + + } + + public SubCategoryDataDefinition(SubCategoryDataDefinition c) { + this.name = c.name; + this.normalizedName = c.normalizedName; + this.uniqueId = c.uniqueId; + this.icons = c.icons; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getNormalizedName() { + return normalizedName; + } + + public void setNormalizedName(String normalizedName) { + this.normalizedName = normalizedName; + } + + public String getUniqueId() { + return uniqueId; + } + + public void setUniqueId(String uniqueId) { + this.uniqueId = uniqueId; + } + + public List<String> getIcons() { + return icons; + } + + public void setIcons(List<String> icons) { + this.icons = icons; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + ((normalizedName == null) ? 0 : normalizedName.hashCode()); + result = prime * result + ((uniqueId == null) ? 0 : uniqueId.hashCode()); + result = prime * result + ((icons == null) ? 0 : icons.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + SubCategoryDataDefinition other = (SubCategoryDataDefinition) obj; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (normalizedName == null) { + if (other.normalizedName != null) + return false; + } else if (!normalizedName.equals(other.normalizedName)) + return false; + if (uniqueId == null) { + if (other.uniqueId != null) + return false; + } else if (!uniqueId.equals(other.uniqueId)) + return false; + if (icons == null) { + if (other.icons != null) + return false; + } else if (!icons.equals(other.icons)) + return false; + return true; + } + + @Override + public String toString() { + return "SubCategoryDataDefinition [name=" + name + ", normalizedName=" + normalizedName + ", uniqueId=" + + uniqueId + ", icons=" + icons + "]"; + } +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/SubCategoryDefinition.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/SubCategoryDefinition.java new file mode 100644 index 000000000..b45ce4fa1 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/SubCategoryDefinition.java @@ -0,0 +1,58 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.devObjects; + +import java.util.ArrayList; +import java.util.List; + +public class SubCategoryDefinition extends SubCategoryDataDefinition { + + private List<GroupingDefinition> groupings; + + public SubCategoryDefinition() { + super(); + } + + public SubCategoryDefinition(SubCategoryDataDefinition subCategory) { + super(subCategory); + } + + public List<GroupingDefinition> getGroupings() { + return groupings; + } + + public void setGroupings(List<GroupingDefinition> groupingDefinitions) { + this.groupings = groupingDefinitions; + } + + public void addGrouping(GroupingDefinition groupingDefinition) { + if (groupings == null) { + groupings = new ArrayList<GroupingDefinition>(); + } + groupings.add(groupingDefinition); + } + + @Override + public String toString() { + return super.toString() + " SubCategoryDefinition [groupings=" + groupings + "]"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/ToscaDataDefinition.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/ToscaDataDefinition.java new file mode 100644 index 000000000..c4fa53b5d --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/devObjects/ToscaDataDefinition.java @@ -0,0 +1,79 @@ +package org.onap.sdc.ci.tests.devObjects; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonValue; +import fj.data.Either; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.stream.Collectors; + +public abstract class ToscaDataDefinition { + + protected Map<String, Object> toscaPresentation; + + + public ToscaDataDefinition(){ + toscaPresentation = new HashMap<String, Object>(); + } + @JsonCreator + public ToscaDataDefinition(Map<String, Object> art){ + toscaPresentation = art; + } + @JsonValue + public Object getToscaPresentationValue(JsonPresentationFields name) { + if (toscaPresentation != null && toscaPresentation.containsKey(name.getPresentation())) { + return toscaPresentation.get(name.getPresentation()); + } + return null; + } + + public void setToscaPresentationValue(JsonPresentationFields name, Object value) { + if (toscaPresentation == null && value !=null) { + toscaPresentation = new HashMap<String, Object>(); + } + toscaPresentation.put(name.getPresentation(), value); + + } + public void setOwnerIdIfEmpty(String ownerId){ + if ( getOwnerId() == null ){ + setOwnerId(ownerId); + } + } + public void setOwnerId(String ownerId){ + setToscaPresentationValue(JsonPresentationFields.OWNER_ID, ownerId); + } + + public String getOwnerId(){ + return (String) getToscaPresentationValue(JsonPresentationFields.OWNER_ID); + } + + + //default merge function for merging data maps - implement where needed and use mergeDataMaps method where applicable instead of map1.putAll(map2) + public <T extends ToscaDataDefinition> T mergeFunction(T other, boolean allowDefaultValueOverride){ + other.setOwnerId(getOwnerId()); + return other; + } + + public static <T extends ToscaDataDefinition> Either<Map<String, T>, String> mergeDataMaps(Map<String, T> map1, Map<String, T> map2){ + return mergeDataMaps(map1, map2, false); + } + + //return Either.right(item key) if an illegal merge was attempted (overriding data type is forbidden) + public static <T extends ToscaDataDefinition> Either<Map<String, T>, String> mergeDataMaps(Map<String, T> map1, Map<String, T> map2, boolean allowDefaultValueOverride){ + for(Entry<String, T> entry : map2.entrySet()){ + map1.merge(entry.getKey(), entry.getValue(), (item1, item2) -> item1.mergeFunction(item2, allowDefaultValueOverride)); + //validate merge success + if(!map1.containsKey(entry.getKey())) + return Either.right(entry.getKey()); + } + return Either.left(map1); + } + + public static <T extends ToscaDataDefinition> Map<String, T> listToMapByName(List<T> dataList) { + return null == dataList? new HashMap<>() : dataList.stream() + .collect(Collectors.toMap(p -> (String)p.getToscaPresentationValue(JsonPresentationFields.NAME), p -> p)); + } +} 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 new file mode 100644 index 000000000..e8c386bb2 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java @@ -0,0 +1,132 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +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; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; + +import org.apache.commons.io.FileUtils; +import org.onap.sdc.ci.tests.datatypes.Configuration; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.FileHandling; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.firefox.FirefoxProfile; +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeSuite; + + +public abstract class DriverFactory { + + private static ThreadLocal<WebDriverThread> driverThread; + private static List<WebDriverThread> webDriverThreadPool = Collections.synchronizedList(new ArrayList<WebDriverThread>()); + private static Configuration configuration; + private static final String GECKO_DRIVER_KEY = "webdriver.gecko.driver"; + + protected abstract UserCredentials getUserCredentials(); + protected abstract Configuration getEnvConfiguration(); + + public DriverFactory() { + + try { + configuration = getEnvConfiguration(); + + //Set geko driver path for firefox + if(configuration.getGeckoDriverPath() != null){ + System.setProperty(GECKO_DRIVER_KEY, configuration.getGeckoDriverPath()); + } else { + throw new RuntimeException("Gecko driver path is null. Make sure to provide path to the gecko driver executable"); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + @BeforeSuite(alwaysRun = true) + public static void instantiateDriverObject() { + + + File basePath = new File(FileHandling.getBasePath()); + File[] listFiles = basePath.listFiles(new FilenameFilter() { + + @Override + public boolean accept(File basePath, String name) { + return name.startsWith(WebDriverThread.AUTOMATION_DOWNLOAD_DIR); + } + }); + Arrays.asList(listFiles).forEach(e -> FileHandling.deleteDirectory(e.getAbsolutePath())); + + + + driverThread = new ThreadLocal<WebDriverThread>() { + @Override + protected WebDriverThread initialValue() { + WebDriverThread webDriverThread = new WebDriverThread(configuration); + webDriverThreadPool.add(webDriverThread); + return webDriverThread; + } + }; + } + + public static WebDriver getDriver() throws Exception { + return driverThread.get().getDriver(); + } + + public static FirefoxProfile getDriverFirefoxProfile() throws Exception { + return driverThread.get().getFirefoxProfile(); + } + + @AfterSuite(alwaysRun = true) + public static void quitDriverAfterSuite() throws Exception { + for (WebDriverThread webDriverThread : webDriverThreadPool) { + if (webDriverThread.getDriver() != null) + webDriverThread.quitDriver(); + } + deleteDownloadDirs(); + } + + private static void deleteDownloadDirs() throws IOException { +// System.gc(); + HashMap<Long,WindowTest> windowMap = WindowTestManager.getWholeMap(); + for (WindowTest win : windowMap.values()){ + String downloadDirectory = win.getDownloadDirectory(); + FileUtils.deleteDirectory(new File(downloadDirectory)); + } + } + + public static void quitDriver() throws Exception{ + driverThread.get().quitDriver(); + driverThread.remove(); + WindowTestManager.removeWindowTest(); + } + public static Configuration getConfiguration() { + return configuration; + } + + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ExtentManager.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ExtentManager.java new file mode 100644 index 000000000..c835648b5 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ExtentManager.java @@ -0,0 +1,177 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.execute.setup; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.util.HashMap; +import java.util.Iterator; + +import org.onap.sdc.ci.tests.datatypes.Configuration; +import org.onap.sdc.ci.tests.utilities.FileHandling; +import org.testng.ITestContext; + +import com.aventstack.extentreports.ExtentReports; +import com.aventstack.extentreports.reporter.ExtentHtmlReporter; +import com.aventstack.extentreports.reporter.ExtentXReporter; +import com.aventstack.extentreports.reporter.configuration.Protocol; +import com.aventstack.extentreports.reporter.configuration.Theme; + +public class ExtentManager { + + private static final String VERSIONS_INFO_FILE_NAME = "versions.info"; + private static ExtentReports extent; + private static ExtentHtmlReporter htmlReporter; + private static ExtentXReporter extentxReporter; + private static final String icon = "$(document).ready(function() {" +"\n"+ + "$('.brand-logo').html('').prepend(\"<span><img src='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQ4AAAB7CAYAAACFKW5jAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAABmJLR0QAAAAAAAD5Q7t/AAAACXBIWXMAAABaAAAAWgBwI7h9AAAAB3RJTUUH3wwXFAQf1clFIAAANNxJREFUeNrtnXeYXVXV/z+n3To101ImvZFGQiCANKUoSBEFebEj1hcb2MWC+lpAbGD5CaKoiL2ggIgoRUIgQAohJCG9TTLJ9Dszt52y9++PfSeZTO6duXfmTkk4n+eZJ5Nbztn7zNnrrL32Wt8NPj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+PgOjjXYDhpX7WgkZMD2qY2qQFtDlSkSvjlsaGJpGUIeQAS1pyb60hMurRrv1Pj5jFnO0G1As9PvbmBiEDkeS8CSmpuEhCOi6FTW0sAYhiTRNTTM8JBoaGmDpSEODoK65EQM7YpLCCCVC97ciAUODuSU6UpO88Jpxo91NH58xwTHtcSx6vJ2DKUlTSlBVVqKVesnqlrSosaWcFTa0eXFX1nmSmrChjTc1qoCIKwlJ1W8NkDoITUPokAQ6U0I2uYL9FZZ+UNfYnvDkhoWlRnNdhIMP7HWcsqDOonKDsK7znzPLRvsS+PiMCsec4VjwWDvNaUFTh8eS8VbFvpSc4Qh5esJjKbBASDnDlZTqGmEpQQ7yPLoGSGxdIx4xtEZbyhdrA/pGIVk+ParveEt9qOH69d3i1AqTcbg8eE71aF8aH58RY8wbjresjbGiCTzpsb/JYUF9oKwpJZekhLzQkfJMIVnkCMoBY7BGIl90DQyNeEjXdhsaz4UN7V9TwvozK88p31Pzzza5uNykOqDzh2Wlo33ZfHyGlTFrOC58opMGT9DuCG6YGdG/ty0xxxby4pTgEkfKpa6gYrgNRX9ogKHhBHVta4WlPR4xtPtmRPXn/7U73XlGfYCoAf8+o2K0L6OPz7AwJg3H/Mc6aEoLFpUawe0J79RuV76525WXuYLpYrQblwUNCOh0Rk3tuQpL/119WHv4yS3O/lNnBji53OQnS6Kj3UQfn6IypgzHOcvb2ZWQnFRpWavbnDM6XfmelJCXOIKq0fQuCsHScKOmtqbE1H41K2r89Yl9qQPvmh3hnqX+9MXn+GHMGI4TH+vgX2eEtLOXJ09sscUHEx5XOUJWHysGoy+mhltmas9OCOl3/E998O9rO9yub82PMLf0uFkB93kFM+qG44HGNF/dnCSoU7s9Lt4bc+UHUp6cdqwajL6EdS01OaI/eOY469t3nxR9PuFJGTX10W6Wj8+QGFXDIaUE0M5d0XnW+k73pg5HnutJjNG+KMVG12Ba2NjzwWnB2z89O/xLDdoANG3U7baPz6AYlUeflLLHaES++nLius1d3m/bbHnB8Wg0AISEnXFvyv0H7Fu2x727gaU918HH51hkxA1Hr8EyrdkW31vZ7n67MSXqj/chJDXY3O1Zrba8HPgN8DYg2MuI+vgcM4yo4eg1QM4B7m1Kyw++2OlFRvsijEznoTaoMyGkA5wA/AT4IlDR59r4+Ix5Rsxw/L4hBWAAbwF+AZz5SprhmzpcPSnIpNChS14GfBa4HZjSYgu+uTkx2s308cmLETEc5yzvoMrSw2khrwN+AMwAmBrROXPc8b88qQNXTQxy3bQgxpHW0gLeCdxZFdAXfn5jguWtzmg318dnQIbdcLz26U7Chla+KuZ+xRbcAtT0vBc1NL4wJ8yp48zBV6ONZSSUmxrXzwzx/UURaoJZL7cGXPTPg/Yvrq4PvursPzT50xafMc+wGo4LVnRQH9LKG5LiyxNC+g0lpnZU7vXicpO7TyrhqkkBwoZ2fBgQCRFD47xai7uXlnDz/Ah1wf4v9ZOt7ikr2pw73v+qstO1n+z3jYfPmGbYwgyvf6aTqREt+uAB58uTw/rH/rSsNNhrfn8Una7kvkabn+5KsabDJeUNdwuLTGacjwtonFppcs3kIBfWBai0Bu5AhyO58rkuHm92mFFirHltrfXedTH3hWfOqRjtXvn4ZGVYhuWtWxK80CmsZ9rsT+9JiC9+bGYo/J2F0bzcm4NpwWPNDvc12qxsd9mXEoieyraxZER6OQSllsacEoPzqi0uGW+xtNyk1MyvsRL4xZ40H30xTsKT6BrMiBj/vaQu8J7tCXfHg6eXj3ZPfXyOouhD8SMvdHLj3BL99c90XrM17t2edGXpdxZG+OSscEHHSQvJ1m7Bs+0uT7Q4rIm57E4IEp7kCC9+JIxJn/OFdI1JYZ1ZUZ1lFSbnVFssLjOoCeoFN+fxFof3v9DN9m5xqC+mBnNLjL9cNSn4walhvfXaqaER6KSPT/4UdUlDSon221bWd3WdtyfpfS3pSVUSOojBHdQ1FpYZLCwzuGZKkH0pwY64x/pOj7Uxl21xwYGUoDktSAiJK6CYYQFNU0uoYV2jOqgxKaQzM2qwoFT9zIoa1Id1FZcZJI81O1y/Pn6E0QBwJWxPiDf+p9nZ8+mZoS883+4ml1Ue/6tPPscORX1ev3ZFDFfI2eu7vN+12PJkACR8dk6Ym+dHinYyiYoLtNmCVluyJynYkxQcTAmaMq/FHElaSBwJXsagmErBK/OvRkCHgK5haRDQIWRolJka5abGuIDG1IjBlLBOVUCjOqBTbmlF6UNaSP683+amTUl2xL2cf4VKS+u+bHzg479aWvJzQPq1LT5jhaLdiQ812fx2T7r0v63OHftT4m09gxUJ59da/PXUUsrynPcPlZQnSQpwhcRD1YqAKjbTAV3T0FEehaH1/CgDMtzsSgh+uCPJz3eniTmy37+ABiwsM3Z+aW7kf66aGFjlGw6fsULR/N/X11jaFzcm3tmUFld6fWICz7e7PN7icPn4wIh0KmRohIzMyccIHY7k/gM2P9ihVo1kHs2TwM6EmL4z7n0RuFZK2e4bD5+xQFHyOKSUfH5jYv7BlPh4WhDs+36nI7llS5It3d5gDn9ME3PUtOStq7r433VxVre7BaWqdDuS3UlxkSO4llGqZvbx6UuxbsRQxNA+1u7IWVnf1WBlu8snNyTYmxyLqqHF50Ba8Ku9af5nVRfXrOnm4YMOSU8OygnalxLBtJAfBZb4iWE+Y4EhT1UyN/IFC8uM/xnolv7HAZuPAN9eEGFOyfEnvZEW8HKXy0NNDvftt1nX6WJ7HN7+aZBICbrGNOB64DopZcKfsviMJkMyHBmjUQVcf3qlWbGk3OCZVjfnIJHA/QdsmtKCr5wQ4fwaixGKlw4bnoQ9ScEzbQ4PHHBY3uqwLyVUZ4doMHqYEtYJ6RrAG4G/PN5s3z/a/fZ5ZTOk2zpjON4P/BAIPnDA5n0vxGlKif6PLKEmpPOeKUHeOzXI7Oix5X2khVoCXtPh8Z9mm+WtLjsSHk6Pd1FEgrrGL5eW8JZJKrAsJI90OOLqXzekO26Y+cqQMvEZewz6Ns8YjQnAfcBpoJ6+9+xNc+PGBAcHMh4ZTigxuHpSgCsmBplXYmCNwfCfI6HdFmzu9lgT81je6rA25tGQ9NRUZEhXsh8kLKs0+ftppT0CQOxLitSdu1Mf+sbWxC/EG2qGeAIfn8ExVMPxQZS+xqF1Vk/CAwdsvrgpwYZOb+AzZFz6yWGdc6stLqixOL3SHHJW5mAREuKepM2WbI17bOzyeCHmsibmsjchaHN6bUg7zM0L6Ro/PjHKtVODh061Nuby4RfjK84cZ17+7QXRVj/W4TMaDCrGkTEa1cDb6WU0QCVTvXFCgFlRg1u2Jrmv0Sbh9rOakHl9b0Jwz540v9+XZmJI56Ryk6UVJovKDE4oMai0NEpMjUiRjIktIOFJ4p6kOS3ZnfTYHvfY1i3YFvfYnvBoSUs63SyGYgTGqga8tT7AVZMCR5zuYFqytds7pdLSzr9xY+KPw98SnwLp+XMd18tfgxoCpz3Zwcqzy98M3APkrF7rdiV/O2Dz4x0pVnW4uCLPM/a65BFTo9zSmBDUmRLRmRDUqQ3q1AY1qgIapaZOqan0L/Q+9R62kKQ96HKVAYi5klZb0pxWaelNaUFDStBqC5KeMiSMdAFdDi6tC/DjxVGmhI+cu31ra5IvbExwQqnxt1sXRt92SV0gOXqt9EEJUy0CFgNTgCjqzkkCDcALmZ+m0W5oMSnY45BS8udGO5ry5NUhQ+u35LXE1HhHfZDzqi3+2mhz7940L8Rc0gMFEXu9l/AkCU/SmBSs6Tj8uqEfrjnpSSXv7bXLjA0QEjzAkxJPcrhEP8f5RjXZVIKlw5snBbl5XuQoo9HpSh5rcfAkHEzLs//YkF4spFypj73pylnANeTOE4qjAupbBzjOFcAlo9D+DuA2YG8/n5kEvBV4MzAfKCH73dMNbAR+B/yW/AxIFfAZlFc/0vwX5RD0S8GG4/vbkzzR6i4bH9Bee1aVldd3JoZ0PjI9xJsnBHik2eEP+2yebXdoTWce7/nc930+4x0qXivQIxxzYyyDhPEhnQ/PCPGh6SHGZSmc+W+Lw8o2tdzd4YhxOxPiMg1WjnbT+2AC1wLvGeBzu4DvDfCZU/M4znDQDPya7IZDQ6n0fw04k4GTKEsy/VgKXAx8HliVx3feBtSPQt8FeRiOgtcw6sO6tqXLu+jZdrdghZnxIZ13TQ7yh1NK+PtpZXx+bpjTxvUSvTmuZ4U5kFBmalw1KcDvl5Vw4+xwVqPRlBb8YEeKTkddJE+i7Ut5F/xkZ2qsLa1MQw2sgbgYGGgn7tGqUXDIfTe+Dvg5cDaFjR8TeC1wF5kNuQbAHaW+53XNC/Y4VnV445psce7L3R5CZTQWTImpceY4kzPHmdwwQ/Bip8cTLQ6rOlw2dnkcSIvDy5wwdr2EwZJZSaoL6rym2uTt9UHOrbYoyZENlxZw+44UT7Q4h66FBNpsuWBlu7tESvnvMbS68mpgah6fOwkVF3hqtBtcADOAbwIzh3CMJShv5RqgZbQ7NFgKMhxSSi5d2XWiLZi3ocuj3ZFUBYZ2w9YEdc6v0Tm/xiLuSfYkBC/EXFbHPF7qVII9TWml/OX1jU+MmbEy0IU7/GvU1JhbYvC6WovLJwRYUm70ZIVmxZFw1+4UP9qRwu3zDOz2ZKTZFucD/x7tLmaIoDyJfOaw44CLgBUcG76mAbwbNfD7w830p79rcAFwGWp/oWOSgj2Odke8KunJ0p78hvNr8otz5EPU0JhXajCv1OCt9Wo1pNVWS6Uvd3lsjwt2Jz12JQSNKUG3K0l6kBIy96030salTztChlr9mVdqsKzC5Owqi5MqDMYHB/Zy0wLu3JXiKy8n1BSlT19cgbY/KZa91OWVA7ER7mk25gJnFPD516HygMbaikO2u6YOuJzc05O9wN+A9aipzhzgysy/fQmgAr9/AHLtwjVaj8W8zluQ4eh2ZUBDe5WUELMlv99nc1aVRR5jYFCUmhqlpsa0iM6rM4HYlJDEXYi5ksaUoCEp2J8SHEyrn6a04GBaJXAlPUlSqFUZZ5hny4aupmAlhkZtUGdmVGdeqcGiMpOFpQaTwnpBQkZtjuS27Ulu256iK4fgj1QrRgufb3enoG7Y0URDGYLaAr6zABU4fDDH+w65B1Y2LLI/6QWQJj/Ppmcpta9/Ox8Vv8lGM/BR4IE+3/s3Ksg6Kct3FqKCn1uyvCcz/U7m2WYdCJJ90DuZn3zQADufDxZkODQYb2rMEJn//L0xzVsmBYrqdQxESNcIBaAqoDEjcqTFcgTYUmILiLuSFlvSYgtabEGbncnhyEgLdjoqt6PLzUgMCnCkxJXZtUsNDayMzGDE0KiwlCcxIaQzMaQf+ndSSOWZRA3lbQyG9Z0e/7c5wd8bbZyeYrkcpDwqyi1toZRy/SjHOcpRU49sj5Fu1I3d90aJoJZb/0n2oNwfgLV5nl+ilkffkuW9PcD/AW15HiuV+U5vJpM7mPtQ5qevsfkvagn201m+U0luw9GCqoTOtxipFvgy2Q3Ub1CeUD5owM58PliQ4Qga2vSpEX0KLeoUzWnJzVuTzC81DtVSjCaWDhYaUQMqLY36MKip6WGEVMlhQspMfgekPUlKQNKTpAXILEY+oGvKaBlKwNjSD8sNDiZAnI1OV4n+fHdbko35pOsDZaYWmBU1lgC/Z3RjBUtRAc++eMAvUUHTRVnePxeVOJXtht2U+cmXE3O83okyTgeG0L8w2f8iHvAI2Z/qAvgPyhvpK1UfILdhSFBY3Koe+DjZDccG4O9D6HdW8jYcmTTzBadVmtF796bp8TqeaHb45pYkN8+P5FwVGEvoGqh4bq+2jnK7XQkr2xxu25HioQOFCf5MDutMi+jzUDdhfJS6oKO8jWxL9C3Ar1BP8WyGYwZqaTOvJ90Q2jdU7Zl0jtcFcLCf7+WaJLvkOS3Is3+5GBZ5/ELdhPkX1lra3FLj0LPNA362O8XXtyTpco+F4PjYQUhY3eHy0RfjXPV8N3/ZZ5MU+RsNTYMl5QZlpjYDKBvFrtShchSysQp4CfXEzxbAtVDTlWJsHpPrBtQZerAxRvaBbgCz+vnePDhaThM1fWsuQp9BGa/++l50CjloGJg5I2rw3inBI8rfU0JllH755YSqHvXpF1eqKtcbNyZ403Nd3LEzxYF0fjIEvSm3tJ74Uh2FBSWLzRmoFZW+COBfKG9jTeYnG2cCs4vQjly6lMWQVNpDdsOno+IqdVneOxGV+Zrt3Ps4Oo4yWCRj2HBUAHUa8O4pIS6sDRzRVFvAj3akuO6F7lekKHE+JDzJ8laHD63r5rKVXdy6LcneROEGAwAJZ42zWFJugjLqkwZxlGLQ4zFkq1tqRAUIQQ26B8nuuo9H5TYMlVyGoxgex2ZUvCAbZwEf43CluI6K3fyM7HEfULGPjiL0GTJlWf30vegUctByMkU3VQGNr84Ls7DMOMJ4OBL+uN/mHau7efCAjfPK0CUekIak4J69ad62ups3PdfFXbvS7OsRbR7k7Rw2Nd45OUipqZEWMrSy3c0nW3M4mIYKfGbjOQ6vGkhUEHF/ls8ZqBjJUKdbw+lxdAJ/JHsQ1AQ+hMrbqEMVqN0DLMtxrPWoZdpiPWFHfKpSSOCkDLWEBMDScpPvLYpy3bo427uPXAF4vt3l3Wu6efvkIB+eHjouhYkHIuZIVnW4/KvJ4ZEmh03dxREuBkDC62stLqpTq5vb48K4ZWuyLiEkkWIt8eTPa1CrIn3xgIdR05QetgJPonRc+nIKKni6YghtGU6PQ6LU7q4mu6GsAG5GTUFOJffY2g18FlUxWyxGfKpSiOGooM86/GtrLH6wKMr16+Ns6208NGh1JD/YkeLRZof3TA1x9aQAk8bAku1wEvckW7o9Hm12+GeTw+oOl5jdqwK4GGNawpSIzqdmhQ8llD3V6vBsmzsupDaoG0k/LwxcSvb7qAFY3ue1NCpJ6kqODoZWoryOpxn8snJ/+cPFuPoHgFuAE8ge05hK/3U661FG4+EitKVvv8es4ajM1oiL6ywiRpRPvpRgTcfRCucbOj0+syHO7xrSvL0+yOUTLKZHjh8PpMuVbO72+G+Ly2MtNms6PA6mhUoiK9bt2ouoqfG52WFOy2xCnfQkDx100DRqV7d7AY58wg83C8jozWZhJbA9y+tPoeIFi/u83pN5+gMGv9ownB5HD0+jvIW6Ar7johLEvgS8WKR29O33mDUc0VyNeE21xT0nl/ClTQkeOGAfWYylqSSrVe1Kt/Onuw3eNCHApXUBFpUZx0TuR2+UiI5gQ5fHilaHFW0uL3Z6NPc2FjAslQaWBh+eEeLdU4KHks7WxjxWtLlEDMpXxdyR3tL+tWRfzXFRy6/Zli8bUSstJ2a5SvNRbv4/Btme4Yxx9PAqVLp4vhwEfgz8P6C1SG3oy9j1OJrSIloTzK01taDU4K4lJdyxK8WPd6Ro7Ktyrqm8hU2dHpu6kvx0V4qlFSavrw1w5jiTuaXGiG1KXQieVBmd2+IeL8Y8VrSpKciOhCqyY5iNRQ+WBh+YFuLG2eFDIs4pIbl7T4qWtGBaVA82pcVIzgUrUZWw2Xq9m9yxCoFaXXk/vWJmGUqA16MMy2D0KIbT4wijYjM3ouQC82U5SrCov+S8bHUmWqY/NgNP3cau4bi3IV37jvqgXttPRVtVQLnRZ44zuX1HikeanKOFijO/t9iSRw6qwGFtUOeEEoNXjTM5rdJkYZnBhKB+lI7ocONJNRjbbMmOuMembo+1MY91MZedCXHYq+jVj2GvYZQQNuBDM0J8cU6Eil4iP/886PCX/XZPM4wRaE1vlpI7xXsFynjkYh3wPGpq0pfzUEvL/X2/n6uVlaF6HJUog/EhlOddCK8D3gXcSXbDthRVZ1KSpc0vomIiafpnIMOhUeRyhLwNx0MHHX121OCyAXacNzQ1dVlaYfLgAZuf7U7zTJtLKlsadeb/TWlBU0rwZItDyNAYH9KYHjFYVGYwt8RgWkRnWsSgKqDqRYIGBLTBGZWeQri0p4KZB9OCPQnBrqRge9xjc7fHnoQqjGvPthXCSA5NCXUhnU/NCnHd9BDRXkVz2+IeX9+SpMOWPdNBGfdGLPlOR+VuZFs+TaOCf/1VZHaigqQXcPQTsScFfTCGo2eu3/evNBSPoxK1WvJeBpe+XYaKbexGxTl6EwA+ALwhx3e3kp/nJRjhPI68L8TBtLAfOODw+rpAXqUdZabG2+qDXFgb4OEmJVT8dJt7SPoulxFJCcmuuGRXXPB4s1K8KsmU15ebGnUhnbqgRpWlUxXQKLNUKXuJqR3RLg9whTpetyuJe9DhqCrZNlsZjGZbEHeh25Mk+6bLj4ah6CGjrPaqKpMvzInwulqL3oW2bbbkpk1J1vYKRnsS1xUjVuQ2ETg/x3s7UQHEgfgPKnNyWp/Xgyij9CcGftL2JZfhGKzHEUZ5Gv0ZjRZUwPfUzHXJxgTUakwjR1b7LiC30WhGCRznk+sxdqcqpkb838223NAV1BaX5W94qwIab68Pctn4AM+0udzXaPNYi8OuuHc4QSyHEemh25V0O5JG4OWuo6+jnlE813p9USJ79CoQ/V3W0TQQfcm0cWpU592Tg7xvWoj6PkvYcU/yrW1J/rw/fUSXBHRPCGkjpVOZK8Uc4AnyS6XeDDxGdjHiM1H1HxvyOE5vih3jeBNwHbnHyUvAF1BG8ApULCNX/GMR8K1Mfxsyr12Eyprti4fSNc3HAMNYNhwBXduzJ+m59+61rYXzTQqVmigzNS6stTi/xmJvUvB4i8M/Dtisjrk0JMVhWcABNm7KhpBgD6R4PhYMQy4yzR4f0nnDhAD/Oy3I4jLzqKlYypN8d1uKH25P0bckKOnJfcsqzZFYig2gcjeyFW45KKOxkPz28NuMcsX73oeTULGOQg1HrgE0GI9jMvAJjo499LAWZVSezfz/d6j4x80cHfTt4Xzgq6gS+HJUPku2dq1AbR+Rb/Xs2F2OnR4x9u+IC/c3DWnryokBTq8c3MqfqcH0iM70KUHeXh9kR1ztxfpYi8MLMY/dCXGkFOBYHvBDJeNUT4noXFwX4JopQU4uN7Pun9vlSm7ZmuT27SlVQdsLS4fqgN68LuaORPLXdFQMIhsmKt36E3key6SvYIqiJ4byC1QVab7kGkCD8Tgu5+hckx52ATdw2GiA8hLuRhmPr5Ld4OjAO1Bp92Vk1y9NAneQPTU/F2M3OPrxmaFYY0p0PdnihL+7LcnPTyoZ8vJpUOeQxui1U0M0JAWbulye7/BY1eGyucujISWUPsXxYkgyxqLM1FhcbnJxncWldQHmlRo5vbiDacHXNif52e4U6SymIaRr4txqs/VjM8JcP/w9OI/c+31oqAzjYnAyyr1/poDvFCuPowS11JxtfLiovIzlWd5zUPkapcDnyC4VEOCwIlg2o7kJeLzAazV2pyqnVZqxyycEmp9td2ofPODw891pPjYjVPCUJRdWjycSCXBxnRLqbUh6bI0L1sVcNnR57Ih77E4q6b+UJ4+W+BuLRiXTRkOHSktnQanB2VUm59VYLC4zGTeASvyGLo8vbkrwQKOdPUomoT6kpy4dH9g1AtKB/Q2oYlMNXEjhhiOXx1EItSgdjWw0oVZHcg3UFPAdlOdxPX32Vs4QzPHdNCq2Uah489idqgAdb54YaL6/0ea/zQ63bk0yp0TnkrpAAYfIn6AOM6MGM6MGF9VaCAntjtIM3ZUQbOry2JXwaEwJ9qWUYHGrrfRD7VyXcTjHVZ/zBQyosHRmZ0SLT64wWVZhMiOqNtAeCEfAPw7afOXlBOtiuWUEdQ1eV2slLqix9g540KEzn9wp5sPBhcCPyH//kWLlcZSTO07RRP+KX6CSvb6BUmX7IPmPs3+gYiWFTjlHvKy+EMPRNSWs7/7YzBBrYy4HUoLPbEgwztJ51bjhfwDpmlqhqQqo3esvqlX1drZQmZ2drlI835sUHEgppfOmzJJrU1qJFic9JUjsCCWm4wglTlzw7C+zV62pKy3SoK4EjCeGdKZFdGZGDeaXGiwoNZkc1hkX0Aq6a3cmPH68M8Uvdqdps/tRBJMwOapz9aRgU8TQBrqZh4qGGsgjuZ/pIlTVbL5FYcWKcVj0e9XzIsbhxK53MvAAPgB8F2gf5LUaiTqdQxQy4iWw+ZI6i/dPC/H9jKDuR9fHuWNxlFMqRrpMQhHQoTqgUR0wmNGneM6VaiUiJSQpT+VrxDLq5j0q5zFHbZ9gS4ntKU0RL4vMuaFphA2lsh42lGhxmalRFdAZZ2lUB3XKTY0SE4KDTHeNOUqs+Ec7k6yLeeoO7edQmgZXTwxySoW5A5VUNZz0bKCUrUVp8pfgz9oV1NO577GjqCDpI+T3FO7P1yzkj5Ikd/5EBdlFi7LRisr8DKFWUPobJLsYeBPugfqejdH1ODRNQ0r5UlDX7E/NDAU2dXk8dMBmdbvL/66Lc9vCKGdVjY7xyNm5TPJYyZgMfhwm7kmebHH4ya40/25ysmfZ9kXCnFKDa5WM4yYK239kMJxC9uIuG7Ut4vMM/skWROVDnJzlvXNRwdh8ckP6C44WMoC6Uepc2aYrFaiktYY8j3UQ+CkqqNxfjcti4COo5dzBLKuPTcORYSvQOD6kT/32gggxR7Ci1WV1u8t71nbztXkRrpyYX2apj0pse7zF4Zd70jza4ijtjjyfjRFT45OzQswtNWzgBYZ3awQDVXyWLcV8F0rFfDAp4r05EVW30bf3s1HSfL/N4xjFyuNoz/Rnepb3ylGJYc+RX57FKcBXgKoBPhdGLWN3A7dRuAc3ZqUDQVnZ7QDzSw1uXxTl5Ew+x9Zujw+t6+abW5JqXu6Tk/0pwa8zUoLvXN3NX/fbxJw8vIwMGvCW+gBvqw8CtKcFw70Z00Rya4I+g1K9GipPkn26FUBNV4J5HKNYqwud5N4ISkeloL+H/h+8Zqbdd5P/zvYlwOdRe9QWIlozpjVHQVnDQ8tjJ1eY3LWkhFdXW6CpGoqvb05wzdpunm5zEb79OETCkzzX7vLVlxNc9mwX73uhmwcabWJu/gYDAKmKCL80J0JY13iyxdl/w/p4sWT2c3EW2Xdod1Dp1sVIdV8PvFzg+fvSXxykkHtdoAKyXTneL0dNzz6BynLtPciDqCnXt1EJbIsojArg68BVFHZnjNngaA9PoebTEYCTyg3uOinKjRszWxYKeLDR5oWYy3unBHn3lBDTIsNi9MY8CU+yMyF4qtXhHwcdnm13aVJbxQ0uCVrCSRUm310YYVpEZ1WHy81bk+v+tTmV73LlYOh54mdLZtrDkdmTQ6EN5XVkW+7tSUEfSKezv+BooTfhSlQtzeU53q8EvobKBH0eZfQqUbKCp5G74I1MG7ei0tqzBVprgVtRD+oHyY+xG+PIBEjXoZSrl/S8PjtqcOfiEuaVJPnRzhQdtqQhobId/9po8+4pQa6aGGRy+Pg3IDFHif482ery72aHlzpd9qcytThDKaiTsLDc4EcnRjmp3KQ5Lbh5S9Le0OU9EqwLuIWWkRbATNQTPxvPoWIcxUCgMiav4+h07Z4Yy6/I7QX0HCMXhd58ncD3UTGKXFtPBFAeRaFexUvA+1Cxkk+QPUlscub8CZQBy+f6FaPfeTEYj+Mgaq+MJb1frApo3DQ3wsIyg1u3plgTU1OV9TGPz25IcO9emysnBrhsfIB5JUbWeoxjkbgn2Z8UrImpNPnn2l1e7vaOFv0ZirMo4eRKk9sWRjljnIkj4Ac7UjzR6uycV2o83XB2xXB2MVeKuYfa33Qoy7B9WQtsI3sNx6moMvSV/V+pomZQLkd5FbdQvFT6nagVpOdQRX4VKDW0bDGNWcDtqJjKcwP0e8wbjp7dud5LnyeDpcPVk4KcXGFy2/YUv21I026rJKu1HS5rYy4/3ZXi3BqLi2pVoVx9WD+mVmE6XaXlsbHTY3XMZW2Hx0tdLo0pSbq3kE6RVC414Nwai+8sjHBSuYmQ8Mu9aX60M0W5pT16UXVw71D2ExiAKKoSNttNvZfC0sHzoRk1FV6S5b1xKDWtZ8ltHIo5Vek53t2ZY97E0Da9kqjB/3kO16LEUCI/JcDbcrRxIapS9n2oOFB/bc3G2DAcmenKs6inQ9YqyVlRg+8ujHJxXYAf7kjyeItDOpNOsych+NXuNL9vsJkW0TljnKrbOKXCZEpYyQWOFWwBLbbKSN3QpSQEN3UrlbCmdB/xn2IrmksIGWrTpS/ODTMlrKuNPRptbtqUICXoPiGk/21n0hvOitglwOk53lsN7Cjy+TyUW/4Bjnbfeypmf0JuFXRJdiNnUNgqRW8c4C7U9PwzqH1k8k0A62E/aoOmn3L05totqIK4EuCNOb5/Kqqw7v0oL6UQ+suCHTSDzdhq73bl/WFDO9PQslu0oK62Tji90uS+Rpu796RY1XF4U6K0kGzu8tjc5XFvQ5rxQZ0Ty0xOrTQ5vdJkdonB+KB2SJh3OJFApyNpslW6+ta4qoXZFvfYmRDsSXh0uZIjitaHYeuD3g2aEVV7p7xzcpASU0MCf2+0+eRLcQ6kBOND+qolZdbzdywpVAKzIKaSe6XjTxRvt/XePIcKCGYLLnZlXs9lONpQXlCkz+tphpZZK1ECRS+i0u6vQsU+xtNnr6FeJFCKX4+jCteeJ3c26j7gk6iM1Z7ckd5ygE6mDZeg8kv6JohJVFVttmncywxDjs+gbn0pJbdsSS4+s8p86Kwqa2I+BzmYFjx00OHXe9M81+4S73la9/5yZrUhYmhMDuvMiOrMLzWYX2oyI6JTG9SpDmiUWxpmRnN0oHMLUEpgUq1yxBxJW0ZCsCEl2BH32BEX7EkKGlKCgymlB+L1NRIjgVSJXZeNt/jkrDDLMmn8noQ/7U/z6ZcSNCQFloE3t8T4yEuNyTt4+8QhnrRfguQeGP2lZQ8FDbWCk8tDSJF7+dfIfLfvX0xmvles9oZQ8Yc5KI3U8ahSeoHyIPagPIvdqOBxvnGg3tfbI/v0I5fqeYjcMgBFF3ga9JCI3t8SvGJS8Ccfnxm69qTy/B2XNlvydJvDn/crCcF9SaHyPbL9qXsaqamNiKosjXEBncqARnVAoyagU2YqvdHenokjJEkhibtk6lFU5WwsU6PS4ajfU57kKOGwUdIYNXU4rdLkuukhLh8fOLTfTMKT3Lkrzc1bEjSnVc5HpaWtP63SvOT2RaV755YeJ1HmY5+eO+cVkb00+GFy135OnxM5a0bU+MvXTgjXzogWNoV0BGzu9ni0xeGxZofnO1TF7VHbD/RmIN3QfD47tF4XF6nK70+uMHlHfZArJwao67X9xL6U4Ftbk/xsd1rFUzSwdLy5UeNzvz+57DsLK46fHfF8ji2GNITu3Jm07tmb/t7EkP6R7y6MDjpPI+FJNnV5PN7i8Eyby+qYy/6kyC1mfCyTMWhllsaZ40yumhTk4jrrCIMhJDze4vDVzUlWtDpH+KuTQvraC2oCb6gL6g23LowUdm4fnyIxpCF5yTMxrpgYXHTXrtR99WF95m0Lo0waYpJX0pPsTgqebXd5ts1lVYfL9oSn6l+OVfnATLutjDjR+TUWl45XO9iV9lmLbkwJ7t6T5ic7U+xLHrkbXoWlpS+osT72p2WlPx0BtS8fn5wM+e6TUmq/3pv+1Pe2p745Oayb318YYWaB05ZcCAltjlp9WRVzWdXusr7TY19K0GqLI6UDx9I46tWusKkCvadVmpxfbXF2tcnU8NH6oklP8kizw/e2pVjR5hyZaYrSAXldrfXgh6eH3vly3O24fobvbfiMHkMebq6QGBoT/rjP/sPnNyXOnhTSuW2RSlYqNraAmCPYFld5FS9ktEj3JQVNtlAVpiNtTPqcL2JoTMgogZ1WqeQCl5SbTAzpBLI4Y46AZ9odfrorzT8O2od2ZuuNDlwxMdD8iZnht57x345HuaKQrUt9fIpPUYbWj3cm+dC00KV/3Gff8/GX4pXVAY1b5ke4sDYwrHu/isxer01pya6E2utV5V8I9ic9mjK7ttkiy+rJEK+anjES1QGNuqCSC1xYarC43GRuic6EUP/JbLaAtTGXe/am+ct+m4N9N+nOoANvmhjwbpwdvvXkCvPLgONPU3xGm6LcgVLNGQKe5Na/N9ofveGluJ7y4OMzQ7xvapCa4MgtGUrUU7zNOaw9ui8l2J3w2JPRI+12JUkBtpBZS/91DSxdI9Dzb0ZTtNzUqA4qQzElrDMprFMbUEai1NTyUnzvdiXPdbjcuzfNPw86HMhhMHr+OFdODPCNeZGn55QYb5GwV/eNhs8YoGh3YcZ4TJbwm4ebnLM/+VKcLV0e59ZYfGJmmPNrrKyu+kjSY1SSGR1SR2TPsOkRIrY0DUtXWzcE9PwSzrIhJOxNCh5tcfjrfptn2pz+RYhRm3e/tT7IN+ZFmqaE9WuE5GFjON03H58CKOqdmDEe5wG/Xt3hTvzcxgT/aXKoDGhcOTHA+6eGWFphHlNFbUOh2Zas7nB5+KDNv5sdtnZn9svtr/+Z7NEPTAvyhTlhpzqgfwP4hqaN2L6wPj4DMhyGQ0cVKX27ISlKbt2W5O7daeKOZGJE500TAry1PsjJFQah4+wJKiQ02YJ1MY8nWx0ebXbY2OXR5WRJr896AWFCSOezc8J8YGqQsKH9Fvgo0ObHNXzGEkW/GzPGI4ySP7s+5Unjj/ttvrMtyfqYKhWoCemcX23x5okBzqoyj0h+OtbodlUMZU2Hy1NtLk+3uWyPF2AsenFqpcn/nRDhtTUWmsYzmtqPY7tvNHzGGsNyR2aMRxVKhORtgLa52+OHO1L8fl+a1rQaVGFTY1GpwWtrLc6ttlhUZlA7xo1IzJEcSAu2dHs835HJLelSwj090gGFaoiWWRrvmBzkU7PCTIvo7E6IXZ2ueNeJZeZy32j4jEWG7a7MGI+pqJ23LwQ0W8CTrQ4/3ZXikSZH5V1kWlFqapxQYnBKhcmrxqnch0lhnUqrsF3QikmXq3aD259SZfYvdqrl3q1xj+bM/rWDzmaVavVmWaXJJ2aGuXyChY7GYy1O2+Mtzg3fumnXvfLP86VvOHzGIsNtOECVH98BnN/zQtyTPNXq8puGNI80OSqHoRemDjVBnRkRnRNKDRaXmcwtMRgf0qkNaoyzdEx96NJGErXbW7crabMFzbakISnYHle5IDsSHnsSgsa0IOX1KrUf6lWTMDWic+3UEO+ZorRYW23Jr/amuh466Hzu0fWpO9+9IOj9cnglAX18Bs2wPs56GY95KPmz83u/nxbwQszlj/tUTsO2hIfT293vcUgyy6FVmWSr2qDap7U6oFNhqbL6qKERMVS+RTCHupArJUlP5Xg0ppSR2J8StNhKn6PZFnS5Eq+vcmWxrpKE2pDOFRMCfGBa8FB27eoOl9t3pGKrO9ybtnaJn9RHDGfn6yqG80/j4zMkht0P7uN53A5cfNRngN0JwdNtDvc12qxoU9sIZH3C903Y0o78VdNU/kXfBRuJ2hPW65270c+xincBVJsmhnQuHR/gXZODLKswsXQVL/ndvjS/2JNubk6LL0wKa7+IpTV3/QUVw/K38PEpFiM2gc4YkCmo1Za3kkO2MOlJtsUFK1od/tXs8Hy7y8G0OCzbdyxM+TMGKWhozCs1eNOEAG8Yb7GgVBkMV8LTbQ7f357iuXZ32+SwfuMPFkf/+vEXu8XT51QO7dw+PiPAiA7DjPEYB3xWwHW6klvLSc+GRk+3uSxvdVjV4bI3oVLGR6cH/XVO/WPoMCmkc8Y4i8vGW7y62mJS6PDEaVOXx527Uvxxv40j5PMLy8xPPn5m2fIbXopz+6KSQZ7cx2dkGfFhJ6Uk4cnQupj3fk9y04Iyo7rSGrgZjlC6pes6XVa2uazucNkSFzSnBZ3u6FbFllqqIvbkCpNXV5mcXWUxI6ofSnCTqL11/7DP5t69afYkPbcupP9lbtS46ZGNiS3fObeCT80qVDjbx2f0GJXntSMk1p2N5gUnRi+dXWJ86dVV5tLzqq2CiuHinqTVlmzp9lgbUzodW7o9DqQELY5UYsi5dtjojwEqaDWl+UlNUGdOZvn41EqThaUGNUGd3l1IC8mLnR5/2mfzt0ab7XGPkKG1zIzqt79hQuD/PdbktN04O8QbJobw8TmWGDVH/9KVncyMaDzc5M60dD5bH9LfcnFdoPSiOouZEaPgcnxHqKlNY1qwOyHYm1QVsbuT6vd2R9Ltqp90piq2x0bomlraNTRVCRvQVVVsMFMVW2oqj2JmRJXPT4voTIsY1AS1o9LmJdCQFDzT5nL/ASXI3JgU6BqyOqivnB7Rv/G3ZSX//MLmpLj7pNLCOunjM0YY1QjBOU910pj0uKDGDD3a4l7W5crPVFraKa+psrh4vMXJFSodfSiN9KQqn+92JR0ZlfOUUEuzPQs+hga6pmFqaj+YoK6WdMO6UlcP6sqo5CrO8yQcSAtejHk83KSMxdZuoXZ206DE1JprgvrP5kb1Hz+8Pbnvo4tL+OGJfjzD59hl1EOLUkres6abX+xIcuXU0ORn2933tdry3YbGlDlRg7OqTM6qsjixzGBKWB+RDZoGQkg1VdqVEKyNufy3Ram0b48LEr32iwkbWrzS0v45Oaz/6OdLS5766Lq4d2qFxbd8kWGfY5zRH4UZ3vp8FwlP8rfTSrXTnoydtDsh3t9qiytcSa2lQ31IZ26JwbJKkxPLTKZHdCaHlYBOQM9PRGcwOEKpjLU5kt0Jj5e7PdbFPF6MuezOJJD1zjfRgJChpSstbfnUiH7XKZXmQw802t03zApz/fQQfgq5z/HAmLuLr9/QzQP7Hc6uMq2Vbe7p7Y54R6fDJSkhJ/UEJQIGjLN0qgIaUyMG0yNK43NCSCly1QQ1yjIGxeonNV2gJPxSQpL2VIxEbeCkpjX7kmqnt+0Jj8aUSkvvcGRWkWQdCBlavNzSnpoS1n89r9T4x1/22x1XTArwKz+W4XOcMeYMRw9nLu9gS7fHOyYHzYcOOItabXlFSshL00LOcwTBbKsflg5hQ+3qFtBV7MLsJzbhSBXr8DJbRLpCrYTYmbiI6CsPluU4GVnBhgpLe3xqxPjz7Kj+xIMHnM4zq0z+cmrZaF9GH59hYcwajh5e/VQH2+OChguf4pQnzpnQ5ohXdzjy9SmPM1wpp9oiy96mgxUlzvNqBFQA9WCJqa2psLR/zY7qj15dH9zy9c1Je3ZU5++nlflTEp/jmmPm7j5neSfNtkeXC5fWBaw1Mbu+xZanJ1zOTgq51BZM9aSsdYSamRRR0BxDBTq7TJ09tQF9o6nxxLSI8Vx9SN9457Z44uzxQWZGDX651J+S+LwyOGYMRw/jH9jH1LIoaaG2PvjdyaXGDRsSEUtjzr6kNytsaEsTnlzQbMvagMYENCpTHkFbSKOnv7n2t5YgLA0R0LUEcCBssH9CSN8LPDcxpG8aH9I3XjUx2HrpEx326yar2dIZ5QG+utDP+vR5ZXHMGY7enL68i1Jd0JiWVFoaqztc4peO47MbEta6Lq+kxNDqW21RtS3uhbtdWV1uaVODulZqaRi9Ku/TmqZ1t9ui5UBatpQYxKdFjXh9SG8I6TT+YVmpo922z3v96aWMD+lIqXFulck1U/1sT59XLse04ejLHTuSbOwSrIo5TI4YmEBTWvByt8fedhfWxeHmBmAb8CJQAcZ58I4aOKMcakyqQio7dGZER5OSoKlzTrXFtVN8Q+Hj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+Pj4+PzSuP/AzE1e5ONHe7vAAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDE1LTEyLTIzVDIwOjA0OjMxKzAwOjAwHarZDQAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxNS0xMi0yM1QyMDowNDozMSswMDowMGz3YbEAAABNdEVYdHNvZnR3YXJlAEltYWdlTWFnaWNrIDYuOS4yLTcgUTE2IHg4Nl82NCAyMDE1LTEyLTAyIGh0dHA6Ly93d3cuaW1hZ2VtYWdpY2sub3Jnbo4WPwAAAEp0RVh0c3ZnOmJhc2UtdXJpAGZpbGU6Ly8vdG1wL3ZpZ25ldHRlL2MxZDQ0ZGY2LWM1ZDYtNDkwMC04ZDBhLWQ0OWVmMzBiZGE3MS5zdmd90CehAAAAGHRFWHRUaHVtYjo6RG9jdW1lbnQ6OlBhZ2VzADGn/7svAAAAGHRFWHRUaHVtYjo6SW1hZ2U6OkhlaWdodAAyNjLFg9PDAAAAF3RFWHRUaHVtYjo6SW1hZ2U6OldpZHRoADU3Mz0hlMwAAAAZdEVYdFRodW1iOjpNaW1ldHlwZQBpbWFnZS9zdme/73BOAAAAF3RFWHRUaHVtYjo6TVRpbWUAMTQ1MDkwMTA3McPsyX0AAAAPdEVYdFRodW1iOjpTaXplADBCQpSiPuwAAABIdEVYdFRodW1iOjpVUkkAZmlsZTovLy90bXAvdmlnbmV0dGUvYzFkNDRkZjYtYzVkNi00OTAwLThkMGEtZDQ5ZWYzMGJkYTcxLnN2Z4N+SbEAAAAASUVORK5CYII=' style='display: block; margin-left: auto; margin-right: auto; margin-top: 7px; width: 89px;'/></span>\").width(\"120px\").css(\"float\",\"left\").css(\"padding-left\",\"0\");$('.report-name').css(\"font-weight\",\"bold\");"+"\n"+ + "})"; + + public enum suiteNameXml { + + TESTNG_FAILED_XML_NAME("testng-failed.xml"); + + suiteNameXml(String value) { + this.value = value; + } + + private String value; + + public String getValue() { + return value; + } + + } + + public synchronized static ExtentReports setReporter(String filePath, String htmlFile, Boolean isAppend) throws Exception { + String dbIp = DriverFactory.getConfiguration().getReportDBhost(); + int dbPort = DriverFactory.getConfiguration().getReportDBport(); + + if (extent == null) { + extentxReporter = new ExtentXReporter(dbIp, dbPort); + extent = new ExtentReports(); + initAndSetExtentHtmlReporter(filePath, htmlFile, isAppend); + + if(extentxReporter.config().getReportObjectId() != null){ + setExtentXReporter(isAppend); + }else{ + extentxReporter.stop(); + } + } + return extent; + } + + public synchronized static void setExtentXReporter(Boolean isAppend){ + extentxReporter.setAppendExisting(isAppend); + extent.attachReporter(extentxReporter); + } + + public synchronized static void initAndSetExtentHtmlReporter(String filePath, String htmlFile, Boolean isAppend) throws Exception{ + htmlReporter = new ExtentHtmlReporter(filePath + htmlFile); + setConfiguration(htmlReporter); + htmlReporter.setAppendExisting(isAppend); + extent.attachReporter(htmlReporter); + } + + public synchronized static ExtentReports getReporter() { + return extent; + } + + public static void initReporter(Configuration config, ITestContext context) throws Exception { + String envData = config.getUrl(); + String suiteName = getSuiteName(context); + String filepath = config.getReportFolder(); + String htmlFile = config.getReportFileName(); + + if(suiteName.equals(suiteNameXml.TESTNG_FAILED_XML_NAME.getValue())){ + if (config.isUseBrowserMobProxy()){ + setTrafficCaptue(config); + } + + setReporter(filepath, htmlFile, true); + suiteName = FileHandling.getKeyByValueFromPropertyFormatFile(filepath + VERSIONS_INFO_FILE_NAME, "suiteName"); + }else{ + FileHandling.deleteDirectory(SetupCDTest.getReportFolder()); + FileHandling.createDirectory(filepath); + setReporter(filepath, htmlFile, false); + createVersionsInfoFile(filepath , VERSIONS_INFO_FILE_NAME, envData, suiteName); + } + reporterDataDefinition(envData, suiteName); + } + + private static void createVersionsInfoFile(String path, String file, String envData, String suiteName) throws FileNotFoundException, IOException { + File myFoo = new File(path + file); + FileOutputStream fooStream = new FileOutputStream(myFoo, false); // true to append + String versions = ("env=\""+ envData + "\"\n" + "suiteName=\""+ suiteName+ "\"\n"); + byte[] myBytes = versions.getBytes(); + fooStream.write(myBytes); + fooStream.close(); + } + + private static void reporterDataDefinition(String envData, String suiteNameFromVersionInfoFile) throws Exception { + extent.setSystemInfo("Host Name Address", FileHandling.getExecutionHostAddress()); + extent.setSystemInfo("ExecutedOn", envData); + extent.setSystemInfo("SuiteName", suiteNameFromVersionInfoFile); + } + + public static void reporterDataDefinition(HashMap<String, String> addedSystemInfo){ + Iterator<String> iterator = addedSystemInfo.keySet().iterator(); + while(iterator.hasNext()){ + String key = iterator.next(); + String value = addedSystemInfo.get(key); + extent.setSystemInfo(key, value); + } + } + + public static String getSuiteName(ITestContext context) { + String suitePath = context.getSuite().getXmlSuite().getFileName(); + if(suitePath != null){ + File file = new File(suitePath); + String suiteName = file.getName(); + return suiteName; + } + return null; + } + + public synchronized static ExtentHtmlReporter setConfiguration(ExtentHtmlReporter htmlReporter) throws Exception { + + htmlReporter.config().setTheme(Theme.STANDARD); + htmlReporter.config().setEncoding("UTF-8"); + htmlReporter.config().setProtocol(Protocol.HTTPS); + htmlReporter.config().setDocumentTitle("Automation Report"); + htmlReporter.config().setChartVisibilityOnOpen(true); + htmlReporter.config().setReportName("Automation Report"); + htmlReporter.config().setChartVisibilityOnOpen(false); + htmlReporter.config().setJS(icon); + return htmlReporter; + } + + public static void closeReporter(){ + extent.flush(); + } + + public static void setTrafficCaptue(Configuration config) { + config.setCaptureTraffic(true); + } +} + diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ExtentTestActions.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ExtentTestActions.java new file mode 100644 index 000000000..e5eac5e24 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ExtentTestActions.java @@ -0,0 +1,114 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.execute.setup; + +import java.io.File; +import java.io.IOException; +import java.util.UUID; + +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; + +import com.aventstack.extentreports.ExtentTest; +import com.aventstack.extentreports.MediaEntityBuilder; +import com.aventstack.extentreports.Status; +import com.aventstack.extentreports.markuputils.ExtentColor; +import com.aventstack.extentreports.markuputils.Markup; +import com.aventstack.extentreports.markuputils.MarkupHelper; + +public class ExtentTestActions { + + public static void log(Status logStatus, Markup mark){ + ExtentTest test = ExtentTestManager.getTest(); + test.log(logStatus, mark); + } + + public static void log(Status logStatus, String message){ + ExtentTest test = ExtentTestManager.getTest(); + test.log(logStatus, message); + } + + public static void log(Status logStatus, String message, String duration){ + log(logStatus, message + addDurationTag(duration)); + } + + public static void log(Status logStatus, Throwable throwabel){ + ExtentTest test = ExtentTestManager.getTest(); + test.log(logStatus, throwabel); + } + + public static void addTag(Status logStatus, String message){ + Markup m = null; + switch(logStatus){ + case PASS: + m = MarkupHelper.createLabel(message, ExtentColor.GREEN); + break; + case FAIL: + m = MarkupHelper.createLabel(message, ExtentColor.RED); + break; + case SKIP: + m = MarkupHelper.createLabel(message, ExtentColor.BLUE); + break; + case FATAL: + m = MarkupHelper.createLabel(message, ExtentColor.BROWN); + break; + default: + break; + } + + if (m != null){ + log(logStatus, m); + } + } + + public static String addScreenshot(Status logStatus, String screenshotName, String message) throws IOException{ + String imageFilePath = null; + String uuid = UUID.randomUUID().toString(); + String[] stringArray = uuid.split("-"); + screenshotName = screenshotName + "-" + stringArray[stringArray.length - 1]; + try { + File imageFile = GeneralUIUtils.takeScreenshot(screenshotName, SetupCDTest.getScreenshotFolder()); + imageFilePath = new File(SetupCDTest.getReportFolder()).toURI().relativize(imageFile.toURI()).getPath(); + } catch (IOException e) { + e.printStackTrace(); + } + + ExtentTest test = ExtentTestManager.getTest(); + test.log(logStatus, message, MediaEntityBuilder.createScreenCaptureFromPath(imageFilePath).build()); + return imageFilePath; + } + + private static String addDurationTag(String duration){ + return "<td width=\"80px\">" + duration + "</td>"; + } + + public static String addLinkTag(String fileName, String pathToFile){ + return String.format("<a download=\"%s\" href=\"%s\">HAR file</a>", fileName, pathToFile); + } + + public static void addFileToReportAsLink(File harFile, String pathToFileFromReportDirectory, String message) { + log(Status.INFO, message, addLinkTag(harFile.getName(), pathToFileFromReportDirectory)); + } + + + + + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ExtentTestManager.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ExtentTestManager.java new file mode 100644 index 000000000..faecb815e --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ExtentTestManager.java @@ -0,0 +1,60 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.execute.setup; + +import java.util.HashMap; + +import com.aventstack.extentreports.ExtentReports; +import com.aventstack.extentreports.ExtentTest; + +public class ExtentTestManager { + + private static HashMap<Long, ExtentTest> extentTestMap = new HashMap<Long, ExtentTest>(); + private static ExtentReports extent = ExtentManager.getReporter(); + + public static synchronized ExtentTest getTest() { + return extentTestMap.get(Thread.currentThread().getId()); + } + + public static synchronized void endTest() { +// extent.endTest(extentTestMap.get(Thread.currentThread().getId())); + extent.flush(); + } + + public static synchronized ExtentTest startTest(String testName) { + return startTest(testName, ""); + } + + public static synchronized ExtentTest startTest(String testName, String desc) { + ExtentTest test = extent.createTest(testName, desc); + extentTestMap.put(Thread.currentThread().getId(), test); + + return test; + } + + public static synchronized <T> void assignCategory(Class<T> clazz){ + String[] parts = clazz.getName().split("\\."); + String lastOne1 = parts[parts.length-1]; + String lastOne2 = parts[parts.length-2]; + getTest().assignCategory(lastOne2 + "-" + lastOne1); + } +} + diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/MobProxy.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/MobProxy.java new file mode 100644 index 000000000..a2d427bc6 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/MobProxy.java @@ -0,0 +1,103 @@ +package org.onap.sdc.ci.tests.execute.setup; + +import java.net.InetSocketAddress; +import java.net.Proxy; +import java.net.ProxySelector; +import java.net.SocketAddress; +import java.net.URI; +import java.util.HashMap; +import java.util.List; +import java.util.stream.Collectors; + +import org.slf4j.LoggerFactory; + +import com.aventstack.extentreports.ExtentTest; +import com.github.markusbernhardt.proxy.ProxySearch; +import com.github.markusbernhardt.proxy.ProxySearch.Strategy; +import com.github.markusbernhardt.proxy.util.PlatformUtil; +import com.github.markusbernhardt.proxy.util.PlatformUtil.Platform; + +import ch.qos.logback.classic.Level; +import ch.qos.logback.classic.Logger; +import ch.qos.logback.classic.LoggerContext; +import net.lightbody.bmp.BrowserMobProxyServer; + +public class MobProxy { + + private static HashMap<Long, BrowserMobProxyServer> mobProxyServerMap = new HashMap<Long, BrowserMobProxyServer>(); + public static InetSocketAddress localProxyAddress = getProxy(); + + public static InetSocketAddress getProxy(){ + setLogger(); + + ProxySearch proxySearch = new ProxySearch(); +// proxySearch.addStrategy(Strategy.JAVA); +// proxySearch.addStrategy(Strategy.BROWSER); +// proxySearch.addStrategy(Strategy.OS_DEFAULT); +// proxySearch.addStrategy(Strategy.ENV_VAR); + if (PlatformUtil.getCurrentPlattform() == Platform.WIN) { + proxySearch.addStrategy(Strategy.IE); + proxySearch.addStrategy(Strategy.FIREFOX); + proxySearch.addStrategy(Strategy.JAVA); + } else if (PlatformUtil.getCurrentPlattform() == Platform.LINUX) { + proxySearch.addStrategy(Strategy.GNOME); + proxySearch.addStrategy(Strategy.KDE); + proxySearch.addStrategy(Strategy.FIREFOX); + proxySearch.addStrategy(Strategy.ENV_VAR); + return null; + } else { + proxySearch.addStrategy(Strategy.OS_DEFAULT); + } + ProxySelector proxySelector = proxySearch.getProxySelector(); + + ProxySelector.setDefault(proxySelector); + URI home = URI.create("http://www.google.com"); + System.out.println("ProxySelector: " + proxySelector); + System.out.println("URI: " + home); + List<Proxy> proxyList = proxySelector.select(home); + String host = null; + String port = null; + if (proxyList != null && !proxyList.isEmpty()) { + for (Proxy proxy : proxyList) { + System.out.println(proxy); + SocketAddress address = proxy.address(); + if (address instanceof InetSocketAddress) { + host = ((InetSocketAddress) address).getHostName(); + port = Integer.toString(((InetSocketAddress) address).getPort()); + System.setProperty("http.proxyHost", host); + System.setProperty("http.proxyPort", port); + } + } + } + InetSocketAddress address = new InetSocketAddress(host, Integer.parseInt(port)); + return address; + } + + // set logger for all classes connected to MobProxy + public static void setLogger() { + LoggerContext lc = (LoggerContext) LoggerFactory. getILoggerFactory(); +// lc.getLogger("ROOT").setLevel(Level.DEBUG); + for(Logger logger:lc.getLoggerList()){ + logger.setLevel(Level.INFO); + } + } + + public static synchronized void setProxyServer() { + BrowserMobProxyServer server = new BrowserMobProxyServer(); + server.setTrustAllServers(true); + if (localProxyAddress != null){ + server.setChainedProxy(localProxyAddress); + server.start(); + } else { + server.start(); + // filter firefox requests to mozilla when system proxy is absent + server.blacklistRequests(".*mozilla.*", 200); + } + mobProxyServerMap.put(Thread.currentThread().getId(), server); + } + + public static synchronized BrowserMobProxyServer getPoxyServer() { + return mobProxyServerMap.get(Thread.currentThread().getId()); + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/OnboardCSVReport.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/OnboardCSVReport.java new file mode 100644 index 000000000..c64edff21 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/OnboardCSVReport.java @@ -0,0 +1,63 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.execute.setup; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.PrintWriter; + +public class OnboardCSVReport { + + private StringBuilder sb; + private PrintWriter pw; + + public OnboardCSVReport(String filepath, String filename) { + sb = new StringBuilder(); + try { + File csvFile = new File(filepath + filename); + pw = new PrintWriter(csvFile); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + + } + + public StringBuilder appendStringToFile(String content) { + return sb.append(content + ","); + } + + public void openNewRow() { + sb.append("\n"); + } + + public void writeRow(String... content) { + for (String str : content) { + appendStringToFile(str); + } + openNewRow(); + } + + public void closeFile() { + pw.write(sb.toString()); + pw.close(); + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ReportAfterTestManager.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ReportAfterTestManager.java new file mode 100644 index 000000000..ee16ddc76 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/ReportAfterTestManager.java @@ -0,0 +1,129 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.execute.setup; + +import java.io.IOException; + +import org.onap.sdc.ci.tests.execute.setup.ExtentManager.suiteNameXml; +import org.testng.ITestContext; +import org.testng.ITestResult; + +import com.aventstack.extentreports.Status; + +public class ReportAfterTestManager extends ExtentTestActions { + + private static String testName; + private static Throwable throwable; + private static int status; + + private static void logSuccessAfterTest(){ + final Status logStatus = Status.PASS; + addTag(logStatus, "Success"); + try{ + String message = "Finished the test with the following screenshot : "; + addScreenshotToReport(logStatus, testName, message); + }catch(Exception e){ + log(logStatus, "SUCCESS - The following exepction occured : " + e.getMessage()); + } + } + + private static void logFailAfterTest(){ + addTag(Status.FAIL, "Failure"); + try{ + log(Status.ERROR, "ERROR - The following exepction occured : "); + log(Status.ERROR, throwable); + String message = "Failure is described in the following screenshot : "; + addScreenshotToReport(Status.FAIL, testName, message); + }catch(Exception e){ + log(Status.ERROR, "ERROR - The following exepction occured : " + e.getMessage()); + } + } + + private static void logSkipAfterTest(){ + final Status logStatus = Status.SKIP; + addTag(logStatus, "Skipped"); + try{ + log(logStatus, "SKIP - The following exepction occured : "); + log(logStatus, throwable); + String message = "Skip is described in the following screenshot : "; + addScreenshotToReport(logStatus, testName, message); + }catch(Exception e){ + log(logStatus, "SKIP - The following exepction occured : " + e.getMessage()); + } + } + private static void logFatalAfterTest(){ + final Status logStatus = Status.FATAL; + addTag(logStatus, "Fatal"); + try{ + log(logStatus, "FATAL - The following exepction occured : "); + log(logStatus, throwable); + String message = "Fatal is described in the following screenshot : "; + addScreenshotToReport(logStatus, testName, message); + }catch(Exception e){ + log(logStatus, "FATAL - The following exepction occured : " + e.getMessage()); + } + } + + private static String addScreenshotToReport(Status logStatus, String testName, String message) throws IOException{ + + String addedValueFromDataProvider = WindowTestManager.getWindowMap().getAddedValueFromDataProvider(); + if (addedValueFromDataProvider != null){ + addedValueFromDataProvider = addedValueFromDataProvider.replace(":", "-"); + testName = testName + "...." + addedValueFromDataProvider; + } + + return addScreenshot(logStatus, testName, message); + } + + public static void report(ITestResult result, ITestContext context){ + + testName = result.getName(); + throwable = result.getThrowable(); + status = result.getStatus(); + + String suiteName = ExtentManager.getSuiteName(context); + + switch(status){ + case ITestResult.SUCCESS: + logSuccessAfterTest(); + break; + + case ITestResult.FAILURE: + + if (suiteName.equals(suiteNameXml.TESTNG_FAILED_XML_NAME.getValue())) { + logFatalAfterTest(); + }else{ + logFailAfterTest(); + } + break; + + case ITestResult.SKIP: + logSkipAfterTest(); + break; + + default: + break; + } + + } + +} + diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/Retry.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/Retry.java new file mode 100644 index 000000000..b74ef14da --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/Retry.java @@ -0,0 +1,44 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.execute.setup; + +import org.testng.Assert; +import org.testng.IRetryAnalyzer; +import org.testng.ITestResult; +import org.testng.annotations.Test; + +public class Retry implements IRetryAnalyzer { + private int retryCount = 0; + private int maxRetryCount = 1; + + public boolean retry(ITestResult result) { + + if (retryCount < maxRetryCount) { + retryCount++; + return true; + } + return false; + } + + + + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java new file mode 100644 index 000000000..bb6a19a36 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/SetupCDTest.java @@ -0,0 +1,356 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.execute.setup; + +import java.io.File; +import java.io.IOException; +import java.util.UUID; + +import org.onap.sdc.ci.tests.datatypes.Configuration; +import org.onap.sdc.ci.tests.datatypes.User; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.datatypes.UserRoleEnum; +import org.onap.sdc.ci.tests.execute.setup.ExtentManager.suiteNameXml; +import org.onap.sdc.ci.tests.run.StartTest; +import org.onap.sdc.ci.tests.utilities.FileHandling; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.openqa.selenium.By; +import org.openqa.selenium.JavascriptExecutor; +import org.openqa.selenium.WebElement; +import org.testng.Assert; +import org.testng.ITestContext; +import org.testng.ITestResult; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.AfterSuite; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.BeforeSuite; +import org.testng.annotations.Test; + +import com.aventstack.extentreports.ExtentTest; +import com.aventstack.extentreports.Status; + +import net.lightbody.bmp.core.har.Har; + +public abstract class SetupCDTest extends DriverFactory { + + private static final String RE_RUN = "<html><font color=\"red\">ReRun - </font></html>"; + + /**************** PRIVATES ****************/ + private static String url; + + protected static ITestContext myContext; + + /**************** METHODS ****************/ + public static ExtentTest getExtendTest() { + return ExtentTestManager.getTest(); + } + + public static WindowTest getWindowTest() { + return WindowTestManager.getWindowMap(); + } + + public static String getScreenshotFolder() { + return getConfiguration().getScreenshotFolder(); + } + + public static String getHarFilesFolder() { + return getConfiguration().getHarFilesFolder(); + } + + public static String getReportFolder(){ + return getConfiguration().getReportFolder(); + } + + public static String getReportFilename(){ + return getConfiguration().getReportFileName(); + } + + protected abstract UserCredentials getUserCredentials(); + protected abstract Configuration getEnvConfiguration(); + protected abstract void loginToLocalSimulator(UserCredentials userCredentials); + + + + /**************** BEFORE ****************/ + + @BeforeSuite(alwaysRun = true) + public void setupBeforeSuite(ITestContext context) throws Exception { + setUrl(); + initReport(context); + } + + private void initReport(ITestContext context) throws Exception { + myContext = context; + ExtentManager.initReporter(getConfiguration(), context); + } + + @BeforeMethod(alwaysRun = true) + public void setBrowserBeforeTest(java.lang.reflect.Method method, ITestContext context) throws Exception { + boolean emptyDataProvider = isDataProviderEmpty(method); + if (emptyDataProvider) { + System.out.println("ExtentReport instance started from BeforeMethod..."); + String suiteName = ExtentManager.getSuiteName(context); + if (suiteName.equals(suiteNameXml.TESTNG_FAILED_XML_NAME.getValue())) { + ExtentTestManager.startTest(RE_RUN + method.getName()); + } else { + ExtentTestManager.startTest(method.getName()); + } + + ExtentTestManager.assignCategory(this.getClass()); + setBrowserBeforeTest(getUserCredentials()); + } else { + System.out.println("ExtentReport instance started from Test..."); + } + + getConfiguration().setWindowsDownloadDirectory(getWindowTest().getDownloadDirectory()); + + if (getConfiguration().isCaptureTraffic()) { + try { + MobProxy.getPoxyServer().newHar(method.getName() + ".har"); + } catch (Throwable e) { + e.printStackTrace(); + } + } + } + + private boolean isDataProviderEmpty(java.lang.reflect.Method method) { + return method.getAnnotation(Test.class).dataProvider().isEmpty(); + } + + /**************** AFTER ****************/ + @AfterMethod(alwaysRun = true) + public void quitAfterTest(ITestResult result, ITestContext context) throws Exception { + + try { + ReportAfterTestManager.report(result, context); + GeneralUIUtils.closeErrorMessage(); + } finally { + + if (getConfiguration().isCaptureTraffic()) { +// addTrafficFileToReport(result); + } + + ExtentTestManager.endTest(); + ExtentManager.closeReporter(); + FileHandling.cleanCurrentDownloadDir(); + } + + } + + @AfterSuite(alwaysRun = true) + public void afterSuite() throws Exception { + if (getConfiguration().isUseBrowserMobProxy()) { + MobProxy.getPoxyServer().stop(); + } + } + + protected static String setUrl() { + url = getConfiguration().getUrl(); + if (url == null) { + String message = "no URL found"; + System.out.println(message); + Assert.fail(message); + } + return url; + } + + public static void navigateToUrl(String url) throws Exception { + try { + System.out.println("Deleting cookies..."); + deleteCookies(); + + System.out.println("Navigating to URL : " + url); + getDriver().navigate().to(url); + GeneralUIUtils.waitForLoader(); + + System.out.println("Zooming out..."); + GeneralUIUtils.windowZoomOutUltimate(); + + } catch (Exception e) { + String msg = "Browser is unreachable"; + System.out.println(msg); + e.printStackTrace(); + getExtendTest().log(Status.ERROR, msg); + Assert.fail(msg); + } + } + + private static void deleteCookies() throws Exception { + getDriver().manage().deleteAllCookies(); + Thread.sleep(1000); + + int attempts = 0; + final int max_attempts = 3; + + while (!getDriver().manage().getCookies().isEmpty() && attempts < max_attempts) { + getExtendTest().log(Status.INFO, + "Trying to delete cookies one more time - " + (attempts + 1) + "/" + max_attempts + "attempts"); + String deleteCookiesJS = "document.cookie.split(';').forEach(function(c) { document.cookie = c.replace(/^ +/, '').replace(/=.*/, '=;expires=' + new Date().toUTCString() + ';path=/'); });"; + ((JavascriptExecutor) getDriver()).executeScript(deleteCookiesJS); + attempts++; + + if (attempts == max_attempts) { + String msg = "Did not delete cookies, can't login with the userId " + + WindowTestManager.getWindowMap().getUserCredentials().getUserId(); + System.out.println(msg); + getExtendTest().log(Status.ERROR, msg); + Assert.fail(msg); + } + } + } + + protected void loginToSystem(UserCredentials userCredentials) throws Exception { + if (getConfiguration().isUseCustomLogin()) { + loginToLocalSimulator(userCredentials); + } + else { + sendUserAndPasswordKeys(userCredentials); + WebElement submitButton = GeneralUIUtils.getWebElementBy(By.name("btnSubmit"), 30); + submitButton.click(); + WebElement buttonOK = GeneralUIUtils.getWebElementBy(By.name("successOK"), 30); + Assert.assertTrue(buttonOK.isDisplayed(), "OK button is not displayed."); + buttonOK.click(); + } + GeneralUIUtils.ultimateWait(); + getWindowTest().setUserCredentials(userCredentials); + } + + private void setRefreshAttempts(int refreshAttempts) { + getWindowTest().setRefreshAttempts(refreshAttempts); + } + + private void sendUserAndPasswordKeys(UserCredentials userCredentials) { + System.out.println("Login with the userId : " + userCredentials.getUserId()); + WebElement userNameTextbox = GeneralUIUtils.getWebElementBy(By.name("userid")); + userNameTextbox.sendKeys(userCredentials.getUserId()); + WebElement passwordTextbox = GeneralUIUtils.getWebElementBy(By.name("password")); + passwordTextbox.sendKeys(userCredentials.getPassword()); + } + + public void loginWithUser(UserCredentials userCredentials) { + try { + getExtendTest().log(Status.INFO, String.format("Login with the userId %s", userCredentials.getUserId())); + loginToSystem(userCredentials); + } catch (Exception e) { + throw new RuntimeException(e); + } finally { + getWindowTest().setPreviousUser(getWindowTest().getUserCredentials().getUserId()); + } + } + + private void setUser(UserCredentials userCredentials) { + User user = new User(); + user.setUserId(userCredentials.getUserId()); + user.setFirstName(userCredentials.getFirstName()); + user.setRole(userCredentials.getRole()); + user.setLastName(userCredentials.getLastName()); + getWindowTest().setUserCredentials(userCredentials); + } + + public User getUser() { + return getWindowTest().getUserCredentials(); + } + + private void setBrowserBeforeTest(UserCredentials userCredentials) { + System.out.println(String.format("Setup before test with the userId %s.", userCredentials.getUserId())); + try { + System.out.println("Previous userId is : " + getWindowTest().getPreviousUser() + " ; Current userId is : " + userCredentials.getUserId()); + if (!getWindowTest().getPreviousUser().toLowerCase().equals(userCredentials.getUserId())) { + System.out.println("User IDs are different. navigating and login."); + navigateAndLogin(userCredentials); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + + public void navigateAndLogin(UserCredentials userCredentials) throws Exception { + int refreshAttempts = getWindowTest().getRefreshAttempts() != 0 ? getWindowTest().getRefreshAttempts() : 0; + setRefreshAttempts(refreshAttempts); + setUser(userCredentials); + navigateToUrl(url); + loginWithUser(userCredentials); + GeneralUIUtils.ultimateWait(); + } + + public User getUser(UserRoleEnum role) { + User user = new User(); + user.setUserId(role.getUserId()); + user.setFirstName(role.getFirstName()); + user.setLastName(role.getLastName()); + user.setRole(role.name()); + return user; + } + + protected void reloginWithNewRole(UserCredentials userCredentials) throws Exception { + System.out.println(String.format("Setup before relogin with the userId %s", userCredentials.getUserId())); + navigateAndLogin(userCredentials); + } + + public void addTrafficFileToReport(ITestResult result) { + try { + // Get the HAR data + Har har = MobProxy.getPoxyServer().getHar(); + String shortUUID = UUID.randomUUID().toString().split("-")[0]; + File harFile = new File(getHarFilesFolder() + result.getName() + shortUUID + ".har"); + new File(getHarFilesFolder()).mkdirs(); + + har.writeTo(harFile); + + String pathToFileFromReportDirectory = getReportFolder() + File.separator + harFile.getName(); + ExtentTestActions.addFileToReportAsLink(harFile, pathToFileFromReportDirectory, + "File with captured traffic"); + } catch (IOException ioe) { + ioe.printStackTrace(); + } + } + + /* + * * Start section of test in ExtentReport with DataProvider parameters, + * should be started from test method, see example in onboardVNFTest + */ + public void setLog(String fromDataProvider) { + + String suiteName = ExtentManager.getSuiteName(myContext); + if (suiteName.equals(suiteNameXml.TESTNG_FAILED_XML_NAME.getValue())) { + ExtentTestManager.startTest(RE_RUN + Thread.currentThread().getStackTrace()[2].getMethodName() + + " " + fromDataProvider); + } else { + ExtentTestManager.startTest(Thread.currentThread().getStackTrace()[2].getMethodName() + + " " + fromDataProvider); + } + + getWindowTest().setAddedValueFromDataProvider(fromDataProvider); + ExtentTestManager.assignCategory(this.getClass()); + setBrowserBeforeTest(getUserCredentials()); + } + + public static void main(String[] args) { + System.out.println("---------------------"); + System.out.println("running test from CLI"); + System.out.println("---------------------"); + + String testSuite = System.getProperty("testSuite"); + String[] testSuiteArr = {testSuite}; + StartTest.main(testSuiteArr); + } + +}
\ No newline at end of file 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 new file mode 100644 index 000000000..501faa8de --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java @@ -0,0 +1,177 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.execute.setup; + +import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; +import java.util.UUID; +import net.lightbody.bmp.BrowserMobProxyServer; +import net.lightbody.bmp.client.ClientUtil; +import net.lightbody.bmp.proxy.CaptureType; +import org.onap.sdc.ci.tests.datatypes.Configuration; +import org.onap.sdc.ci.tests.utilities.FileHandling; +import org.openqa.selenium.Capabilities; +import org.openqa.selenium.Dimension; +import org.openqa.selenium.Platform; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.firefox.FirefoxDriver; +import org.openqa.selenium.firefox.FirefoxOptions; +import org.openqa.selenium.firefox.FirefoxProfile; +import org.openqa.selenium.remote.CapabilityType; +import org.openqa.selenium.remote.LocalFileDetector; +import org.openqa.selenium.remote.RemoteWebDriver; + +public class WebDriverThread { + + public static final String AUTOMATION_DOWNLOAD_DIR = "automationDownloadDir"; + private WebDriver webdriver; + private FirefoxProfile firefoxProfile; + public static final String SELENIUM_NODE_URL = "http://%s:%s/wd/hub"; + public static final String MARIONETTE_CAPABILITY= "marionette"; + + public WebDriverThread(Configuration config) { + initDriver(config); + if (isHeadless()) { + webdriver.manage().window().setSize(new Dimension(1920, 1080)); + } else { + webdriver.manage().window().maximize(); + } + } + + private boolean isHeadless() { + if (webdriver instanceof RemoteWebDriver) { + Capabilities capabilities = ((RemoteWebDriver) webdriver).getCapabilities(); + Object headless = capabilities.getCapability("moz:headless"); + return Boolean.TRUE == headless; + } else { + return false; + } + } + + public WebDriver getDriver() throws Exception { + return webdriver; + } + + public void quitDriver() { + if (webdriver != null) { + webdriver.quit(); + webdriver = null; + } + } + + + public void initDriver(Configuration config){ + try { + boolean remoteTesting = config.isRemoteTesting(); + if (!remoteTesting) { + boolean mobProxyStatus = config.isUseBrowserMobProxy(); + if (mobProxyStatus){ + setWebDriverWithMobProxy(); + } else { + System.out.println("Opening LOCAL browser"); + FirefoxOptions cap = new FirefoxOptions(); + + 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 { + System.out.println("Opening REMOTE browser"); + String remoteEnvIP = config.getRemoteTestingMachineIP(); + int remoteEnvPort = config.getRemoteTestingMachinePort(); + + FirefoxOptions cap = new FirefoxOptions(); + cap.setCapability("platform",Platform.ANY); + cap.setCapability("browserName","firefox"); + cap.setCapability(MARIONETTE_CAPABILITY, true); + + String remoteNodeUrl = String.format(SELENIUM_NODE_URL, remoteEnvIP, remoteEnvPort); + RemoteWebDriver remoteWebDriver = new RemoteWebDriver(new URL(remoteNodeUrl), cap); + remoteWebDriver.setFileDetector(new LocalFileDetector()); + webdriver = remoteWebDriver; + } + + + } catch (MalformedURLException e) { + throw new RuntimeException(e); + } + } + + private FirefoxProfile initFirefoxProfile() { + firefoxProfile = new FirefoxProfile(); + firefoxProfile.setPreference("browser.download.folderList",2); + firefoxProfile.setPreference("browser.download.manager.showWhenStarting",false); + firefoxProfile.setPreference("browser.download.dir", getDownloadDirectory()); + firefoxProfile.setPreference("browser.helperApps.neverAsk.saveToDisk","application/octet-stream, application/xml, text/plain, text/xml, image/jpeg"); + return firefoxProfile; + } + + private String getDownloadDirectory() { + String downloadDirectory = FileHandling.getBasePath() + File.separator + AUTOMATION_DOWNLOAD_DIR + UUID.randomUUID().toString().split("-")[0] + File.separator; + File dir = new File(downloadDirectory); + if(!dir.exists()) { + dir.mkdirs(); + } + return dir.getAbsolutePath(); + } + + public FirefoxProfile getFirefoxProfile() { + return firefoxProfile; + } + + private void setWebDriverWithMobProxy(){ + MobProxy.setProxyServer(); + BrowserMobProxyServer proxyServer = MobProxy.getPoxyServer(); + + firefoxProfile = new FirefoxProfile(); + firefoxProfile.setPreference("browser.download.folderList",2); + firefoxProfile.setPreference("browser.download.manager.showWhenStarting",false); + firefoxProfile.setPreference("browser.download.dir", getDownloadDirectory()); + firefoxProfile.setPreference("browser.helperApps.neverAsk.saveToDisk","application/octet-stream, application/xml, text/plain, text/xml, image/jpeg"); + firefoxProfile.setAcceptUntrustedCertificates(true); + firefoxProfile.setAssumeUntrustedCertificateIssuer(true); +// firefoxProfile.setPreference("network.proxy.http", "localhost"); +// firefoxProfile.setPreference("network.proxy.http_port", proxyServer.getPort()); +// firefoxProfile.setPreference("network.proxy.ssl", "localhost"); +// firefoxProfile.setPreference("network.proxy.ssl_port", proxyServer.getPort()); +// firefoxProfile.setPreference("network.proxy.type", 1); +// firefoxProfile.setPreference("network.proxy.no_proxies_on", ""); + + FirefoxOptions capabilities = new FirefoxOptions(); + + capabilities.setCapability(FirefoxDriver.PROFILE, firefoxProfile); + capabilities.setCapability(CapabilityType.PROXY, ClientUtil.createSeleniumProxy(proxyServer)); + capabilities.setCapability(CapabilityType.ACCEPT_SSL_CERTS, true); + capabilities.setCapability(MARIONETTE_CAPABILITY, true); + + webdriver = new FirefoxDriver(capabilities); + proxyServer.enableHarCaptureTypes(CaptureType.REQUEST_CONTENT, CaptureType.RESPONSE_CONTENT, CaptureType.REQUEST_COOKIES, CaptureType.REQUEST_BINARY_CONTENT, + CaptureType.REQUEST_HEADERS, CaptureType.RESPONSE_COOKIES, CaptureType.RESPONSE_HEADERS, CaptureType.RESPONSE_BINARY_CONTENT); + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTest.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTest.java new file mode 100644 index 000000000..1fb3b188b --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTest.java @@ -0,0 +1,84 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.execute.setup; + +import java.io.File; + +import org.onap.sdc.ci.tests.datatypes.User; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; + +public class WindowTest { + + + + public WindowTest(){ + refreshAttempts = 0; + previousUser = ""; + addedValueFromDataProvider = null; + try { + downloadDirectory = DriverFactory.getDriverFirefoxProfile().getStringPreference("browser.download.dir", null) + File.separator; + } catch (Exception e) { + e.printStackTrace(); + } + } + + private int refreshAttempts; + private String addedValueFromDataProvider; + private String downloadDirectory; + private UserCredentials userCredentials; + private String previousUser; + + public int getRefreshAttempts() { + return refreshAttempts; + } + public void setRefreshAttempts(int refreshAttempts) { + this.refreshAttempts = refreshAttempts; + } + public synchronized String getAddedValueFromDataProvider() { + return addedValueFromDataProvider; + } + public synchronized void setAddedValueFromDataProvider(String addedValueFromDataProvider) { + this.addedValueFromDataProvider = addedValueFromDataProvider; + } + public String getDownloadDirectory() { + return downloadDirectory; + } + public void setDownloadDirectory(String downloadDirectory) { + this.downloadDirectory = downloadDirectory; + } + public UserCredentials getUserCredentials() { + return userCredentials; + } + public void setUserCredentials(UserCredentials userCredentials) { + this.userCredentials = userCredentials; + } + + public void setUserCredentials(User user) { + this.userCredentials = new UserCredentials(user); + } + public String getPreviousUser() { + return previousUser; + } + public void setPreviousUser(String previousUser) { + this.previousUser = previousUser; + } + +} 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 new file mode 100644 index 000000000..727876f27 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java @@ -0,0 +1,52 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +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>(); + + public static synchronized WindowTest getWindowMap() { + Long currentThreadId = Thread.currentThread().getId(); + boolean containsKey = windowMap.containsKey(currentThreadId); + if (!containsKey){ + setWindowMap(currentThreadId); + } + return windowMap.get(currentThreadId); + } + + private static synchronized void setWindowMap(Long currentThreadId) { + WindowTestManager.windowMap.put(currentThreadId, new WindowTest()); + } + + public static synchronized void removeWindowTest(){ + windowMap.remove(Thread.currentThread().getId()); + } + + public static synchronized HashMap<Long, WindowTest> getWholeMap(){ + return windowMap; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/run/RunTest.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/run/RunTest.java new file mode 100644 index 000000000..a3f88e23b --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/run/RunTest.java @@ -0,0 +1,25 @@ +package org.onap.sdc.ci.tests.run; + +import java.util.ArrayList; +import java.util.List; + +import org.testng.TestNG; + +public class RunTest { + + public static void runTestSuite() { + TestNG testng = new TestNG(); + List<String> suites = new ArrayList<String>(); + + String testSuite = System.getProperty("testSuite"); + if (testSuite == null){ + System.out.println("No test suite file was found, please provide test suite."); + System.exit(1); + } + suites.add(testSuite); + testng.setTestSuites(suites); + testng.setUseDefaultListeners(true); + testng.setOutputDirectory("target/"); + testng.run(); + } +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/run/StartTest.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/run/StartTest.java new file mode 100644 index 000000000..b314c44bb --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/run/StartTest.java @@ -0,0 +1,87 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.run; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.atomic.AtomicBoolean; + +import org.apache.log4j.Logger; +import org.apache.log4j.PropertyConfigurator; +import org.testng.TestNG; + +public class StartTest { + + public static long timeOfTest = 0; + + public static boolean debug = false; + + public static AtomicBoolean loggerInitialized = new AtomicBoolean(false); + + protected static Logger logger = null; + + public static void main(String[] args) { + + String debugEnabled = System.getProperty("debug"); + if (debugEnabled != null && debugEnabled.equalsIgnoreCase("true")) { + debug = true; + } + System.out.println("Debug mode is " + (debug ? "enabled" : "disabled")); + + enableLogger(); + + TestNG testng = new TestNG(); + + List<String> suites = new ArrayList<String>(); + suites.add(args[0]); + testng.setTestSuites(suites); + testng.setUseDefaultListeners(true); + testng.setOutputDirectory("target/"); + + testng.run(); + + } + + public StartTest() { + logger = Logger.getLogger(StartTest.class.getName()); + } + + public static void enableLogger() { + + if (false == loggerInitialized.get()) { + + loggerInitialized.set(true); + + String log4jPropsFile = System.getProperty("log4j.configuration"); + if (System.getProperty("os.name").contains("Windows")) { + String logProps = "src/main/resources/ci/conf/log4j.properties"; + if (log4jPropsFile == null) { + System.setProperty("targetlog", "target/"); + log4jPropsFile = logProps; + } + + } + PropertyConfigurator.configureAndWatch(log4jPropsFile); + + } + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/AdditionalConditions.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/AdditionalConditions.java new file mode 100644 index 000000000..9a070e2b0 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/AdditionalConditions.java @@ -0,0 +1,133 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.utilities; + +import com.paulhammant.ngwebdriver.NgWebDriver; +import org.openqa.selenium.By; +import org.openqa.selenium.JavascriptExecutor; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.ExpectedCondition; + +import java.util.List; + +public class AdditionalConditions { + + public static ExpectedCondition<WebElement> searchForOneElement(List<By> ByList){ + return new ExpectedCondition<WebElement>() { + @Override + public WebElement apply(WebDriver driver) { + for (By by : ByList){ + WebElement findElement = driver.findElement(by); + if (findElement != null){ + return findElement; + } + } + return null; + } + }; + } + + public static ExpectedCondition<Boolean> jQueryAJAXCallsHaveCompleted() { + return new ExpectedCondition<Boolean>() { + @Override + public Boolean apply(WebDriver driver) { + return (Boolean) ((JavascriptExecutor)driver). + executeScript("return (window.jQuery!= null) && (jQuery.active === 0);"); + } + }; + } + + public static ExpectedCondition <Boolean> angularHasFinishedProcessing() { + return new ExpectedCondition<Boolean>() { + @Override + public Boolean apply(WebDriver driver) { +// String scriptJS = "return (window.angular !==undefined) &&" +// + " (angular.element(document).injector() !==undefined) &&" +// + " (angular.element(document).injector().get('$http').pendingRequests.length === 0)"; +// return Boolean.valueOf(( (JavascriptExecutor) driver).executeScript(scriptJS).toString()); + new NgWebDriver((JavascriptExecutor) driver).waitForAngularRequestsToFinish(); + return true; + } + }; + } + + public static ExpectedCondition <Boolean> angular2HasFinishedProcessing() { + return driver -> { + new NgWebDriver((JavascriptExecutor) driver).waitForAngular2RequestsToFinish(); + return true; + }; + } + + public static ExpectedCondition <Boolean> pageLoadWait() { + return new ExpectedCondition<Boolean>() { + @Override + public Boolean apply(WebDriver driver) { + String scriptJS = + "try {\r\n" + + " if (document.readyState !== 'complete') {\r\n" + + " return false; // Page not loaded yet\r\n" + + " }\r\n" + + " if (window.jQuery) {\r\n" + + " if (window.jQuery.active) {\r\n" + + " return false;\r\n" + + " } else if (window.jQuery.ajax && window.jQuery.ajax.active) {\r\n" + + " return false;\r\n" + + " }\r\n" + + " }\r\n" + + " if (window.angular) {\r\n" + + " if (!window.qa) {\r\n" + + " // Used to track the render cycle finish after loading is complete\r\n" + + " window.qa = {\r\n" + + " doneRendering: false\r\n" + + " };\r\n" + + " }\r\n" + + " // Get the angular injector for this app (change element if necessary)\r\n" + + " var injector = window.angular.element(document).find('body').injector();\r\n" + + " // Store providers to use for these checks\r\n" + + " var $rootScope = injector.get('$rootScope');\r\n" + + " var $http = injector.get('$http');\r\n" + + " var $timeout = injector.get('$timeout');\r\n" + + " // Check if digest\r\n" + + " if ($rootScope.$$phase === '$apply' || $rootScope.$$phase === '$digest' || $http.pendingRequests.length !== 0) {\r\n" + + " window.qa.doneRendering = false;\r\n" + + " return false; // Angular digesting or loading data\r\n" + + " }\r\n" + + " if (!window.qa.doneRendering) {\r\n" + + " // Set timeout to mark angular rendering as finished\r\n" + + " $timeout(function() {\r\n" + + " window.qa.doneRendering = true;\r\n" + + " }, 0);\r\n" + + " return false;\r\n" + + " }\r\n" + + " }\r\n" + + " return true;\r\n" + + "} catch (ex) {\r\n" + + " return false;\r\n" + + "}"; + return Boolean.valueOf(( (JavascriptExecutor) driver).executeScript(scriptJS).toString()); + } + }; + } + + + +} 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 new file mode 100644 index 000000000..eb93a619e --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java @@ -0,0 +1,54 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +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 { + private final String uniqueId; + private ImmutablePair<Integer, Integer> location; + private WebElement elementType; + + CanvasElement(String name, ImmutablePair<Integer, Integer> location, WebElement canvasItem) { + super(); + this.uniqueId = name; + this.location = location; + elementType = canvasItem; + } + + public String getUniqueId() { + return uniqueId; + } + + public ImmutablePair<Integer, Integer> getLocation() { + return location; + } + + public void setLocation(ImmutablePair<Integer, Integer> location) { + this.location = location; + } + + public WebElement getElementType() { + return elementType; + } +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasManager.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasManager.java new file mode 100644 index 000000000..91011f333 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasManager.java @@ -0,0 +1,179 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.utilities; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.UUID; +import java.util.stream.Collectors; + +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.onap.sdc.ci.tests.datatypes.DataTestIdEnum; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.interactions.Actions; + +public final class CanvasManager { + private Map<String, CanvasElement> canvasElements; + private Actions actions; + private WebElement canvas; + private int reduceCanvasWidthFactor; + // Offsets Are used to find upper right corner of canvas element in order to + // connect links + private static final int CANVAS_ELEMENT_Y_OFFSET = 40; + private static final int CANVAS_ELEMENT_X_OFFSET = 21; // 14 - 27 + + private CanvasManager() { + canvasElements = new HashMap<>(); + actions = new Actions(GeneralUIUtils.getDriver()); + canvas = GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralCanvasItems.CANVAS.getValue()); + try { + WebElement webElement = GeneralUIUtils + .getWebElementByTestID(DataTestIdEnum.GeneralCanvasItems.CANVAS_RIGHT_PANEL.getValue()); + reduceCanvasWidthFactor = webElement.getSize().width; + } catch (Exception e) { + reduceCanvasWidthFactor = 0; + } + } + + public static CanvasManager getCanvasManager() { + return new CanvasManager(); + } + + public List<CanvasElement> getCanvasElements() { + return canvasElements.values().stream().collect(Collectors.toList()); + } + + private void addCanvasElement(CanvasElement element) { + canvasElements.put(element.getUniqueId(), element); + } + + private void moveElementOnCanvas(CanvasElement canvasElement, ImmutablePair<Integer, Integer> newLocation) + throws Exception { + GeneralUIUtils.waitForLoader(); + Thread.sleep(500); + actions.moveToElement(canvas, canvasElement.getLocation().left, canvasElement.getLocation().right); + actions.clickAndHold(); + actions.moveToElement(canvas, newLocation.left, newLocation.right); + actions.release(); + actions.perform(); + canvasElement.setLocation(newLocation); + GeneralUIUtils.waitForLoader(); + + } + + public void moveElementOnCanvas(CanvasElement canvasElement) throws Exception { + moveElementOnCanvas(canvasElement, getFreePosition()); + } + + public void deleteElementFromCanvas(CanvasElement canvasElement) throws Exception { + GeneralUIUtils.waitForLoader(); + actions.moveToElement(canvas, canvasElement.getLocation().left, canvasElement.getLocation().right); + actions.click(); + actions.perform(); + GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralCanvasItems.DELETE_INSTANCE_BUTTON.getValue()) + .click(); + GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.ModalItems.OK.getValue()).click(); + canvasElements.remove(canvasElement.getUniqueId()); + GeneralUIUtils.waitForLoader(); + } + + private String getItemName(WebElement canvasItem) { + String canvasItemName = canvasItem.getAttribute("data-tests-id"); + + return canvasItemName.substring(canvasItemName.lastIndexOf("-")); + } + + public CanvasElement createElementOnCanvas(WebElement canvasItem) throws Exception { + GeneralUIUtils.waitForLoader(); + ImmutablePair<Integer, Integer> freePosition = getFreePosition(); + actions.moveToElement(canvasItem, 0, 0); + actions.clickAndHold(); + actions.moveToElement(canvas, freePosition.left, freePosition.right); + actions.release(); + actions.perform(); + + String uniqueId = getItemName(canvasItem) + "_" + UUID.randomUUID().toString(); + CanvasElement canvasElement = new CanvasElement(uniqueId, freePosition, canvasItem); + addCanvasElement(canvasElement); + GeneralUIUtils.waitForLoader(); + return canvasElement; + } + + private ImmutablePair<Integer, Integer> getFreePosition() { + // TODO mshitrit use better method + ImmutablePair<Integer, Integer> randomPosition = null; + boolean freePosition = false; + int minSpace = 150; + while (!freePosition) { + ImmutablePair<Integer, Integer> tempRandomPosition = getRandomPosition(); + freePosition = !canvasElements.values().stream().map(e -> e.getLocation()) + .filter(e -> Math.abs(e.left - tempRandomPosition.left) < minSpace + && Math.abs(e.right - tempRandomPosition.right) < minSpace) + .findAny().isPresent(); + randomPosition = tempRandomPosition; + } + return randomPosition; + } + + private ImmutablePair<Integer, Integer> getRandomPosition() { + int edgeBuffer = 50; + Random random = new Random(); + int xElement = random.nextInt(canvas.getSize().width - 2 * edgeBuffer - reduceCanvasWidthFactor) + edgeBuffer; + int yElement = random.nextInt(canvas.getSize().height - 2 * edgeBuffer) + edgeBuffer; + return new ImmutablePair<Integer, Integer>(xElement, yElement); + } + + public void linkElements(CanvasElement firstElement, CanvasElement secondElement) throws Exception { + GeneralUIUtils.waitForLoader(); + drawSimpleLink(firstElement, secondElement); + + selectReqAndCapAndConnect(); + + GeneralUIUtils.waitForLoader(); + + } + + private void selectReqAndCapAndConnect() { + // Select First Cap + GeneralUIUtils.getWebElementsListByTestID(DataTestIdEnum.LinkMenuItems.LINK_ITEM_CAP.getValue()).get(0).click(); + // Select First Req + GeneralUIUtils.getWebElementsListByTestID(DataTestIdEnum.LinkMenuItems.LINK_ITEM_REQ.getValue()).get(0).click(); + // Connect + GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.LinkMenuItems.CONNECT_BUTTON.getValue()).click(); + } + + private void drawSimpleLink(CanvasElement firstElement, CanvasElement secondElement) { + + int yOffset = CANVAS_ELEMENT_Y_OFFSET; + int xOffset = CANVAS_ELEMENT_X_OFFSET; + + actions.moveToElement(canvas, firstElement.getLocation().left + xOffset, + firstElement.getLocation().right - yOffset); + + actions.clickAndHold(); + actions.moveToElement(canvas, secondElement.getLocation().left + xOffset, + secondElement.getLocation().right - yOffset); + actions.release(); + actions.perform(); + } +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/Constants.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/Constants.java new file mode 100644 index 000000000..4be51fbfd --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/Constants.java @@ -0,0 +1,128 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.utilities; + +public interface Constants { + + public static final String APPLICATION_NAME = "application-name"; + public static final String APPLICATION_VERSION = "application-version"; + public static final String CONFIG_HOME = "config.home"; + public static final String LOG_HOME = "log.home"; + public static final String YAML_SUFFIX = ".yaml"; + public static final String CONFIGURATION_SOURCE_ATTR = "configuration-source"; + public static final String MDC_APP_NAME = "APP_NAME"; + public static final String CONFIGURATION_MANAGER_ATTR = "configuration-manager"; + public static final String HEALTH_CHECK_SERVICE_ATTR = "healthCheckService"; + public static final String REST_CLIENT_ATTR = "rest-client"; + public static final String ARTIFACT_DAO_ATTR = "artifact-dao"; + public static final String UPLOAD_VALIDATORR_ATTR = "upload-validator"; + public static final String THREAD_EXECUTOR_ATTR = "thread-executor"; + public static final String ERROR_LOG_FORMAT = "EVENT = ARTIFACT_UPLOAD USER_ID=%s USER_NAME=%s ACCESS_IP=%s ACCESS_TYPE=%s RURL=%s SC=%d"; + public static final String FIRST_NAME_HEADER = "HTTP_CSP_FIRSTNAME"; + public static final String LAST_NAME_HEADER = "HTTP_CSP_LASTNAME"; + public static final String USER_ID_HEADER = "USER_ID"; + public static final String MD5_HEADER = "Content-MD5"; + public static final String CONTENT_DISPOSITION_HEADER = "Content-Disposition"; + public static final String CONTENT_TYPE_HEADER = "Content-Type"; + public static final String ORIGIN_HEADER = "HTTP_IV_REMOTE_ADDRESS"; + public static final String ACCESS_HEADER = "HTTP_CSP_WSTYPE"; + public static final String X_ECOMP_REQUEST_ID_HEADER = "X-ECOMP-RequestID"; + public static final String X_ECOMP_INSTANCE_ID_HEADER = "X-ECOMP-InstanceID"; + public static final String X_ECOMP_SERVICE_ID_HEADER = "X-ECOMP-ServiceID"; + public static final String HTTP = "http"; + public static final String HTTPS = "https"; + public static final String HTTP_IV_USER = "HTTP_IV_USER"; + public static final String A4C_CSAR_CONTEXT = "/rest/csars/"; + public static final String WEB_APPLICATION_CONTEXT_WRAPPER_ATTR = "web-application-context-wrapper"; + public static final String CATALOG_BE = "catalog-be"; + public static final String HTTP_CSP_FIRSTNAME = "HTTP_CSP_FIRSTNAME"; + public static final String HTTP_CSP_LASTNAME = "HTTP_CSP_LASTNAME"; + public static final String HTTP_IV_REMOTE_ADDRESS = "HTTP_IV_REMOTE_ADDRESS"; + public static final String HTTP_CSP_TYPE = "HTTP_CSP_WSTYPE"; + public static final String RESOURCE_SUPPORTED_VERSION = "0.0.1"; + public static final String ARTIFACT_ID_FORMAT = "%s:%s:%s"; // resourceName:resourceVersion:artifactName + public static final String SERVICE_ARTIFACT_ID_FORMAT = "%s:%s:%s:%s"; // serviceName:serviceVersion:nodeTemplateName:artifactName + public static final String CONTENT_DISPOSITION = "content-disposition"; + public static final String DOWNLOAD_ARTIFACT_LOGIC_ATTR = "downloadArtifactLogic"; + public static final String ASDC_RELEASE_VERSION_ATTR = "ASDC-Version"; + // public static final String AUDITING_MANAGER = "auditingManager"; + // public static final String USER_ADMIN_MANAGER = "userAdminManager"; + public static final String YEAR = "year"; + public static final String MONTH = "month"; + public static final String DAY = "day"; + public static final String HOUR = "hour"; + public static final String MINUTE = "minute"; + public static final String NONE = "none"; + public static final String RESOURCE_OPERATION_MANAGER = "resourceOperationManager"; + public static final String PROPERTY_OPERATION_MANAGER = "propertyOperationManager"; + public static final String SERVICE_OPERATION_MANAGER = "serviceOperationManager"; + public static final String EMPTY_STRING = ""; + public static final String NULL_STRING = "null"; + public static final String DOUBLE_NULL_STRING = "null null"; + public static final String ECOMP_ERROR_MNGR_ATTR = "ecompErrorMngrAttr"; + public static final String AUTHORIZATION_HEADER = "Authorization"; + public static final String ACCEPT_HEADER = "Accept"; + public static final String STANDARD_INTERFACE_TYPE = "standard"; + public static final String MURANO_PKG_ARTIFACT_TYPE = "MURANO-PKG"; + public static final String ARTIFACT_GROUP_TYPE_FIELD = "artifactGroupType"; + + // TOSCA + public static final String TOSCA_META_PATH = "TOSCA-Metadata/TOSCA.meta"; + public static final String TOSCA_META_ENTRY_DEFINITIONS = "Entry-Definitions"; + public static final String USER_DEFINED_RESOURCE_NAMESPACE_PREFIX = "org.openecomp.resource."; + + public static final String IS_BASE = "isBase"; + public static final String HEAT_FILE_PROPS = "heat_file"; + public static final String MODULE_NAME_FORMAT = "%s..%s..module-%s"; + public static final String MODULE_DESC_PATTERN = "[\\_\\-\\.a-zA-Z0-9]+"; + public static final String MODULE_OLD_NAME_PATTERN = "([\\w\\_\\-\\.\\s]+)(::module-)(\\d+)"; + public static final String MODULE_NEW_NAME_PATTERN = "([\\w\\_\\-\\.\\s]+\\.\\.)([\\_\\-\\.a-zA-Z0-9]+)(..module-)(\\d+)"; + public static final String MODULE_NAME_DELIMITER = "module-"; + public static final String IMPORT_STRUCTURE = "importStructure"; + public static final String DEFAULT_GROUP_VF_MODULE = "org.openecomp.groups.VfModule"; + + public static final String ARTIFACT_GROUP_TYPE = "artifactGroupType"; + public static final String ARTIFACT_LABEL = "artifactLabel"; + public static final String ARTIFACT_PAYLOAD_DATA = "payloadData"; + public static final String ARTIFACT_DISPLAY_NAME = "artifactDisplayName"; + public static final String ARTIFACT_DESCRIPTION = "description"; + public static final String ARTIFACT_TYPE = "artifactType"; + public static final String ARTIFACT_NAME = "artifactName"; + public static final String ARTIFACT_ID = "uniqueId"; + public static final String REQUIRED_ARTIFACTS = "requiredArtifacts"; + + public static final String ABSTRACT = "abstract"; + public static final String GLOBAL_SUBSTITUTION_TYPES_SERVICE_TEMPLATE = "Definitions/GlobalSubstitutionTypesServiceTemplate.yaml"; + public static final String ABSTRACT_SUBSTITUTE_GLOBAL_TYPES_SERVICE_TEMPLATE = "Definitions/AbstractSubstituteGlobalTypesServiceTemplate.yaml"; + + public static final String VENDOR_LICENSE_MODEL = "vendor-license-model.xml"; + public static final String VENDOR_LICENSE_LABEL = "vendorlicense"; + public static final String VENDOR_LICENSE_DISPLAY_NAME = "Vendor License"; + public static final String VENDOR_LICENSE_DESCRIPTION = " Vendor license file"; + + public static final String VF_LICENSE_MODEL = "vf-license-model.xml"; + public static final String VF_LICENSE_LABEL = "vflicense"; + public static final String VF_LICENSE_DISPLAY_NAME = "VF License"; + public static final String VF_LICENSE_DESCRIPTION = "VF license file"; + public static final String GET_INPUT = "get_input"; + public static final String SERVICE_TEMPLATE_FILE_POSTFIX = "ServiceTemplate.yaml"; + public static final String UNBOUNDED = "unbounded"; +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/Decoder.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/Decoder.java new file mode 100644 index 000000000..049302e54 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/Decoder.java @@ -0,0 +1,62 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.utilities; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; + +import org.apache.commons.codec.binary.Base64; + +public class Decoder { + + public static String encode(byte[] byteArrayToEncode) { + + byte[] bytesEncoded = Base64.encodeBase64(byteArrayToEncode); + String strEncoded = new String(bytesEncoded); + return strEncoded; + } + + public static String decode(String strEncoded) throws IOException { + + byte[] byteDecoded = Base64.decodeBase64(strEncoded); + String decoded = new String(byteDecoded); + + return decoded; + + } + + public static String readFileToString(String file) throws IOException { + + BufferedReader reader = new BufferedReader(new FileReader(file)); + String line = null; + StringBuilder stringBuilder = new StringBuilder(); + String ls = System.getProperty("line.separator"); + + while ((line = reader.readLine()) != null) { + stringBuilder.append(line); + stringBuilder.append(ls); + } + reader.close(); + return stringBuilder.toString(); + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/EcompPortalUtilities.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/EcompPortalUtilities.java new file mode 100644 index 000000000..bded65be8 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/EcompPortalUtilities.java @@ -0,0 +1,17 @@ +package org.onap.sdc.ci.tests.utilities; + +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; + +public class EcompPortalUtilities { + + public static void swichFrames(By by){ + WebElement appImage = GeneralUIUtils.getClickableButtonBy(by, 3 * 60); + appImage.click(); + GeneralUIUtils.getDriver().switchTo().frame(1); + GeneralUIUtils.waitForBackLoader(); + GeneralUIUtils.waitForAngular(); + GeneralUIUtils.getWebElementByClassName("applicationWindow"); + } + +} 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 new file mode 100644 index 000000000..d5d5540a9 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java @@ -0,0 +1,489 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.utilities; + +import static org.testng.AssertJUnit.assertTrue; + +import java.io.BufferedOutputStream; +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.FileWriter; +import java.io.FilenameFilter; +import java.io.IOException; +import java.io.InputStream; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.util.ArrayList; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.zip.ZipEntry; +import java.util.zip.ZipException; +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; + +import com.aventstack.extentreports.Status; + +public class FileHandling { + +// ------------------yaml parser methods---------------------------- + public static Map<?, ?> parseYamlFile(String filePath) throws Exception { + Yaml yaml = new Yaml(); + File file = new File(filePath); + InputStream inputStream = new FileInputStream(file); + Map<?, ?> map = (Map<?, ?>) yaml.load(inputStream); + return map; + } + + /** + * The method return map fetched objects by pattern from yaml file + * @param yamlFile + * @param pattern + * @return + * @throws Exception + */ + public static Map<String, Object> parseYamlFileToMapByPattern(File yamlFile, String pattern) throws Exception { + Map<?, ?> yamlFileToMap = FileHandling.parseYamlFile(yamlFile.toString()); + Map<String, Object> objectMap = getObjectMapByPattern(yamlFileToMap, pattern); + return objectMap; + } + + @SuppressWarnings("unchecked") + public static Map<String, Object> getObjectMapByPattern(Map<?, ?> parseUpdetedEnvFile, String pattern) { + Map<String, Object> objectMap = null; + + Object objectUpdetedEnvFile = parseUpdetedEnvFile.get(pattern); + if(objectUpdetedEnvFile instanceof HashMap){ + objectMap = (Map<String, Object>) objectUpdetedEnvFile; + } + return objectMap; + } + +// ------------------------------------------------------------------------------------------------- + + public static String getFilePath(String folder) { + String filepath = System.getProperty("filepath"); + if (filepath == null && System.getProperty("os.name").contains("Windows")) { + filepath = FileHandling.getResourcesFilesPath() + folder + File.separator; + } + + else if(filepath.isEmpty() && !System.getProperty("os.name").contains("Windows")){ + filepath = FileHandling.getBasePath() + "Files" + File.separator + folder + File.separator; + } + + System.out.println(filepath); + + return filepath; + } + + public static String getBasePath() { + return System.getProperty("user.dir") + File.separator; + } + + public static String getDriversPath() { + return getBasePath() + "src" + File.separator + "main" + File.separator + "resources" + + File.separator + "ci" + File.separator + "drivers" + File.separator; + } + + public static String getResourcesFilesPath() { + return getBasePath() + "src" + File.separator + "main" + File.separator + "resources" + + File.separator + "Files" + File.separator; + } + + public static String getResourcesEnvFilesPath() { + return getBasePath() + File.separator + "src" + File.separator + "main" + File.separator + "resources" + + File.separator + "Files" + File.separator + "ResourcesEnvFiles" +File.separator; + } + + public static String getCiFilesPath() { + return getBasePath() + "src" + File.separator + "main" + File.separator + "resources" + + File.separator + "ci"; + } + + public static String getConfFilesPath() { + return getCiFilesPath() + File.separator + "conf" + File.separator; + } + + public static String getTestSuitesFilesPath() { + return getCiFilesPath() + File.separator + "testSuites" + File.separator; + } + + public static File getConfigFile(String configFileName) throws Exception { + File configFile = new File(FileHandling.getBasePath() + File.separator + "conf" + File.separator + configFileName); + if (!configFile.exists()) { + configFile = new File(FileHandling.getConfFilesPath() + configFileName); + } + return configFile; + } + + public static Object[] filterFileNamesFromFolder(String filepath, String extension) { + try { + File dir = new File(filepath); + List<String> filenames = new ArrayList<String>(); + + FilenameFilter extensionFilter = new FilenameFilter() { + public boolean accept(File dir, String name) { + return name.endsWith(extension); + } + }; + + if (dir.isDirectory()) { + for (File file : dir.listFiles(extensionFilter)) { + filenames.add(file.getName()); + } + return filenames.toArray(); + } + + } catch (Exception e) { + e.printStackTrace(); + } + return null; + } + + public static String[] getArtifactsFromZip(String filepath, String zipFilename){ + try{ + ZipFile zipFile = new ZipFile(filepath + File.separator + zipFilename); + Enumeration<? extends ZipEntry> entries = zipFile.entries(); + + String[] artifactNames = new String[zipFile.size() - 1]; + + int i = 0; + while(entries.hasMoreElements()){ + ZipEntry nextElement = entries.nextElement(); + if (!nextElement.isDirectory()){ + if (!nextElement.getName().equals("MANIFEST.json")){ + String name = nextElement.getName(); + artifactNames[i++] = name; + } + } + } + zipFile.close(); + return artifactNames; + } + catch(ZipException zipEx){ + System.err.println("Error in zip file named : " + zipFilename); + zipEx.printStackTrace(); + } catch (IOException e) { + System.err.println("Unhandled exception : "); + e.printStackTrace(); + } + + return null; + + } + + public static Object[] getZipFileNamesFromFolder(String filepath) { + return filterFileNamesFromFolder(filepath, ".zip"); + } + + public static int countFilesInZipFile(String[] artifactsArr, String reqExtension){ + int fileCounter = 0; + for (String artifact : artifactsArr){ + String extensionFile = artifact.substring(artifact.lastIndexOf(".") + 1 , artifact.length()); + if (extensionFile.equals(reqExtension)){ + fileCounter++; + } + } + return fileCounter; + } + + + public static synchronized File getLastModifiedFileFromDir() throws Exception{ + return getLastModifiedFileFromDir(SetupCDTest.getWindowTest().getDownloadDirectory()); + } + + public static synchronized File getLastModifiedFileFromDir(String dirPath){ + File dir = new File(dirPath); + File[] files = dir.listFiles(); + if (files == null) { + assertTrue("File not found under directory " + dirPath, false); + return null; + } + + File lastModifiedFile = files[0]; + for (int i = 1; i < files.length; i++) { + if(files[i].isDirectory()) { + continue; + } + if (lastModifiedFile.lastModified() < files[i].lastModified()) { + lastModifiedFile = files[i]; + } + } + return lastModifiedFile; + } + + public static void deleteDirectory(String directoryPath) { + File dir = new File(directoryPath); + try { + FileUtils.deleteDirectory(dir); + } catch (IOException e) { + System.out.println("Failed to delete " + dir); + SetupCDTest.getExtendTest().log(Status.INFO, "Failed to delete " + dir); + } + } + + public static void createDirectory(String directoryPath) { + File directory = new File(String.valueOf(directoryPath)); + if (! directory.exists()){ + directory.mkdir(); + } + } + + + /** + * The method append data to existing file, if file not exists - create it + * @param pathToFile + * @param text + * @param leftSpaceCount + * @throws IOException + */ + public static synchronized void writeToFile(File pathToFile, Object text, Integer leftSpaceCount) throws IOException{ + + BufferedWriter bw = null; + FileWriter fw = null; + if(!pathToFile.exists()){ + createEmptyFile(pathToFile); + } + try { + fw = new FileWriter(pathToFile, true); + bw = new BufferedWriter(fw); + StringBuilder sb = new StringBuilder(); + if(leftSpaceCount > 0 ){ + for(int i = 0; i < leftSpaceCount; i++){ + sb.append(" "); + } + } + bw.write(sb.toString() + text); + bw.newLine(); + bw.close(); + fw.close(); + } catch (Exception e) { + SetupCDTest.getExtendTest().log(Status.INFO, "Unable to write to flie " + pathToFile); + } + } + + + public static void cleanCurrentDownloadDir() throws IOException { + try{ + ExtentTestActions.log(Status.INFO, "Cleaning directory " + SetupCDTest.getWindowTest().getDownloadDirectory()); + System.gc(); + FileUtils.cleanDirectory(new File(SetupCDTest.getWindowTest().getDownloadDirectory())); + } + catch(Exception e){ + + } + } + + public static boolean isFileDownloaded(String downloadPath, String fileName) { + boolean flag = false; + File dir = new File(downloadPath); + File[] dir_contents = dir.listFiles(); + for (int i = 0; i < dir_contents.length; i++) { + if (dir_contents[i].getName().equals(fileName)) + return flag = true; + } + return flag; + } + + public static String getMD5OfFile(File file) throws IOException { + String content = FileUtils.readFileToString(file); + String md5 = GeneralUtility.calculateMD5ByString(content); + return md5; + } + + public static File createEmptyFile(String fileToCreate) { + File file= new File(fileToCreate); + try { + if(file.exists()){ + deleteFile(file); + } + file.createNewFile(); + SetupCDTest.getExtendTest().log(Status.INFO, "Create file " + fileToCreate); + } catch (IOException e) { + SetupCDTest.getExtendTest().log(Status.INFO, "Failed to create file " + fileToCreate); + e.printStackTrace(); + } + return file; + } + + public static File createEmptyFile(File fileToCreate) { + try { + if(fileToCreate.exists()){ + deleteFile(fileToCreate); + } + fileToCreate.createNewFile(); + SetupCDTest.getExtendTest().log(Status.INFO, "Create file " + fileToCreate); + } catch (IOException e) { + SetupCDTest.getExtendTest().log(Status.INFO, "Failed to create file " + fileToCreate); + e.printStackTrace(); + } + return fileToCreate; + } + + public static void deleteFile(File file){ + + try{ + if(file.exists()){ + file.deleteOnExit(); + SetupCDTest.getExtendTest().log(Status.INFO, "File " + file.getName() + "has been deleted"); + }else{ + SetupCDTest.getExtendTest().log(Status.INFO, "Failed to delete file " + file.getName()); + } + }catch(Exception e){ + e.printStackTrace(); + } + + } + + + /** + * get file list from directory by extension array + * @param directory + * @param okFileExtensions + * @return + */ + public static List<File> getHeatAndHeatEnvArtifactsFromZip(File directory, String[] okFileExtensions){ + + List<File> fileList = new ArrayList<>(); + File[] files = directory.listFiles(); + + for (String extension : okFileExtensions){ + for(File file : files){ + if (file.getName().toLowerCase().endsWith(extension)){ + fileList.add(file); + } + } + } + return fileList; + } + + private static final int BUFFER_SIZE = 4096; + public static void unzip(String zipFilePath, String destDirectory) throws IOException { + File destDir = new File(destDirectory); + if (!destDir.exists()) { + destDir.mkdir(); + } + ZipInputStream zipIn = new ZipInputStream(new FileInputStream(zipFilePath)); + ZipEntry entry = zipIn.getNextEntry(); +// iterates over entries in the zip file + while (entry != null) { + String entryName; + if(System.getProperty("os.name").contains("Windows")){ + entryName = entry.getName().replaceAll("/", "\\"+File.separator); + }else{ + entryName = entry.getName(); + } + String filePath = destDirectory + entryName; + String currPath = destDirectory; + String[] dirs = entryName.split("\\"+File.separator); + String currToken; + for(int i = 0; i<dirs.length;++i){ + currToken = dirs[i]; + if(!entry.isDirectory() && i==dirs.length-1){ + extractFile(zipIn, filePath); + } else { + if(currPath.endsWith(File.separator)){ + currPath = currPath + currToken; + }else{ + currPath = currPath + File.separator + currToken; + } +// if the entry is a directory, make the directory + File dir = new File(currPath); + dir.mkdir(); + } + } + zipIn.closeEntry(); + entry = zipIn.getNextEntry(); + } + zipIn.close(); + } + + private static void extractFile(ZipInputStream zipIn, String filePath) throws IOException { + BufferedOutputStream bos = new BufferedOutputStream(new FileOutputStream(filePath)); + byte[] bytesIn = new byte[BUFFER_SIZE]; + int read = 0; + while ((read = zipIn.read(bytesIn)) != -1) { + bos.write(bytesIn, 0, read); + } + bos.close(); + } + + public static int getFileCountFromDefaulDownloadDirectory(){ + return new File(SetupCDTest.getWindowTest().getDownloadDirectory()).listFiles().length; + } + + + public static String getKeyByValueFromPropertyFormatFile(String fullPath, String key) { + Properties prop = new Properties(); + InputStream input = null; + String value = null; + try { + input = new FileInputStream(fullPath); + prop.load(input); + value = (prop.getProperty(key)); + + } catch (IOException ex) { + ex.printStackTrace(); + } finally { + if (input != null) { + try { + input.close(); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + return value.replaceAll("\"",""); + } + + public static String getExecutionHostAddress() { + + String computerName = null; + try { + computerName = InetAddress.getLocalHost().getHostAddress().replaceAll("\\.", "·"); + System.out.println(computerName); + if (computerName.indexOf(".") > -1) + computerName = computerName.substring(0, + computerName.indexOf(".")).toUpperCase(); + } catch (UnknownHostException e) { + System.out.println("Uknown hostAddress"); + } + return computerName != null ? computerName : "Uknown hostAddress"; + } + + public static Map<?, ?> loadCredentialsFile(String path, String filename) throws Exception { + File credentialsFileRemote = new File(path + filename); + Map<?, ?> yamlFile = FileHandling.parseYamlFile(credentialsFileRemote.getAbsolutePath()); + return yamlFile; + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FindUtils.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FindUtils.java new file mode 100644 index 000000000..2b0ca66da --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FindUtils.java @@ -0,0 +1,52 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.utilities; + +import org.onap.sdc.ci.tests.datatypes.DataTestIdEnum; +import org.onap.sdc.ci.tests.execute.setup.SetupCDTest; +import org.openqa.selenium.WebElement; +import org.testng.Assert; + +import com.aventstack.extentreports.Status; + +public final class FindUtils { + + + public static void findComponentAndClick(String componentName) throws Exception { + SetupCDTest.getExtendTest().log(Status.INFO, "finding component " + componentName); + GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.MainMenuButtons.SEARCH_BOX.getValue()).sendKeys(componentName); + WebElement foundComp = null; + try { + foundComp = GeneralUIUtils.getWebElementByTestID(componentName); + foundComp.click(); + GeneralUIUtils.waitForLoader(); + GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralElementsEnum.LIFECYCLE_STATE.getValue()); + } catch (Exception e) { + String msg = String.format("DID NOT FIND A COMPONENT NAMED %s", componentName); + SetupCDTest.getExtendTest().log(Status.FAIL, msg); + System.out.println(msg); + Assert.fail(msg); + } + } + + + +} 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 new file mode 100644 index 000000000..8885e1c3f --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java @@ -0,0 +1,803 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.utilities; + +import com.aventstack.extentreports.Status; +import org.apache.commons.io.FileUtils; +import org.junit.Assert; +import org.onap.sdc.ci.tests.datatypes.DataTestIdEnum; +import org.onap.sdc.ci.tests.datatypes.DataTestIdEnum.DashboardCardEnum; +import org.onap.sdc.ci.tests.execute.setup.DriverFactory; +import org.onap.sdc.ci.tests.execute.setup.SetupCDTest; +import org.openqa.selenium.*; +import org.openqa.selenium.firefox.FirefoxDriver; +import org.openqa.selenium.interactions.Actions; +import org.openqa.selenium.support.ui.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.awt.*; +import java.awt.event.KeyEvent; +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.UUID; +import java.util.concurrent.TimeUnit; +import java.util.function.Supplier; + +import static org.hamcrest.Matchers.is; + + +public final class GeneralUIUtils { + + public static final String FILE_NAME = "Valid_tosca_Mycompute.yml"; + static final Logger logger = LoggerFactory.getLogger(GeneralUIUtils.class); + + private static int timeOut=90; + +// public static void setTimeOut(int time) { +// if (time>0) { +// timeOut=time; +// } +// else { +// timeOut=timeOut; +// } +// } + + /**************** DRIVER ****************/ + + public static WebDriver getDriver() { + try{ + return DriverFactory.getDriver(); + } + catch(Exception e){ + e.printStackTrace(); + } + return null; + } + /****************************************/ + + public static List<WebElement> getElemenetsFromTable(By by) { + return getDriver().findElements(by); + } + + public static File takeScreenshot(String screenshotFilename, String dir, String testName) throws IOException { + if (screenshotFilename == null) { + if (testName != null){ + screenshotFilename = testName; + } + else + { + screenshotFilename = UUID.randomUUID().toString(); + } + } + try { + File scrFile = ((TakesScreenshot) getDriver()).getScreenshotAs(OutputType.FILE); + File filePath = new File(String.format("%s/%s.png", dir, screenshotFilename)); + new File(dir).mkdirs(); + FileUtils.copyFile(scrFile, filePath); + return filePath; + } catch (IOException e1) { + e1.printStackTrace(); + } + return null; + } + + public static File takeScreenshot(String screenshotFilename, String dir) throws IOException{ + return takeScreenshot(screenshotFilename, dir, null); + } + + + public static void scrollDown() { + try{ + Robot robot = new Robot(); + robot.keyPress(KeyEvent.VK_DOWN); + robot.keyRelease(KeyEvent.VK_DOWN); + GeneralUIUtils.waitForLoader(); + } + catch(Exception e){ + e.printStackTrace(); + } + } + + + public static WebElement getWebElementByTestID(String dataTestId) { + return getWebElementByTestID(dataTestId, timeOut); + } + + public static WebElement getWebElementByTestID(String dataTestId, int timeout) { + WebDriverWait wait = newWait(timeout); + return wait.until(ExpectedConditions.visibilityOfElementLocated(By.xpath("//*[@data-tests-id='" + dataTestId + "']"))); + } + + public static boolean isWebElementExistByTestId(String dataTestId) { + if(getDriver().findElements(By.xpath("//*[@data-tests-id='" + dataTestId + "']")).size() == 0) { + return false; + } + return true; + } + + public static WebElement getInputElement(String dataTestId) { + try{ + ultimateWait(); + return getDriver().findElement(By.xpath("//*[@data-tests-id='" + dataTestId + "']")); + } + catch(Exception e){ + return null; + } + } + + public static List<WebElement> getInputElements(String dataTestId) { + ultimateWait(); + return getDriver().findElements(By.xpath("//*[@data-tests-id='" + dataTestId + "']")); + + } + + public static WebElement getWebElementBy(By by) { + return getWebElementBy(by, timeOut); + } + + public static WebElement getWebElementBy(By by, int timeoutInSeconds) { + WebDriverWait wait = newWait(timeoutInSeconds); + return wait.until(ExpectedConditions.visibilityOfElementLocated(by)); + } + + public static List<String> getWebElementListText(List<WebElement>elements) { + List<String>Text=new ArrayList<>(); + for (WebElement webElement : elements) { + Text.add(webElement.getText()); + } + return Text; + } + + + public static List<WebElement> getWebElementsListBy(By by) { + return getWebElementsListBy(by, timeOut); + } + + public static List<WebElement> getWebElementsListBy(By by, int timeOut) { + WebDriverWait wait = newWait(timeOut); + return wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(by)); + } + + public static List<WebElement> getWebElementsListByContainTestID(String dataTestId) { + try{ + WebDriverWait wait = newWait(10); + return wait.until(ExpectedConditions.presenceOfAllElementsLocatedBy(By.xpath("//*[contains(@data-tests-id, '"+dataTestId+"')]"))); + } + catch(Exception e){ + return new ArrayList<WebElement>(); + } + } + + public static List<WebElement> getWebElementsListByContainsClassName(String containedText) { + return getWebElementsListByContainsClassName(containedText, timeOut); + } + + public static List<WebElement> getWebElementsListByContainsClassName(String containedText, int timeoutInSeconds) { + WebDriverWait wait = newWait(timeoutInSeconds); + return wait.until(ExpectedConditions.presenceOfAllElementsLocatedBy(By.xpath("//*[contains(@class, '"+containedText+"')]"))); + } + + public static WebElement getWebElementByContainsClassName(String containedText) { + return getWebElementByContainsClassName(containedText, timeOut); + } + + public static WebElement getWebElementByContainsClassName(String containedText, int timeoutInSeconds) { + return getWebElementBy(By.xpath("//*[contains(@class, '"+containedText+"')]"), timeoutInSeconds); + } + + public static WebElement getWebElementByClassName(String className) { + return getWebElementByClassName(className, timeOut); + } + + public static WebElement getWebElementByClassName(String className, int timeoutInSeconds) { + WebDriverWait wait = newWait(timeoutInSeconds); + return wait.until(ExpectedConditions.visibilityOfElementLocated(By.className(className))); + } + + public static List<WebElement> getWebElementsListByContainsClassNameAndText(String cssName, String text, int timeoutInSeconds) { + WebDriverWait wait = newWait(timeoutInSeconds); + String xpath = String.format("//*[contains(@class, '%s') and contains(text(),'%s')]", cssName, text); + return wait.until(ExpectedConditions.presenceOfAllElementsLocatedBy( + By.xpath(xpath))); + } + + public static WebElement getWebElementByLinkText(String linkText) { + WebDriverWait wait = newWait(timeOut); + return wait.until(ExpectedConditions.visibilityOfElementLocated(By.xpath("//*[@text='" + linkText + "']"))); + } + + + public static List<WebElement> getWebElementsListByTestID(String dataTestId) { + WebDriverWait wait = newWait(timeOut); + return wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(By.xpath("//*[@data-tests-id='" + dataTestId + "']"))); + } + + public static List<WebElement> getWebElementsListByClassName(String className) { + WebDriverWait wait = newWait(timeOut); + return wait.until(ExpectedConditions.visibilityOfAllElementsLocatedBy(By.className(className))); + } + + + + + public static Boolean isElementInvisibleByTestId(String dataTestId) { + WebDriverWait wait = newWait(timeOut); + return wait.until( + ExpectedConditions.invisibilityOfElementLocated(By.xpath("//*[@data-tests-id='" + dataTestId + "']"))); + } + + public static Boolean isElementVisibleByTestId(String dataTestId) { + try{ + WebDriverWait wait = newWait(timeOut); + if(wait.until(ExpectedConditions.visibilityOfElementLocated((By.xpath("//*[@data-tests-id='" + dataTestId + "']")))).isDisplayed()){ + return true; + }else { + return false; + } + } + catch(Exception e){ + return false; + } + } + + public static void clickOnElementByTestId(String dataTestId) { + clickOnElementByTestIdWithoutWait(dataTestId); + ultimateWait(); + } + + public static void clickOnElementByTestIdWithoutWait(String dataTestId) { + WebDriverWait wait = newWait(timeOut); + wait.until(ExpectedConditions.elementToBeClickable(By.xpath("//*[@data-tests-id='" + dataTestId + "']"))).click(); + } + + public static void clickOnElementByTestId(String dataTestId, int customTimeout) { + WebDriverWait wait = newWait(customTimeout); + wait.until(ExpectedConditions.elementToBeClickable(By.xpath("//*[@data-tests-id='" + dataTestId + "']"))).click(); + } + + public static WebElement waitForElementVisibilityByTestId(String dataTestId) { + WebDriverWait wait = newWait(timeOut); + return wait.until(ExpectedConditions.visibilityOfElementLocated(By.xpath("//*[@data-tests-id='" + dataTestId + "']"))); + } + + public static Boolean waitForElementInVisibilityByTestId(String dataTestId) { + return waitForElementInVisibilityByTestId(dataTestId, timeOut); + } + + public static Boolean waitForElementInVisibilityByTestId(String dataTestId, int timeOut) { + WebDriverWait wait = newWait(timeOut); + boolean displayed = getDriver().findElements(By.xpath("//*[@data-tests-id='" + dataTestId + "']")).isEmpty(); + if (!displayed){ + Boolean until = wait.until(ExpectedConditions.invisibilityOfElementLocated(By.xpath("//*[@data-tests-id='" + dataTestId + "'])"))); + ultimateWait(); + return until; + } + return false; + } + + public static Boolean waitForElementInVisibilityByTestId(By by) { + return waitForElementInVisibilityBy(by, timeOut); + } + + + public static Boolean waitForElementInVisibilityBy(By by, int timeOut) { + WebDriverWait wait = newWait(timeOut); + boolean displayed = getDriver().findElements(by).isEmpty(); + if (!displayed){ + Boolean until = wait.until(ExpectedConditions.invisibilityOfElementLocated(by)); + sleep(1); + return until; + } + return false; + } + + + public static void setWebElementByTestId(String elementID, String value) { + WebElement resourceDescriptionTextbox = GeneralUIUtils.getWebElementByTestID(elementID); + resourceDescriptionTextbox.clear(); + resourceDescriptionTextbox.sendKeys(value); + + } + + public static WebElement hoverOnAreaByTestId(String areaId) { + Actions actions = new Actions(getDriver()); + WebElement area = getWebElementByTestID(areaId); + actions.moveToElement(area).perform(); + ultimateWait(); + return area; + } + + public static WebElement hoverOnAreaByClassName(String className) { + Actions actions = new Actions(getDriver()); + WebElement area = getWebElementByClassName(className); + actions.moveToElement(area).perform(); + GeneralUIUtils.ultimateWait(); + return area; + } + + public static void clickElementUsingActions(WebElement element){ + Actions actions = new Actions(getDriver()); + + actions.moveToElement(element); + actions.perform(); + + actions.click(); + actions.perform(); + + ultimateWait(); + } + + public static void waitForLoader() { + waitForLoader(timeOut); + } + + public static void waitForLoader(int timeOut) { + sleep(1); + waitForElementInVisibilityBy(By.className("tlv-loader"), timeOut); + } + + public static void findComponentAndClick(String resourceName) throws Exception { + SetupCDTest.getExtendTest().log(Status.INFO, "Searching for " + resourceName + " in homepage"); + WebElement searchTextbox = GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.MainMenuButtons.SEARCH_BOX.getValue()); + try{ + searchTextbox.clear(); + searchTextbox.sendKeys(resourceName); + ultimateWait(); + } + catch(Exception e){ + SetupCDTest.getExtendTest().log(Status.INFO, "Can't interact with search bar"); + e.printStackTrace(); + } + + + try{ + SetupCDTest.getExtendTest().log(Status.INFO, String.format("Clicking on the %s component from home screen", resourceName)); + clickOnElementByTestId(resourceName); + GeneralUIUtils.ultimateWait(); + getWebElementByTestID(DataTestIdEnum.GeneralElementsEnum.LIFECYCLE_STATE.getValue()); + } + catch(Exception e){ + SetupCDTest.getExtendTest().log(Status.INFO, "Can't click on component named " + resourceName); + e.printStackTrace(); + } + } + + + public static String getComponentVersion(String componentName) { + return GeneralUIUtils.getWebElementByTestID(componentName + "Version").getText(); + } + + public static void windowZoomOut() { + final int zoomOutFactor = 3; + for (int i = 0; i < zoomOutFactor; i++) { + if(getDriver() instanceof FirefoxDriver) { + getDriver().findElement(By.tagName("html")).sendKeys(Keys.chord(Keys.CONTROL, Keys.SUBTRACT)); + } + } + } + + public static void resetZoom(){ + getDriver().findElement(By.tagName("html")).sendKeys(Keys.chord(Keys.CONTROL, "0")); + } + + public static void windowZoomOutUltimate(){ + resetZoom(); + windowZoomOut(); +// JavascriptExecutor js = (JavascriptExecutor) driver; +// js.executeScript("document.body.style.zoom='90%'"); + } + + public static void clickASDCLogo() { + WebDriverWait wait = newWait(15); + wait.until(ExpectedConditions.visibilityOfElementLocated(By.linkText("ASDC"))); + WebElement ClickASDCLogo = getDriver().findElement(By.linkText("ASDC")); + ClickASDCLogo.click(); + GeneralUIUtils.waitForLoader(); + } + + public static void sleep(int millis) { + try { + Thread.sleep(millis); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } + } + + public static void moveToStep(DataTestIdEnum.StepsEnum Stepname) { + moveToStep(Stepname.getValue()); + SetupCDTest.getExtendTest().log(Status.INFO, String.format("Going to %s page ", Stepname.toString())); + } + + public static void moveToStep(String dataTestId) { + clickOnElementByTestId(dataTestId); + ultimateWait(); + } + + + public static Select getSelectList(String item, String datatestsid) { + Select selectlist = new Select(getWebElementByTestID(datatestsid)); + if (item != null) { + selectlist.selectByVisibleText(item); + Assert.assertThat(selectlist.getFirstSelectedOption().getText(), is(item)); + } + return selectlist; + } + + public static List<WebElement> waitForElementsListVisibilityTestMethod(DashboardCardEnum dataTestId) { + GeneralUIUtils.waitForLoader(); + return getDriver().findElements(By.xpath("//*[@data-tests-id='" + dataTestId.getValue() + "']")); + } + + public static List<WebElement> getElementsByCSS(String cssString) throws InterruptedException { + GeneralUIUtils.waitForLoader(); + List<WebElement> assets = getDriver().findElements(By.cssSelector(cssString)); + return assets; + } + + public static WebElement getElementfromElementByCSS(WebElement parentElement, String cssString){ + WebDriverWait wait = newWait(timeOut); + GeneralUIUtils.waitForLoader(); + return parentElement.findElement(By.cssSelector(cssString)); + } + + public static WebElement getElementfromElementByXPATH(WebElement parentElement, DashboardCardEnum dataTestId){ + WebDriverWait wait = newWait(timeOut); + GeneralUIUtils.waitForLoader(); + return HighlightMyElement( parentElement.findElement(By.xpath("//*[@data-tests-id='" + dataTestId.getValue() + "']"))); + } + + public static WebElement HighlightMyElement(WebElement element) { + JavascriptExecutor javascript = (JavascriptExecutor) getDriver(); + javascript.executeScript("arguments[0].setAttribute('style', arguments[1]);", element, "color: yellow; border: 4px solid yellow;"); + return element; + } + + public static WebElement getSelectedElementFromDropDown(String dataTestId){ + GeneralUIUtils.ultimateWait();; + WebElement selectedElement = new Select (getDriver().findElement(By.xpath("//*[@data-tests-id='" + dataTestId + "']"))).getFirstSelectedOption(); + return selectedElement; + } + + + public static void waitForPageLoadByReadyState() { + newWait(30).until((ExpectedCondition<Boolean>) wd -> + ((JavascriptExecutor) wd).executeScript("return document.readyState").equals("complete")); + } + + + public static boolean checkElementsCountInTable(int expectedElementsCount, Supplier<List<WebElement>> func) { + int maxWaitingPeriodMS = 10 * 1000; + int napPeriodMS = 100; + int sumOfWaiting = 0; + List<WebElement> elements = null; + boolean isKeepWaiting = false; + while (!isKeepWaiting) { + elements = func.get(); + isKeepWaiting = (expectedElementsCount == elements.size()); + sleep(isKeepWaiting ? napPeriodMS : 0); + sumOfWaiting += napPeriodMS; + if (sumOfWaiting > maxWaitingPeriodMS) + return false; + } + return true; + } + + public static String getActionDuration(Runnable func) throws Exception{ + long startTime = System.nanoTime(); + func.run(); + long estimateTime = System.nanoTime(); + long duration = TimeUnit.NANOSECONDS.toSeconds(estimateTime - startTime); + String durationString = String.format("%02d:%02d", duration / 60, duration % 60); + return durationString; + } + + public static WebElement clickOnAreaJS(String areaId) { + return clickOnAreaJS(areaId, timeOut); + } + + + public static WebElement clickOnAreaJS(String areaId, int timeout) { + try{ + ultimateWait(); + WebElement area = getWebElementByTestID(areaId); + JavascriptExecutor javascript = (JavascriptExecutor) getDriver(); + //HighlightMyElement(area); + Object executeScript = javascript.executeScript("arguments[0].click();", area, "color: yellow; border: 4px solid yellow;"); + waitForLoader(timeout); + return area; + } + catch (Exception e){ + e.printStackTrace(); + } + return null; + } + + + + public static WebElement clickOnAreaJS(WebElement areaId) throws InterruptedException { + JavascriptExecutor javascript = (JavascriptExecutor) getDriver(); + //HighlightMyElement(area); + javascript.executeScript("arguments[0].click();", areaId, "color: yellow; border: 4px solid yellow;"); + return areaId; + } + + + + public static void clickSomewhereOnPage() { + getDriver().findElement(By.cssSelector(".asdc-app-title")).click(); + } + + public static void findComponentAndClickInCatalog(String resourceName) throws Exception { + // This method will find element by element name, don't use data-tests-id argument + WebElement searchTextbox = GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.MainMenuButtons.SEARCH_BOX.getValue()); + searchTextbox.clear(); + searchTextbox.sendKeys(resourceName); + ultimateWait(); + clickOnElementByText(resourceName); + ultimateWait(); + } + + public static void clickOnElementByText(String textInElement) { + logger.info("clickOnElementByText: {}", textInElement); + WebDriverWait wait = newWait(timeOut); + HighlightMyElement(wait.until( + ExpectedConditions.elementToBeClickable(findByText(textInElement)))).click(); + } + + public static void clickOnElementByText(String textInElement, int customTimeout) { + logger.info("clickOnElementByText: {}", textInElement); + WebDriverWait wait = newWait(customTimeout); + HighlightMyElement(wait.until(ExpectedConditions.elementToBeClickable(searchByTextContaining(textInElement)))).click(); + } + + private static WebDriverWait newWait(int timeoutInSeconds) { + final WebDriver driver = getDriver(); + driver.manage().timeouts().setScriptTimeout(timeoutInSeconds, TimeUnit.SECONDS); + return new WebDriverWait(driver, timeoutInSeconds, 120); + } + + public static void clickJSOnElementByText(String textInElement) throws Exception { + WebDriverWait wait = newWait(timeOut); + clickOnAreaJS(wait.until( + ExpectedConditions.elementToBeClickable(findByText(textInElement)))); + } + + public static void fluentWaitTestID(String dataTestId, String text) { + FluentWait<WebDriver> fluentWait = new FluentWait<WebDriver>(getDriver()) + .withTimeout(30, TimeUnit.SECONDS) + .pollingEvery(50, TimeUnit.MILLISECONDS) + .ignoring(NoSuchElementException.class); + + fluentWait.until(ExpectedConditions.refreshed( + ExpectedConditions.textToBePresentInElementValue(By.xpath("//*[@data-tests-id='" + dataTestId + "']"), text))); + } + + public static void regularWait(WebElement element, String text){ + WebDriverWait wait = newWait(timeOut); + + wait.until(ExpectedConditions.textToBePresentInElementValue(element, text)); + } + + public static void waitForAngular(){ + WebDriverWait wait = newWait(90); + wait.until(AdditionalConditions.pageLoadWait()); + wait.until(AdditionalConditions.angularHasFinishedProcessing()); + } + + public static void waitForAngular2(){ + WebDriverWait wait = newWait(90); + wait.until(AdditionalConditions.pageLoadWait()); + try { + WebDriverWait briefWait = newWait(2); + briefWait.until(AdditionalConditions.angular2HasFinishedProcessing()); + } catch (TimeoutException | org.openqa.selenium.ScriptTimeoutException e) { + logger.info("Ignoring TimeoutException while waiting for angular2: {}", e, e); + } + } + + public static Object getAllElementAttributes(WebElement element) { + return ((JavascriptExecutor)getDriver()).executeScript("var s = []; var attrs = arguments[0].attributes; for (var l = 0; l < attrs.length; ++l) { var a = attrs[l]; s.push(a.name + ':' + a.value); } ; return s;", element); + } + + public static boolean isElementReadOnly(WebElement element){ + try { + HighlightMyElement(element).clear(); + return false; + } catch (Exception e) { + return true; + } + } + + public static boolean isElementReadOnly(String dataTestId){ + return isElementReadOnly( + waitForElementVisibilityByTestId(dataTestId)); + } + + public static boolean isElementDisabled(WebElement element){ + return HighlightMyElement(element).getAttribute("class").contains("view-mode") || + element.getAttribute("class").contains("disabled"); + } + + public static boolean isElementDisabled(String dataTestId){ + return isElementDisabled( + waitForElementVisibilityByTestId(dataTestId)); + } + + public static void ultimateWait(){ + logger.info("ultimateWait: starting"); + long startTime = System.nanoTime(); + + GeneralUIUtils.waitForAngular(); + logger.info("ultimateWait: waited for angular: {} ms", TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime)); + + GeneralUIUtils.waitForAngular2(); + logger.info("ultimateWait: waited for angular2: {} ms", TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime)); + + long estimateTime = System.nanoTime(); + long duration = TimeUnit.NANOSECONDS.toSeconds(estimateTime - startTime); + if(duration > timeOut){ + SetupCDTest.getExtendTest().log(Status.WARNING, String.format("Delays on page, %d seconds", duration)); + } + + logger.info("ultimateWait: done"); + } + + public static WebElement makeElementVisibleWithJS(WebElement element){ + String js = "arguments[0].style.height='auto'; arguments[0].style.visibility='visible';"; + ((JavascriptExecutor) getDriver()).executeScript(js, element); + return element; + } + + public static WebElement unhideElement(WebElement element, String attributeValue){ + String js = "arguments[0].setAttribute('class','" + attributeValue + "');"; + ((JavascriptExecutor) getDriver()).executeScript(js, element); + return element; + } + + public static WebElement findByText(String textInElement){ + return getDriver().findElement(searchByTextContaining(textInElement)); + } + + public static List<WebElement> findElementsByText(String textInElement){ + return getDriver().findElements(searchByTextContaining(textInElement)); + } + + public static By searchByTextContaining(String textInElement) { + return By.xpath("//*[contains(text(),'" + textInElement + "')]"); + } + + + public static boolean findAndWaitByText(String textInElement, int timeout){ + logger.info("findAndWaitByText: {}", textInElement); + try{ + WebDriverWait wait = newWait(timeout); + wait.until(ExpectedConditions.presenceOfElementLocated(searchByTextContaining(textInElement))); + return true; + } + catch(Exception e){ + return false; + } + } + + public static WebElement getClickableButtonBy(By by, int timout){ + try{ + WebDriverWait wait = newWait(timout); + WebElement element = wait.until(ExpectedConditions.elementToBeClickable(by)); + return element; + } + catch(Exception e){ + return null; + } + } + + + + public static WebElement getButtonWithText(String textInButton){ + try{ + return getDriver().findElement(By.xpath("//button[contains(text(),'" + textInButton + "')]")); + } + catch(Exception e) + { + return null; + } + } + + + public static List<WebElement> getElementsByDataTestsIdStartWith(String startWithString){ + ultimateWait(); + return getDriver().findElements(By.xpath("//*[starts-with(@data-tests-id,'" + startWithString + "')]")); + } + + public static void closeErrorMessage() { + WebElement okWebElement = getButtonWithText("OK"); + if (okWebElement != null){ + okWebElement.click(); + ultimateWait(); + } + } + + public static WebElement getElementByCSS(String cssString) throws InterruptedException { + ultimateWait(); + return getDriver().findElement(By.cssSelector(cssString)); + } + + public static String getDataTestIdAttributeValue(WebElement element) { + return element.getAttribute("data-tests-id"); + } + + public static String getTextContentAttributeValue(WebElement element) { + return element.getAttribute("textContent"); + } + + public static WebElement getElementInsideElementByDataTestsId(WebElement element, String dataTestId) { + try{ + return element.findElement(By.xpath("//*[@data-tests-id='" + dataTestId + "']")); + } + catch(Exception e){ + return null; + } + } + + public static void clickOnElementByCSS(String cssString) throws Exception { + WebDriverWait wait = newWait(timeOut); + wait.until(ExpectedConditions.visibilityOfElementLocated(By.cssSelector(cssString))).click(); + ultimateWait(); + } + public static String getRandomComponentName(String prefix) { + return prefix + GeneralUIUtils.randomNumber(); + } + public static int randomNumber() { + Random r = new Random(); + return r.nextInt(10000); + } + + public static void waitForUINotification() { + List<WebElement> notificationElements = getDriver().findElements(By.className("ui-notification")); + if (!notificationElements.isEmpty()){ + notificationElements.forEach(WebElement::click); + } + } + + public static boolean checkForDisabledAttribute(String dataTestId){ + Object elementAttributes = getAllElementAttributes(waitForElementVisibilityByTestId(dataTestId)); + return elementAttributes.toString().contains("disabled"); + } + + public static void dragAndDropElementByY(WebElement area, int yOffset) { + Actions actions = new Actions(getDriver()); + actions.dragAndDropBy(area, 10, yOffset).perform(); + ultimateWait(); + } + + public static void waitForBackLoader() { + waitForBackLoader(timeOut); + } + + public static void waitForBackLoader(int timeOut) { + sleep(1); + waitForElementInVisibilityBy(By.className("tlv-loader-back"), timeOut); + } + +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUtility.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUtility.java new file mode 100644 index 000000000..f2e834e03 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUtility.java @@ -0,0 +1,155 @@ +/*- + * ============LICENSE_START======================================================= + * SDC + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.sdc.ci.tests.utilities; + +import java.io.File; +import java.io.IOException; +import java.util.List; +import java.util.regex.Pattern; + +import org.apache.commons.codec.binary.Base64; +import org.apache.commons.io.FileUtils; + +public class GeneralUtility { + + public static boolean generateTextFile(String fileName, String fileData) { + boolean isSuccessfull = true; + try { + FileUtils.writeStringToFile(new File(fileName), fileData); + } catch (IOException e) { + isSuccessfull = false; + } + return isSuccessfull; + } + + /** + * Use with care, usage is not advised!!! + * The method only checks if String does not contain special characters + length divided by 4 with no remainder. + * The methods contained in other common libraries do the same. + */ + public static boolean isBase64Encoded(byte[] data) { + return Base64.isBase64(data); + } + + /** + *Use with care, usage is not advised!!! + * The method only checks if String does not contain special characters + length divided by 4 with no remainder. + * The methods contained in other common libraries do the same. + */ + public static boolean isBase64Encoded(String str) { + boolean isEncoded = false; + try { + // checks if the string was properly padded to the + isEncoded = ((str.length() % 4 == 0) && (Pattern.matches("\\A[a-zA-Z0-9/+]+={0,2}\\z", str))); + if (isEncoded) { + // If no exception is caught, then it is possibly a base64 + // encoded string + byte[] data = Base64.decodeBase64(str); + } + + } catch (Exception e) { + // If exception is caught, then it is not a base64 encoded string + isEncoded = false; + } + return isEncoded; + } + + /** + * Checks whether the passed string exceeds a limit of number of characters. + * + * @param str + * @param limit + * @return the result of comparison, or false if str is null. + */ + public static boolean isExceedingLimit(String str, int limit) { + if (str == null) { + return false; + } + return str.length() > limit; + } + + /** + * Checks the passed string list whether the cumulative length of strings and delimiters between them exceeds a limit of number of characters. For example for list ("one","two","three") with delimiter "," the length of list is calculated + * 3+1+3+1+5=13 + * + * @param strList + * @param limit + * @param delimiterLength + * - 0 if there is no delimeter. + * @return the result of comparison, or false if strList is null. + */ + public static boolean isExceedingLimit(List<String> strList, int limit, int delimiterLength) { + if (strList == null || strList.isEmpty()) { + return false; + } + int sum = 0; + int size = strList.size(); + for (int i = 0; i < size - 1; i++) { + String str = strList.get(i); + if (str != null) { + sum += str.length(); + } + sum += delimiterLength; + } + String str = strList.get(size - 1); + if (str != null) { + sum += str.length(); + } + return sum > limit; + } + + /** + * Return the extension as the substring from the last dot. For input "kuku.txt", "txt" will be returned. If no dot is found or input is null, empty string is returned. + * + * @param fileName + * @return extension + */ + public static String getFilenameExtension(String fileName) { + String res = Constants.EMPTY_STRING; + if (fileName != null) { + int indexOf = fileName.lastIndexOf('.'); + if (indexOf != -1 && indexOf < (fileName.length() - 1)) { + res = fileName.substring(indexOf + 1); + } + } + return res; + } + + public static String calculateMD5ByByteArray(byte[] payload) { + String decodedMd5 = org.apache.commons.codec.digest.DigestUtils.md5Hex(payload); + byte[] encodeMd5 = Base64.encodeBase64(decodedMd5.getBytes()); + return new String(encodeMd5); + + } + + /** + * + * @param data + * @return + */ + public static String calculateMD5ByString(String data) { + String calculatedMd5 = org.apache.commons.codec.digest.DigestUtils.md5Hex(data); + + // encode base-64 result + byte[] encodeBase64 = Base64.encodeBase64(calculatedMd5.getBytes()); + return new String(encodeBase64); + } +} diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/LoginUtils.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/LoginUtils.java new file mode 100644 index 000000000..eca3599c6 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/LoginUtils.java @@ -0,0 +1,42 @@ +package org.onap.sdc.ci.tests.utilities; + +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.datatypes.UserRoleEnum; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; + +public class LoginUtils { + + private static final String WEB_SEAL_PASSWORD = "123123a"; + + public static void loginToLocalWebsealSimulator(UserRoleEnum role) { + WebDriver driver = GeneralUIUtils.getDriver(); + WebDriverWait wait = new WebDriverWait(driver, 30); + + wait.until(ExpectedConditions.visibilityOf(driver.findElement(By.xpath("//*[@method='" + "post" + "']")))); + + WebElement userIdTextbox = GeneralUIUtils.getWebElementBy(By.name("userId")); + userIdTextbox.sendKeys(role.getUserId()); + WebElement passwordTextbox = GeneralUIUtils.getWebElementBy(By.name("password")); + passwordTextbox.sendKeys(WEB_SEAL_PASSWORD); + + wait.until(ExpectedConditions.elementToBeClickable(driver.findElement(By.xpath("//*[@value='" + "Login" + "']")))).click(); + } + + public static void loginToLocalWebsealSimulator(UserCredentials user) { + WebDriver driver = GeneralUIUtils.getDriver(); + WebDriverWait wait = new WebDriverWait(driver, 30); + + wait.until(ExpectedConditions.visibilityOf(driver.findElement(By.xpath("//*[@method='" + "post" + "']")))); + + WebElement userIdTextbox = GeneralUIUtils.getWebElementBy(By.name("userId")); + userIdTextbox.sendKeys(user.getUserId()); + WebElement passwordTextbox = GeneralUIUtils.getWebElementBy(By.name("password")); + passwordTextbox.sendKeys(user.getPassword()); + + wait.until(ExpectedConditions.elementToBeClickable(driver.findElement(By.xpath("//*[@value='" + "Login" + "']")))).click(); + } +} 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 8194d87ac..4f4779d8e 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,5 +1,6 @@ package org.onap.simulator.presetGenerator.presets.BasePresets; +import java.util.Map; import vid.automation.test.infra.Features; /** @@ -7,13 +8,17 @@ import vid.automation.test.infra.Features; */ public abstract class BaseMSOPreset extends BasePreset { + public static final String DEFAULT_CLOUD_OWNER = "irma-aic"; + public static final String DEFAULT_INSTANCE_ID = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb"; + protected String cloudOwner = DEFAULT_CLOUD_OWNER; + public static String getRequestBodyWithTestApiOnly() { if (Features.FLAG_ADD_MSO_TESTAPI_FIELD.isActive()) { return "" + "{" + " \"requestDetails\": { " + " \"requestParameters\": { " + - " \"testApi\": \"GR_API\" " + + " \"testApi\": \"VNF_API\" " + " } " + " } " + "} " + @@ -23,8 +28,20 @@ public abstract class BaseMSOPreset extends BasePreset { } } + protected String addCloudOwnerIfNeeded() { + return Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST.isActive() ? + "\"cloudOwner\": \""+cloudOwner+"\"," : ""; + } + @Override protected String getRootPath() { return "/mso"; } + + @Override + public Map<String, String> getRequestHeaders() { + Map<String, String> map = super.getRequestHeaders(); + map.put("X-ONAP-PartnerName", "VID"); + return map; + } } 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 162367368..662677e83 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,11 +1,10 @@ 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. @@ -13,12 +12,13 @@ import java.util.Map; public abstract class BasePreset { public RegistrationRequest generateScenario() { - Map<String, String> headers = new HashMap<>(); - headers.put("Content-Type", getContentType()); + Map<String, String> responseHeaders = new HashMap<>(); + responseHeaders.put("Content-Type", getContentType()); return new RegistrationRequest( - new RegistrationRequest.SimulatorRequest(getReqMethod(), getReqPath(), getQueryParams(), getRequestBody()), - new RegistrationRequest.SimulatorResponse(getResponseCode(), headers, getResponseBody(), getFile())); + new RegistrationRequest.SimulatorRequest(getReqMethod(), getReqPath(), getQueryParams(), getRequestBody(), isStrictMatch(), getRequestHeaders()), + new RegistrationRequest.SimulatorResponse(getResponseCode(), responseHeaders, getResponseBody(), getFile()), + new RegistrationRequest.Misc(getNumberOfTimes(), getReplace())); } public Object getResponseBody() { return null; }; @@ -41,7 +41,19 @@ public abstract class BasePreset { return null; } + public boolean isStrictMatch() { + return false; + } + public Map<String, List> getQueryParams() { return null; } protected abstract String getRootPath(); + + protected Integer getNumberOfTimes() {return null;} + + protected boolean getReplace() {return true;} + + public Map<String,String> getRequestHeaders() { + return new HashMap<>(); + } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aaf/AAFGetBasicAuthPreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aaf/AAFGetBasicAuthPreset.java new file mode 100644 index 000000000..f7900d14b --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aaf/AAFGetBasicAuthPreset.java @@ -0,0 +1,31 @@ +package org.onap.simulator.presetGenerator.presets.aaf; + +import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.springframework.http.HttpMethod; + +import java.util.Map; + +public class AAFGetBasicAuthPreset extends BasePreset { + public static final String VALID_AUTH_VALUE = "bTEyMzRAYXR0LmNvbTphYWFh"; + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return "/authn/basicAuth"; + } + + @Override + protected String getRootPath() { + return ""; + } + + @Override + public Map<String, String> getRequestHeaders() { + return ImmutableMap.of("Authorization", "Basic " + VALID_AUTH_VALUE); + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aaf/AAFGetUrlServicePreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aaf/AAFGetUrlServicePreset.java new file mode 100644 index 000000000..b3376e61a --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aaf/AAFGetUrlServicePreset.java @@ -0,0 +1,26 @@ +package org.onap.simulator.presetGenerator.presets.aaf; + +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.springframework.http.HttpMethod; + +public class AAFGetUrlServicePreset extends BasePreset { + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return "/locate/com.att.aaf.service:2.0"; + } + + @Override + protected String getRootPath() { + return ""; + } + + @Override + public Object getResponseBody() { + return "{\"endpoint\":[{\"name\":\"com.att.aaf.service\",\"major\": 2,\"minor\": 0,\"patch\": 19,\"pkg\": 21,\"latitude\": 38.627346,\"longitude\": -90.19377,\"protocol\": \"http\",\"subprotocol\": [],\"hostname\": \"127.0.0.1\",\"port\": 1080}]}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java deleted file mode 100644 index 2452a24f7..000000000 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/BasePresetAAIGetVersion.java +++ /dev/null @@ -1,48 +0,0 @@ -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 BasePresetAAIGetVersion extends BaseAAIPreset { - public String modelVersionId1; - public String modelInvariantId; - - public BasePresetAAIGetVersion(String modelVersionId1, String modelInvariantId) { - this.modelVersionId1 = modelVersionId1; - this.modelInvariantId = modelInvariantId; - } - @Override - public HttpMethod getReqMethod() { - return HttpMethod.PUT; - } - - @Override - public String getReqPath() { - return getRootPath() + "/query"; - } - - @Override - public Map<String, List> getQueryParams() { - return ImmutableMap.of("format", Collections.singletonList("resource")); - } - - @Override - public Object getRequestBody() { - return "{\"start\" : \"service-design-and-creation/models/\", \"query\" : \"query/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK\"}"; - } - - public String getModelVersionId1() { - return modelVersionId1; - } - - public String getModelInvariantId() { - return modelInvariantId; - } - - -} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java index c74cc0b14..66562ed63 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,12 +2,11 @@ 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 { @@ -64,9 +63,9 @@ public class PresetAAICloudRegionAndSourceFromConfigurationPut extends BaseAAIPr " \"results\": [{" + " \"id\": \"2979590232\"," + " \"node-type\": \"cloud-region\"," + - " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/SDNO-S-BcloudReg-E1802\"," + + " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/SDNO-S-BcloudReg-E1802\"," + " \"properties\": {" + - " \"cloud-owner\": \"att-aic\"," + + " \"cloud-owner\": \"irma-aic\"," + " \"cloud-region-id\": \"" + getCloudRegionId() + "\"," + " \"sriov-automation\": false," + " \"resource-version\": \"1513631040564\"" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIFilterServiceInstanceById.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIFilterServiceInstanceById.java new file mode 100644 index 000000000..5fca9f392 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIFilterServiceInstanceById.java @@ -0,0 +1,39 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import com.google.common.collect.ImmutableMap; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +public class PresetAAIFilterServiceInstanceById extends PresetAAIBaseSearchNodeQuery { + + private String subscriberId; + private String serviceType; + private String serviceInstanceId; + + public PresetAAIFilterServiceInstanceById(String subscriberId, String serviceType, String serviceInstanceId) { + this.subscriberId = subscriberId; + this.serviceType = serviceType; + this.serviceInstanceId = serviceInstanceId; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("search-node-type", Collections.singletonList("service-instance"), + "filter", Collections.singletonList("service-instance-id:EQUALS:" + this.serviceInstanceId)); + } + + @Override + public Object getResponseBody() { + return "" + + "{" + + "\"result-data\": [\n" + + " {\n" + + " \"resource-type\": \"service-instance\",\n" + + " \"resource-link\": \"/aai/v11/business/customers/customer/" + this.subscriberId + "/service-subscriptions/service-subscription/" + this.serviceType + "/service-instances/service-instance/" + this.serviceInstanceId + "\"\n" + + " }\n" + + " ]" + + "}"; + } +} 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 new file mode 100644 index 000000000..be075b481 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudOwnersByCloudRegionId.java @@ -0,0 +1,130 @@ +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 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 PresetAAIGetCloudOwnersByCloudRegionId extends BaseAAIPreset { + public static final String SOME_LEGACY_REGION = "some legacy region"; + public static final String JUST_ANOTHER_REGION = "just another region"; + public static final String MY_REGION = "my region"; + public static final String LCP_REGION_TEXT = "lcpRegionText"; + public static final String ATT_AIC = "irma-aic"; + public static final String MDT_1 = "mdt1"; + public static final String ATT_NC = "att-nc"; + public static final String hvf3 = "hvf3"; + 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 ONE = "One"; + public static final String hvf6 = "hvf6"; + private final String cloudRegionId; + private final String cloudOwner; + + //Since there is a cache of cloudRegionToCloudOwner, we can't have 2 preset of same cloud region that return different cloud owner. + //So all the preset instance must be declared here, for conflicts prevention. + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_SOME_LEGACY_REGION_TO_ATT_AIC = + new PresetAAIGetCloudOwnersByCloudRegionId(SOME_LEGACY_REGION, ATT_AIC); + + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_JUST_ANOTHER_REGION_TO_ATT_AIC = + new PresetAAIGetCloudOwnersByCloudRegionId(JUST_ANOTHER_REGION, ATT_AIC); + + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_MDT1_TO_ATT_NC = + new PresetAAIGetCloudOwnersByCloudRegionId(MDT_1, ATT_NC); + + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_RDM3_TO_ATT_NC = + new PresetAAIGetCloudOwnersByCloudRegionId(olson3, ATT_NC); + + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_MTN3_TO_ATT_SABABA = + new PresetAAIGetCloudOwnersByCloudRegionId(hvf3, ATT_SABABA); + + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_AAIAIC25_TO_ATT_AIC = + new PresetAAIGetCloudOwnersByCloudRegionId(AAIAIC_25, ATT_AIC); + + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_ONE_TO_ATT_AIC = + new PresetAAIGetCloudOwnersByCloudRegionId(ONE, ATT_AIC); + + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_MTN6_TO_ATT_AIC = + new PresetAAIGetCloudOwnersByCloudRegionId(hvf6, ATT_AIC); + + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_MY_REGION_TO_ATT_AIC = + new PresetAAIGetCloudOwnersByCloudRegionId(MY_REGION, ATT_AIC); + + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_LCP_REGION_TEXT_TO_ATT_AIC = + new PresetAAIGetCloudOwnersByCloudRegionId(LCP_REGION_TEXT, ATT_AIC); + + private PresetAAIGetCloudOwnersByCloudRegionId(String cloudRegionId, String cloudOwnerResult) { + this.cloudRegionId = cloudRegionId; + this.cloudOwner = cloudOwnerResult; + } + + @Override + public Object getResponseBody() { + return "" + + "{" + + " \"cloud-region\": [{" + + " \"cloud-owner\": \"" + cloudOwner + "\"," + + " \"cloud-region-id\": \"" + cloudRegionId + "\"," + + " \"cloud-region-version\": \"2.5\"," + + " \"identity-url\": \"http://" + randomAlphabetic(5) + ":5000/v2.0\"," + + " \"complex-name\": \"" + cloudRegionId + "\"," + + " \"resource-version\": \"" + randomNumeric(5) + "\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"pserver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.LocatedIn\"," + + " \"related-link\": \"/aai/v12/cloud-infrastructure/pservers/pserver/" + randomAlphabetic(5) + "\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"pserver.hostname\"," + + " \"relationship-value\": \"" + randomAlphabetic(5) + "\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"pserver.pserver-name2\"" + + " }" + + " ]" + + " }, {" + + " \"related-to\": \"l3-network\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v12/network/l3-networks/l3-network/" + UUID.randomUUID() + "\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"l3-network.network-id\"," + + " \"relationship-value\": \"" + UUID.randomUUID() + "\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"l3-network.network-name\"," + + " \"property-value\": \"" + randomAlphabetic(5) + "\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + "}"; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/cloud-infrastructure/cloud-regions"; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("cloud-region-id", Collections.singletonList(cloudRegionId)); + } +} 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 new file mode 100644 index 000000000..976228bf0 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudRegionFromVnf.java @@ -0,0 +1,130 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import com.google.common.collect.ImmutableList; +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; + +public class PresetAAIGetCloudRegionFromVnf extends BaseAAIPreset { + + private String vnfInstanceId; + + public PresetAAIGetCloudRegionFromVnf(String vnfInstanceId) { + this.vnfInstanceId = vnfInstanceId; + } + + public String getVnfInstanceId() { + return vnfInstanceId; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.PUT; + } + + @Override + public String getReqPath() { + return getRootPath() + "/query"; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of( + "format", Collections.singletonList("simple") + ); + } + + @Override + public Object getRequestBody() { + return ImmutableMap.of( + "start", ImmutableList.of("/network/generic-vnfs/generic-vnf/" + getVnfInstanceId()), + "query", "/query/cloud-region-fromVnf" + ); + } + + @Override + public Object getResponseBody() { + return "{" + + " \"results\": [" + + " {" + + " \"id\": \"363687968\"," + + " \"node-type\": \"generic-vnf\"," + + " \"url\": \"/aai/v14/network/generic-vnfs/generic-vnf/" + getVnfInstanceId() + "\"," + + " \"properties\": {" + + " \"vnf-id\": \"" + getVnfInstanceId() + "\"," + + " \"vnf-name\": \"zhvf23bmogx05_oam_01_rk\"," + + " \"vnf-type\": \"vMOG_SVC_UPDATED_FLAV_OAM/vMOG_VSP_UPDATED_FLAV 0\"," + + " \"service-id\": \"db171b8f-115c-4992-a2e3-ee04cae357e0\"," + + " \"prov-status\": \"NVTPROV\"," + + " \"orchestration-status\": \"Created\"," + + " \"in-maint\": false," + + " \"is-closed-loop-disabled\": false," + + " \"resource-version\": \"1522780608709\"," + + " \"model-invariant-id\": \"5108d7e4-f32a-44cd-8835-433a70915b8c\"," + + " \"model-version-id\": \"bae37933-b694-4b4e-a734-db63416f9cfe\"," + + " \"model-customization-id\": \"732305c6-d36a-47ee-a701-6f28f87b90cd\"," + + " \"nf-type\": \"POLICY\"," + + " \"nf-function\": \"Emanuel Orchestration Gateway (MOG)\"," + + " \"nf-role\": \"vMOG\"," + + " \"nf-naming-code\": \"\"" + + " }," + + " \"related-to\": [" + + " {" + + " \"id\": \"193753168\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\"," + + " \"node-type\": \"service-instance\"," + + " \"url\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vMOG/service-instances/service-instance/7f10ffe2-548f-4168-8722-b782d05675b7\"" + + " }" + + " ]" + + " }," + + " {" + + " \"id\": \"8757432\"," + + " \"node-type\": \"tenant\"," + + " \"url\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a\"," + + " \"properties\": {" + + " \"tenant-id\": \"3e9a20a3e89e45f884e09df0cc2d2d2a\"," + + " \"tenant-name\": \"APPC-24595-T-IST-02C\"," + + " \"resource-version\": \"1539855222745\"" + + " }," + + " \"related-to\": [" + + " {" + + " \"id\": \"264798392\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," + + " \"node-type\": \"vserver\"," + + " \"url\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a/vservers/vserver/088c2bf0-80e2-4bdf-93ae-b2469fbeba84\"" + + " }" + + " ]" + + " }," + + " {" + + " \"id\": \"302227536\"," + + " \"node-type\": \"cloud-region\"," + + " \"url\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23b\"," + + " \"properties\": {" + + " \"cloud-owner\": \"irma-aic\"," + + " \"cloud-region-id\": \"hvf23b\"," + + " \"cloud-type\": \"openstack\"," + + " \"owner-defined-type\": \"lcp\"," + + " \"cloud-region-version\": \"3.0\"," + + " \"identity-url\": \"https://iden.onap.org:5000/v2.0\"," + + " \"cloud-zone\": \"z1\"," + + " \"complex-name\": \"c1\"," + + " \"sriov-automation\": \"false\"," + + " \"resource-version\": \"1539855222969\"" + + " }," + + " \"related-to\": [" + + " {" + + " \"id\": \"2744328\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," + + " \"node-type\": \"tenant\"," + + " \"url\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23b/tenants/tenant/5452d6bd0cb34e99a3553d349456c642\"" + + " }" + + " ]" + + " }" + + " ]" + + "}"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetHomingForVfModule.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetHomingForVfModule.java new file mode 100644 index 000000000..6b07f5293 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetHomingForVfModule.java @@ -0,0 +1,150 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + +public class PresetAAIGetHomingForVfModule extends BaseAAIPreset { + private final String vnfInstanceId; + private final String vfModuleId; + private final String tenantId; + private final String lcpRegionId; + + public PresetAAIGetHomingForVfModule(String vnfInstanceId, String vfModuleId, String tenantId, String lcpRegionId) { + this.vnfInstanceId = vnfInstanceId; + this.vfModuleId = vfModuleId; + this.tenantId = tenantId; + this.lcpRegionId = lcpRegionId; + } + + public PresetAAIGetHomingForVfModule(String vnfInstanceId, String vfModuleId) { + this( + vnfInstanceId, + vfModuleId, + "db1818f7f2e34862b378bfb2cc520f91", + "olson5b" + ); + } + + public PresetAAIGetHomingForVfModule() { + this( + "0846287b-65bf-45a6-88f6-6a1af4149fac", + "a9b70ac0-5917-4203-a308-0e6920e6d09b", + "db1818f7f2e34862b378bfb2cc520f91", + "olson5b" + ); + } + + @Override + public Object getResponseBody() { + return "{" + + " \"vf-module-id\": \""+vfModuleId+"\"," + + " \"vf-module-name\": \"apndns_az_02_module_1\"," + + " \"heat-stack-id\": \"apndns_az_02_module_1/97a319f3-b095-4fff-befa-c657508ecaf8\"," + + " \"orchestration-status\": \"active\"," + + " \"is-base-vf-module\": false," + + " \"resource-version\": \"1530559380383\"," + + " \"model-invariant-id\": \"74450b48-0aa0-4743-8314-9163e92b7862\"," + + " \"model-version-id\": \"6bc01a2b-bc48-4991-b9fe-e22c2215d801\"," + + " \"model-customization-id\": \"74f638c2-0368-4212-8f73-e961005af17c\"," + + " \"module-index\": 0," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"l3-network\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.DependsOn\"," + + " \"related-link\": \"/aai/v12/network/l3-networks/l3-network/335e62be-73a3-41e8-930b-1a677bcafea5\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"l3-network.network-id\"," + + " \"relationship-value\": \"335e62be-73a3-41e8-930b-1a677bcafea5\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"l3-network.network-name\"," + + " \"property-value\": \"MNS-FN-25180-T-02Shared_oam_protected_net_1\"" + + " }" + + " ]" + + " }," + + " {" + + " \"related-to\": \"l3-network\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.DependsOn\"," + + " \"related-link\": \"/aai/v12/network/l3-networks/l3-network/2db4ee3e-2ac7-4fc3-8739-ecf53416459e\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"l3-network.network-id\"," + + " \"relationship-value\": \"2db4ee3e-2ac7-4fc3-8739-ecf53416459e\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"l3-network.network-name\"," + + " \"property-value\": \"Mobisupport-FN-27099-T-02_int_apn_dns_net_1\"" + + " }" + + " ]" + + " }," + + " {" + + " \"related-to\": \"volume-group\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/" + lcpRegionId + "/volume-groups/volume-group/66013ebe-0c81-44b9-a24f-7c6acba73a39\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"irma-aic\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"" + lcpRegionId + "\"" + + " }," + + " {" + + " \"relationship-key\": \"volume-group.volume-group-id\"," + + " \"relationship-value\": \"66013ebe-0c81-44b9-a24f-7c6acba73a39\"" + + " }" + + " ]" + + " }," + + " {" + + " \"related-to\": \"vserver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/" + lcpRegionId + "/tenants/tenant/" + tenantId+ "/vservers/vserver/5eef9f6d-9933-4bc6-9a1a-862d61309437\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"irma-aic\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"" + lcpRegionId + "\"" + + " }," + + " {" + + " \"relationship-key\": \"tenant.tenant-id\"," + + " \"relationship-value\": \"" + 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; + } + + @Override + public String getReqPath() { + return getRootPath() + "/network/generic-vnfs/generic-vnf/" + this.vnfInstanceId + "/vf-modules/vf-module/" + this.vfModuleId; + } + + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java index a50462a3d..9435dcd2b 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegion.java @@ -44,7 +44,7 @@ public class PresetAAIGetInstanceGroupsByCloudRegion extends BaseAAIPreset { public Object getRequestBody() { return ImmutableMap.of( "start", ImmutableList.of("cloud-infrastructure/cloud-regions/cloud-region/" + getCloudOwner() + "/" + getCloudRegionId()), - "query", "query/instance-group-byCloudRegion?type=" + type + "&role=" + role + "&function=" + getNetworkFunction() + "query", "query/instance-groups-byCloudRegion?type=" + type + "&role=" + role + "&function=" + getNetworkFunction() ); } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java index 9dae89be5..b20ef5a6e 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest.java @@ -44,7 +44,7 @@ public class PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest extends BaseA public Object getRequestBody() { return ImmutableMap.of( "start", ImmutableList.of("cloud-infrastructure/cloud-regions/cloud-region/" + getCloudOwner() + "/" + getCloudRegionId()), - "query", "query/instance-group-byCloudRegion?type=" + type + "&role=" + role + "&function=" + getNetworkFunction() + "query", "query/instance-groups-byCloudRegion?type=" + type + "&role=" + role + "&function=" + getNetworkFunction() ); } @@ -62,124 +62,124 @@ public class PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest extends BaseA @Override public Object getResponseBody() { - return "{\n" + - " \"results\": [\n" + - " {\n" + - " \"instance-group\": {\n" + - " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" + - " \"some-filed\": \"some-data\",\n" + //extra field - " \"model-invariant-id\": \"model-id3\",\n" + - " \"model-version-id\": \"a0efd5fc-f7be-4502-936a-a6c6392b958f\",\n" + - " \"id\": \"AAI-12002-test3-vm230w\",\n" + - " \"description\": \"a9DEa0kpY\",\n" + - " \"instance-group-type\": \"type\",\n" + - " \"resource-version\": \"1520888659539\",\n" + - " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" + - " \"instance-group-function\": \"testfunction2\",\n" + - " \"relationship-list\": {\n" + - " \"relationship\": [\n" + - " {\n" + - " \"related-to\": \"cloud-region\",\n" + - " \"some-filed\": \"some-data\",\n" + //extra field - " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" + - " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" + - " \"relationship-data\": [\n" + - " {\n" + - " \"relationship-key\": \"cloud-region.cloud-owner\",\n" + - " \"relationship-value\": \"AAI-12002-vm230w\"\n" + - " },\n" + - " {\n" + - " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" + - " \"relationship-value\": \"AAI-region-vm230w\"\n" + - " }\n" + - " ],\n" + - " \"related-to-property\": [\n" + - " {\n" + - " \"property-key\": \"cloud-region.owner-defined-type\"\n" + - " }\n" + - " ]\n" + - " }\n" + - " ]\n" + - " }\n" + - " }\n" + - " },\n" + - " {\n" + - " \"instance-group\": {\n" + - " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" + - " \"model-invariant-id\": \"model-id1\",\n" + - " \"model-version-id\": \"a0efd5fc-f7be-4502-936a-a6c6392b958f\",\n" + - " \"id\": \"AAI-12002-test1-vm230w\",\n" + - " \"description\": \"a9DEa0kpY\",\n" + - " \"instance-group-type\": \"type\",\n" + - " \"resource-version\": \"1520886467989\",\n" + - " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" + - " \"instance-group-function\": \"testfunction2\",\n" + - " \"relationship-list\": {\n" + - " \"relationship\": [\n" + - " {\n" + - " \"related-to\": \"cloud-region\",\n" + - " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" + - " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" + - " \"relationship-data\": [\n" + - " {\n" + - " \"relationship-key\": \"cloud-region.cloud-owner\",\n" + - " \"some-filed\": \"some-data\",\n" + //extra field - " \"relationship-value\": \"AAI-12002-vm230w\"\n" + - " },\n" + - " {\n" + - " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" + - " \"relationship-value\": \"AAI-region-vm230w\"\n" + - " }\n" + - " ],\n" + - " \"related-to-property\": [\n" + - " {\n" + - " \"property-key\": \"cloud-region.owner-defined-type\"\n" + - " }\n" + - " ]\n" + - " }\n" + - " ]\n" + - " }\n" + - " }\n" + - " },\n" + - " {\n" + - " \"instance-group\": {\n" + - " \"instance-group-role\": \"JZmha7QSS4tJ\",\n" + - " \"model-invariant-id\": \"model-id2\",\n" + - " \"model-version-id\": \"version2\",\n" + - " \"id\": \"AAI-12002-test2-vm230w\",\n" + - " \"description\": \"a9DEa0kpY\",\n" + - " \"instance-group-type\": \"type\",\n" + - " \"resource-version\": \"1520888629970\",\n" + - " \"instance-group-name\": \"wKmBXiO1xm8bK\",\n" + - " \"instance-group-function\": \"testfunction2\",\n" + - " \"relationship-list\": {\n" + - " \"relationship\": [\n" + - " {\n" + - " \"related-to\": \"cloud-region\",\n" + - " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" + - " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\n" + - " \"relationship-data\": [\n" + - " {\n" + - " \"relationship-key\": \"cloud-region.cloud-owner\",\n" + - " \"relationship-value\": \"AAI-12002-vm230w\"\n" + - " },\n" + - " {\n" + - " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" + - " \"relationship-value\": \"AAI-region-vm230w\"\n" + - " }\n" + - " ],\n" + - " \"related-to-property\": [\n" + - " {\n" + - " \"property-key\": \"cloud-region.owner-defined-type\"\n" + - " }\n" + - " ]\n" + - " }\n" + - " ]\n" + - " }\n" + - " }\n" + - " }\n" + - " ]\n" + - "}\n"; + return "{" + + " \"results\": [" + + " {" + + " \"instance-group\": {" + + " \"instance-group-role\": \"JZmha7QSS4tJ\"," + + " \"some-filed\": \"some-data\"," + //extra field + " \"model-invariant-id\": \"model-id3\"," + + " \"model-version-id\": \"a0efd5fc-f7be-4502-936a-a6c6392b958f\"," + + " \"id\": \"AAI-12002-test3-vm230w\"," + + " \"description\": \"a9DEa0kpY\"," + + " \"instance-group-type\": \"type\"," + + " \"resource-version\": \"1520888659539\"," + + " \"instance-group-name\": \"wKmBXiO1xm8bK\"," + + " \"instance-group-function\": \"testfunction2\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"cloud-region\"," + + " \"some-filed\": \"some-data\"," + //extra field + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"AAI-12002-vm230w\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"AAI-region-vm230w\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"cloud-region.owner-defined-type\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " }," + + " {" + + " \"instance-group\": {" + + " \"instance-group-role\": \"JZmha7QSS4tJ\"," + + " \"model-invariant-id\": \"model-id1\"," + + " \"model-version-id\": \"a0efd5fc-f7be-4502-936a-a6c6392b958f\"," + + " \"id\": \"AAI-12002-test1-vm230w\"," + + " \"description\": \"a9DEa0kpY\"," + + " \"instance-group-type\": \"type\"," + + " \"resource-version\": \"1520886467989\"," + + " \"instance-group-name\": \"wKmBXiO1xm8bK\"," + + " \"instance-group-function\": \"testfunction2\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"cloud-region\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"some-filed\": \"some-data\"," + //extra field + " \"relationship-value\": \"AAI-12002-vm230w\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"AAI-region-vm230w\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"cloud-region.owner-defined-type\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " }," + + " {" + + " \"instance-group\": {" + + " \"instance-group-role\": \"JZmha7QSS4tJ\"," + + " \"model-invariant-id\": \"model-id2\"," + + " \"model-version-id\": \"version2\"," + + " \"id\": \"AAI-12002-test2-vm230w\"," + + " \"description\": \"a9DEa0kpY\"," + + " \"instance-group-type\": \"type\"," + + " \"resource-version\": \"1520888629970\"," + + " \"instance-group-name\": \"wKmBXiO1xm8bK\"," + + " \"instance-group-function\": \"testfunction2\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"cloud-region\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"AAI-12002-vm230w\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"AAI-region-vm230w\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"cloud-region.owner-defined-type\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " }" + + " ]" + + "}"; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java index 4d596e527..eb4a22889 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing.java @@ -44,7 +44,7 @@ public class PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing extends Base public Object getRequestBody() { return ImmutableMap.of( "start", ImmutableList.of("cloud-infrastructure/cloud-regions/cloud-region/" + getCloudOwner() + "/" + getCloudRegionId()), - "query", "query/instance-group-byCloudRegion?type=" + type + "&role=" + role + "&function=" + getNetworkFunction() + "query", "query/instance-groups-byCloudRegion?type=" + type + "&role=" + role + "&function=" + getNetworkFunction() ); } 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 610ab6b48..41c35b8a5 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,12 +1,11 @@ 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; @@ -45,11 +44,11 @@ public class PresetAAIGetModelsByOwningEntity extends BaseAAIPreset { " {" + " \"related-to\": \"service-instance\"," + " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," + - " \"related-link\": \"/aai/v12/business/customers/customer/MSO_1610_ST/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/af9d52f9-13b2-4657-a198-463677f82dc0\"," + + " \"related-link\": \"/aai/v12/business/customers/customer/CAR_2020_ER/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/af9d52f9-13b2-4657-a198-463677f82dc0\"," + " \"relationship-data\": [" + " {" + " \"relationship-key\": \"customer.global-customer-id\"," + - " \"relationship-value\": \"MSO_1610_ST\"" + + " \"relationship-value\": \"CAR_2020_ER\"" + " }," + " {" + " \"relationship-key\": \"service-subscription.service-type\"," + @@ -70,11 +69,11 @@ public class PresetAAIGetModelsByOwningEntity extends BaseAAIPreset { " {" + " \"related-to\": \"service-instance\"," + " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," + - " \"related-link\": \"/aai/v12/business/customers/customer/MSO_1610_ST/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/49769492-5def-4c89-8e73-b236f958fa40\"," + + " \"related-link\": \"/aai/v12/business/customers/customer/CAR_2020_ER/service-subscriptions/service-subscription/MSO-dev-service-type/service-instances/service-instance/49769492-5def-4c89-8e73-b236f958fa40\"," + " \"relationship-data\": [" + " {" + " \"relationship-key\": \"customer.global-customer-id\"," + - " \"relationship-value\": \"MSO_1610_ST\"" + + " \"relationship-value\": \"CAR_2020_ER\"" + " }," + " {" + " \"relationship-key\": \"service-subscription.service-type\"," + @@ -120,7 +119,7 @@ public class PresetAAIGetModelsByOwningEntity extends BaseAAIPreset { " {" + " \"related-to\": \"service-instance\"," + " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," + - " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/7e4f8130-5dee-47c4-8770-1abc5f5ded83\"," + + " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/7e4f8130-5dee-47c4-8770-1abc5f5ded83\"," + " \"relationship-data\": [" + " {" + " \"relationship-key\": \"customer.global-customer-id\"," + @@ -128,7 +127,7 @@ public class PresetAAIGetModelsByOwningEntity extends BaseAAIPreset { " }," + " {" + " \"relationship-key\": \"service-subscription.service-type\"," + - " \"relationship-value\": \"Mobility\"" + + " \"relationship-value\": \"Emanuel\"" + " }," + " {" + " \"relationship-key\": \"service-instance.service-instance-id\"," + @@ -145,7 +144,7 @@ public class PresetAAIGetModelsByOwningEntity extends BaseAAIPreset { " {" + " \"related-to\": \"service-instance\"," + " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\"," + - " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/d849b312-03f6-4fa3-a923-a469b850ec73\"," + + " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/d849b312-03f6-4fa3-a923-a469b850ec73\"," + " \"relationship-data\": [" + " {" + " \"relationship-key\": \"customer.global-customer-id\"," + @@ -153,7 +152,7 @@ public class PresetAAIGetModelsByOwningEntity extends BaseAAIPreset { " }," + " {" + " \"relationship-key\": \"service-subscription.service-type\"," + - " \"relationship-value\": \"Mobility\"" + + " \"relationship-value\": \"Emanuel\"" + " }," + " {" + " \"relationship-key\": \"service-instance.service-instance-id\"," + 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 96372abb4..cb80fd6ce 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,13 +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 java.util.UUID; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; public class PresetAAIGetModelsByProject extends BaseAAIPreset { private String projectName; @@ -49,7 +48,7 @@ public class PresetAAIGetModelsByProject extends BaseAAIPreset { " {" + " \"related-to\": \"service-instance\"," + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + - " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/3f826016-3ac9-4928-9561-beee75fd91d5\"," + + " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/3f826016-3ac9-4928-9561-beee75fd91d5\"," + " \"relationship-data\": [" + " {" + " \"relationship-key\": \"customer.global-customer-id\"," + @@ -57,7 +56,7 @@ public class PresetAAIGetModelsByProject extends BaseAAIPreset { " }," + " {" + " \"relationship-key\": \"service-subscription.service-type\"," + - " \"relationship-value\": \"Mobility\"" + + " \"relationship-value\": \"Emanuel\"" + " }," + " {" + " \"relationship-key\": \"service-instance.service-instance-id\"," + @@ -124,7 +123,7 @@ public class PresetAAIGetModelsByProject extends BaseAAIPreset { " {" + " \"related-to\": \"service-instance\"," + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + - " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/ff2d9326-1ef5-4760-aba0-0eaf372ae675\"," + + " \"related-link\": \"/aai/v12/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/ff2d9326-1ef5-4760-aba0-0eaf372ae675\"," + " \"relationship-data\": [" + " {" + " \"relationship-key\": \"customer.global-customer-id\"," + @@ -132,7 +131,7 @@ public class PresetAAIGetModelsByProject extends BaseAAIPreset { " }," + " {" + " \"relationship-key\": \"service-subscription.service-type\"," + - " \"relationship-value\": \"Mobility\"" + + " \"relationship-value\": \"Emanuel\"" + " }," + " {" + " \"relationship-key\": \"service-instance.service-instance-id\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java deleted file mode 100644 index a9c63196a..000000000 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetMultipleVersion.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.onap.simulator.presetGenerator.presets.aai; - -public class PresetAAIGetMultipleVersion extends BasePresetAAIGetVersion { - public String modelVersionId2; - public String modelVersionId3; - public PresetAAIGetMultipleVersion(String modelVersionId1, - String modelVersionId2, - String modelVersionId3, - String modelInvariantId) { - super( modelVersionId1, modelInvariantId); - this.modelVersionId2 = modelVersionId2; - this.modelVersionId3 = modelVersionId3; - } - public String getModelVersionId2() { - return modelVersionId2; - } - public String getModelVersionId3() { - return modelVersionId3; - } - - @Override - public Object getResponseBody() { - return "{\"results\": [" + - " {" + - " \"model\": {" + - " \"model-invariant-id\": \"" + getModelInvariantId() + "\"," + - " \"model-type\": \"resource\"," + - " \"resource-version\": \"1500138206526\"," + - " \"model-vers\": {" + - " \"model-ver\": [" + - " {" + - " \"model-version-id\": \"" + getModelVersionId1() + "\"," + - " \"model-name\": \"action-data\"," + - " \"model-version\": \"1.0\"," + - " \"model-description\": \"decontamination arm circus ammonia hump edge\"," + - " \"resource-version\": \"1500137463984\"" + - " }," + - " {" + - " \"model-version-id\": \"" + getModelVersionId3() + "\"," + - " \"model-name\": \"action-data\"," + - " \"model-version\": \"3.0\"," + - " \"model-description\": \"Non decontamination arm circus ammonia hump edge\"," + - " \"resource-version\": \"1500137463986\"" + - " }," + - " {" + - " \"model-version-id\": \"" + getModelVersionId2() + "\"," + - " \"model-name\": \"action-data\"," + - " \"model-version\": \"2.0\"," + - " \"model-description\": \"The oldest one\"," + - " \"resource-version\": \"1500137463980\"" + - " }" + - " ]" + - " }" + - " }" + - " }" + - " ]}"; - } - - }
\ No newline at end of file diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java index e1fa74ec8..b99f58bda 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,12 +2,11 @@ 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 { @@ -219,10 +218,11 @@ public class PresetAAIGetNetworkCollectionDetails extends BaseAAIPreset { " \"network-id\": \"l3network-id-rs804s\",\n" + " \"network-name\": \"oam-net\",\n" + " \"network-type\": \"Tenant_Layer_3\",\n" + - " \"network-role\": \"HngwProtectedOam.OAM\",\n" + + " \"network-role\": \"RosemaProtectedOam.OAM\",\n" + " \"network-technology\": \"Contrail\",\n" + " \"is-bound-to-vpn\": false,\n" + " \"resource-version\": \"1521662814627\",\n" + + " \"orchestration-status\": \"Created\",\n" + " \"is-provider-network\": false,\n" + " \"is-shared-network\": false,\n" + " \"is-external-network\": false,\n" + @@ -258,10 +258,11 @@ public class PresetAAIGetNetworkCollectionDetails extends BaseAAIPreset { " \"network-id\": \"l3network-id-3-rs804s\",\n" + " \"network-name\": \"oam-net\",\n" + " \"network-type\": \"Tenant_Layer_3\",\n" + - " \"network-role\": \"HngwProtectedOam.OAM\",\n" + + " \"network-role\": \"RosemaProtectedOam.OAM\",\n" + " \"network-technology\": \"Contrail\",\n" + " \"is-bound-to-vpn\": false,\n" + " \"resource-version\": \"1521662816043\",\n" + + " \"orchestration-status\": \"Created\",\n" + " \"is-provider-network\": false,\n" + " \"is-shared-network\": false,\n" + " \"is-external-network\": false,\n" + @@ -297,10 +298,11 @@ public class PresetAAIGetNetworkCollectionDetails extends BaseAAIPreset { " \"network-id\": \"l3network-id-2-rs804s\",\n" + " \"network-name\": \"oam-net\",\n" + " \"network-type\": \"Tenant_Layer_3\",\n" + - " \"network-role\": \"HngwProtectedOam.OAM\",\n" + + " \"network-role\": \"RosemaProtectedOam.OAM\",\n" + " \"network-technology\": \"Contrail\",\n" + " \"is-bound-to-vpn\": false,\n" + " \"resource-version\": \"1521662815304\",\n" + + " \"orchestration-status\": \"Created\",\n" + " \"is-provider-network\": false,\n" + " \"is-shared-network\": false,\n" + " \"is-external-network\": false,\n" + 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 d0e4baf60..0d447c2c2 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,12 +2,11 @@ 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 { @@ -221,11 +220,12 @@ public class PresetAAIGetNetworkCollectionDetailsInvalidRequest extends BaseAAIP " \"network-id\": \"l3network-id-rs804s\",\n" + " \"network-name\": \"oam-net\",\n" + " \"network-type\": \"Tenant_Layer_3\",\n" + - " \"network-role\": \"HngwProtectedOam.OAM\",\n" + - " \"network-roles\": \"HngwProtectedOam.OAM\",\n" +//extra field + " \"network-role\": \"RosemaProtectedOam.OAM\",\n" + + " \"network-roles\": \"RosemaProtectedOam.OAM\",\n" +//extra field " \"network-technology\": \"Contrail\",\n" + " \"is-bound-to-vpn\": false,\n" + " \"resource-version\": \"1521662814627\",\n" + + " \"orchestration-status\": \"Created\",\n" + " \"is-provider-network\": false,\n" + " \"is-shared-network\": false,\n" + " \"is-external-network\": false,\n" + @@ -261,10 +261,11 @@ public class PresetAAIGetNetworkCollectionDetailsInvalidRequest extends BaseAAIP " \"network-id\": \"l3network-id-3-rs804s\",\n" + " \"network-name\": \"oam-net\",\n" + " \"network-type\": \"Tenant_Layer_3\",\n" + - " \"network-role\": \"HngwProtectedOam.OAM\",\n" + + " \"network-role\": \"RosemaProtectedOam.OAM\",\n" + " \"network-technology\": \"Contrail\",\n" + " \"is-bound-to-vpn\": false,\n" + " \"resource-version\": \"1521662816043\",\n" + + " \"orchestration-status\": \"Created\",\n" + " \"is-provider-network\": false,\n" + " \"is-shared-network\": false,\n" + " \"is-external-network\": false,\n" + @@ -300,10 +301,11 @@ public class PresetAAIGetNetworkCollectionDetailsInvalidRequest extends BaseAAIP " \"network-id\": \"l3network-id-2-rs804s\",\n" + " \"network-name\": \"oam-net\",\n" + " \"network-type\": \"Tenant_Layer_3\",\n" + - " \"network-role\": \"HngwProtectedOam.OAM\",\n" + + " \"network-role\": \"RosemaProtectedOam.OAM\",\n" + " \"network-technology\": \"Contrail\",\n" + " \"is-bound-to-vpn\": false,\n" + " \"resource-version\": \"1521662815304\",\n" + + " \"orchestration-status\": \"Created\",\n" + " \"is-provider-network\": false,\n" + " \"is-shared-network\": false,\n" + " \"is-external-network\": false,\n" + 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 c32a3b563..23b35d204 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,12 +2,11 @@ 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 { @@ -218,7 +217,7 @@ public class PresetAAIGetNetworkCollectionDetailsRequiredMissing extends BaseAAI " \"network-id\": \"l3network-id-rs804s\",\n" + " \"network-name\": \"oam-net\",\n" + " \"network-type\": \"Tenant_Layer_3\",\n" + - " \"network-role\": \"HngwProtectedOam.OAM\",\n" + + " \"network-role\": \"RosemaProtectedOam.OAM\",\n" + " \"network-technology\": \"Contrail\",\n" + " \"is-bound-to-vpn\": false,\n" + " \"resource-version\": \"1521662814627\",\n" + @@ -257,7 +256,7 @@ public class PresetAAIGetNetworkCollectionDetailsRequiredMissing extends BaseAAI " \"network-id\": \"l3network-id-3-rs804s\",\n" + " \"network-name\": \"oam-net\",\n" + " \"network-type\": \"Tenant_Layer_3\",\n" + - " \"network-role\": \"HngwProtectedOam.OAM\",\n" + + " \"network-role\": \"RosemaProtectedOam.OAM\",\n" + " \"network-technology\": \"Contrail\",\n" + " \"is-bound-to-vpn\": false,\n" + " \"resource-version\": \"1521662816043\",\n" + @@ -296,7 +295,7 @@ public class PresetAAIGetNetworkCollectionDetailsRequiredMissing extends BaseAAI " \"network-id\": \"l3network-id-2-rs804s\",\n" + " \"network-name\": \"oam-net\",\n" + " \"network-type\": \"Tenant_Layer_3\",\n" + - " \"network-role\": \"HngwProtectedOam.OAM\",\n" + + " \"network-role\": \"RosemaProtectedOam.OAM\",\n" + " \"network-technology\": \"Contrail\",\n" + " \"is-bound-to-vpn\": false,\n" + " \"resource-version\": \"1521662815304\",\n" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java index e8449b320..93f8ad8ab 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkZones.java @@ -721,8 +721,8 @@ public class PresetAAIGetNetworkZones extends BaseAAIPreset { " \"zone-name\": \"QWERTYUI-NUM1\"" + " }," + " {" + - " \"zone-id\": \"MTN32\"," + - " \"zone-name\": \"MDTWNJ21-MTN32\"" + + " \"zone-id\": \"hvf32\"," + + " \"zone-name\": \"MDTWNJ21-hvf32\"" + " }," + " {" + " \"zone-id\": \"RTZ4\"," + @@ -773,8 +773,8 @@ public class PresetAAIGetNetworkZones extends BaseAAIPreset { " \"zone-name\": \"ATLSECIA-ABC12\"" + " }," + " {" + - " \"zone-id\": \"MTN20\"," + - " \"zone-name\": \"MDTWNJ21-MTN20\"" + + " \"zone-id\": \"hvf20\"," + + " \"zone-name\": \"MDTWNJ21-hvf20\"" + " }," + " {" + " \"zone-id\": \"ABC15\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java deleted file mode 100644 index 74e2102f1..000000000 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetOneVersion.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.onap.simulator.presetGenerator.presets.aai; - -public class PresetAAIGetOneVersion extends BasePresetAAIGetVersion { - - public PresetAAIGetOneVersion(String modelVersionId1, - String modelInvariantId) { - super(modelVersionId1, modelInvariantId); - } - - @Override - public Object getResponseBody() { - return "{\"results\": [" + - " {" + - " \"model\": {" + - " \"model-invariant-id\": \"" + getModelInvariantId() + "\"," + - " \"model-type\": \"resource\"," + - " \"resource-version\": \"1500138206526\"," + - " \"model-vers\": {" + - " \"model-ver\": [" + - " {" + - " \"model-version-id\": \"" + getModelVersionId1() + "\"," + - " \"model-name\": \"action-data\"," + - " \"model-version\": \"1.0\"," + - " \"model-description\": \"decontamination arm circus ammonia hump edge\"," + - " \"resource-version\": \"1500137463984\"" + - " }" + - " ]" + - " }" + - " }" + - " }" + - " ]}"; - } -} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java index d363619e5..0676217a1 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 @@ -12,7 +12,7 @@ public class PresetAAIGetPNFByRegionErrorPut extends BaseAAIPreset { public Object getResponseBody() { return "{" + " \"start\": \"/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911\"," + - " \"query\": \"query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP\"" + + " \"query\": \"query/pnf-fromModel-byRegion?cloudRegionId=JANET25&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 a95df4592..fdb387d71 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,12 +1,11 @@ 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) { @@ -64,10 +63,10 @@ public class PresetAAIGetPortMirroringSourcePorts extends BaseAAIPreset { " {\n" + " \"id\": \"4876980240\",\n" + " \"node-type\": \"l-interface\",\n" + - " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm5b/tenants/tenant/460f35aeb53542dc9f77105066483e83/vservers/vserver/15e46e2f-4b98-4e06-9644-f0e6e35cc79a/l-interfaces/l-interface/zrdm5bfprbVLBA005-vlbagent_aff_int_pktmirror_1_port-dr5jhyxva5ib\",\n" + + " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson5b/tenants/tenant/460f35aeb53542dc9f77105066483e83/vservers/vserver/15e46e2f-4b98-4e06-9644-f0e6e35cc79a/l-interfaces/l-interface/zolson5bfprbVLBA005-vlbagent_aff_int_pktmirror_1_port-dr5jhyxva5ib\",\n" + " \"properties\": {\n" + " \"interface-name\": " + doubleQuoteIfNotNull(getInterfaceName()) + ",\n" + - " \"selflink\": \"https://network-aic.rdm5b.cci.att.com:9696/v2.0/ports/6de7bf87-6faa-4984-9492-18d1188b3d4a\",\n" + + " \"selflink\": \"https://netw.onap.org:9696/v2.0/ports/6de7bf87-6faa-4984-9492-18d1188b3d4a\",\n" + " \"interface-id\": " + doubleQuoteIfNotNull(getInterfaceId()) + ",\n" + " \"macaddr\": \"02:6d:e7:bf:87:6f\",\n" + " \"network-name\": \"APP-C-24595-D-T001-vprobe_int_pktmirror_net_1\",\n" + @@ -81,7 +80,7 @@ public class PresetAAIGetPortMirroringSourcePorts extends BaseAAIPreset { " \"id\": \"4999893128\",\n" + " \"relationship-label\": \"org.onap.relationships.inventory.BelongsTo\",\n" + " \"node-type\": \"l3-interface-ipv4-address-list\",\n" + - " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm5b/tenants/tenant/460f35aeb53542dc9f77105066483e83/vservers/vserver/15e46e2f-4b98-4e06-9644-f0e6e35cc79a/l-interfaces/l-interface/zrdm5bfprbVLBA005-vlbagent_aff_int_pktmirror_1_port-dr5jhyxva5ib/l3-interface-ipv4-address-list/107.244.46.254\"\n" + + " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson5b/tenants/tenant/460f35aeb53542dc9f77105066483e83/vservers/vserver/15e46e2f-4b98-4e06-9644-f0e6e35cc79a/l-interfaces/l-interface/zolson5bfprbVLBA005-vlbagent_aff_int_pktmirror_1_port-dr5jhyxva5ib/l3-interface-ipv4-address-list/107.244.46.254\"\n" + " },\n" + " {\n" + " \"id\": \"6150074384\",\n" + @@ -111,7 +110,7 @@ public class PresetAAIGetPortMirroringSourcePorts extends BaseAAIPreset { " \"id\": \"5491453960\",\n" + " \"relationship-label\": \"tosca.relationships.network.BindsTo\",\n" + " \"node-type\": \"vserver\",\n" + - " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm5b/tenants/tenant/460f35aeb53542dc9f77105066483e83/vservers/vserver/15e46e2f-4b98-4e06-9644-f0e6e35cc79a\"\n" + + " \"url\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson5b/tenants/tenant/460f35aeb53542dc9f77105066483e83/vservers/vserver/15e46e2f-4b98-4e06-9644-f0e6e35cc79a\"\n" + " }\n" + " ]\n" + " }\n" + 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 97186c9da..da1a120b4 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,12 +1,11 @@ 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 { @@ -47,7 +46,7 @@ public class PresetAAIGetRelatedInstanceGroupsByVnfId extends BaseAAIPreset { public Object getResponseBody() { return "{\n" + " \"vnf-id\": \"vnf-id-3\",\n" + - " \"vnf-name\": \"zmtn6nf-code-110\",\n" + + " \"vnf-name\": \"zhvf6nf-code-110\",\n" + " \"vnf-type\": \"vnf-type\",\n" + " \"prov-status\": \"NVTPROV\",\n" + " \"operational-status\": \"out-of-service-path\",\n" + @@ -106,15 +105,15 @@ public class PresetAAIGetRelatedInstanceGroupsByVnfId extends BaseAAIPreset { " {\n" + " \"related-to\": \"availability-zone\",\n" + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" + - " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/availability-zones/availability-zone/AZ-MN02\",\n" + + " \"related-link\": \"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/availability-zones/availability-zone/AZ-MN02\",\n" + " \"relationship-data\": [\n" + " {\n" + " \"relationship-key\": \"cloud-region.cloud-owner\",\n" + - " \"relationship-value\": \"att-aic\"\n" + + " \"relationship-value\": \"irma-aic\"\n" + " },\n" + " {\n" + " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" + - " \"relationship-value\": \"mtn6\"\n" + + " \"relationship-value\": \"hvf6\"\n" + " },\n" + " {\n" + " \"relationship-key\": \"availability-zone.availability-zone-name\",\n" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServiceInstancesByInvariantId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServiceInstancesByInvariantId.java new file mode 100644 index 000000000..8f7b6d0fb --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServiceInstancesByInvariantId.java @@ -0,0 +1,90 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Multimap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public class PresetAAIGetServiceInstancesByInvariantId extends BaseAAIPreset { + + private String globalCustomerId; + private String serviceType; + private String invariantId; + private Map<String, Multimap<String, String>> servicesWithRelationships; + + public PresetAAIGetServiceInstancesByInvariantId(String globalCustomerId, String serviceType, String invariantId, + Map<String, Multimap<String, String>> servicesWithRelationships) { + this.globalCustomerId = globalCustomerId; + this.serviceType = serviceType; + this.invariantId = invariantId; + this.servicesWithRelationships = servicesWithRelationships; + } + + @Override + public String getResponseBody() { + return "{" + + " \"service-instance\":[" + + servicesWithRelationships.entrySet().stream().map( + entry -> buildServiceInstance(entry.getKey(), entry.getValue()) + ).collect(Collectors.joining(",")) + + " ]" + + "}"; + } + + private String buildServiceInstance(String serviceInstanceId, Multimap<String, String> relationships) { + return " {" + + " \"service-instance-id\":\"" + serviceInstanceId + "\"," + + " \"service-instance-name\":\"service-instance-name\"," + + " \"service-instance-type\":\"service-instance-type\"," + + " \"service-instance-role\":\"service-instance-role\"," + + " \"model-invariant-id\":\"" + invariantId + "\"," + + " \"model-version-id\":\"7a6ee536-f052-46fa-aa7e-2fca9d674c44\"," + + " \"resource-version\":\"GARBAGE DATA\"," + + " \"orchestration-status\":\"GARBAGE DATA\"," + + " \"relationship-list\":{" + + " \"relationship\":[" + + relationships.entries().stream().map( + entry -> buildRelationship(entry.getKey(), entry.getValue()) + ).collect(Collectors.joining(",")) + + " ]" + + " }" + + " }"; + } + + private String buildRelationship(String relatedTo, final String relatedLink) { + return "" + + "{ " + + " \"related-to\": \"" + relatedTo + "\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", " + + " \"related-link\": \"" + relatedLink + "\", " + + " \"relationship-data\": [" + + " { " + + " \"relationship-key\": \"GARBAGE DATA\", " + + " \"relationship-value\": \"GARBAGE DATA\" " + + " } " + + " ] " + + "}"; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/business/customers/customer/" + + globalCustomerId + "/service-subscriptions/service-subscription/" + + serviceType + "/service-instances"; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("model-invariant-id", ImmutableList.of(invariantId)); + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java deleted file mode 100644 index e99630639..000000000 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServiceModelList.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.onap.simulator.presetGenerator.presets.aai; - -public class PresetAAIGetServiceModelList extends BasePresetAAIGetVersion { - - public String modelInvariant2; - public String modelInvariant3; - public PresetAAIGetServiceModelList(String modelVersionId1, - String modelInvariantId1, String modelInvariant2, String modelInvariant3) { - super(modelVersionId1, modelInvariantId1); - this.modelInvariant2 = modelInvariant2; - this.modelInvariant3 = modelInvariant3; - } - - public String getModelInvariant2() { - return modelInvariant2; - } - - public void setModelInvariant2(String modelInvariant2) { - this.modelInvariant2 = modelInvariant2; - } - - public String getModelInvariant3() { - return modelInvariant3; - } - - public void setModelInvariant3(String modelInvariant3) { - this.modelInvariant3 = modelInvariant3; - } - - @Override - public Object getResponseBody() { - return "{\n" + - "\"results\": [\n" + - " {\"model\": { \n" + - " \"model-invariant-id\": \"" + getModelInvariantId() + "\"," + - " \"model-type\": \"service\",\n" + - " \"resource-version\": \"1515103312329\",\n" + - " \"model-vers\": {\"model-ver\": [\n" + - " {\n" + - " \"model-version-id\": \"" + getModelVersionId1() + "\"," + - " \"model-name\": \"AAAvIRC_mm779p_Service\",\n" + - " \"model-version\": \"1.0\",\n" + - " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\",\n" + - " \"model-description\": \"tbd\",\n" + - " \"resource-version\": \"1516206395612\"\n" + - " }\n" + - " ]}\n" + - " }},\n" + - " {\"model\": { \n" + - " \"model-invariant-id\": \"" + getModelInvariant2() + "\"," + - " \"model-type\": \"service\",\n" + - " \"resource-version\": \"1515103312329\",\n" + - " \"model-vers\": {\"model-ver\": [\n" + - " {\n" + - " \"model-version-id\": \"1dae721c-a1ef-435f-b811-760c23f467bf\",\n" + - " \"model-name\": \"BBBvIRC_mm779p_Service\",\n" + - " \"model-version\": \"3.0\",\n" + - " \"model-description\": \"tbd\",\n" + - " \"resource-version\": \"1516025197086\"\n" + - " }\n" + - " ]}\n" + - " }},\n" + - " {\"model\": { \n" + - " \"model-invariant-id\": \"" + getModelInvariant3() + "\"," + - " \"model-type\": \"service\",\n" + - " \"resource-version\": \"1515103312329\",\n" + - " \"model-vers\": {\"model-ver\": [\n" + - "{\n" + - " \"model-version-id\": \"29236d45-e790-4c17-a115-1533cc09b7b1\",\n" + - " \"model-name\": \"CCCvIRC_mm779p_Service\",\n" + - " \"model-version\": \"4.0\",\n" + - " \"distribution-status\": \"DISTRIBUTION_COMPLETE_ERROR\",\n" + - " \"model-description\": \"tbd\",\n" + - " \"resource-version\": \"1517319724440\"\n" + - " }\n" + - " ]}\n" + - " }}\n" + - "]}\n"; - } -} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java index 04cef06ad..615879e18 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 @@ -29,18 +29,18 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet { " \"resource-version\":\"1494001980153\"" + " }," + " {" + - " \"service-id\":\"vRRaaS\"," + - " \"service-description\":\"vRRaaS\"," + + " \"service-id\":\"vTerrance\"," + + " \"service-description\":\"vTerrance\"," + " \"resource-version\":\"1484865266\"" + " }," + " {" + " \"service-id\":\"323d69d9-2efe-4r45-ay0a-89ea7ard4e6f\"," + - " \"service-description\":\"vSCP\"," + + " \"service-description\":\"vEsmeralda\"," + " \"resource-version\":\"1494001903012\"" + " }," + " {" + " \"service-id\":\"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"," + - " \"service-description\":\"Mobility\"," + + " \"service-description\":\"Emanuel\"," + " \"resource-version\":\"1503954056794\"" + " }," + " {" + @@ -59,18 +59,18 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet { " \"resource-version\":\"1494001863930\"" + " }," + " {" + - " \"service-id\":\"vHNGWaas\"," + + " \"service-id\":\"vRosemarie\"," + " \"service-description\":\"HNGATEWAY\"," + " \"resource-version\":\"1501192849249\"" + " }," + " {" + " \"service-id\":\"vHNPaas\"," + - " \"service-description\":\"HNPORTAL\"," + + " \"service-description\":\"WILKINS\"," + " \"resource-version\":\"1501192982895\"" + " }," + " {" + " \"service-id\":\"e433710f-9217-458d-a79d-1c7aff376d89\"," + - " \"service-description\":\"VIRTUAL USP\"," + + " \"service-description\":\"TYLER SILVIA\"," + " \"resource-version\":\"1494001802638\"" + " }," + " {" + @@ -79,8 +79,8 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet { " \"resource-version\":\"1492533254036\"" + " }," + " {" + - " \"service-id\":\"VIPRaaS\"," + - " \"service-description\":\"vIPRaaS\"," + + " \"service-id\":\"vMuriel\"," + + " \"service-description\":\"vMuriel\"," + " \"resource-version\":\"1490910058887\"" + " }," + " {" + @@ -99,8 +99,8 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet { " \"resource-version\":\"1506361785997\"" + " }," + " {" + - " \"service-id\":\"vVIGaaS\"," + - " \"service-description\":\"vVIGaaS\"," + + " \"service-id\":\"vSalvatore\"," + + " \"service-description\":\"vSalvatore\"," + " \"resource-version\":\"1494001900545\"" + " }," + " {" + @@ -109,8 +109,8 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet { " \"resource-version\":\"1494001941772\"" + " }," + " {" + - " \"service-id\":\"vPEaaS\"," + - " \"service-description\":\"vPEaaS\"," + + " \"service-id\":\"vHubbard\"," + + " \"service-description\":\"vHubbard\"," + " \"resource-version\":\"1494001988229\"" + " }," + " {" + 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 3033c027f..db41b9518 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,13 @@ package org.onap.simulator.presetGenerator.presets.aai; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; +import static vid.automation.test.utils.ReadFile.loadResourceAsString; +import com.google.common.collect.ImmutableMap; import java.util.Collections; import java.util.List; import java.util.Map; - -import static vid.automation.test.utils.ReadFile.loadResourceAsString; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; public class PresetAAIGetSubDetailsGet extends BaseAAIPreset { private String subscriberId; @@ -15,14 +15,23 @@ public class PresetAAIGetSubDetailsGet extends BaseAAIPreset { private static final String baseResponseBody = loadResourceAsString("presets_templates/PresetAAIGetSubDetailsGet.json"); private static final String GLOBAL_CUSTOMER_ID = "GLOBAL_CUSTOMER_ID"; + private static final String ORCH_STATUS = "<ORCH_STATUS>"; public PresetAAIGetSubDetailsGet(String subscriberId) { this.subscriberId = subscriberId == null ? "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" : subscriberId; this.responseBody = baseResponseBody.replace(GLOBAL_CUSTOMER_ID, this.subscriberId); } - public void mapQueryParams(Map<String, List> map) { - map.put("depth", Collections.singletonList("2")); + public PresetAAIGetSubDetailsGet(String subscriberId, String orchStatus) { + this.subscriberId = subscriberId == null ? "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" : subscriberId; + this.responseBody = baseResponseBody.replace(GLOBAL_CUSTOMER_ID, this.subscriberId); + this.responseBody = this.responseBody.replace("\"subscriber-name\":\"Emanuel\"", "\"subscriber-name\":\"SILVIA ROBBINS\""); + this.responseBody = this.responseBody.replaceAll(ORCH_STATUS, orchStatus); + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("depth", Collections.singletonList("2")); } @Override 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 new file mode 100644 index 000000000..615c196a9 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java @@ -0,0 +1,114 @@ +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; + +public class PresetAAIGetSubDetailsGetSpecificService extends BaseAAIPreset { + private String subscriberId; + private String subscriberName = "Emanuel"; + private String orchStatus; + + private String serviceInstanceId = "c187e9fe-40c3-4862-b73e-84ff056205f61234"; + private String serviceInstanceName = "test_fabric_config"; + private ModelInfo modelInfo = serviceFabricSriovService; + + public PresetAAIGetSubDetailsGetSpecificService(String subscriberId) { + this.subscriberId = subscriberId == null ? "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" : subscriberId; + } + + public PresetAAIGetSubDetailsGetSpecificService(String subscriberId, String subscriberName, String orchStatus, ModelInfo modelInfo, String serviceInstanceId) { + this(subscriberId); + this.subscriberName = subscriberName; + this.orchStatus = orchStatus; + this.modelInfo = modelInfo; + this.serviceInstanceId = serviceInstanceId; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("depth", Collections.singletonList("2")); + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/business/customers/customer/" + getSubscriberId(); + } + + public String getSubscriberId() { + return subscriberId; + } + + @Override + public Object getResponseBody() { + return "{" + + " \"global-customer-id\":\""+this.subscriberId+"\"," + + " \"subscriber-name\":\""+this.subscriberName+"\"," + + " \"subscriber-type\":\"INFRA\"," + + " \"resource-version\":\"1494255056308\"," + + " \"service-subscriptions\":{" + + " \"service-subscription\":[" + + " {" + + " \"service-type\":\"vFlowLogic\"," + + " \"resource-version\":\"1501700976809\"," + + " \"service-instances\":{" + + " \"service-instance\":[" + + " {" + + " \"service-instance-id\":\"414db2d4-18d0-415e-aac2-f255b586cfb5\"," + + " \"service-instance-name\":\"vFlowLogic-vflf_080117\"," + + " \"persona-model-id\":null," + + " \"persona-model-version\":null," + + " \"resource-version\":\"1502391806301\"," + + " \"orchestration-status\":\"Active\"," + + " \"model-invariant-id\":\"64dbe153-48c6-4d6f-95e7-12ff4cce9871\"," + + " \"model-version-id\":\"4e8b6372-dea3-4028-81d0-16eba59c94fb\"" + + " }," + + " {" + + " \"service-instance-id\":\"769be44e-981a-4da8-af3b-ca5fa76b7fb1\"," + + " \"service-instance-name\":\"vFlowLogic-vflp_080117\"," + + " \"persona-model-id\":null," + + " \"persona-model-version\":null," + + " \"resource-version\":\"1501712783617\"," + + " \"orchestration-status\":\"Active\"," + + " \"model-invariant-id\":\"14a99b56-dfb6-4300-97e1-ef10198ec936\"," + + " \"model-version-id\":\"9c6eee3b-8bd6-4a01-8afc-39441b63ecc9\"" + + " }" + + " ]" + + " }," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"TYLER SILVIA\"," + + " \"resource-version\":\"1501700976809\"," + + " \"service-instances\":{" + + " \"service-instance\":[" + + " {" + + " \"service-instance-id\": \""+this.serviceInstanceId+"\"," + + " \"service-instance-name\": \""+this.serviceInstanceName+"\"," + + " \"model-invariant-id\": \""+this.modelInfo.modelInvariantId+"\"," + + " \"model-version-id\": \""+this.modelInfo.modelVersionId+"\"," + + " \"resource-version\": \"1500789244674\"," + + " \"orchestration-status\": \""+this.orchStatus+"\"" + + " }" + + " ]" + + " }," + + " \"is-permitted\":false" + + " }" + + " ]" + + " }" + + "}"; + } + +} + 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 new file mode 100644 index 000000000..f6ce3e86d --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGet.java @@ -0,0 +1,153 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +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; + +public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset { + private String subscriberId; + private String subscriberName = "Emanuel"; + + + public PresetAAIGetSubDetailsWithoutInstancesGet(String subscriberId) { + this.subscriberId = subscriberId == null ? "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" : subscriberId; + } + + public PresetAAIGetSubDetailsWithoutInstancesGet(String subscriberId, boolean isSubscriberUspVoice) { + this(subscriberId); + if (isSubscriberUspVoice) { + this.subscriberName = "SILVIA ROBBINS"; + } + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("depth", Collections.singletonList("1")); + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/business/customers/customer/" + getSubscriberId(); + } + + public String getSubscriberId() { + return subscriberId; + } + + @Override + public Object getResponseBody() { + return "{" + + " \"global-customer-id\":\"" + subscriberId + "\"," + + " \"subscriber-name\":\" " + subscriberName + "\"," + + " \"subscriber-type\":\"INFRA\"," + + " \"resource-version\":\"1494255056308\"," + + " \"service-subscriptions\":{" + + " \"service-subscription\":[" + + " {" + + " \"service-type\":\"vFlowLogic\"," + + " \"resource-version\":\"1501700976809\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"TYLER SILVIA\"," + + " \"resource-version\":\"1501700976809\"," + + " \"is-permitted\":true" + + " }," + + " {" + + " \"service-type\":\"Emanuel\"," + + " \"resource-version\":\"1505402148533\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"vBNG\"," + + " \"resource-version\":\"1498068165053\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"vVoiceMail\"," + + " \"resource-version\":\"1494254889686\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"Kennedy\"," + + " \"resource-version\":\"1509369877126\"," + + " \"is-permitted\":true" + + " }," + + " {" + + " \"service-type\":\"vSEGW\"," + + " \"resource-version\":\"1494254851983\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"vVM\"," + + " \"resource-version\":\"1494255049530\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"vOTA\"," + + " \"resource-version\":\"1501692006937\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"vMME\"," + + " \"resource-version\":\"1497729820723\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"vMNS\"," + + " \"resource-version\":\"1509391084129\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"vEsmeralda\"," + + " \"resource-version\":\"1501532104695\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"VPMS\"," + + " \"resource-version\":\"1509738154248\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"vWINIFRED\"," + + " \"resource-version\":\"1498752217386\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"SSD\"," + + " \"resource-version\":\"1494254866295\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"vMOG\"," + + " \"resource-version\":\"1500675745252\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"FIRSTNET\"," + + " \"resource-version\":\"1509387060781\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"ACTIVE_CHARGE\"," + + " \"resource-version\":\"1494255101364\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"vHSS\"," + + " \"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 new file mode 100644 index 000000000..62a587001 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGetSpecificService.java @@ -0,0 +1,67 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +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; + +public class PresetAAIGetSubDetailsWithoutInstancesGetSpecificService extends BaseAAIPreset { + private String subscriberId; + private String subscriberName = "Emanuel"; + + public PresetAAIGetSubDetailsWithoutInstancesGetSpecificService(String subscriberId) { + this.subscriberId = subscriberId == null ? "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" : subscriberId; + } + + public PresetAAIGetSubDetailsWithoutInstancesGetSpecificService(String subscriberId, String subscriberName) { + this(subscriberId); + this.subscriberName = subscriberName; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("depth", Collections.singletonList("1")); + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/business/customers/customer/" + getSubscriberId(); + } + + public String getSubscriberId() { + return subscriberId; + } + + @Override + public Object getResponseBody() { + return "{" + + " \"global-customer-id\":\""+this.subscriberId+"\"," + + " \"subscriber-name\":\""+this.subscriberName+"\"," + + " \"subscriber-type\":\"INFRA\"," + + " \"resource-version\":\"1494255056308\"," + + " \"service-subscriptions\":{" + + " \"service-subscription\":[" + + " {" + + " \"service-type\":\"vFlowLogic\"," + + " \"resource-version\":\"1501700976809\"," + + " \"is-permitted\":false" + + " }," + + " {" + + " \"service-type\":\"TYLER SILVIA\"," + + " \"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 b21e9de27..0517fd788 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,14 +3,13 @@ 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 { @@ -29,26 +28,26 @@ public class PresetAAIGetSubscribersGet extends BaseAAIPreset { String subscribersString = "" + "[ " + " { " + - " \"global-customer-id\":\"MSO_1610_ST\", " + - " \"subscriber-name\":\"MSO_1610_ST\", " + + " \"global-customer-id\":\"CAR_2020_ER\", " + + " \"subscriber-name\":\"CAR_2020_ER\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1494001902987\" " + " }, " + " { " + " \"global-customer-id\":\"21014aa2-526b-11e6-beb8-9e71128cae77\", " + - " \"subscriber-name\":\"PACKET CORE\", " + + " \"subscriber-name\":\"JULIO ERICKSON\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1494001776295\" " + " }, " + " { " + " \"global-customer-id\":\"DHV1707-TestSubscriber-2\", " + - " \"subscriber-name\":\"ICORE CORE\", " + + " \"subscriber-name\":\"DALE BRIDGES\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1498751754450\" " + " }, " + " { " + " \"global-customer-id\":\"DHV1707-TestSubscriber-1\", " + - " \"subscriber-name\":\"PACKET1 CORE\", " + + " \"subscriber-name\":\"LLOYD BRIDGES\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1498595633607\" " + " }, " + @@ -65,59 +64,90 @@ public class PresetAAIGetSubscribersGet extends BaseAAIPreset { " \"resource-version\":\"1494001970225\" " + " }, " + " { " + - " \"global-customer-id\":\"DHV1802-TestSub-PWT-102\", " + - " \"subscriber-name\":\"DHV1802-TestSub-PWT-102\", " + + " \"global-customer-id\":\"ERICA5779-TestSub-PWT-102\", " + + " \"subscriber-name\":\"ERICA5779-TestSub-PWT-102\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1508852495058\" " + " }, " + " { " + - " \"global-customer-id\":\"DHV1802-TestSub-PWT-101\", " + - " \"subscriber-name\":\"DHV1802-TestSub-PWT-101\", " + + " \"global-customer-id\":\"ERICA5779-TestSub-PWT-101\", " + + " \"subscriber-name\":\"ERICA5779-TestSub-PWT-101\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1508179953733\" " + " }, " + " { " + " \"global-customer-id\":\"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\", " + - " \"subscriber-name\":\"Mobility\", " + + " \"subscriber-name\":\"Emanuel\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1494001894192\" " + " }, " + " { " + - " \"global-customer-id\":\"DHV1802-Subscriber-4\", " + - " \"subscriber-name\":\"DHV1802-Subscriber-5\", " + + " \"global-customer-id\":\"ERICA5779-Subscriber-4\", " + + " \"subscriber-name\":\"ERICA5779-Subscriber-5\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1509134064531\" " + " }, " + " { " + - " \"global-customer-id\":\"DHV1802-TestSub-PWT-103\", " + - " \"subscriber-name\":\"DHV1802-TestSub-PWT-103\", " + + " \"global-customer-id\":\"ERICA5779-TestSub-PWT-103\", " + + " \"subscriber-name\":\"ERICA5779-TestSub-PWT-103\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1509045503736\" " + " }, " + " { " + - " \"global-customer-id\":\"DHV1802-Subscriber-2\", " + - " \"subscriber-name\":\"DHV1802-Subscriber-2\", " + + " \"global-customer-id\":\"ERICA5779-Subscriber-2\", " + + " \"subscriber-name\":\"ERICA5779-Subscriber-2\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1509122065439\" " + " }, " + " { " + " \"global-customer-id\":\"e433710f-9217-458d-a79d-1c7aff376d89\", " + - " \"subscriber-name\":\"USP VOICE\", " + + " \"subscriber-name\":\"SILVIA ROBBINS\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1494001938080\" " + " }, " + " { " + - " \"global-customer-id\":\"DHV1802-Subscriber-3\", " + - " \"subscriber-name\":\"DHV1802-Subscriber-3\", " + + " \"global-customer-id\":\"ERICA5779-Subscriber-3\", " + + " \"subscriber-name\":\"ERICA5779-Subscriber-3\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1509122759407\" " + " }, " + " { " + " \"global-customer-id\":\"31739f3e-526b-11e6-beb8-9e71128cae77\", " + - " \"subscriber-name\":\"FIREWALL/MISC\", " + + " \"subscriber-name\":\"CRAIG/ROBERTS\", " + " \"subscriber-type\":\"INFRA\", " + " \"resource-version\":\"1494001772223\" " + - " } " + + " }, " + + " { " + + " \"global-customer-id\":\"global-customer-id\", " + + " \"subscriber-name\":\"global-customer-id\", " + + " \"subscriber-type\":\"INFRA\", " + + " \"resource-version\":\"1494001772226\", " + + " \"relationship-list\":{ " + + " \"relationship\":[ " + + " { " + + " \"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\" " + + " } " + + " ] " + + " } " + + " ] " + + " } " + + " }" + " ] "; try { this.subscriberList = objectMapper.readValue(subscribersString, typeRef); 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 ed370cf15..638cc3911 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,11 +1,28 @@ 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; + private String responseBody; + + public PresetAAIGetTenants(String subscriberId, String serviceType, String responseBodyResource) { + this.subscriberId = subscriberId; + this.serviceType = serviceType; + this.responseBody = loadResourceAsString(responseBodyResource); + } + + public PresetAAIGetTenants() { + this( + "e433710f-9217-458d-a79d-1c7aff376d89", + "TYLER SILVIA", + "presets_templates/PresetAAIGetTenants.json" + ); + } @Override public Object getResponseBody() { @@ -19,9 +36,8 @@ public class PresetAAIGetTenants extends BaseAAIPreset { @Override public String getReqPath() { - return getRootPath() + "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL USP"; + return getRootPath() + "/business/customers/customer/" + this.subscriberId + "/service-subscriptions/service-subscription/" + this.serviceType; } - private String responseBody = loadResourceAsString("presets_templates/PresetAAIGetTenants.json"); } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetVfModulesByVnf.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetVfModulesByVnf.java new file mode 100644 index 000000000..798a02642 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetVfModulesByVnf.java @@ -0,0 +1,83 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + +public class PresetAAIGetVfModulesByVnf extends BaseAAIPreset { + private final String vnfInstanceId; + + public PresetAAIGetVfModulesByVnf(String vnfInstanceId) { + this.vnfInstanceId = vnfInstanceId; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/network/generic-vnfs/generic-vnf/" + this.vnfInstanceId + "/vf-modules"; + } + + @Override + public Object getResponseBody() { + return "" + + "{" + + " \"vf-module\": [{" + + " \"vf-module-id\": \"2c1ca484-cbc2-408b-ab86-25a2c15ce280\"," + + " \"vf-module-name\": \"ss820f_0918_db\"," + + " \"orchestration-status\": \"deleted\"," + + " \"is-base-vf-module\": false," + + " \"in-maint\": true," + + " \"automated-assignment\": false," + + " \"resource-version\": \"1537396469591\"," + + " \"model-invariant-id\": \"09edc9ef-85d0-4b26-80de-1f569d49e750\"," + + " \"model-version-id\": \"522159d5-d6e0-4c2a-aa44-5a542a12a830\"," + + " \"model-customization-id\": \"55b1be94-671a-403e-a26c-667e9c47d091\"," + + " \"module-index\": 0," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"vnfc\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v13/network/vnfcs/vnfc/ss820f_0918_refvnf_vnfinstancem002mmb001\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"vnfc.vnfc-name\"," + + " \"relationship-value\": \"ss820f_0918_refvnf_vnfinstancem002mmb001\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }, {" + + " \"vf-module-id\": \"3ef042c4-259f-45e0-9aba-0989bd8d1cc5\"," + + " \"vf-module-name\": \"ss820f_0918_base\"," + + " \"heat-stack-id\": \"\"," + + " \"orchestration-status\": \"Assigned\"," + + " \"is-base-vf-module\": true," + + " \"automated-assignment\": false," + + " \"resource-version\": \"1537310272044\"," + + " \"model-invariant-id\": \"1e463c9c-404d-4056-ba56-28fd102608de\"," + + " \"model-version-id\": \"dc229cd8-c132-4455-8517-5c1787c18b14\"," + + " \"model-customization-id\": \"8ad8670b-0541-4499-8101-275bbd0e8b6a\"," + + " \"module-index\": 0," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"vnfc\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v13/network/vnfcs/vnfc/ss820f_0918_refvnf_vnfinstancem001mmb001\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"vnfc.vnfc-name\"," + + " \"relationship-value\": \"ss820f_0918_refvnf_vnfinstancem001mmb001\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + "}"; + } + + +} 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 new file mode 100644 index 000000000..429d17647 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGet.java @@ -0,0 +1,394 @@ +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.List; +import java.util.Map; + +import static java.util.stream.Collectors.joining; + +public class PresetAAIModelsByInvariantIdGet extends BaseAAIPreset { + private final ImmutableList<String> modelInvariantIds; + + public PresetAAIModelsByInvariantIdGet(ImmutableList<String> modelInvariantIds) { + this.modelInvariantIds = modelInvariantIds; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/service-design-and-creation/models"; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.<String, List>builder() + .put("depth", ImmutableList.of("2")) + .put("model-invariant-id", modelInvariantIds) + .build(); + } + + @Override + public Object getResponseBody() { + // based on aai_get_model_by_2_invariant_ids.json + // should be refined to match input + return "" + + "{" + + " \"model\": [" + + modelInvariantIds.stream().map(modelInvariantId -> + " {" + + " \"model-invariant-id\": \""+modelInvariantId+"\"," + + " \"model-type\": \"resource\"," + + " \"resource-version\": \"1507472057666\"," + + " \"model-vers\": {" + + " \"model-ver\": [" + + " {" + + " \"model-version-id\": \"7a6ee536-f052-46fa-aa7e-2fca9d674c44\"," + + " \"model-name\": \"vf_vEPDG\"," + + " \"model-version\": \"2.0\"," + + " \"model-description\": \"vEPDG\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_ERROR\"," + + " \"resource-version\": \"1507649620979\"," + + " \"model-elements\": {" + + " \"model-element\": [" + + " {" + + " \"model-element-uuid\": \"ccbc6dc9-58ad-4082-a81f-630114d99a70\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1507649620982\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"model-ver\"," + + " \"related-link\": \"/aai/v11/service-design-and-creation/models/model/acc6edd8-a8d4-4b93-afaa-0994068be14c/model-vers/model-ver/93a6166f-b3d5-4f06-b4ba-aed48d009ad9\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"acc6edd8-a8d4-4b93-afaa-0994068be14c\"" + + " }," + + " {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"93a6166f-b3d5-4f06-b4ba-aed48d009ad9\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"generic-vnf\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"model-element\"," + + " \"related-link\": \"/aai/v11/service-design-and-creation/models/model/d661b5fd-e0be-457e-a5ca-e345621af761/model-vers/model-ver/6019af4d-1902-47b1-a7ee-4609c198bf37/model-elements/model-element/8cf71918-6cce-4e01-8049-3f980f8f2b00/model-elements/model-element/4703eeb3-7200-4546-aff2-6e942ac0c0e1\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"d661b5fd-e0be-457e-a5ca-e345621af761\"" + + " }," + + " {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"6019af4d-1902-47b1-a7ee-4609c198bf37\"" + + " }," + + " {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"8cf71918-6cce-4e01-8049-3f980f8f2b00\"" + + " }," + + " {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"4703eeb3-7200-4546-aff2-6e942ac0c0e1\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"model-version-id\": \"eb5f56bf-5855-4e61-bd00-3e19a953bf02\"," + + " \"model-name\": \"vf_vEPDG\"," + + " \"model-version\": \"1.0\"," + + " \"model-description\": \"vEPDG\"," + + " \"resource-version\": \"1507472057702\"," + + " \"model-elements\": {" + + " \"model-element\": [" + + " {" + + " \"model-element-uuid\": \"18881687-8dab-4ec8-ab65-ebf8f95a6599\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1507472057707\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"model-ver\"," + + " \"related-link\": \"/aai/v11/service-design-and-creation/models/model/acc6edd8-a8d4-4b93-afaa-0994068be14c/model-vers/model-ver/93a6166f-b3d5-4f06-b4ba-aed48d009ad9\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"acc6edd8-a8d4-4b93-afaa-0994068be14c\"" + + " }," + + " {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"93a6166f-b3d5-4f06-b4ba-aed48d009ad9\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"generic-vnf\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"model-element\"," + + " \"related-link\": \"/aai/v11/service-design-and-creation/models/model/d661b5fd-e0be-457e-a5ca-e345621af761/model-vers/model-ver/de6f879b-37a9-44a5-97ed-cd52cc14bc47/model-elements/model-element/7a074be4-fcf1-46a5-88ee-41a7c7a6faab/model-elements/model-element/72f0adb5-5294-46f7-8085-a8aee9cb5f49\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"d661b5fd-e0be-457e-a5ca-e345621af761\"" + + " }," + + " {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"de6f879b-37a9-44a5-97ed-cd52cc14bc47\"" + + " }," + + " {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"7a074be4-fcf1-46a5-88ee-41a7c7a6faab\"" + + " }," + + " {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"72f0adb5-5294-46f7-8085-a8aee9cb5f49\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"model-version-id\": \"b7f2e8fb-ac71-4ea0-a801-06ef1479ea84\"," + + " \"model-name\": \"vf_vEPDG\"," + + " \"model-version\": \"4.0\"," + + " \"model-description\": \"vEPDG_Up\"," + + " \"resource-version\": \"1508954433176\"," + + " \"model-elements\": {" + + " \"model-element\": [" + + " {" + + " \"model-element-uuid\": \"4ed7025a-d37b-444f-8008-5c7c41d76d47\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1508954433179\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"model-ver\"," + + " \"related-link\": \"/aai/v11/service-design-and-creation/models/model/acc6edd8-a8d4-4b93-afaa-0994068be14c/model-vers/model-ver/93a6166f-b3d5-4f06-b4ba-aed48d009ad9\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"acc6edd8-a8d4-4b93-afaa-0994068be14c\"" + + " }," + + " {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"93a6166f-b3d5-4f06-b4ba-aed48d009ad9\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"generic-vnf\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"model-element\"," + + " \"related-link\": \"/aai/v11/service-design-and-creation/models/model/d661b5fd-e0be-457e-a5ca-e345621af761/model-vers/model-ver/0e3f3390-48dd-4640-aed7-0eb873d40a97/model-elements/model-element/106d11a5-2b8c-4586-a56d-ee387e822757/model-elements/model-element/3d7e724a-6f05-4111-8b22-78d024c53081\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"d661b5fd-e0be-457e-a5ca-e345621af761\"" + + " }," + + " {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"0e3f3390-48dd-4640-aed7-0eb873d40a97\"" + + " }," + + " {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"106d11a5-2b8c-4586-a56d-ee387e822757\"" + + " }," + + " {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"3d7e724a-6f05-4111-8b22-78d024c53081\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"model-version-id\": \"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc\"," + + " \"model-name\": \"Grouping Service for Test\"," + + " \"model-version\": \"1.0\"," + + " \"model-description\": \"vEPDG_Up\"," + + " \"resource-version\": \"1508954433176\"," + + " \"model-elements\": {" + + " \"model-element\": [" + + " {" + + " \"model-element-uuid\": \"4ed7025a-d37b-444f-8008-5c7c41d76d47\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1508954433179\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"model-ver\"," + + " \"related-link\": \"/aai/v11/service-design-and-creation/models/model/acc6edd8-a8d4-4b93-afaa-0994068be14c/model-vers/model-ver/93a6166f-b3d5-4f06-b4ba-aed48d009ad9\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"acc6edd8-a8d4-4b93-afaa-0994068be14c\"" + + " }," + + " {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"93a6166f-b3d5-4f06-b4ba-aed48d009ad9\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"generic-vnf\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"model-element\"," + + " \"related-link\": \"/aai/v11/service-design-and-creation/models/model/d661b5fd-e0be-457e-a5ca-e345621af761/model-vers/model-ver/0e3f3390-48dd-4640-aed7-0eb873d40a97/model-elements/model-element/106d11a5-2b8c-4586-a56d-ee387e822757/model-elements/model-element/3d7e724a-6f05-4111-8b22-78d024c53081\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"d661b5fd-e0be-457e-a5ca-e345621af761\"" + + " }," + + " {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"0e3f3390-48dd-4640-aed7-0eb873d40a97\"" + + " }," + + " {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"106d11a5-2b8c-4586-a56d-ee387e822757\"" + + " }," + + " {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"3d7e724a-6f05-4111-8b22-78d024c53081\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"model-version-id\": \"6e59c5de-f052-46fa-aa7e-2fca9d674c44\"," + + " \"model-name\": \"vf_vEPDG\"," + + " \"model-version\": \"5.0\"," + + " \"model-description\": \"vEPDG_Up\"," + + " \"resource-version\": \"1509570916147\"," + + " \"model-elements\": {" + + " \"model-element\": [" + + " {" + + " \"model-element-uuid\": \"49899999-076d-456b-915c-078d1b2a05b3\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1509570916150\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"model-ver\"," + + " \"related-link\": \"/aai/v11/service-design-and-creation/models/model/acc6edd8-a8d4-4b93-afaa-0994068be14c/model-vers/model-ver/93a6166f-b3d5-4f06-b4ba-aed48d009ad9\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"acc6edd8-a8d4-4b93-afaa-0994068be14c\"" + + " }," + + " {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"93a6166f-b3d5-4f06-b4ba-aed48d009ad9\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"generic-vnf\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"model-element\"," + + " \"related-link\": \"/aai/v11/service-design-and-creation/models/model/d661b5fd-e0be-457e-a5ca-e345621af761/model-vers/model-ver/03655348-0148-4482-b0b7-a5de71ab6264/model-elements/model-element/e97f008f-fc19-4b6e-8842-e54ec6eafb6e/model-elements/model-element/cfc574f2-6869-41d3-bfae-42b54b711568\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"d661b5fd-e0be-457e-a5ca-e345621af761\"" + + " }," + + " {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"03655348-0148-4482-b0b7-a5de71ab6264\"" + + " }," + + " {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"e97f008f-fc19-4b6e-8842-e54ec6eafb6e\"" + + " }," + + " {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"cfc574f2-6869-41d3-bfae-42b54b711568\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }").collect(joining(", ")) + + " ]" + + " }"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java index e098a576d..0d143b50c 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIPostNamedQueryForViewEdit.java @@ -6,15 +6,20 @@ import org.springframework.http.HttpMethod; public class PresetAAIPostNamedQueryForViewEdit extends BaseAAIPreset { private final String serviceInstanceId; - private final boolean hasConfigurationInstance; + private final boolean hasProxyConfigurationInstance; + private final boolean hasFabricConfigurationInstance; + private String serviceInstanceName; + public static final String DEFAULT_SERVICE_INSTANCE_NAME = "test_sssdad"; - public PresetAAIPostNamedQueryForViewEdit(String serviceInstanceId) { - this(serviceInstanceId, true); + public PresetAAIPostNamedQueryForViewEdit(String serviceInstanceId, boolean hasProxyConfigurationInstance, boolean hasFabricConfigurationInstance) { + this(serviceInstanceId, DEFAULT_SERVICE_INSTANCE_NAME, hasProxyConfigurationInstance, hasFabricConfigurationInstance); } - public PresetAAIPostNamedQueryForViewEdit(String serviceInstanceId, boolean hasConfigurationInstance) { + public PresetAAIPostNamedQueryForViewEdit(String serviceInstanceId, String serviceInstanceName, boolean hasProxyConfigurationInstance, boolean hasFabricConfigurationInstance) { this.serviceInstanceId = serviceInstanceId; - this.hasConfigurationInstance = hasConfigurationInstance; + this.serviceInstanceName = serviceInstanceName; + this.hasProxyConfigurationInstance = hasProxyConfigurationInstance; + this.hasFabricConfigurationInstance = hasFabricConfigurationInstance; } // inspired by @@ -44,7 +49,7 @@ public class PresetAAIPostNamedQueryForViewEdit extends BaseAAIPreset { " \"service-instance-id\": \"" + serviceInstanceId + "\"" + " }," + " \"service-subscription\": {" + - " \"service-type\": \"VIRTUAL USP\"" + + " \"service-type\": \"TYLER SILVIA\"" + " }" + " }" + " ]" + @@ -65,10 +70,10 @@ public class PresetAAIPostNamedQueryForViewEdit extends BaseAAIPreset { " \"model-name\": \"0eOHz2Yh8WJcBYzKy079\"," + " \"service-instance\": {" + " \"service-instance-id\": \"" + serviceInstanceId + "\"," + - " \"service-instance-name\": \"test_sssdad\"" + + " \"service-instance-name\": \"" + serviceInstanceName + "\"" + " }," + " \"extra-properties\": {}"; - if(hasConfigurationInstance) { + if(hasProxyConfigurationInstance) { response += "," + " \"inventory-response-items\": {" + " \"inventory-response-item\": [{" + @@ -92,6 +97,29 @@ public class PresetAAIPostNamedQueryForViewEdit extends BaseAAIPreset { " ]" + " }"; } + else if(hasFabricConfigurationInstance) { + response += "," + + " \"inventory-response-items\": {" + + " \"inventory-response-item\": [{" + + " \"model-name\": \"Fabric-Configuration-Instance\"," + + " \"configuration\": {" + + " \"configuration-id\": \"1234-fabric-config-LB1113\"," + + " \"configuration-name\": \"dummy_instance\"," + + " \"configuration-type\": \"fabric-configuration-type-1234\"," + + " \"configuration-sub-type\": \"fabric-configuration-sub-type-1234\"," + + " \"model-invariant-id\": \"model-invariant-id-1234\"," + + " \"model-version-id\": \"model-version-id-1234\"," + + " \"orchestration-status\": \"Assigned\"," + + " \"operational-status\": \"\"," + + " \"configuration-selflink\": \"\"," + + " \"model-customization-id\": \"model-customization-id-1234\"," + + " \"resource-version\": \"1504038855716\"" + + " }," + + " \"extra-properties\": {}" + + " }" + + " ]" + + " }"; + } response += " }" + " ]" + "}"; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java deleted file mode 100644 index f5ab2d1f7..000000000 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryEmptyResult.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.onap.simulator.presetGenerator.presets.aai; - -public class PresetAAISearchNodeQueryEmptyResult extends PresetAAIBaseSearchNodeQuery { - - @Override - public Object getResponseBody() { - return "{}"; - } - - @Override - public int getResponseCode() { - return 200; - } -} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryNonEmptyResult.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryNonEmptyResult.java new file mode 100644 index 000000000..29e7d5092 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAISearchNodeQueryNonEmptyResult.java @@ -0,0 +1,46 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import com.google.common.collect.ImmutableMap; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +public class PresetAAISearchNodeQueryNonEmptyResult extends PresetAAIBaseSearchNodeQuery { + + private final String type; + private final String name; + + public PresetAAISearchNodeQueryNonEmptyResult(String type, String name) { + this.type = type; + this.name = name; + } + + @Override + public Object getResponseBody() { + return "{ \"something\": [] }"; + } + + @Override + public int getResponseCode() { + return 200; + } + + @Override + public String getReqPath() { + return getRootPath() + "/nodes/" + searchPath(); + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of(searchKey(), Collections.singletonList(name)); + } + + private String searchPath() { + return type + "s"; + } + + private String searchKey() { + return type + "-name"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java index 6a97e1159..180685282 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIServiceDesignAndCreationPut.java @@ -4,40 +4,34 @@ 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 vid.automation.test.infra.ModelInfo; +import vid.automation.test.test.BrowseASDCTest; import java.util.Collections; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import static vid.automation.test.infra.ModelInfo.ModelInfoWithMultipleVersions.modelInfoWithMultipleVersions; + public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { public PresetAAIServiceDesignAndCreationPut(boolean emptyList) { - serviceModelIdentifiers = ImmutableList.of(); + modelInfos = ImmutableList.of(); this.emptyList = emptyList; } - public PresetAAIServiceDesignAndCreationPut(String modelVersionId, String modelInvariantId) { - serviceModelIdentifiers = ImmutableList.of(new ServiceModelIdentifiers(modelVersionId, modelInvariantId)); - } - public PresetAAIServiceDesignAndCreationPut(List<ServiceModelIdentifiers> serviceModelIdentifiers) { - this.serviceModelIdentifiers = serviceModelIdentifiers; - } + private List<ModelInfo> modelInfos; + boolean emptyList; - public static class ServiceModelIdentifiers { - public final String modelVersionId; - public final String modelInvariantId; - public ServiceModelIdentifiers(String modelVersionId, String modelInvariantId) { - this.modelVersionId = modelVersionId; - this.modelInvariantId = modelInvariantId; - } + //Constructor that use the super set of model infos as response + //all test should be migrated to use this constructor + public PresetAAIServiceDesignAndCreationPut() { + this.modelInfos = ModelInfo.superSetOfModelInfos; } - private List<ServiceModelIdentifiers> serviceModelIdentifiers; - boolean emptyList; - @Override public HttpMethod getReqMethod() { return HttpMethod.PUT; @@ -62,16 +56,16 @@ public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { private String presetModels() { return - serviceModelIdentifiers.stream().map(identifiers -> + modelInfos.stream().map(modelInfo -> " {" + " \"model\": {" + - " \"model-invariant-id\": \"" + identifiers.modelInvariantId + "\"," + + " \"model-invariant-id\": \"" + modelInfo.modelInvariantId + "\"," + " \"model-type\": \"resource\"," + " \"resource-version\": \"1500138206526\"," + " \"model-vers\": {" + " \"model-ver\": [" + " {" + - " \"model-version-id\": \"" + identifiers.modelVersionId + "\"," + + " \"model-version-id\": \"" + modelInfo.modelVersionId + "\"," + " \"model-name\": \"action-data\"," + " \"model-version\": \"1.0\"," + " \"model-description\": \"lustre settler sideways volcanic eight cellular\"," + @@ -112,6 +106,89 @@ public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { } + private String serviceWithMultipleVersions() { + return + " {" + + " \"model\": {" + + " \"model-invariant-id\": \"" + modelInfoWithMultipleVersions.modelInvariantId + "\"," + + " \"model-type\": \"resource\"," + + " \"resource-version\": \"1500138206526\"," + + " \"model-vers\": {" + + " \"model-ver\": [" + + " {" + + " \"model-version-id\": \"" + modelInfoWithMultipleVersions.modelVersionId1 + "\"," + + " \"model-name\": \""+modelInfoWithMultipleVersions.modelName+"\"," + + " \"model-version\": \"1.0\"," + + " \"model-description\": \"decontamination arm circus ammonia hump edge\"," + + " \"resource-version\": \"1500137463984\"" + + " }," + + " {" + + " \"model-version-id\": \"" + modelInfoWithMultipleVersions.modelVersionId3 + "\"," + + " \"model-name\": \""+modelInfoWithMultipleVersions.modelName+"\"," + + " \"model-version\": \"3.0\"," + + " \"model-description\": \"Non decontamination arm circus ammonia hump edge\"," + + " \"resource-version\": \"1500137463986\"" + + " }," + + " {" + + " \"model-version-id\": \"" + modelInfoWithMultipleVersions.modelVersionId2 + "\"," + + " \"model-name\": \""+modelInfoWithMultipleVersions.modelName+"\"," + + " \"model-version\": \"2.0\"," + + " \"model-description\": \"The oldest one\"," + + " \"resource-version\": \"1500137463980\"" + + " }" + + " ]" + + " }" + + " }" + + " }," ; + } + + public String modelsForBrowseSDCServiceModelListCheckAAIResponse() { + return " {\"model\": { " + + " \"model-invariant-id\": \"" + BrowseASDCTest.modelInvariantUUID1 + "\"," + + " \"model-type\": \"service\"," + + " \"resource-version\": \"1515103312329\"," + + " \"model-vers\": {\"model-ver\": [" + + " {" + + " \"model-version-id\": \"" + BrowseASDCTest.modelUuid + "\"," + + " \"model-name\": \"CheckAAIResponse_AAAvIRC_mm779p_Service\"," + + " \"model-version\": \"1.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"tbd\"," + + " \"resource-version\": \"1516206395612\"" + + " }" + + " ]}" + + " }}," + + " {\"model\": { " + + " \"model-invariant-id\": \"" + BrowseASDCTest.modelInvariantUUID2 + "\"," + + " \"model-type\": \"service\"," + + " \"resource-version\": \"1515103312329\"," + + " \"model-vers\": {\"model-ver\": [" + + " {" + + " \"model-version-id\": \"1dae721c-a1ef-435f-b811-760c23f467bf\"," + + " \"model-name\": \"CheckAAIResponse_BBBvIRC_mm779p_Service\"," + + " \"model-version\": \"3.0\"," + + " \"model-description\": \"tbd\"," + + " \"resource-version\": \"1516025197086\"" + + " }" + + " ]}" + + " }}," + + " {\"model\": { " + + " \"model-invariant-id\": \"" + BrowseASDCTest.modelInvariantUUID3 + "\"," + + " \"model-type\": \"service\"," + + " \"resource-version\": \"1515103312329\"," + + " \"model-vers\": {\"model-ver\": [" + + " {" + + " \"model-version-id\": \"29236d45-e790-4c17-a115-1533cc09b7b1\"," + + " \"model-name\": \"CheckAAIResponse_CCCvIRC_mm779p_Service\"," + + " \"model-version\": \"4.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_ERROR\"," + + " \"model-description\": \"tbd\"," + + " \"resource-version\": \"1517319724440\"" + + " }" + + " ]}" + + " }},"; + } + @Override public Object getResponseBody() { if(emptyList) { @@ -119,6 +196,8 @@ public class PresetAAIServiceDesignAndCreationPut extends BaseAAIPreset { } return "{\"results\": [" + presetModels()+ + serviceWithMultipleVersions() + + modelsForBrowseSDCServiceModelListCheckAAIResponse() + " {" + " \"model\": {" + " \"model-invariant-id\": \"00beb8f9-6d39-452f-816d-c709b9cbb87d\"," + 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 new file mode 100644 index 000000000..13ee91e2b --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIStandardQueryGet.java @@ -0,0 +1,239 @@ +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.text.StrSubstitutor; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + +public class PresetAAIStandardQueryGet extends BaseAAIPreset { + private final String instanceId; + private final String instanceName; + private final String instanceType; + private final String instanceRole; + private final String additionalProperties; + private final String uri; + private final String typeInResponse; + private final Multimap<String, String> relationshipsUris; + + private PresetAAIStandardQueryGet(String typeInResponse, String instanceId, String instanceName, String instanceType, String instanceRole, String uri, Multimap<String, String> relationshipsUris, String additionalProperties) { + this.instanceId = defaultIfNull(instanceId, randomUUID()); + this.instanceName = defaultIfNull(instanceName, randomAlphanumeric()); + this.instanceType = defaultIfNull(instanceType, randomAlphanumeric()); + this.instanceRole = defaultIfNull(instanceRole, randomAlphanumeric()); + this.uri = uri; + this.typeInResponse = typeInResponse; + this.additionalProperties = additionalProperties; + this.relationshipsUris = relationshipsUris; + } + + private PresetAAIStandardQueryGet(String typeInResponse, String instanceId, String uri, Multimap<String, String> relationshipsUris, String additionalProperties) { + this(typeInResponse, instanceId, randomAlphanumeric(), randomAlphanumeric(), randomAlphanumeric(), uri, relationshipsUris, additionalProperties); + } + + public static PresetAAIStandardQueryGet ofServiceInstance(String instanceId, final String modelVersionId, final String modelInvariantId, String subscriberId, String serviceType, Multimap<String, String> relationshipsUris) { + return new PresetAAIStandardQueryGet( + "service-instance", instanceId, + new StrSubstitutor(ImmutableMap.of( + "global-customer-id", subscriberId, + "service-type", serviceType, + "service-instance-id", instanceId + )).replace("" + + "/business/customers/customer/${global-customer-id}" + + "/service-subscriptions/service-subscription/${service-type}" + + "/service-instances/service-instance/${service-instance-id}"), + relationshipsUris, "" + + "\"model-invariant-id\": \"" + modelInvariantId + "\", " + + "\"model-version-id\": \"" + modelVersionId + "\", " + + "\"resource-version\": \"GARBAGE DATA\", " + + "\"orchestration-status\": \"GARBAGE DATA\", " + ); + } + + public static PresetAAIStandardQueryGet ofInstanceGroup(String groupType, String groupRole, Multimap<String, String> relationshipsUris) { + 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\"," + + " \"description\": \"vTSBC Customer Landing Network Collection Desc\"," + + " \"resource-version\": \"1536169790853\"," + + " \"instance-group-function\": \"vTSBC Customer Landing Network Collection\"," + ); + } + + 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, String modelVersionId,String modelCustomizationId, String additionalProperties, Multimap<String, String> relationshipsUris) { + 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 + "\", " + ); + } + + public static PresetAAIStandardQueryGet ofRelatedVnf(String instanceId, String modelVersionId, String additionalProperties, Multimap<String, String> relationshipsUris) { + return new PresetAAIStandardQueryGet( + "vnf", instanceId, + "/network/generic-vnfs/generic-vnf/" + instanceId, + relationshipsUris, additionalProperties + + "\"model-invariant-id\": \"vnf-instance-model-invariant-id\", " + + "\"model-version-id\": \"" + modelVersionId + "\", " + ); + } + + private static String randomAlphanumeric() { + return RandomStringUtils.randomAlphanumeric(17); + } + + private static String randomUUID() { + return UUID.randomUUID().toString(); + } + + public static PresetAAIStandardQueryGet ofL3Network(String instanceType, String orchStatus, Multimap<String, String> relationshipsUris) { + 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) { + return ofL3Network(randomUUID(), randomAlphanumeric(), instanceType, relationshipsUris, orchStatus, provStatus, modelVersionId, modelCustomizationId); + } + + public static PresetAAIStandardQueryGet ofL3Network(String instanceId, String instanceName, String instanceType, Multimap<String, String> relationshipsUris, String orchStatus) { + return ofL3Network(instanceId, instanceName, instanceType, relationshipsUris, orchStatus, "prov", "network-instance-model-version-id", "94fdd893-4a36-4d70-b16a-ec29c54c184f"); + } + + public static PresetAAIStandardQueryGet ofL3Network(String instanceId, String instanceName, String instanceType, Multimap<String, String> relationshipsUris, String orchStatus, String provStatus, String modelVersionId, String modelCustomizationId) { + return new PresetAAIStandardQueryGet( + "network", instanceId, instanceName, instanceType, randomAlphanumeric(), + "/network/l3-networks/l3-network/" + instanceId, + relationshipsUris, "" + + "\"orchestration-status\": \"" + orchStatus + "\"," + + "\"prov-status\": \"" + provStatus + "\"," + + "\"network-technology\": \"contrail\", " + + "\"neutron-network-id\": \"66ee6123-1c45-4e71-b6c0-a748ae0fee88\", " + + "\"is-bound-to-vpn\": true, " + + "\"is-external-network\": true, " + + "\"model-invariant-id\": \"network-instance-model-invariant-id\", " + + "\"model-customization-id\": \"" + modelCustomizationId + "\", " + + "\"model-version-id\": \"" + modelVersionId + "\", " + ); + } + + public static PresetAAIStandardQueryGet ofVolumeGroup(String instanceType, Multimap<String, String> relationshipsUris) { + final String instanceId = randomUUID(); + return new PresetAAIStandardQueryGet( + "volume-group", instanceId, randomAlphanumeric(), instanceType, randomAlphanumeric(), + "/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson5b/volume-groups/volume-group/" + instanceId, + relationshipsUris, "" + + " \"vnf-type\": \"vSON_test_ap7145/vSON_test_ap7145 0\"," + + " \"orchestration-status\": \"Active\"," + + " \"model-customization-id\": \"bc3bbdcc-42f3-4682-b151-99c308d15255\"," + + " \"vf-module-model-customization-id\": \"bc3bbdcc-42f3-4682-b151-99c308d15255\"," + + " \"resource-version\": \"1533679899735\"," + ); + } + + public static PresetAAIStandardQueryGet ofCollectionResource(String orchStatus, Multimap<String, String> relationshipsUris) { + 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\", " + ); + } + + public static PresetAAIStandardQueryGet ofVlanTag(int vlanIdOuter) { + final String instanceId = randomUUID(); + return new PresetAAIStandardQueryGet( + "vlan-tag", instanceId, + "/this is an invented link/tag/vlan-tags/vlan-tag/" + instanceId, + ImmutableMultimap.of(), "" + + "\"vlan-interface\": \"US-10688-genvnf-vlan-interface1\", " + + "\"vlan-id-inner\": " + 123456789 + ", " + + "\"vlan-id-outer\": " + vlanIdOuter + ", " + + "\"resource-version\": \"1518934744675\", " + + "\"in-maint\": false, " + + "\"is-ip-unnumbered\": false, " + ); + } + + public String getInstanceId() { + return instanceId; + } + + public String getInstanceName() { + return instanceName; + } + + public String getInstanceType() { + return instanceType; + } + + public String getInstanceRole() { + return instanceRole; + } + + @Override + public Object getResponseBody() { + return "" + + "{ " + + " \"" + typeInResponse + "-id\": \"" + getInstanceId() + "\", " + + " \"" + typeInResponse + "-name\": \"" + escapeJson(getInstanceName()) + "\", " + + " \"" + typeInResponse + "-type\": \"" + escapeJson(getInstanceType()) + "\", " + + " \"" + typeInResponse + "-role\": \"" + escapeJson(getInstanceRole()) + "\", " + + additionalProperties + + " \"relationship-list\": { " + + " \"relationship\": [ " + + relationshipsUris.entries().stream().map( + entry -> buildRelationship(entry.getKey(), entry.getValue()) + ).collect(Collectors.joining(",")) + + " ] " + + " } " + + "} "; + } + + private String buildRelationship(String relatedTo, final String relatedLink) { + return "" + + "{ " + + " \"related-to\": \"" + relatedTo + "\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", " + + " \"related-link\": \"" + relatedLink + "\", " + + " \"relationship-data\": [" + + " { " + + " \"relationship-key\": \"GARBAGE DATA\", " + + " \"relationship-value\": \"GARBAGE DATA\" " + + " } " + + " ] " + + "}"; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + uri; + } + + +} 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 55cc3dbc6..02ff1c159 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() + "//getSessionSlotCheckInterval"; + return getRootPath() + "/v3/getSessionSlotCheckInterval"; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/RegistrationRequest.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/RegistrationRequest.java index 680dabe92..56fd1c9a7 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/RegistrationRequest.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/RegistrationRequest.java @@ -11,6 +11,8 @@ public class RegistrationRequest { public static class SimulatorRequest { public final HttpMethod method; public final String path; + public final boolean strict; + public final Map<String,String> headers; @JsonInclude(JsonInclude.Include.NON_NULL) public final Map<String,List> queryParams; @@ -18,11 +20,13 @@ public class RegistrationRequest { @JsonInclude(JsonInclude.Include.NON_NULL) public final Object body; - public SimulatorRequest(HttpMethod method, String path, Map<String, List> queryParams, Object body) { + public SimulatorRequest(HttpMethod method, String path, Map<String, List> queryParams, Object body, boolean strictMatch, Map<String, String> headers) { this.method = method; this.path = path; this.queryParams = queryParams; this.body = body; + this.strict = strictMatch; + this.headers = headers; } } @@ -44,11 +48,27 @@ public class RegistrationRequest { } } + public static class Misc { + + @JsonInclude(JsonInclude.Include.NON_NULL) + public Integer numberOfTimes; + + public boolean replace; + + public Misc(Integer numberOfTimes, boolean replace) { + this.numberOfTimes = numberOfTimes; + this.replace = replace; + } + } + public SimulatorRequest simulatorRequest; public SimulatorResponse simulatorResponse; + public Misc misc; - public RegistrationRequest(SimulatorRequest simulatorRequest, SimulatorResponse simulatorResponse) { + public RegistrationRequest(SimulatorRequest simulatorRequest, SimulatorResponse simulatorResponse, Misc misc) { this.simulatorRequest = simulatorRequest; this.simulatorResponse = simulatorResponse; + this.misc = misc; } + } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/Subscriber.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/Subscriber.java index 27f3f9bba..2f1d83f19 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/Subscriber.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/Subscriber.java @@ -3,6 +3,8 @@ package org.onap.simulator.presetGenerator.presets.model; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Map; + public class Subscriber { @JsonProperty("global-customer-id") @@ -16,4 +18,7 @@ public class Subscriber { @JsonProperty("resource-version") public String resourceVersion; + + @JsonProperty("relationship-list") + public Map relationshipList; } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOActivateFabricConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOActivateFabricConfiguration.java new file mode 100644 index 000000000..51aaaf5a3 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOActivateFabricConfiguration.java @@ -0,0 +1,61 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; + +public class PresetMSOActivateFabricConfiguration extends BaseMSOPreset { + private final String serviceInstanceId; + private final String requestId; + public static final String DEFAULT_SERVICE_INSTANCE_ID = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; + public static final String DEFAULT_REQUEST_ID = "318cc766-b673-4a50-b9c5-471f68914584"; + + public PresetMSOActivateFabricConfiguration() { + this(null, null); + } + + public PresetMSOActivateFabricConfiguration(String serviceInstanceId) { + this(serviceInstanceId, null); + } + + public PresetMSOActivateFabricConfiguration(String serviceInstanceId, String requestId) { + this.serviceInstanceId = serviceInstanceId != null ? serviceInstanceId : DEFAULT_SERVICE_INSTANCE_ID; + this.requestId = requestId != null ? requestId : DEFAULT_REQUEST_ID; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/activateFabricConfiguration"; + } + + @Override + public String getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelType\": \"service\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"" + + " }," + + " \"requestParameters\": {" + + " \"aLaCarte\": false" + + " }" + + " }" + + "}"; + } + + @Override + public Object getResponseBody() { + return "{\"requestReferences\":{\"instanceId\":\"" + serviceInstanceId + "\",\"requestId\":\"" + requestId + "\"}}"; + } + + @Override + public int getResponseCode() { + return 202; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOActivateFabricConfigurationErrorResponse.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOActivateFabricConfigurationErrorResponse.java new file mode 100644 index 000000000..92d45bf5b --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOActivateFabricConfigurationErrorResponse.java @@ -0,0 +1,62 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; + +public class PresetMSOActivateFabricConfigurationErrorResponse extends BaseMSOPreset { + private final String serviceInstanceId; + private final int errorCode; + public static final String DEFAULT_SERVICE_INSTANCE_ID = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; + + public PresetMSOActivateFabricConfigurationErrorResponse() { + this(null, 0); + } + + public PresetMSOActivateFabricConfigurationErrorResponse(String serviceInstanceId) { + this(serviceInstanceId, 0); + } + + public PresetMSOActivateFabricConfigurationErrorResponse(String serviceInstanceId, int errorCode) { + this.serviceInstanceId = serviceInstanceId != null ? serviceInstanceId : DEFAULT_SERVICE_INSTANCE_ID; + this.errorCode = errorCode > 0 ? errorCode : 500; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/activateFabricConfiguration"; + } + + @Override + public String getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelType\": \"service\"" + + " }," + + " \"cloudConfiguration\": {" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"" + + " }," + + " \"requestParameters\": {" + + " \"aLaCarte\": false" + + " }" + + " }" + + "}"; + } + + @Override + public Object getResponseBody() { + return "{\"error\":\"222\",\"message\":\"error message\"}"; + } + + @Override + public int getResponseCode() { + return errorCode; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOAddOrRemoveOneInstanceGroupMember.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOAddOrRemoveOneInstanceGroupMember.java new file mode 100644 index 000000000..eba6be256 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOAddOrRemoveOneInstanceGroupMember.java @@ -0,0 +1,60 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOAddOrRemoveOneInstanceGroupMember extends PresetMSOBaseCreateInstancePost { + + public enum InstanceGroupMemberAction { + Add("/addMembers"), + Remove("/removeMembers"); + + private final String actionPath; + + InstanceGroupMemberAction(String actionPath) { + this.actionPath = actionPath; + } + + public String getActionPAth() { + return actionPath; + } + } + + + private final String memberInstanceId; + private final String userId; + private final InstanceGroupMemberAction action; + + public PresetMSOAddOrRemoveOneInstanceGroupMember(String vnfGroupInstanceId, String memberInstanceId, String userId, String requestId, InstanceGroupMemberAction action) { + super(requestId, vnfGroupInstanceId); + this.memberInstanceId = memberInstanceId; + this.userId = userId; + this.action = action; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./instanceGroups/" + responseInstanceId + action.getActionPAth(); + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"" + userId + "\"" + + " }," + + " \"relatedInstanceList\": [" + + " {" + + " \"relatedInstance\": {" + + " \"instanceId\": \"" + memberInstanceId + "\"," + + " \"modelInfo\": {" + + " \"modelType\": \"vnf\"" + + " }" + + " }" + + " }" + + " ]" + + " }" + + "}" + + ""; + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOAssignServiceInstanceGen2WithNames.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOAssignServiceInstanceGen2WithNames.java index 4d7b85027..6fc2182db 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOAssignServiceInstanceGen2WithNames.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOAssignServiceInstanceGen2WithNames.java @@ -1,5 +1,7 @@ package org.onap.simulator.presetGenerator.presets.mso; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; + import java.util.Map; public class PresetMSOAssignServiceInstanceGen2WithNames extends PresetMSOServiceInstanceGen2WithNames { @@ -7,10 +9,11 @@ public class PresetMSOAssignServiceInstanceGen2WithNames extends PresetMSOServic public PresetMSOAssignServiceInstanceGen2WithNames(Map<Keys, String> names, int suffix) { super(names, suffix); + this.cloudOwner = PresetAAIGetCloudOwnersByCloudRegionId.ATT_SABABA; } @Override public String getReqPath() { - return getRootPath() + "/serviceInstantiation/v7/serviceInstances/assign"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/assign"; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseCreateInstancePost.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseCreateInstancePost.java new file mode 100644 index 000000000..05b8c8bec --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseCreateInstancePost.java @@ -0,0 +1,68 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.apache.commons.lang3.StringUtils; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; + +public abstract class PresetMSOBaseCreateInstancePost extends BaseMSOPreset { + + private final String requestId; + protected String responseInstanceId; + public static final String DEFAULT_REQUEST_ID = "c0011670-0e1a-4b74-945d-8bf5aede1d9c"; + protected String msoTestApi; + protected boolean withTestApi; + + public PresetMSOBaseCreateInstancePost() { + this(null); + } + + public PresetMSOBaseCreateInstancePost(String requestId) { + this.requestId = requestId != null ? requestId : DEFAULT_REQUEST_ID; + this.responseInstanceId = DEFAULT_INSTANCE_ID; + } + + public PresetMSOBaseCreateInstancePost(String requestId, String responseInstanceId) { + this.requestId = requestId != null ? requestId : DEFAULT_REQUEST_ID; + this.responseInstanceId = responseInstanceId; + } + + public PresetMSOBaseCreateInstancePost(String requestId, String responseInstanceId, String msoTestApi) { + this(requestId, responseInstanceId, msoTestApi, true); + } + + public PresetMSOBaseCreateInstancePost(String requestId, String responseInstanceId, String msoTestApi, boolean withTestApi) { + this(requestId, responseInstanceId); + this.msoTestApi = msoTestApi; + this.withTestApi= withTestApi; + } + + public String addTestApi() { + if(this.withTestApi) { + return "\"testApi\": \"" + msoTestApi + "\","; + } + return ""; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public int getResponseCode() { + return 202; + } + + public String getRequestId() { + return requestId; + } + + @Override + public Object getResponseBody() { + return "{\"requestReferences\":{\"instanceId\":\"" + responseInstanceId + "\",\"requestId\":\"" + requestId + "\"}}"; + } + + protected String formatSuffix(int suffix) { + return (suffix==0) ? StringUtils.EMPTY : "_" + String.format("%03d", suffix); + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseCreateServiceInstancePost.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseCreateServiceInstancePost.java deleted file mode 100644 index 703829213..000000000 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseCreateServiceInstancePost.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.onap.simulator.presetGenerator.presets.mso; - -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; -import org.springframework.http.HttpMethod; - -public abstract class PresetMSOBaseCreateServiceInstancePost extends BaseMSOPreset { - private final String requestId; - public static final String DEFAULT_REQUEST_ID = "c0011670-0e1a-4b74-945d-8bf5aede1d9c"; - - public PresetMSOBaseCreateServiceInstancePost() { - this(null); - } - - public PresetMSOBaseCreateServiceInstancePost(String requestId) { - this.requestId = requestId != null ? requestId : DEFAULT_REQUEST_ID; - } - - @Override - public HttpMethod getReqMethod() { - return HttpMethod.POST; - } - - @Override - public int getResponseCode() { - return 202; - } - - - - @Override - public Object getResponseBody() { - return "{\"requestReferences\":{\"instanceId\":\"f8791436-8d55-4fde-b4d5-72dd2cf13cfb\",\"requestId\":\"" + requestId + "\"}}"; - } -} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDelete.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDelete.java index 99433e0a2..e8ef7b51b 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDelete.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDelete.java @@ -4,20 +4,25 @@ import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.springframework.http.HttpMethod; public abstract class PresetMSOBaseDelete extends BaseMSOPreset { - private final String requestId; - public static final String DEFAULT_REQUEST_ID = "c0011670-0e1a-4b74-945d-8bf5aede1d9c"; + protected final String requestId; + protected final String instanceId; - public PresetMSOBaseDelete() { - this(null ); - } + public static final String DEFAULT_REQUEST_ID = "c0011670-0e1a-4b74-945d-8bf5aede1d9c"; public PresetMSOBaseDelete(String requestId) { this.requestId = requestId != null ? requestId : DEFAULT_REQUEST_ID; + this.instanceId = DEFAULT_INSTANCE_ID; } + public PresetMSOBaseDelete(String requestId, String instanceId) { + this.requestId = requestId; + this.instanceId = instanceId; + } + + @Override protected String getRootPath() { - return super.getRootPath() + "/serviceInstances/v./"; + return super.getRootPath() + "/serviceInstantiation/v./serviceInstances/"; } @Override @@ -32,6 +37,6 @@ public abstract class PresetMSOBaseDelete extends BaseMSOPreset { @Override public Object getResponseBody() { - return "{\"requestReferences\":{\"instanceId\":\"f8791436-8d55-4fde-b4d5-72dd2cf13cfb\",\"requestId\":\"" + requestId + "\"}}"; + return "{\"requestReferences\":{\"instanceId\":\""+instanceId+"\",\"requestId\":\"" + requestId + "\"}}"; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDeleteWithCloudConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDeleteWithCloudConfiguration.java new file mode 100644 index 000000000..0c813641d --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOBaseDeleteWithCloudConfiguration.java @@ -0,0 +1,36 @@ +package org.onap.simulator.presetGenerator.presets.mso; + + +public abstract class PresetMSOBaseDeleteWithCloudConfiguration extends PresetMSOBaseDelete { + + private final String modelType; + + public PresetMSOBaseDeleteWithCloudConfiguration(String requestId, String modelType) { + super(requestId); + this.modelType = modelType; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelType\": \""+modelType+"\"" + + //" \"modelName\": \"\", //required for VfModule" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"requestParameters\": {" + + " \"testApi\": \"VNF_API\"" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"hvf6\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\"" + + " }" + + " }" + + "}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java new file mode 100644 index 000000000..ed92767fa --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java @@ -0,0 +1,63 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; + +public class PresetMSOCreateMacroPre1806Post extends PresetMSOBaseCreateInstancePost { + + public PresetMSOCreateMacroPre1806Post() { + this.cloudOwner = ATT_NC; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstances/v."; + } + + @Override + public Object getRequestBody() { + return "" + + "{" + + " \"requestDetails\": {" + + " \"requestInfo\": {" + + " \"instanceName\": \"New Instance Name\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"fi5777000\"," + + " \"productFamilyId\": \"e30755dc-5673-4b6b-9dcf-9abdd96b93d1\"" + + " }," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelInvariantId\": \"d27e42cf-087e-4d31-88ac-6c4b7585f800\"," + + " \"modelVersionId\": \"4d71990b-d8ad-4510-ac61-496288d9078e\"," + + " \"modelName\": \"vidmacrofalsenaming\"," + + " \"modelVersion\": \"1.0\"" + + " }," + + " \"requestParameters\": {" + + " \"userParams\": [" + + " {" + + " \"name\": \"aic_zone\"," + + " \"value\": \"NFT1\"" + + " }" + + " ]," + + " \"subscriptionServiceType\": \"AIM Transport\"," + + " \"aLaCarte\": false" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"olson3\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\"" + + " }," + + " \"subscriberInfo\": {" + + " \"globalSubscriberId\": \"31739f3e-526b-11e6-beb8-9e71128cae77\"" + + " }," + + " \"project\": {" + + " \"projectName\": \"yyy1\"" + + " }," + + " \"owningEntity\": {" + + " \"owningEntityId\": \"aaa1\"," + + " \"owningEntityName\": \"aaa1\"" + + " }" + + " }" + + "}"; + } +} 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 new file mode 100644 index 000000000..42b1578f4 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java @@ -0,0 +1,79 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; + +public class PresetMSOCreateNetworkALaCarte5G extends PresetMSOBaseCreateInstancePost { + private String serviceInstanceId; + private String networkName; + private final String requestorId; + + + public PresetMSOCreateNetworkALaCarte5G(String overrideRequestId, String serviceInstanceId, String networkName, String requestorId) { + super(overrideRequestId); + this.serviceInstanceId = serviceInstanceId; + this.networkName = networkName; + this.requestorId = requestorId; + this.cloudOwner = PresetAAIGetCloudOwnersByCloudRegionId.ATT_AIC; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/networks"; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelCustomizationName\": \"SR-IOV Provider-1\"," + + " \"modelCustomizationId\": \"0a0287b1-74a3-4c40-9bbb-9f56601e4fc4\"," + + " \"modelInvariantId\": \"379f816b-a7aa-422f-be30-17114ff50b7c\"," + + " \"modelVersionId\": \"840ffc47-e4cf-46de-8e23-525fd8c6fdc3\"," + + " \"modelName\": \"ExtVL\"," + + " \"modelType\": \"network\"," + + " \"modelVersion\": \"49.0\"" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \""+PresetAAIGetCloudOwnersByCloudRegionId.SOME_LEGACY_REGION+"\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"," + + " }," + + " \"requestInfo\": {" + + " \"instanceName\": \""+networkName+"\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \""+requestorId+"\"" + + " }," + + " \"platform\": {" + + " \"platformName\": \"platform\"" + + " }," + + " \"lineOfBusiness\": {" + + " \"lineOfBusinessName\": \"ECOMP\"" + + " }," + + " \"relatedInstanceList\": [{" + + " \"relatedInstance\": {" + + " \"modelInfo\": {" + + " \"modelInvariantId\": \"16e56d12-40b3-4db1-a40e-d48c36679e2e\"," + + " \"modelVersionId\": \"4659e8bd-0920-4eed-8ec5-550b4c8dceeb\"," + + " \"modelName\": \"SR-IOV Provider-1\"," + + " \"modelType\": \"service\"," + + " \"modelVersion\": \"1.0\"" + + " }," + + " \"instanceId\": \""+serviceInstanceId+"\"" + + " }" + + " }" + + " ]," + + " \"requestParameters\": {" + + " \"testApi\": \"VNF_API\"," + + " \"userParams\": []" + + " }" + + " }" + + "}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteCypress.java new file mode 100644 index 000000000..273fc255f --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteCypress.java @@ -0,0 +1,68 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateNetworkALaCarteCypress extends PresetMSOBaseCreateInstancePost { + private final String networkInstanceName; + private final String serviceInstanceId; + + + public PresetMSOCreateNetworkALaCarteCypress(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String networkInstanceName, String msoTestApi, boolean withTestApi) { + super(overrideRequestId, responseInstanceId, msoTestApi, withTestApi); + this.serviceInstanceId = serviceInstanceId; + this.networkInstanceName = networkInstanceName; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/networks"; + } + + @Override + public Object getRequestBody() { + return "{\"requestDetails\": {" + + + "\"modelInfo\":{" + + "\"modelCustomizationId\":\"94fdd893-4a36-4d70-b16a-ec29c54c184f\"," + + "\"modelCustomizationName\":\"ExtVL 0\"," + + "\"modelInvariantId\":\"379f816b-a7aa-422f-be30-17114ff50b7c\"," + + "\"modelName\":\"ExtVL\"," + + "\"modelVersion\":\"37.0\"," + + "\"modelVersionId\":\"ddc3f20c-08b5-40fd-af72-c6d14636b986\"," + + "\"modelType\":\"network\"" + + "}," + + "\"cloudConfiguration\":" + + "{\"lcpCloudRegionId\":\"lcpRegionText\"," + + addCloudOwnerIfNeeded() + + "\"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"}," + + "\"requestInfo\":" + + "{\"instanceName\":\""+ networkInstanceName +"\"," + + "\"productFamilyId\":\"ebc3bc3d-62fd-4a3f-a037-f619df4ff034\"," + + "\"source\":\"VID\"," + + "\"suppressRollback\":false," + + "\"requestorId\":\"us16807000\"}," + + //not sure it should be here + "\"platform\":{\"platformName\":\"xxx1\"}," + + //not sure it should be here + "\"lineOfBusiness\":{\"lineOfBusinessName\":\"zzz1\"}," + + + "\"relatedInstanceList\":[" + + "{\"relatedInstance\":{" + + "\"instanceId\":\""+serviceInstanceId+"\"," + + "\"modelInfo\":{" + + "\"modelVersionId\":\"2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd\"," + + "\"modelName\":\"action-data\"," + + "\"modelInvariantId\":\"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0\"," + + "\"modelType\":\"service\"," + + "\"modelVersion\":\"1.0\"" + + "}}}]," + + + "\"requestParameters\":{" + + this.addTestApi() + + "\"userParams\":[]}" + + "}}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java new file mode 100644 index 000000000..bccb07251 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java @@ -0,0 +1,65 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCreateInstancePost { + private final String networkInstanceName; + private final String serviceInstanceId; + + public PresetMSOCreateNetworkALaCarteOldViewEdit(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String networkInstanceName) { + super(overrideRequestId, responseInstanceId); + this.serviceInstanceId = serviceInstanceId; + this.networkInstanceName = networkInstanceName; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/networks"; + } + + @Override + public Object getRequestBody() { + return "{\"requestDetails\": {" + + " \"requestInfo\": {" + + " \"instanceName\": \""+networkInstanceName+"\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"mo57174000\"," + + " \"productFamilyId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" + + " }," + + " \"modelInfo\": {" + + " \"modelType\": \"network\"," + + " \"modelInvariantId\": \"de01afb5-532b-451d-aac4-ff9ff0644060\"," + + " \"modelVersionId\": \"ac815c68-35b7-4ea4-9d04-92d2f844b27c\"," + + " \"modelName\": \"AIC30_CONTRAIL_BASIC\"," + + " \"modelVersion\": \"3.0\"," + + " \"modelCustomizationId\": \"e94d61f7-b4b2-489a-a4a7-30b1a1a80daf\"," + + " \"modelCustomizationName\": \"AIC30_CONTRAIL_BASIC 0\"" + + " }," + + " \"requestParameters\": {" + + " \"testApi\": \"VNF_API\"," + + " \"userParams\": []" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"One\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"c630e297a3ae486497d63eacec1d7c14\"" + + " }," + + " \"platform\": {" + + " \"platformName\": \"xxx1\"" + + " }," + + " \"relatedInstanceList\": [" + + " {" + + " \"relatedInstance\": {" + + " \"instanceId\": \""+serviceInstanceId+"\"," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelName\": \"Using VID for VoIP Network Instantiations Shani\"," + + " \"modelInvariantId\": \"5b9c0f33-eec1-484a-bf77-736a6644d7a8\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelVersionId\": \"b75e0d22-05ff-4448-9266-5f0d4e1dbbd6\"" + + " }" + + " }" + + " }" + + " ]" + + " }}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteServiceCypress2.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteServiceCypress2.java new file mode 100644 index 000000000..356b59d9f --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteServiceCypress2.java @@ -0,0 +1,68 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateNetworkALaCarteServiceCypress2 extends PresetMSOBaseCreateInstancePost { + private String serviceInstanceId; + private String networkName; + private String serviceModelName; + private String serviceModelVersionId; + + + public PresetMSOCreateNetworkALaCarteServiceCypress2(String overrideRequestId, String serviceInstanceId, String networkName) { + this(overrideRequestId, serviceInstanceId, networkName, "ComplexService", "6e59c5de-f052-46fa-aa7e-2fca9d674c44"); + } + + public PresetMSOCreateNetworkALaCarteServiceCypress2(String overrideRequestId, String serviceInstanceId, String networkName, String serviceModelName, String serviceModelVersionId) { + super(overrideRequestId); + this.serviceInstanceId = serviceInstanceId; + this.networkName = networkName; + this.serviceModelName = serviceModelName; + this.serviceModelVersionId = serviceModelVersionId; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/networks"; + } + + @Override + public Object getRequestBody() { + return "{\"requestDetails\":" + + "{\"requestInfo\":" + + "{\"instanceName\":\"" + networkName + "\"," + + "\"productFamilyId\":\"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"," + + "\"source\":\"VID\"," + + "\"suppressRollback\":false," + + "\"requestorId\":\"us16807000\"}," + + "\"lineOfBusiness\":{\"lineOfBusinessName\":\"zzz1\"}," + + "\"cloudConfiguration\":" + + "{\"lcpCloudRegionId\":\"hvf6\"," + + addCloudOwnerIfNeeded() + + "\"tenantId\":\"229bcdc6eaeb4ca59d55221141d01f8e\"}," + + "\"platform\":{\"platformName\":\"xxx1\"}," + + "\"modelInfo\":" + + "{\"modelCustomizationId\":\"94fdd893-4a36-4d70-b16a-ec29c54c184f\"," + + "\"modelCustomizationName\":\"ExtVL 0\"," + + "\"modelVersionId\":\"ddc3f20c-08b5-40fd-af72-c6d14636b986\"," + + "\"modelName\":\"ExtVL\"," + + "\"modelInvariantId\":\"379f816b-a7aa-422f-be30-17114ff50b7c\"," + + "\"modelType\":\"network\"," + + "\"modelVersion\":\"37.0\"}," + + "\"requestParameters\":{" + + "\"testApi\": \"GR_API\", " + + "\"userParams\":[]}," + + "\"relatedInstanceList\":[" + + "{\"relatedInstance\":{" + + "\"instanceId\":\"" + serviceInstanceId + "\"," + + "\"modelInfo\":{" + + "\"modelVersionId\":\"" + serviceModelVersionId + "\"," + + "\"modelName\":\"" + serviceModelName + "\"," + + "\"modelInvariantId\":\"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0\"," + + "\"modelType\":\"service\"," + + "\"modelVersion\":\"1.0\"}}}]}}"; + } +} 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 new file mode 100644 index 000000000..afd96a46f --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java @@ -0,0 +1,59 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; + +import java.util.Map; + +public class PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork extends PresetMSOCreateServiceInstanceGen2WithNames { + + private final String requestorId; + + public PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork(Map<Keys, String> names, String requestId, String requestorId) { + super(names, 0, requestId); + this.requestorId = requestorId; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelInvariantId\": \"16e56d12-40b3-4db1-a40e-d48c36679e2e\"," + + " \"modelVersionId\": \"4659e8bd-0920-4eed-8ec5-550b4c8dceeb\"," + + " \"modelName\": \"SR-IOV Provider-1\"," + + " \"modelType\": \"service\"," + + " \"modelVersion\": \"1.0\"" + + " }," + + " \"owningEntity\": {" + + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\"," + + " \"owningEntityName\": \"MetroPacketCore\"" + + " }," + + " \"subscriberInfo\": {" + + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }," + + " \"project\": {" + + " \"projectName\": \"DFW\"" + + " }," + + " \"requestInfo\": {" + + " \"instanceName\": \""+names.get(SERVICE_NAME)+"\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \""+this.requestorId+"\"" + + " }," + + " \"requestParameters\": {" + + " \"testApi\": \"VNF_API\"," + + " \"subscriptionServiceType\": \"TYLER SILVIA\"," + + " \"aLaCarte\": true," + + " \"userParams\": []" + + " }" + + " }" + + "}"; + + } + +} 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 3dbebd5e5..3a7b09b43 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 @@ -1,17 +1,15 @@ package org.onap.simulator.presetGenerator.presets.mso; -public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateServiceInstancePost{ +public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateInstancePost { - public PresetMSOCreateServiceInstanceGen2() { - } - - public PresetMSOCreateServiceInstanceGen2(String requestId) { - super(requestId); + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances"; } @Override - public String getReqPath() { - return getRootPath() + "/serviceInstantiation/v7/serviceInstances"; + public boolean isStrictMatch() { + return true; } @Override @@ -44,7 +42,7 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateServi " \"requestorId\": \"us16807000\" " + " }, " + " \"requestParameters\": { " + - " \"subscriptionServiceType\": \"VIRTUAL USP\", " + + " \"subscriptionServiceType\": \"TYLER SILVIA\", " + " \"aLaCarte\": false, " + " \"userParams\": [{ " + " \"service\": { " + @@ -58,16 +56,17 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateServi " \"resources\": { " + " \"vnfs\": [{ " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017-488_ADIOD-vPE 0\", " + + " \"modelCustomizationName\": \"2017-488_PASQUALE-vPE 0\", " + " \"modelCustomizationId\": \"1da7b585-5e61-4993-b95e-8e6606c81e45\", " + " \"modelInvariantId\": \"72e465fe-71b1-4e7b-b5ed-9496118ff7a8\", " + " \"modelVersionId\": \"69e09f68-8b63-4cc9-b9ff-860960b5db09\", " + - " \"modelName\": \"2017-488_ADIOD-vPE\", " + + " \"modelName\": \"2017-488_PASQUALE-vPE\", " + " \"modelType\": \"vnf\", " + " \"modelVersion\": \"5.0\" " + " }, " + " \"cloudConfiguration\": { " + - " \"lcpCloudRegionId\": \"mtn6\", " + + " \"lcpCloudRegionId\": \"hvf6\", " + + addCloudOwnerIfNeeded() + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\" " + " }, " + " \"platform\": { " + @@ -78,19 +77,20 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateServi " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [], " + - " \"vfModules\": [{ " + + " \"vfModules\": [" + + " { " + " \"modelInfo\": { " + " \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " + " \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " + - " \"modelName\": \"2017488AdiodVpe..ADIOD_vRE_BV..module-1\", " + + " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"6\" " + " }, " + -// " \"instanceName\": \"VFinstancename_00" + suffix + "\", " + +// \"instanceName\": \"VFinstancename_00" + suffix + "\", " + " \"instanceParams\": [] " + - " } " + + " }" + " ] " + -// " \"instanceName\": \"2017488_ADIODvPEVNFinstancename_00" + suffix + "\" " + +// " \"instanceName\": \"2017488_PASQUALEvPEVNFinstancename_00" + suffix + "\" " + " } " + " ] " + " } " + 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 new file mode 100644 index 000000000..f76293f1d --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java @@ -0,0 +1,55 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import java.util.Map; + +public class PresetMSOCreateServiceInstanceGen2AlacarteService extends PresetMSOCreateServiceInstanceGen2WithNames { + + public PresetMSOCreateServiceInstanceGen2AlacarteService(Map<Keys, String> names, int suffix, String requestId) { + super(names, suffix, requestId); + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public Object getRequestBody() { + return "" + + "{ " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"16e56d12-40b3-4db1-a40e-d48c36679e2e\", " + + " \"modelVersionId\": \"4659e8bd-0920-4eed-8ec5-550b4c8dceeb\", " + + " \"modelName\": \"SR-IOV Provider-1\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"owningEntity\": { " + + " \"owningEntityName\": \"MetroPacketCore\", " + + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\" " + + " }, " + + " \"project\": { " + + " \"projectName\": \"DFW\" " + + " }, " + + " \"subscriberInfo\": { " + + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + + " }, " + + " \"requestInfo\": { " + + " \"source\": \"VID\", " + + " \"suppressRollback\": false, " + + " \"instanceName\": \"" + names.get(Keys.SERVICE_NAME) + suffix + "\", " + + " \"requestorId\": \"us16807000\" " + + " }, " + + " \"requestParameters\": { " + + " \"testApi\": \"VNF_API\", " + + " \"subscriptionServiceType\": \"TYLER SILVIA\", " + + " \"aLaCarte\": true, " + + " \"userParams\": [] " + + " } " + + " } " + + "} "; + + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2ErrorResponse.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2ErrorResponse.java new file mode 100644 index 000000000..a8b4d9aa5 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2ErrorResponse.java @@ -0,0 +1,24 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateServiceInstanceGen2ErrorResponse extends PresetMSOBaseCreateInstancePost { + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances"; + } + + @Override + public int getResponseCode() { + return 500; + } + + @Override + public Object getResponseBody() { + return "{" + + " \"serviceException\": {" + + " \"messageId\": \"SVC0002\"," + + " \"text\": \"JSON Object Mapping Request\"" + + " }" + + "}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNames.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNames.java index 89008b99b..f9124cc75 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNames.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNames.java @@ -1,15 +1,27 @@ package org.onap.simulator.presetGenerator.presets.mso; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; + import java.util.Map; public class PresetMSOCreateServiceInstanceGen2WithNames extends PresetMSOServiceInstanceGen2WithNames { public PresetMSOCreateServiceInstanceGen2WithNames(Map<Keys, String> names, int suffix) { super(names, suffix); + this.cloudOwner = PresetAAIGetCloudOwnersByCloudRegionId.ATT_SABABA; + } + + public PresetMSOCreateServiceInstanceGen2WithNames(Map<Keys, String> names, int suffix, String requestId) { + super(names, suffix, requestId); } + public PresetMSOCreateServiceInstanceGen2WithNames(Map<Keys, String> names, int suffix, String requestId, String responseInstanceId) { + super(names, suffix, requestId, responseInstanceId); + } + + @Override public String getReqPath() { - return getRootPath() + "/serviceInstantiation/v7/serviceInstances"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances"; } } 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 new file mode 100644 index 000000000..8f0b14115 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java @@ -0,0 +1,63 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import java.util.Map; + +public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService extends PresetMSOCreateServiceInstanceGen2WithNames { + + private String userId = "us16807000"; + + public PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService(Map<Keys, String> names, int suffix, String requestId) { + super(names, suffix, requestId); + } + + public PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService(Map<Keys, String> names, int suffix, String requestId, String responseInstanceId, String userId) { + super(names, suffix, requestId); + this.responseInstanceId = responseInstanceId; + this.userId = userId; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public Object getRequestBody() { + return "" + + "{ " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"7ee41ce4-4827-44b0-a48e-2707a59905d2\", " + + " \"modelVersionId\": \"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc\", " + + " \"modelName\": \"Grouping Service for Test\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"owningEntity\": { " + + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " + + " \"owningEntityName\": \"MetroPacketCore\" " + + " }, " + + " \"project\": { " + + " \"projectName\": \"DFW\" " + + " }, " + + " \"subscriberInfo\": { " + + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + + " }, " + + " \"requestInfo\": { " + + " \"source\": \"VID\", " + + " \"suppressRollback\": false, " + + " \"instanceName\": \"" + names.get(Keys.SERVICE_NAME) + suffix + "\", " + + " \"requestorId\": \"" + userId + "\" " + + " }, " + + " \"requestParameters\": { " + + " \"testApi\": \"VNF_API\", " + + " \"subscriptionServiceType\": \"TYLER SILVIA\", " + + " \"aLaCarte\": true, " + + " \"userParams\": [] " + + " } " + + " } " + + "} "; + + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService.java new file mode 100644 index 000000000..cc33a3b14 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService.java @@ -0,0 +1,60 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import java.util.Map; + +public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService extends PresetMSOCreateServiceInstanceGen2WithNames { + + public PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService(Map<Keys, String> names, int suffix, String requestId) { + super(names, suffix, requestId); + } + + public PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService(Map<Keys, String> names, int suffix, String requestId, String responseInstanceId) { + super(names, suffix, requestId, responseInstanceId); + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public Object getRequestBody() { + return "" + + "{ " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"0367689e-d41e-483f-b200-eab17e4a7f8d\", " + + " \"modelVersionId\": \"e3c34d88-a216-4f1d-a782-9af9f9588705\", " + + " \"modelName\": \"gayawabawe\", " + + " \"modelVersion\": \"5.1\" " + + " }, " + + " \"owningEntity\": { " + + " \"owningEntityId\": \"038d99af-0427-42c2-9d15-971b99b9b489\", " + + " \"owningEntityName\": \"Lucine Sarika\" " + + " }, " + + " \"project\": { " + + " \"projectName\": \"zasaki\" " + + " }, " + + " \"subscriberInfo\": { " + + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + + " }, " + + " \"requestInfo\": { " + + " \"source\": \"VID\", " + + " \"suppressRollback\": true, " + + " \"instanceName\": \"" + names.get(Keys.SERVICE_NAME) + suffix + "\", " + + " \"productFamilyId\": \"ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3\", " + + " \"requestorId\": \"us16807000\" " + + " }, " + + " \"requestParameters\": { " + + " \"testApi\": \"VNF_API\", " + + " \"subscriptionServiceType\": \"TYLER SILVIA\", " + + " \"aLaCarte\": true, " + + " \"userParams\": [] " + + " } " + + " } " + + "} "; + + } + +} 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 new file mode 100644 index 000000000..a864b0d10 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java @@ -0,0 +1,58 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import java.util.Map; + +public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress extends PresetMSOCreateServiceInstanceGen2WithNames { + + public PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress(Map<Keys, String> names, int suffix, String requestId, String testApi, boolean withTestApi) { + super(names, suffix, requestId); + this.msoTestApi = testApi; + this.withTestApi = withTestApi; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public Object getRequestBody() { + return "" + + "{ " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0\", " + + " \"modelVersionId\": \"2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd\", " + + " \"modelName\": \"action-data\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"owningEntity\": { " + + " \"owningEntityName\": \"MetroPacketCore\", " + + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\" " + + " }, " + + " \"project\": { " + + " \"projectName\": \"DFW\" " + + " }, " + + " \"subscriberInfo\": { " + + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + + " }, " + + " \"requestInfo\": { " + + " \"source\": \"VID\", " + + " \"suppressRollback\": false, " + + " \"productFamilyId\": \"ebc3bc3d-62fd-4a3f-a037-f619df4ff034\", " + + " \"instanceName\": \"" + names.get(Keys.SERVICE_NAME) + suffix + "\", " + + " \"requestorId\": \"us16807000\" " + + " }, " + + " \"requestParameters\": { " + + addTestApi()+ + " \"subscriptionServiceType\": \"TYLER SILVIA\", " + + " \"aLaCarte\": true, " + + " \"userParams\": [] " + + " } " + + " } " + + "} "; + + } + +} 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 new file mode 100644 index 000000000..2a8d7586e --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java @@ -0,0 +1,327 @@ +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 java.util.Map; +import vid.automation.test.infra.Features; + +public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends PresetMSOCreateServiceInstanceGen2WithNames { + + protected static final String INSTANCE_PARAMS_VNF = "{ " + + " \"bandwidth\": \"10\", " + + " \"vnf_instance_name\": \"mtnj309me6\", " + + " \"vnf_config_template_version\": \"17.2\", " + + " \"AIC_CLLI\": \"ATLMY8GA\", " + + " \"ASN\": \"AV_vPE\", " + + " \"bandwidth_units\": \"Gbps\" " + + " }"; + + protected static final String INSTANCE_PARAMS_WITH_SUPP_FILE_VNF = "{ " + + " \"vnf_config_template_version\": \"17.2\", " + + " \"AIC_CLLI\": \"ATLMY8GA\", " + + " \"bandwidth\": \"10\", " + + " \"bandwidth_units\": \"Gbps\", " + + " \"ASN\": \"AV_vPE\", " + + " \"param\": \"ABCD\", " + + " \"vnf_instance_name\": \"sample\" " + + " }"; + + protected static final String INSTANCE_PARAMS_VF_MODULE = "{ " + + " \"bandwidth\": \"10\", " + + " \"vnf_instance_name\": \"mtnj309me6\", " + + " \"vnf_config_template_version\": \"17.2\", " + + " \"AIC_CLLI\": \"ATLMY8GA\", " + + " \"bandwidth_units\": \"Gbps\" " + + " }"; + + protected static final String INSTANCE_PARAMS_WITH_SUPP_FILE_VF_MODULE = "{ " + + " \"vnf_config_template_version\": \"17.2\", " + + " \"AIC_CLLI\": \"ATLMY8GA\", " + + " \"bandwidth\": \"10\", " + + " \"bandwidth_units\": \"Gbps\", " + + " \"param\": \"ABCD\", " + + " \"vnf_instance_name\": \"sample\" " + + " }"; + + + + public PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse(Map<Keys, String> names, int suffix, String requestId) { + super(names, suffix, requestId); + } + + @Override + public boolean isStrictMatch() { + return false; + } + + 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; + } + return INSTANCE_PARAMS_VNF; + } + + protected String getVFModuleInstanceParams() { + if (Features.FLAG_SUPPLEMENTARY_FILE.isActive()) { + return INSTANCE_PARAMS_WITH_SUPP_FILE_VF_MODULE; + } + return INSTANCE_PARAMS_VF_MODULE; + } + + @Override + public Object getRequestBody() { + return "" + + "{ " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelInvariantId\": \"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0\", " + + " \"modelVersionId\": \"6b528779-44a3-4472-bdff-9cd15ec93450\", " + + " \"modelName\": \"action-data\", " + + " \"modelType\": \"service\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"owningEntity\": { " + + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " + + " \"owningEntityName\": \"MetroPacketCore\" " + + " }, " + + " \"subscriberInfo\": { " + + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + + " }, " + + " \"project\": { " + + " \"projectName\": \"DFW\" " + + " }, " + + " \"requestInfo\": { " + + " \"instanceName\": \"" + names.get(SERVICE_NAME) + suffix + "\", " + + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + + " \"source\": \"VID\", " + + " \"suppressRollback\": false, " + + " \"requestorId\": \"us16807000\" " + + " }, " + + " \"requestParameters\": { " + + " \"subscriptionServiceType\": \"TYLER SILVIA\", " + + " \"aLaCarte\": false, " + + " \"userParams\": [{ " + + " \"service\": { " + + " \"instanceName\": \"" + names.get(SERVICE_NAME) + suffix + "\", " + + " \"modelInfo\": { " + + " \"modelVersionId\": \"6b528779-44a3-4472-bdff-9cd15ec93450\", " + + " \"modelName\": \"action-data\", " + + " \"modelType\": \"service\" " + + " }, " + + " \"instanceParams\": [{ " + + " \"2017488_PASQUALEvpe0_ASN\": \"AV_vPE\"" + + " }" + + " ], " + + " \"resources\": { " + + " \"vnfs\": [{ " + + " \"instanceName\": \"" + names.get(VNF_NAME2) + suffix + "\", " + + " \"modelInfo\": { " + + " \"modelCustomizationName\": \"2017-388_PASQUALE-vPE 0\", " + + " \"modelCustomizationId\": \"b3c76f73-eeb5-4fb6-9d31-72a889f1811c\", " + + " \"modelInvariantId\": \"72e465fe-71b1-4e7b-b5ed-9496118ff7a8\", " + + " \"modelVersionId\": \"afacccf6-397d-45d6-b5ae-94c39734b168\", " + + " \"modelName\": \"2017-388_PASQUALE-vPE\", " + + " \"modelType\": \"vnf\", " + + " \"modelVersion\": \"4.0\" " + + " }, " + + " \"cloudConfiguration\": { " + + " \"lcpCloudRegionId\": \"hvf6\", " + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\" " + + " }, " + + " \"platform\": { " + + " \"platformName\": \"platform\" " + + " }, " + + " \"lineOfBusiness\": { " + + " \"lineOfBusinessName\": \"ECOMP\" " + + " }, " + + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + + " \"instanceParams\": [" + INSTANCE_PARAMS_VNF + "] " + + " }," + + " { " + //start of vnf + " \"instanceName\": \"" + names.get(VNF_NAME) + suffix + "\", " + + " \"modelInfo\": { " + + " \"modelCustomizationName\": \"2017-488_PASQUALE-vPE 0\", " + + " \"modelCustomizationId\": \"1da7b585-5e61-4993-b95e-8e6606c81e45\", " + + " \"modelInvariantId\": \"72e465fe-71b1-4e7b-b5ed-9496118ff7a8\", " + + " \"modelVersionId\": \"69e09f68-8b63-4cc9-b9ff-860960b5db09\", " + + " \"modelName\": \"2017-488_PASQUALE-vPE\", " + + " \"modelType\": \"vnf\", " + + " \"modelVersion\": \"5.0\" " + + " }, " + + " \"cloudConfiguration\": { " + + " \"lcpCloudRegionId\": \"hvf6\", " + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\" " + + " }, " + + " \"platform\": { " + + " \"platformName\": \"platform\" " + + " }, " + + " \"lineOfBusiness\": { " + + " \"lineOfBusinessName\": \"ECOMP\" " + + " }, " + + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + + " \"instanceParams\": [" + getVnfInstanceParams() + "], " + + " \"vfModules\": [{ " + + " \"instanceName\": \"" + names.get(VFM_NAME1) + suffix + "\", " + + " \"modelInfo\": { " + + " \"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\", " + + " \"modelType\": \"vfModule\", " + + " \"modelVersion\": \"5\" " + + " }, " + + " \"instanceParams\": [] " + + " }, { " + + " \"instanceName\": \"" + names.get(VFM_NAME2) + suffix + "\", " + + " \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + suffix + "\", " + + " \"modelInfo\": { " + + " \"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\", " + + " \"modelType\": \"vfModule\", " + + " \"modelVersion\": \"6\" " + + " }, " + + " \"instanceParams\": [" + getVFModuleInstanceParams() + "] " + + " }" + //end of vfModule + " ] " + //end of vfModules list + " }" + //end of vnf + addDuplicatedVnfIfFeatureOn() + + " ] " + //end of vnf list + " } " + + " } " + + " } " + + " ] " + + " } " + + " } " + + "}"; + + } + + private String addDuplicatedVnfIfFeatureOn() { + if (!Features.FLAG_DUPLICATE_VNF.isActive()) { + return ""; + } + + return + " ,{ " + //start of vnf + " \"instanceName\": \"" + names.get(VNF_NAME)+ "_001" + suffix + "\", " + + " \"modelInfo\": { " + + " \"modelCustomizationName\": \"2017-488_PASQUALE-vPE 0\", " + + " \"modelCustomizationId\": \"1da7b585-5e61-4993-b95e-8e6606c81e45\", " + + " \"modelInvariantId\": \"72e465fe-71b1-4e7b-b5ed-9496118ff7a8\", " + + " \"modelVersionId\": \"69e09f68-8b63-4cc9-b9ff-860960b5db09\", " + + " \"modelName\": \"2017-488_PASQUALE-vPE\", " + + " \"modelType\": \"vnf\", " + + " \"modelVersion\": \"5.0\" " + + " }, " + + " \"cloudConfiguration\": { " + + " \"lcpCloudRegionId\": \"hvf6\", " + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\" " + + " }, " + + " \"platform\": { " + + " \"platformName\": \"platform\" " + + " }, " + + " \"lineOfBusiness\": { " + + " \"lineOfBusinessName\": \"ECOMP\" " + + " }, " + + " \"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\", " + + " \"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\", " + + " \"modelType\": \"vfModule\", " + + " \"modelVersion\": \"5\" " + + " }, " + + " \"instanceParams\": [] " + + " }, { " + + " \"instanceName\": \"" + names.get(VFM_NAME2) + "_001" + suffix + "\", " + + " \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + "_001" + suffix + "\", " + + " \"modelInfo\": { " + + " \"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\", " + + " \"modelType\": \"vfModule\", " + + " \"modelVersion\": \"6\" " + + " }, " + + " \"instanceParams\": [" + getVFModuleInstanceParams() + "] " + + " }" + //end of vfModule + " ] " + //end of vfModules list + " }" + //end of vnf + " ,{ " + //start of vnf + " \"instanceName\": \"" + names.get(VNF_NAME)+ "_002" + suffix + "\", " + + " \"modelInfo\": { " + + " \"modelCustomizationName\": \"2017-488_PASQUALE-vPE 0\", " + + " \"modelCustomizationId\": \"1da7b585-5e61-4993-b95e-8e6606c81e45\", " + + " \"modelInvariantId\": \"72e465fe-71b1-4e7b-b5ed-9496118ff7a8\", " + + " \"modelVersionId\": \"69e09f68-8b63-4cc9-b9ff-860960b5db09\", " + + " \"modelName\": \"2017-488_PASQUALE-vPE\", " + + " \"modelType\": \"vnf\", " + + " \"modelVersion\": \"5.0\" " + + " }, " + + " \"cloudConfiguration\": { " + + " \"lcpCloudRegionId\": \"hvf6\", " + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\" " + + " }, " + + " \"platform\": { " + + " \"platformName\": \"platform\" " + + " }, " + + " \"lineOfBusiness\": { " + + " \"lineOfBusinessName\": \"ECOMP\" " + + " }, " + + " \"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\", " + + " \"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\", " + + " \"modelType\": \"vfModule\", " + + " \"modelVersion\": \"5\" " + + " }, " + + " \"instanceParams\": [] " + + " }, { " + + " \"instanceName\": \"" + names.get(VFM_NAME2) + "_002" + suffix + "\", " + + " \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + "_002" + suffix + "\", " + + " \"modelInfo\": { " + + " \"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\", " + + " \"modelType\": \"vfModule\", " + + " \"modelVersion\": \"6\" " + + " }, " + + " \"instanceParams\": [" + getVFModuleInstanceParams() + "] " + + " }" + //end of vfModule + " ] " + //end of vfModules list + " }" ; //end of vnf + } + + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceMultipleVnfsServiceCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceMultipleVnfsServiceCypress.java new file mode 100644 index 000000000..065050a63 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceMultipleVnfsServiceCypress.java @@ -0,0 +1,56 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import java.util.Map; + +public class PresetMSOCreateServiceInstanceMultipleVnfsServiceCypress extends PresetMSOCreateServiceInstanceGen2WithNames { + + public PresetMSOCreateServiceInstanceMultipleVnfsServiceCypress(Map<Keys, String> names, int suffix, String requestId) { + super(names, suffix, requestId); + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public Object getRequestBody() { + return "" + + "{ " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0\", " + + " \"modelVersionId\": \"6e59c5de-f052-46fa-aa7e-2fca9d674c44\", " + + " \"modelName\": \"ComplexService\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"owningEntity\": { " + + " \"owningEntityName\": \"aaa1\", " + + " \"owningEntityId\": \"aaa1\" " + + " }, " + + " \"project\": { " + + " \"projectName\": \"yyy1\" " + + " }, " + + " \"subscriberInfo\": { " + + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + + " }, " + + " \"requestInfo\": { " + + " \"source\": \"VID\", " + + " \"suppressRollback\": false, " + + " \"productFamilyId\": \"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e\", " + + " \"instanceName\": \"" + names.get(Keys.SERVICE_NAME) + suffix + "\", " + + " \"requestorId\": \"us16807000\" " + + " }, " + + " \"requestParameters\": { " + + " \"testApi\": \"GR_API\", " + + " \"subscriptionServiceType\": \"TYLER SILVIA\", " + + " \"aLaCarte\": true, " + + " \"userParams\": [] " + + " } " + + " } " + + "} "; + + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java index 931fe59e3..39b415fa2 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstancePost.java @@ -3,10 +3,10 @@ package org.onap.simulator.presetGenerator.presets.mso; /** * Created by itzikliderman on 13/12/2017. */ -public class PresetMSOCreateServiceInstancePost extends PresetMSOBaseCreateServiceInstancePost { +public class PresetMSOCreateServiceInstancePost extends PresetMSOBaseCreateInstancePost { public String getReqPath() { - return getRootPath() + "/serviceInstances/v6"; + return getRootPath() + "/serviceInstances/v."; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance.java new file mode 100644 index 000000000..f203a7df6 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance.java @@ -0,0 +1,74 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; + +public class PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance extends PresetMSOBaseCreateInstancePost { + private final String suffix; + private String serviceInstanceId; + private String vnfInstanceName; + + public PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance(String vnfInstanceName, String vnfRequestId, String serviceInstanceId, String vnfInstanceId, int suffix) { + super(vnfRequestId, vnfInstanceId); + this.vnfInstanceName = vnfInstanceName; + this.serviceInstanceId = serviceInstanceId; + this.cloudOwner = PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; + this.suffix = formatSuffix(suffix); + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs"; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelType\": \"vnf\"," + + " \"modelInvariantId\": \"ff5256d1-5a33-55df-13ab-12abad84e7ff\"," + + " \"modelVersionId\": \"fe042c22-ba82-43c6-b2f6-8f1fc4164091\"," + + " \"modelName\": \"vSAMP12\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelCustomizationName\": \"vSAMP12 1\"," + + " \"modelCustomizationId\": \"a7f1d08e-b02d-11e6-80f5-76304dec7eb7\"" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"mdt1\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"88a6ca3ee0394ade9403f075db23167e\"" + + " }," + + " \"requestInfo\": {" + + " \"instanceName\": \"" + vnfInstanceName+suffix + "\"," + + " \"productFamilyId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": true," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"platform\": {" + + " \"platformName\": \"vnf_platformName\"" + + " }," + + " \"lineOfBusiness\": {" + + " \"lineOfBusinessName\": \"vnf_lineOfBusinessName\"" + + " }," + + " \"relatedInstanceList\": [" + + " {" + + " \"relatedInstance\": {" + + " \"instanceId\": \"" + serviceInstanceId + "\"," + + " \"modelInfo\": {" + + " \"modelInvariantId\": \"0367689e-d41e-483f-b200-eab17e4a7f8d\"," + + " \"modelVersionId\": \"e3c34d88-a216-4f1d-a782-9af9f9588705\"," + + " \"modelName\": \"gayawabawe\"," + + " \"modelVersion\": \"5.1\"" + + " }" + + " }" + + " }" + + " ]," + + " \"requestParameters\": {" + + " \"userParams\": []," + + " \"testApi\": \"VNF_API\"" + + " }" + + " }" + + "}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstancePost.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstancePost.java deleted file mode 100644 index 443d78e81..000000000 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVNFInstancePost.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.onap.simulator.presetGenerator.presets.mso; - -public class PresetMSOCreateVNFInstancePost extends PresetMSOBaseCreateServiceInstancePost { - private String serviceInstanceId; - private String serviceModelVersionId; - - public PresetMSOCreateVNFInstancePost(String serviceInstanceId, String serviceModelVersionId) { - this.serviceInstanceId = serviceInstanceId; - this.serviceModelVersionId = serviceModelVersionId; - } - - @Override - public String getReqPath() { - return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs"; - } - - @Override - public Object getRequestBody() { - return "{\"requestDetails\":{\"requestInfo\":{\"productFamilyId\":\"e433710f-9217-458d-a79d-1c7aff376d89\",\"source\":\"VID\",\"suppressRollback\":false,\"requestorId\":\"us16807000\"},\"lineOfBusiness\":{\"lineOfBusinessName\":\"ecomp\"},\"cloudConfiguration\":{\"lcpCloudRegionId\":\"AAIAIC25\",\"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"},\"platform\":{\"platformName\":\"plat1\"},\"modelInfo\":{\"modelCustomizationId\":\"882e5dcb-ba9f-4766-8cde-e326638107db\",\"modelCustomizationName\":\"vDBE 0\",\"modelVersionId\":\"61535073-2e50-4141-9000-f66fea69b433\",\"modelName\":\"vDBE\",\"modelInvariantId\":\"fcdf49ce-6f0b-4ca2-b676-a484e650e734\",\"modelType\":\"vnf\",\"modelVersion\":\"0.2\"},\"requestParameters\":{\"userParams\":[],\"testApi\":\"GR_API\"},\"relatedInstanceList\":[{\"relatedInstance\":{\"instanceId\":\"" + serviceInstanceId + "\",\"modelInfo\":{\"modelVersionId\":\"" + serviceModelVersionId + "\",\"modelName\":\"vDBE_srv\",\"modelInvariantId\":\"9aa04749-c02c-432d-a90c-18caa361c833\",\"modelType\":\"service\",\"modelVersion\":\"1.0\"}}},{\"relatedInstance\":{\"instanceId\":\"AAI-12002-test3-vm230w\",\"modelInfo\":{\"modelName\":\"oam_group\",\"modelType\":\"networkCollection\",\"modelVersion\":\"1\",\"modelVersionId\":\"a0efd5fc-f7be-4502-936a-a6c6392b958f\",\"modelInvariantId\":\"9384abf9-1231-4da4-bd8d-89e4d2f8a749\"}}},{\"relatedInstance\":{\"instanceId\":\"AAI-12002-test3-vm230w\",\"modelInfo\":{\"modelName\":\"oam_group\",\"modelType\":\"networkCollection\",\"modelVersion\":\"1\",\"modelVersionId\":\"a0efd5fc-f7be-4502-936a-a6c6392b958f\",\"modelInvariantId\":\"9384abf9-1231-4da4-bd8d-89e4d2f8a749\"}}}]}}"; - } -} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleInstancePost.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModule.java index 4f662ee87..72538fc11 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleInstancePost.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModule.java @@ -1,17 +1,32 @@ package org.onap.simulator.presetGenerator.presets.mso; -public class PresetMSOCreateVfModuleInstancePost extends PresetMSOBaseCreateServiceInstancePost{ +public class PresetMSOCreateVfModule extends PresetMSOBaseCreateInstancePost { private String serviceInstanceId; private String vnfInstanceId; + private String instanceName; + private String modelVersionId; + private String modelInvariantId; + private String serviceName; - public PresetMSOCreateVfModuleInstancePost(String serviceInstanceId, String vnfInstanceId) { + public PresetMSOCreateVfModule(String serviceInstanceId, String vnfInstanceId, String cloudOwner) { + this(serviceInstanceId, vnfInstanceId, cloudOwner, "aa", "240376de-870e-48df-915a-31f140eedd2c", + "709d1be4-9a3f-4a29-8c4d-a20465e808a3", "Demo Service 1"); + } + + public PresetMSOCreateVfModule(String serviceInstanceId, String vnfInstanceId, + String cloudOwner, String instanceName, String modelVersionId, String modelInvariantId, String serviceName) { this.serviceInstanceId = serviceInstanceId; this.vnfInstanceId = vnfInstanceId; + this.cloudOwner = cloudOwner; + this.instanceName = instanceName; + this.modelVersionId = modelVersionId; + this.modelInvariantId = modelInvariantId; + this.serviceName = serviceName; } @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/"+vnfInstanceId+"/vfModules"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/"+vnfInstanceId+"/vfModules"; } @Override @@ -19,7 +34,7 @@ public class PresetMSOCreateVfModuleInstancePost extends PresetMSOBaseCreateServ return "{" + "\"requestDetails\":{" + "\"requestInfo\":{" + - "\"instanceName\":\"aa\"," + + "\"instanceName\":\"" + instanceName + "\"," + "\"source\":\"VID\"," + "\"suppressRollback\":false," + "\"requestorId\":\"us16807000\"" + @@ -40,6 +55,7 @@ public class PresetMSOCreateVfModuleInstancePost extends PresetMSOBaseCreateServ "}," + "\"cloudConfiguration\":{" + "\"lcpCloudRegionId\":\"mdt1\"," + + addCloudOwnerIfNeeded() + "\"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"" + "}," + "\"relatedInstanceList\":[" + @@ -48,10 +64,10 @@ public class PresetMSOCreateVfModuleInstancePost extends PresetMSOBaseCreateServ "\"instanceId\":\"" + serviceInstanceId + "\","+ "\"modelInfo\":{" + "\"modelType\":\"service\"," + - "\"modelName\":\"Demo Service 1\"," + - "\"modelInvariantId\":\"709d1be4-9a3f-4a29-8c4d-a20465e808a3\"," + + "\"modelName\":\"" + serviceName + "\","+ + "\"modelInvariantId\":\"" + modelInvariantId + "\","+ "\"modelVersion\":\"1.0\"," + - "\"modelVersionId\":\"240376de-870e-48df-915a-31f140eedd2c\"" + + "\"modelVersionId\":\"" + modelVersionId + "\"" + "}" + "}" + "}" + 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 new file mode 100644 index 000000000..dabc526c7 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java @@ -0,0 +1,115 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import com.google.common.collect.ImmutableMap; +import java.util.Map; + +public class PresetMSOCreateVfModuleALaCarteCypress extends PresetMSOBaseCreateInstancePost { + private String serviceInstanceId; + private String vnfInstanceId; + protected final Map<Keys, String> names; + + public enum Keys { + modelVersionId, modelName, modelVersion, modelCustomizationId, modelCustomizationName, instanceName, modelInvariantId + } + + public static final Map<Keys, String> module0Names = ImmutableMap.<Keys, String>builder() + .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.modelVersion, "5") + .put(Keys.modelCustomizationId, "a55961b2-2065-4ab0-a5b7-2fcee1c227e3") + .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.modelVersion, "6") + .put(Keys.modelCustomizationId, "3cd946bb-50e0-40d8-96d3-c9023520b557") + .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) { + super(overrideRequestId); + this.vnfInstanceId = vnfInstanceId; + this.serviceInstanceId = serviceInstanceId; + this.names = names; + this.msoTestApi = testApi; + this.withTestApi = withTestApi; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModules"; + } + + @Override + public Object getRequestBody() { + return "" + + "{" + + " \"requestDetails\":{" + + " \"modelInfo\":{" + + " \"modelType\":\"vfModule\"," + + " \"modelInvariantId\":\"" + names.get(Keys.modelInvariantId) + "\"," + + " \"modelVersionId\":\"" + names.get(Keys.modelVersionId) + "\"," + + " \"modelName\":\"" + names.get(Keys.modelName) + "\"," + + " \"modelVersion\":\"" + names.get(Keys.modelVersion) + "\"," + + " \"modelCustomizationId\":\"" + names.get(Keys.modelCustomizationId) + "\"," + + " \"modelCustomizationName\":\"" + names.get(Keys.modelCustomizationName) + "\"" + + " }," + + " \"cloudConfiguration\":{" + + " \"lcpCloudRegionId\":\"hvf6\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\":\"624eb554b0d147c19ff8885341760481\"" + + + " }," + + " \"requestInfo\":{" + + " \"instanceName\":\"" + names.get(Keys.instanceName) + "\"," + + " \"source\":\"VID\"," + + " \"suppressRollback\":true," + + " \"requestorId\":\"us16807000\"" + + " }," + + " \"relatedInstanceList\":[{" + + " \"relatedInstance\":{" + + " \"instanceId\":\"" + serviceInstanceId + "\"," + + " \"modelInfo\":{" + + " \"modelType\":\"service\"," + + " \"modelName\":\"action-data\"," + + " \"modelInvariantId\":\"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0\"," + + " \"modelVersion\":\"1.0\"," + + " \"modelVersionId\":\"2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd\"" + + " }" + + " }" + + " }, {" + + " \"relatedInstance\":{" + + " \"instanceId\":\"" + vnfInstanceId + "\"," + + " \"modelInfo\":{" + + " \"modelType\":\"vnf\"," + + " \"modelName\":\"2017-488_PASQUALE-vPE\"," + + " \"modelInvariantId\":\"72e465fe-71b1-4e7b-b5ed-9496118ff7a8\"," + + " \"modelVersion\":\"5.0\"," + + " \"modelVersionId\":\"69e09f68-8b63-4cc9-b9ff-860960b5db09\"," + + " \"modelCustomizationId\":\"1da7b585-5e61-4993-b95e-8e6606c81e45\"," + + " \"modelCustomizationName\":\"2017-488_PASQUALE-vPE 0\"" + + " }" + + " }" + + " }" + + " ]," + + " \"requestParameters\":{" + + addTestApi()+ + " \"userParams\":[" + + " ]," + + " \"usePreload\":false" + + " }" + + " }" + + "}"; + } +} 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 new file mode 100644 index 000000000..bf085cae5 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java @@ -0,0 +1,81 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateVfModuleOldViewEdit extends PresetMSOBaseCreateInstancePost { + private final String serviceInstanceId; + private final String vnfInstanceId; + private final String instanceName; + + public PresetMSOCreateVfModuleOldViewEdit(String overrideRequestId, String responseInstanceId , + String serviceInstanceId, String vnfInstanceId, + String instanceName, String msoTestApi, + String cloudOwner) { + super(overrideRequestId, responseInstanceId, msoTestApi); + this.serviceInstanceId = serviceInstanceId; + this.vnfInstanceId = vnfInstanceId; + this.instanceName = instanceName; + this.cloudOwner = cloudOwner; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/"+vnfInstanceId+"/vfModules"; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"requestInfo\": {" + + " \"instanceName\": \""+instanceName+"\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"mo37915000\"" + + " }," + + " \"modelInfo\": {" + + " \"modelType\": \"vfModule\"," + + " \"modelInvariantId\": \"d9f9c851-9543-476e-b3c2-a2e5284a26aa\"," + + " \"modelVersionId\": \"d205e01d-e5da-4e68-8c52-f95cb0607959\"," + + " \"modelName\": \"Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8\"," + + " \"modelVersion\": \"1\"," + + " \"modelCustomizationId\": \"e81b58ce-ae9b-4bde-9f81-9962a5007756\"," + + " \"modelCustomizationName\": \"Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8\"" + + " }," + + " \"requestParameters\": {" + + addTestApi() + + " \"usePreload\": false" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"mdt1\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" + + " }," + + " \"relatedInstanceList\": [{" + + " \"relatedInstance\": {" + + " \"instanceId\": \""+serviceInstanceId+"\"," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelName\": \"ServicevWINIFREDPID298109\"," + + " \"modelInvariantId\": \"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelVersionId\": \"aa2f8e9c-9e47-4b15-a95c-4a93855ac61b\"" + + " }" + + " }" + + " }, {" + + " \"relatedInstance\": {" + + " \"instanceId\": \""+vnfInstanceId+"\"," + + " \"modelInfo\": {" + + " \"modelType\": \"vnf\"," + + " \"modelName\": \"VSP1710PID298109_vWINIFRED\"," + + " \"modelInvariantId\": \"e7961100-cde6-4b5a-bcda-b8945086950a\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelVersionId\": \"959a7ba0-89ee-4984-9af6-65d5bdda4b0e\"," + + " \"modelCustomizationId\": \"6b8fc7dc-2db1-4283-a222-b07d10595495\"," + + " \"modelCustomizationName\": \"VSP1710PID298109_vWINIFRED 0\"" + + " }" + + " }" + + " }" + + " ]" + + " }" + + "}"; + } +} 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 new file mode 100644 index 000000000..c8fb7fcf9 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java @@ -0,0 +1,116 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends PresetMSOBaseCreateInstancePost { + private final String serviceInstanceId; + private final String vnfInstanceId; + private final String volumeGroupInstanceId; + private final boolean isVolumeGroupPreset; + private PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress(Boolean isVolumeGroupPreset, String requestId, String serviceInstanceId, String vnfInstanceId, String volumeGroupInstanceId, String testApi, boolean withTestApi) { + super(requestId, isVolumeGroupPreset ? volumeGroupInstanceId : DEFAULT_INSTANCE_ID, testApi, withTestApi); + this.serviceInstanceId = serviceInstanceId; + this.vnfInstanceId = vnfInstanceId; + this.isVolumeGroupPreset = isVolumeGroupPreset; + this.volumeGroupInstanceId = volumeGroupInstanceId; + } + + public static PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress forVfModule(String requestId, String serviceInstanceId, String vnfInstanceId, String volumeGroupInstanceId, String testApi, boolean withTestApi) { + return new PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress(false, requestId, serviceInstanceId, vnfInstanceId, volumeGroupInstanceId, testApi, withTestApi); + } + + public static PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress forVolumeGroup(String requestId, String serviceInstanceId, String vnfInstanceId, String testApi, boolean withTestApi) { + return new PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress(true, requestId, serviceInstanceId, vnfInstanceId, requestId,testApi, withTestApi); + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public String getReqPath() { + if (isVolumeGroupPreset) { + return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/volumeGroups"; + } else { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModules"; + } + } + + @Override + public Object getRequestBody() { + return "" + + "{" + + " \"requestDetails\":{" + + " \"modelInfo\":{" + + " \"modelType\":\"" + select("volumeGroup", "vfModule") + "\"," + + " \"modelInvariantId\":\"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\"," + + " \"modelVersionId\":\"25284168-24bb-4698-8cb4-3f509146eca5\"," + + " \"modelName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," + + " \"modelVersion\":\"6\"," + + " \"modelCustomizationId\":\"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\"," + + " \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"" + + " }," + + " \"cloudConfiguration\":{" + + " \"lcpCloudRegionId\":\"my region\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"" + + " }," + + " \"requestInfo\":{" + + " \"instanceName\":\"" + select("puwesovabe_vol", "puwesovabe") + "\"," + + " \"source\":\"VID\"," + + " \"suppressRollback\":false," + + " \"requestorId\":\"us16807000\"" + + " }," + + " \"relatedInstanceList\":[{" + + " \"relatedInstance\":{" + + " \"instanceId\":\"" + serviceInstanceId + "\"," + + " \"modelInfo\":{" + + " \"modelType\":\"service\"," + + " \"modelName\":\"action-data\"," + + " \"modelInvariantId\":\"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0\"," + + " \"modelVersion\":\"1.0\"," + + " \"modelVersionId\":\"2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd\"" + + " }" + + " }" + + " }, {" + + " \"relatedInstance\":{" + + " \"instanceId\":\"" + vnfInstanceId + "\"," + + " \"modelInfo\":{" + + " \"modelType\":\"vnf\"," + + " \"modelName\":\"2017-488_PASQUALE-vPE\"," + + " \"modelInvariantId\":\"72e465fe-71b1-4e7b-b5ed-9496118ff7a8\"," + + " \"modelVersion\":\"5.0\"," + + " \"modelVersionId\":\"69e09f68-8b63-4cc9-b9ff-860960b5db09\"," + + " \"modelCustomizationId\":\"1da7b585-5e61-4993-b95e-8e6606c81e45\"," + + " \"modelCustomizationName\":\"2017-488_PASQUALE-vPE 0\"" + + " }" + + " }" + + select("", " }, {" + + " \"relatedInstance\":{" + + " \"modelInfo\":{" + + " \"modelType\":\"volumeGroup\"" + + " }," + + " \"instanceId\":\"" + volumeGroupInstanceId + "\"," + + " \"instanceName\":\"puwesovabe_vol\"" + + " } ") + + " }" + + " ]," + + " \"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\"" + + " }" + + " ]," + + " \"usePreload\":true" + + " }" + + " }" + + "}"; + } + + private String select(String ofVolumeGroup, String ofVfModule) { + return isVolumeGroupPreset ? ofVolumeGroup : ofVfModule; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteCypress2.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteCypress2.java new file mode 100644 index 000000000..96424e803 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteCypress2.java @@ -0,0 +1,51 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateVnfALaCarteCypress2 extends PresetMSOCreateVnfBase { + private String vnfInstanceName; + + public PresetMSOCreateVnfALaCarteCypress2(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String vnfInstanceName, String testApi, boolean withTestApi) { + super(overrideRequestId, serviceInstanceId, responseInstanceId); + this.vnfInstanceName = vnfInstanceName; + this.msoTestApi = testApi; + this.withTestApi = withTestApi; + } + + @Override + public Object getRequestBody() { + return "{\"requestDetails\":" + + "{\"requestInfo\":" + + "{\"instanceName\":\""+vnfInstanceName+"\"," + + "\"productFamilyId\":\"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"," + + "\"source\":\"VID\"," + + "\"suppressRollback\":false," + + "\"requestorId\":\"us16807000\"}," + + "\"lineOfBusiness\":{\"lineOfBusinessName\":\"zzz1\"}," + + "\"cloudConfiguration\":" + + "{\"lcpCloudRegionId\":\"just another region\"," + + addCloudOwnerIfNeeded() + + "\"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"}," + + "\"platform\":{\"platformName\":\"xxx1\"}," + + "\"modelInfo\":" + + "{\"modelCustomizationId\":\"1da7b585-5e61-4993-b95e-8e6606c81e45\"," + + "\"modelCustomizationName\":\"2017-488_PASQUALE-vPE 0\"," + + "\"modelVersionId\":\"69e09f68-8b63-4cc9-b9ff-860960b5db09\"," + + "\"modelName\":\"2017-488_PASQUALE-vPE\"," + + "\"modelInvariantId\":\"72e465fe-71b1-4e7b-b5ed-9496118ff7a8\"," + + "\"modelType\":\"vnf\"," + + "\"modelVersion\":\"5.0\"}," + + "\"requestParameters\":{" + + addTestApi()+ + "\"userParams\":[]}, " + + "\"relatedInstanceList\":[" + + "{\"relatedInstance\":{" + + "\"instanceId\":\""+serviceInstanceId+"\"," + + "\"modelInfo\":{" + + "\"modelVersionId\":\"2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd\"," + + "\"modelName\":\"action-data\"," + + "\"modelInvariantId\":\"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0\"," + + "\"modelType\":\"service\"," + + "\"modelVersion\":\"1.0\"" + + "}}}]" + + "}}"; + } +} 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 new file mode 100644 index 000000000..7947c5b83 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java @@ -0,0 +1,69 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateVnfALaCarteOldViewEdit extends PresetMSOCreateVnfBase { + private String vnfInstanceName; + private boolean haveLOB; + + public PresetMSOCreateVnfALaCarteOldViewEdit(String overrideRequestId, String serviceInstanceId, + String vnfInstanceName, boolean haveLOB, String msoTestApi) { + super(overrideRequestId, serviceInstanceId); + this.vnfInstanceName = vnfInstanceName; + this.haveLOB = haveLOB; + this.msoTestApi = msoTestApi; + this.withTestApi = true; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"requestInfo\": {" + + " \"instanceName\": \""+vnfInstanceName+"\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"mo37915000\"," + + " \"productFamilyId\": \"ebc3bc3d-62fd-4a3f-a037-f619df4ff034\"" + + " }," + + " \"modelInfo\": {" + + " \"modelType\": \"vnf\"," + + " \"modelInvariantId\": \"e7961100-cde6-4b5a-bcda-b8945086950a\"," + + " \"modelVersionId\": \"959a7ba0-89ee-4984-9af6-65d5bdda4b0e\"," + + " \"modelName\": \"VSP1710PID298109_vWINIFRED\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelCustomizationId\": \"6b8fc7dc-2db1-4283-a222-b07d10595495\"," + + " \"modelCustomizationName\": \"VSP1710PID298109_vWINIFRED 0\"" + + " }," + + " \"requestParameters\": {" + + addTestApi() + + " \"userParams\": []" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"some legacy region\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" + + " }," + + selectLob("\"lineOfBusiness\": {\"lineOfBusinessName\": \"ECOMP\"},", "") + + " \"platform\": {" + + " \"platformName\": \"platform\"" + + " }," + + " \"relatedInstanceList\": [{" + + " \"relatedInstance\": {" + + " \"instanceId\": \""+serviceInstanceId+"\"," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelName\": \"ServicevWINIFREDPID298109\"," + + " \"modelInvariantId\": \"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelVersionId\": \"aa2f8e9c-9e47-4b15-a95c-4a93855ac61b\"" + + " }" + + " }" + + " }" + + " ]" + + " }"+ + "}"; + } + + private String selectLob(String lob, String noLob) { + return haveLOB ? lob : noLob; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress.java new file mode 100644 index 000000000..2be8c639b --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress.java @@ -0,0 +1,51 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateVnfALaCarteServiceCypress extends PresetMSOCreateVnfBase { + protected String vnfInstanceName; + protected String lineOfBusinessName; + + public PresetMSOCreateVnfALaCarteServiceCypress(String overrideRequestId, String serviceInstanceId, String vnfInstanceName, String lineOfBusinessName) { + super(overrideRequestId, serviceInstanceId); + this.vnfInstanceName = vnfInstanceName; + this.lineOfBusinessName = lineOfBusinessName; + } + + @Override + public Object getRequestBody() { + return "{\"requestDetails\":" + + "{\"requestInfo\":" + + "{\"instanceName\":\""+vnfInstanceName+"\"," + + "\"productFamilyId\":\"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e\"," + + "\"source\":\"VID\"," + + "\"suppressRollback\":false," + + "\"requestorId\":\"us16807000\"}," + + "\"lineOfBusiness\":{\"lineOfBusinessName\":\""+lineOfBusinessName+"\"}," + + "\"cloudConfiguration\":" + + "{\"lcpCloudRegionId\":\"hvf6\"," + + addCloudOwnerIfNeeded() + + "\"tenantId\":\"bae71557c5bb4d5aac6743a4e5f1d054\"}," + + "\"platform\":{\"platformName\":\"platform\"}," + + "\"modelInfo\":" + + "{\"modelCustomizationId\":\"91415b44-753d-494c-926a-456a9172bbb9\"," + + "\"modelCustomizationName\":\"VF_vGeraldine 0\"," + + "\"modelVersionId\":\"d6557200-ecf2-4641-8094-5393ae3aae60\"," + + "\"modelName\":\"VF_vGeraldine\"," + + "\"modelInvariantId\":\"4160458e-f648-4b30-a176-43881ffffe9e\"," + + "\"modelType\":\"vnf\"," + + "\"modelVersion\":\"2.0\"}," + + "\"requestParameters\":{" + + "\"testApi\": \"GR_API\", " + + "\"userParams\":[]" + + "}," + + "\"relatedInstanceList\":[" + + "{\"relatedInstance\":{" + + "\"instanceId\":\"f8791436-8d55-4fde-b4d5-72dd2cf13cfb\"," + + "\"modelInfo\":{" + + "\"modelVersionId\":\"6e59c5de-f052-46fa-aa7e-2fca9d674c44\"," + + "\"modelName\":\"ComplexService\"," + + "\"modelInvariantId\":\"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0\"," + + "\"modelType\":\"service\"," + + "\"modelVersion\":\"1.0\"" + + "}}}]}}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress2.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress2.java new file mode 100644 index 000000000..afdb3f49b --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteServiceCypress2.java @@ -0,0 +1,47 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateVnfALaCarteServiceCypress2 extends PresetMSOCreateVnfALaCarteServiceCypress { + + public PresetMSOCreateVnfALaCarteServiceCypress2(String overrideRequestId, String serviceInstanceId, String vnfInstanceName, String lineOfBusinessName) { + super(overrideRequestId, serviceInstanceId, vnfInstanceName, lineOfBusinessName); + } + + @Override + public Object getRequestBody() { + return "{\"requestDetails\":" + + "{\"requestInfo\":" + + "{\"instanceName\":\""+vnfInstanceName+"\"," + + "\"productFamilyId\":\"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"," + + "\"source\":\"VID\"," + + "\"suppressRollback\":false," + + "\"requestorId\":\"us16807000\"}," + + "\"lineOfBusiness\":{\"lineOfBusinessName\":\""+lineOfBusinessName+"\"}," + + "\"cloudConfiguration\":" + + "{\"lcpCloudRegionId\":\"hvf6\"," + + addCloudOwnerIfNeeded() + + "\"tenantId\":\"229bcdc6eaeb4ca59d55221141d01f8e\"}," + + "\"platform\":{\"platformName\":\"xxx1\"}," + + "\"modelInfo\":" + + "{\"modelCustomizationId\":\"b3c76f73-eeb5-4fb6-9d31-72a889f1811c\"," + + "\"modelCustomizationName\":\"2017-388_PASQUALE-vPE 0\"," + + "\"modelVersionId\":\"afacccf6-397d-45d6-b5ae-94c39734b168\"," + + "\"modelName\":\"2017-388_PASQUALE-vPE\"," + + "\"modelInvariantId\":\"72e465fe-71b1-4e7b-b5ed-9496118ff7a8\"," + + "\"modelType\":\"vnf\"," + + "\"modelVersion\":\"4.0\"}," + + "\"requestParameters\":{" + + "\"testApi\": \"VNF_API\", " + + "\"userParams\":[]" + + "}," + + "\"relatedInstanceList\":[" + + "{\"relatedInstance\":{" + + "\"instanceId\":\"f8791436-8d55-4fde-b4d5-72dd2cf13cfb\"," + + "\"modelInfo\":{" + + "\"modelVersionId\":\"6b528779-44a3-4472-bdff-9cd15ec93450\"," + + "\"modelName\":\"action-data\"," + + "\"modelInvariantId\":\"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0\"," + + "\"modelType\":\"service\"," + + "\"modelVersion\":\"1.0\"" + + "}}}]}}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfBase.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfBase.java new file mode 100644 index 000000000..0fcbb3fe0 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfBase.java @@ -0,0 +1,25 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateVnfBase extends PresetMSOBaseCreateInstancePost { + protected String serviceInstanceId; + + public PresetMSOCreateVnfBase(String requestId, String serviceInstanceId) { + super(requestId); + this.serviceInstanceId = serviceInstanceId; + } + + public PresetMSOCreateVnfBase(String requestId, String serviceInstanceId, String responseInstanceId) { + super(requestId, responseInstanceId); + this.serviceInstanceId = serviceInstanceId; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfGroup.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfGroup.java new file mode 100644 index 000000000..ac2d6f4b9 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfGroup.java @@ -0,0 +1,68 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateVnfGroup extends PresetMSOBaseCreateInstancePost { + private String serviceInstanceId; + private String modelInfo; + private String instanceName; + private boolean suppressRollback; + + public PresetMSOCreateVnfGroup(String instanceName, String vnfGroupRequestId, String groupModelInfo, String serviceInstanceId,boolean suppressRollback ) { + super(vnfGroupRequestId); + this.serviceInstanceId = serviceInstanceId; + this.modelInfo = groupModelInfo; + this.instanceName = instanceName; + this.suppressRollback = suppressRollback; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./instanceGroups"; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + modelInfo + + " \"requestInfo\": {" + + " \"instanceName\": \"" + instanceName + "\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": "+suppressRollback+"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"relatedInstanceList\": [" + + " {" + + " \"relatedInstance\": {" + + " \"instanceId\": \"" + serviceInstanceId + "\"," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelInvariantId\": \"7ee41ce4-4827-44b0-a48e-2707a59905d2\"," + + " \"modelVersionId\": \"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc\"," + + " \"modelName\": \"Grouping Service for Test\"," + + " \"modelVersion\": \"1.0\"" + + " }" + + " }" + + " }" + + " ]," + + " \"requestParameters\": {" + + " \"testApi\": \"VNF_API\", " + + " \"userParams\": []" + + " }" + + " }" + + "}"; + } + + //only modelType and modelVersionId are required by MSO fro create instance group + public static final String MODEL_INFO_0 = "" + + " \"modelInfo\": {" + + " \"modelType\": \"instanceGroup\"," + + " \"modelVersionId\": \"daeb6568-cef8-417f-9075-ed259ce59f48\"" + + " },"; + + public static final String MODEL_INFO_1 = "" + + " \"modelInfo\": {" + + " \"modelType\": \"instanceGroup\"," + + " \"modelVersionId\": \"c2b300e6-45de-4e5e-abda-3032bee2de56\"" + + " },"; + +} 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 new file mode 100644 index 000000000..9fd0a678f --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java @@ -0,0 +1,94 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateVnfVlanTagging extends PresetMSOBaseCreateInstancePost { + private final boolean ecompNamingEnabled; + private String serviceInstanceId; + private String serviceModelVersionId; + + public PresetMSOCreateVnfVlanTagging(String serviceInstanceId, String serviceModelVersionId, boolean ecompNamingEnabled) { + this.serviceInstanceId = serviceInstanceId; + this.serviceModelVersionId = serviceModelVersionId; + this.ecompNamingEnabled = ecompNamingEnabled; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs"; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"requestInfo\": {" + + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"instanceName\" : \"NewName\"," + +// addInstanceNameIfNeeded()+ + " \"requestorId\": \"us16807000\"" + + " }," + + " \"lineOfBusiness\": {" + + " \"lineOfBusinessName\": \"ECOMP\"" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"JANET25\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" + + " }," + + " \"platform\": {" + + " \"platformName\": \"xxx1\"" + + " }," + + " \"modelInfo\": {" + + " \"modelCustomizationId\": \"882e5dcb-ba9f-4766-8cde-e326638107db\"," + + " \"modelCustomizationName\": \"vDOROTHEA 0\"," + + " \"modelVersionId\": \"61535073-2e50-4141-9000-f66fea69b433\"," + + " \"modelName\": \"vDOROTHEA\"," + + " \"modelInvariantId\": \"fcdf49ce-6f0b-4ca2-b676-a484e650e734\"," + + " \"modelType\": \"vnf\"," + + " \"modelVersion\": \"0.2\"" + + " }," + + " \"requestParameters\": {" + + " \"userParams\": []," + + " \"testApi\": \"VNF_API\"" + + " }," + + " \"relatedInstanceList\": [{" + + " \"relatedInstance\": {" + + " \"instanceId\": \""+ serviceInstanceId +"\"," + + " \"modelInfo\": {" + + " \"modelVersionId\": \""+ serviceModelVersionId +"\"," + + " \"modelName\": \"vDOROTHEA_srv\"," + + " \"modelInvariantId\": \"9aa04749-c02c-432d-a90c-18caa361c833\"," + + " \"modelType\": \"service\"," + + " \"modelVersion\": \"1.0\"" + + " }" + + " }" + + " }, {" + + " \"relatedInstance\": {" + + " \"instanceId\": \"AAI-12002-test3-vm230w\"," + + " \"modelInfo\": {" + + " \"modelType\": \"networkInstanceGroup\"" + + " }" + + " }" + + " }, {" + + " \"relatedInstance\": {" + + " \"instanceId\": \"AAI-12002-test3-vm230w\"," + + " \"modelInfo\": {" + + " \"modelType\": \"networkInstanceGroup\"" + + " }" + + " }" + + " }" + + " ]" + + " }" + + "}"; + } + + private String addInstanceNameIfNeeded() { + return ecompNamingEnabled ? "": "\"instanceName\" : \"NewName\","; + } +} 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 new file mode 100644 index 000000000..ed5bee788 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java @@ -0,0 +1,78 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOCreateVolumeGroupOldViewEdit extends PresetMSOBaseCreateInstancePost { + private final String serviceInstanceId; + private final String vnfInstanceId; + private final String instanceName; + + public PresetMSOCreateVolumeGroupOldViewEdit(String overrideRequestId, String responseInstanceId , + String serviceInstanceId, String vnfInstanceId, + String instanceName, String msoTestApi) { + super(overrideRequestId, responseInstanceId, msoTestApi); + this.serviceInstanceId = serviceInstanceId; + this.vnfInstanceId = vnfInstanceId; + this.instanceName = instanceName; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/"+vnfInstanceId+"/volumeGroups"; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"requestInfo\": {" + + " \"instanceName\": \""+instanceName+"\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"mo37915000\"" + + " }," + + " \"modelInfo\": {" + + " \"modelType\": \"volumeGroup\"," + + " \"modelInvariantId\": \"6931e88a-fbcc-4ca9-8583-876b669c3106\"," + + " \"modelVersionId\": \"13f022c4-651e-4326-b8e1-61e9a8c7a7ad\"," + + " \"modelName\": \"Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3\"," + + " \"modelVersion\": \"1\"," + + " \"modelCustomizationId\": \"020af091-cc66-46db-876c-02f14b4a795f\"," + + " \"modelCustomizationName\": \"Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3\"" + + " }," + + " \"requestParameters\": {" + + addTestApi() + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"some legacy region\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" + + " }," + + " \"relatedInstanceList\": [{" + + " \"relatedInstance\": {" + + " \"instanceId\": \""+serviceInstanceId+"\"," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelName\": \"ServicevWINIFREDPID298109\"," + + " \"modelInvariantId\": \"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelVersionId\": \"aa2f8e9c-9e47-4b15-a95c-4a93855ac61b\"" + + " }" + + " }" + + " }, {" + + " \"relatedInstance\": {" + + " \"instanceId\": \""+vnfInstanceId+"\"," + + " \"modelInfo\": {" + + " \"modelType\": \"vnf\"," + + " \"modelName\": \"VSP1710PID298109_vWINIFRED\"," + + " \"modelInvariantId\": \"e7961100-cde6-4b5a-bcda-b8945086950a\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelVersionId\": \"959a7ba0-89ee-4984-9af6-65d5bdda4b0e\"," + + " \"modelCustomizationId\": \"6b8fc7dc-2db1-4283-a222-b07d10595495\"," + + " \"modelCustomizationName\": \"VSP1710PID298109_vWINIFRED 0\"" + + " }" + + " }" + + " }" + + " ]" + + " }" + + "}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeactivateAndCloudDelete.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeactivateAndCloudDelete.java new file mode 100644 index 000000000..04d7522a3 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeactivateAndCloudDelete.java @@ -0,0 +1,70 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; + +public class PresetMSODeactivateAndCloudDelete extends BaseMSOPreset { + private final String serviceInstanceId; + private final String vnfInstanceId; + private final String vfModuleInstanceId; + private final String requestId; + public static final String DEFAULT_SERVICE_INSTANCE_ID = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; + public static final String DEFAULT_REQUEST_ID = "318cc766-b673-4a50-b9c5-471f68914584"; + + public PresetMSODeactivateAndCloudDelete(String serviceInstanceId, String vnfInstanceId, String vfModuleInstanceId, String requestId, String cloudOwner) { + this.serviceInstanceId = serviceInstanceId != null ? serviceInstanceId : DEFAULT_SERVICE_INSTANCE_ID; + this.vnfInstanceId = vnfInstanceId; + this.vfModuleInstanceId = vfModuleInstanceId; + this.requestId = requestId != null ? requestId : DEFAULT_REQUEST_ID; + this.cloudOwner = cloudOwner; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModules/" + vfModuleInstanceId + "/deactivateAndCloudDelete"; + } + + @Override + public String getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelType\": \"vfModule\"" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"hvf6\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"requestParameters\": { " + + " \"testApi\": \"GR_API\", " + + " \"userParams\": [] " + + " } " + + " }" + + "}"; + } + + @Override + public Object getResponseBody() { + return "{\"requestReferences\":{\"instanceId\":\"" + serviceInstanceId + "\",\"requestId\":\"" + requestId + "\"}}"; + } + + @Override + public int getResponseCode() { + return 202; + } + + @Override + public boolean isStrictMatch() { + return true; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeactivateAndCloudDeleteErrorResponse.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeactivateAndCloudDeleteErrorResponse.java new file mode 100644 index 000000000..fc19aed9d --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeactivateAndCloudDeleteErrorResponse.java @@ -0,0 +1,70 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; + +public class PresetMSODeactivateAndCloudDeleteErrorResponse extends BaseMSOPreset { + private final String serviceInstanceId; + private final String vnfInstanceId; + private final String vfModuleInstanceId; + private final int errorCode; + public static final String DEFAULT_SERVICE_INSTANCE_ID = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; + public static final String DEFAULT_REQUEST_ID = "318cc766-b673-4a50-b9c5-471f68914584"; + + public PresetMSODeactivateAndCloudDeleteErrorResponse(String serviceInstanceId, String vnfInstanceId, String vfModuleInstanceId, int errorCode, String cloudOwner) { + this.serviceInstanceId = serviceInstanceId != null ? serviceInstanceId : DEFAULT_SERVICE_INSTANCE_ID; + this.vnfInstanceId = vnfInstanceId; + this.vfModuleInstanceId = vfModuleInstanceId; + this.errorCode = errorCode > 0 ? errorCode : 500; + this.cloudOwner = cloudOwner; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModules/" + vfModuleInstanceId + "/deactivateAndCloudDelete"; + } + + @Override + public String getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelType\": \"vfModule\"" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"hvf6\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"requestParameters\": { " + + " \"testApi\": \"GR_API\", " + + " \"userParams\": [] " + + " } " + + " }" + + "}"; + } + + @Override + public Object getResponseBody() { + return "{\"error\":\"222\",\"message\":\"error message\"}"; + } + + @Override + public int getResponseCode() { + return errorCode; + } + + @Override + public boolean isStrictMatch() { + return true; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteALaCarteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteALaCarteService.java new file mode 100644 index 000000000..b20d462e6 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteALaCarteService.java @@ -0,0 +1,58 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.springframework.http.HttpMethod; + +public class PresetMSODeleteALaCarteService extends PresetMSODeleteService { + + private final int responseCode; + + public PresetMSODeleteALaCarteService(String requestId, String serviceInstanceId) { + super(requestId, serviceInstanceId); + responseCode = 202; + } + + public PresetMSODeleteALaCarteService(String requestId, String serviceInstanceId, int responseCode) { + super(requestId, serviceInstanceId); + this.responseCode = responseCode; + } + + @Override + public int getResponseCode() { + return responseCode; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelInvariantId\": \"7ee41ce4-4827-44b0-a48e-2707a59905d2\"," + + " \"modelVersionId\": \"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc\"," + + " \"modelName\": \"Grouping Service for Test\"," + + " \"modelType\": \"service\"," + + " \"modelVersion\": \"1.0\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"requestParameters\": {" + + " \"testApi\": \"VNF_API\","+ + " \"aLaCarte\": true" + + " }" + + " }" + + "}"; + + } + + @Override + protected String getRootPath() { + return "/mso/serviceInstantiation/v./serviceInstances/"; + + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.DELETE; + } +} 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 new file mode 100644 index 000000000..fc9cc3c5c --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java @@ -0,0 +1,38 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSODeleteBaseVfModuleCypress extends PresetMSODeleteVfModule { + + public PresetMSODeleteBaseVfModuleCypress() { + super(null, null, null, null); + } + + public PresetMSODeleteBaseVfModuleCypress(String requestId, String serviceInstanceId, String vnfInstanceId, String vfModuleInstanceId) { + super(requestId, serviceInstanceId, vnfInstanceId, vfModuleInstanceId); + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\":{" + + " \"modelInfo\":{" + + " \"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\"," + + " \"modelType\":\"vfModule\"," + + " \"modelVersion\":\"5\"" + + " }," + + " \"cloudConfiguration\":{" + + " \"lcpCloudRegionId\":\"JANET25\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"," + + " }," + + " \"requestInfo\":{" + + " \"source\":\"VID\"," + + " \"requestorId\":\"us16807000\"" + + " }" + + " }" + + "}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteGroupMembers.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteGroupMembers.java new file mode 100644 index 000000000..670e9a5e8 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteGroupMembers.java @@ -0,0 +1,51 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import com.google.common.collect.ImmutableList; +import org.springframework.http.HttpMethod; + +import static java.util.stream.Collectors.joining; + +public class PresetMSODeleteGroupMembers extends PresetMSOBaseCreateInstancePost { + + + private final ImmutableList<String> groupMembersInstanceIds; + + public PresetMSODeleteGroupMembers(String vnfGroupInstanceId, ImmutableList<String> groupMembersInstanceIds, String requestId) { + super(requestId, vnfGroupInstanceId); + this.groupMembersInstanceIds = groupMembersInstanceIds; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./instanceGroups/" + responseInstanceId + "/removeMembers"; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"relatedInstanceList\": [" + + groupMembersInstanceIds.stream().map(groupMemberInstanceId -> + " { " + + " \"relatedInstance\": { " + + " \"instanceId\": \""+ groupMemberInstanceId +"\"," + + " \"modelInfo\": {" + + " \"modelType\": \"vnf\"" + + " }" + + " }" + + " }").collect(joining(", ")) + + " ]" + + " }" + + "}" ; + } + +} 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 new file mode 100644 index 000000000..9174cd2bb --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java @@ -0,0 +1,28 @@ +package org.onap.simulator.presetGenerator.presets.mso; + + +import java.util.Map; + +public class PresetMSODeleteInstanceGroup extends PresetMSOBaseDelete { + + private final String userId; + + public PresetMSODeleteInstanceGroup(String requestId, String instanceId, String userId) { + super(requestId, instanceId); + this.userId = userId; + } + + @Override + public String getReqPath() { + return "/mso/serviceInstantiation/v./instanceGroups/"+instanceId; + } + + @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/PresetMSODeleteInstanceOrchestrationRequestGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceOrchestrationRequestGet.java index bfe3a24c5..3d6770518 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceOrchestrationRequestGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceOrchestrationRequestGet.java @@ -30,7 +30,7 @@ public class PresetMSODeleteInstanceOrchestrationRequestGet extends BaseMSOPrese } public String getReqPath() { - return getRootPath() + "/orchestrationRequests/v5/" + requestId; + return getRootPath() + "/orchestrationRequests/v./" + requestId; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteNetwork.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteNetwork.java index 426dec3d9..f45569448 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteNetwork.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteNetwork.java @@ -1,6 +1,6 @@ package org.onap.simulator.presetGenerator.presets.mso; -public class PresetMSODeleteNetwork extends PresetMSOBaseDelete { +public class PresetMSODeleteNetwork extends PresetMSOBaseDeleteWithCloudConfiguration { private final String serviceInstanceId; private final String networkInstanceId; public static final String DEFAULT_SERVICE_INSTANCE_ID = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; @@ -11,13 +11,13 @@ public class PresetMSODeleteNetwork extends PresetMSOBaseDelete { } public PresetMSODeleteNetwork(String requestId, String serviceInstanceId, String networkInstanceId) { - super(requestId); + super(requestId, "network"); this.serviceInstanceId = serviceInstanceId != null ? serviceInstanceId : DEFAULT_SERVICE_INSTANCE_ID; this.networkInstanceId = networkInstanceId != null ? networkInstanceId : DEFAULT_NETWORK_INSTANCE_ID; } @Override public String getReqPath() { - return getRootPath() + serviceInstanceId + "/networks/" + networkInstanceId; + return "/mso/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/networks/" + networkInstanceId; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteNetworkAlaCarteCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteNetworkAlaCarteCypress.java new file mode 100644 index 000000000..23710f19a --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteNetworkAlaCarteCypress.java @@ -0,0 +1,56 @@ +package org.onap.simulator.presetGenerator.presets.mso; + + +public class PresetMSODeleteNetworkAlaCarteCypress extends PresetMSOBaseDelete { + + private final String userId; + private final String serviceInstanceId; + private final String networkInstanceId; + + public PresetMSODeleteNetworkAlaCarteCypress(String requestId, String serviceInstanceId, String networkInstanceId, String userId) { + super(requestId, networkInstanceId); + this.userId = userId; + this.serviceInstanceId = serviceInstanceId; + this.networkInstanceId = networkInstanceId; + } + + @Override + public String getReqPath() { + return "/mso/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/networks/" + networkInstanceId; + } +// +// @Override +// public Map<String, String> getRequestHeaders() { +// Map<String, String> map = super.getRequestHeaders(); +// map.put("X-RequestorID", userId); +// return map; +// +// } + + @Override + public String getRequestBody() { + return "{" + + " \"requestDetails\":{" + + " \"modelInfo\":{" + + " \"modelInvariantId\":\"379f816b-a7aa-422f-be30-17114ff50b7c\",\n" + + " \"modelVersionId\":\"ddc3f20c-08b5-40fd-af72-c6d14636b986\",\n" + + " \"modelName\":\"ExtVL\",\n" + + " \"modelVersion\":\"37.0\",\n" + + " \"modelType\":\"network\",\n" + + " \"modelCustomizationId\":\"94fdd893-4a36-4d70-b16a-ec29c54c184f\",\n" + + " \"modelCustomizationName\":\"ExtVL 0\"" + + " }," + + " \"cloudConfiguration\":{" + + " \"lcpCloudRegionId\":\"hvf6\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\":\"229bcdc6eaeb4ca59d55221141d01f8e\"" + + " }," + + " \"requestInfo\":{" + + " \"source\":\"VID\"," + + " \"requestorId\":\"" + userId + "\"" + + " }" + + " }" + + "}"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModule.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModule.java index 76487edf5..85ee1a8be 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModule.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModule.java @@ -1,6 +1,6 @@ package org.onap.simulator.presetGenerator.presets.mso; -public class PresetMSODeleteVfModule extends PresetMSOBaseDelete { +public class PresetMSODeleteVfModule extends PresetMSOBaseDeleteWithCloudConfiguration { private final String serviceInstanceId; private final String vnfInstanceId; private final String vfModuleInstanceId; @@ -13,7 +13,7 @@ public class PresetMSODeleteVfModule extends PresetMSOBaseDelete { } public PresetMSODeleteVfModule(String requestId, String serviceInstanceId, String vnfInstanceId, String vfModuleInstanceId) { - super(requestId); + super(requestId, "vfModule"); this.serviceInstanceId = serviceInstanceId != null ? serviceInstanceId : DEFAULT_SERVICE_INSTANCE_ID; this.vnfInstanceId = vnfInstanceId != null ? vnfInstanceId : DEFAULT_VNF_INSTANCE_ID; this.vfModuleInstanceId = vfModuleInstanceId != null ? vfModuleInstanceId : DEFAULT_VFMODULE_INSTANCE_ID; 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 new file mode 100644 index 000000000..d4a21cc36 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java @@ -0,0 +1,38 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSODeleteVfModuleCypress extends PresetMSODeleteVfModule { + + public PresetMSODeleteVfModuleCypress() { + super(null, null, null, null); + } + + public PresetMSODeleteVfModuleCypress(String requestId, String serviceInstanceId, String vnfInstanceId, String vfModuleInstanceId) { + super(requestId, serviceInstanceId, vnfInstanceId, vfModuleInstanceId); + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\":{" + + " \"modelInfo\":{" + + " \"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\"," + + " \"modelType\":\"vfModule\"," + + " \"modelVersion\":\"6\"" + + " }," + + " \"cloudConfiguration\":{" + + " \"lcpCloudRegionId\":\"JANET25\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"," + + " }," + + " \"requestInfo\":{" + + " \"source\":\"VID\"," + + " \"requestorId\":\"us16807000\"" + + " }" + + " }" + + "}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVnf.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVnf.java index 83c9883f8..f1142523d 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVnf.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVnf.java @@ -1,6 +1,6 @@ package org.onap.simulator.presetGenerator.presets.mso; -public class PresetMSODeleteVnf extends PresetMSOBaseDelete { +public class PresetMSODeleteVnf extends PresetMSOBaseDeleteWithCloudConfiguration { private final String serviceInstanceId; private final String vnfInstanceId; public static final String DEFAULT_SERVICE_INSTANCE_ID = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; @@ -11,7 +11,7 @@ public class PresetMSODeleteVnf extends PresetMSOBaseDelete { } public PresetMSODeleteVnf(String requestId, String serviceInstanceId, String vnfInstanceId) { - super(requestId); + super(requestId, "vnf"); this.serviceInstanceId = serviceInstanceId != null ? serviceInstanceId : DEFAULT_SERVICE_INSTANCE_ID; this.vnfInstanceId = vnfInstanceId != null ? vnfInstanceId : DEFAULT_VNF_INSTANCE_ID; } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVnfAlaCarteCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVnfAlaCarteCypress.java new file mode 100644 index 000000000..bb33bbe2a --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVnfAlaCarteCypress.java @@ -0,0 +1,48 @@ +package org.onap.simulator.presetGenerator.presets.mso; + + +public class PresetMSODeleteVnfAlaCarteCypress extends PresetMSOBaseDelete { + + private final String userId; + private final String serviceInstanceId; + private final String vnfInstanceId; + + public PresetMSODeleteVnfAlaCarteCypress(String requestId, String serviceInstanceId, String vnfInstanceId, String userId) { + super(requestId, vnfInstanceId); + this.userId = userId; + this.serviceInstanceId = serviceInstanceId; + this.vnfInstanceId = vnfInstanceId; + } + + @Override + public String getReqPath() { + return "/mso/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId; + } + + @Override + public String getRequestBody() { + return "{" + + " \"requestDetails\":{" + + " \"modelInfo\":{" + + " \"modelInvariantId\":\"72e465fe-71b1-4e7b-b5ed-9496118ff7a8\",\n" + + " \"modelVersionId\":\"69e09f68-8b63-4cc9-b9ff-860960b5db09\",\n" + + " \"modelName\":\"2017-488_PASQUALE-vPE\",\n" + + " \"modelVersion\":\"5.0\",\n" + + " \"modelType\":\"vnf\",\n" + + " \"modelCustomizationId\":\"1da7b585-5e61-4993-b95e-8e6606c81e45\",\n" + + " \"modelCustomizationName\":\"2017-488_PASQUALE-vPE 0\"" + + " }," + + " \"cloudConfiguration\":{" + + " \"lcpCloudRegionId\":\"some legacy region\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"" + + " }," + + " \"requestInfo\":{" + + " \"source\":\"VID\"," + + " \"requestorId\":\"" + userId + "\"" + + " }" + + " }" + + "}"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVolumeGroup.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVolumeGroup.java index d9598b20d..964d37e84 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVolumeGroup.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVolumeGroup.java @@ -1,6 +1,6 @@ package org.onap.simulator.presetGenerator.presets.mso; -public class PresetMSODeleteVolumeGroup extends PresetMSOBaseDelete { +public class PresetMSODeleteVolumeGroup extends PresetMSOBaseDeleteWithCloudConfiguration { private final String serviceInstanceId; private final String vnfInstanceId; private final String volumeGroupInstanceId; @@ -13,7 +13,7 @@ public class PresetMSODeleteVolumeGroup extends PresetMSOBaseDelete { } public PresetMSODeleteVolumeGroup(String requestId, String serviceInstanceId, String vnfInstanceId, String volumeGroupInstanceId) { - super(requestId); + super(requestId, "volumeGroup"); this.serviceInstanceId = serviceInstanceId != null ? serviceInstanceId : DEFAULT_SERVICE_INSTANCE_ID; this.vnfInstanceId = vnfInstanceId != null ? vnfInstanceId : DEFAULT_VNF_INSTANCE_ID; this.volumeGroupInstanceId = volumeGroupInstanceId != null ? volumeGroupInstanceId : DEFAULT_VG_INSTANCE_ID; @@ -23,4 +23,10 @@ public class PresetMSODeleteVolumeGroup extends PresetMSOBaseDelete { public String getReqPath() { return getRootPath() + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/volumeGroups/" + volumeGroupInstanceId; } + + //remove this method once VfModule path starts with /serviceInstantiation/v7/ + @Override + protected String getRootPath() { + return "/mso/serviceInstances/v7/"; + } } 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 dcf1a054d..381ac856b 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,21 +1,35 @@ package org.onap.simulator.presetGenerator.presets.mso; 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 java.time.Instant; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; + /** * Created by itzikliderman on 13/12/2017. */ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { + private static final Logger logger = LogManager.getLogger(PresetMSOOrchestrationRequestGet.class); + + public static final String COMPLETE = "COMPLETE"; + public static final String DEFAULT_REQUEST_ID = "c0011670-0e1a-4b74-945d-8bf5aede1d9c"; + public static final String DEFAULT_SERVICE_INSTANCE_ID = BaseMSOPreset.DEFAULT_INSTANCE_ID; - private final String DEFAULT_REQUEST_ID = "c0011670-0e1a-4b74-945d-8bf5aede1d9c"; private final String requestId; private String statusMessage; - String requestState; + private String requestState; + private int startedHoursAgo = 1; + public PresetMSOOrchestrationRequestGet() { - requestState = "COMPLETE"; + requestState = COMPLETE; this.requestId = DEFAULT_REQUEST_ID; } @@ -35,25 +49,38 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { this.statusMessage = statusMessage; } + public PresetMSOOrchestrationRequestGet(String requestState, String overrideRequestId, String statusMessage, int startedHoursAgo) { + this.requestState = requestState; + this.requestId = overrideRequestId; + this.statusMessage = statusMessage; + this.startedHoursAgo = startedHoursAgo; + } + + public PresetMSOOrchestrationRequestGet(String requestState, int startedHoursAgo) { + this.requestState = requestState; + this.requestId = DEFAULT_REQUEST_ID; + this.startedHoursAgo = startedHoursAgo; + } + @Override public HttpMethod getReqMethod() { return HttpMethod.GET; } public String getReqPath() { - return getRootPath() + "/orchestrationRequests/v5/" + requestId; + return getRootPath() + "/orchestrationRequests/v./" + requestId; } @Override public Object getResponseBody() { - return "{" + + String body = "{" + " \"request\": {" + " \"requestId\": \"" + requestId + "\"," + - " \"startTime\": \"Mon, 11 Dec 2017 07:27:49 GMT\"," + + " \"startTime\": \"" + getTimeHoursAgo(startedHoursAgo) + "\"," + " \"requestScope\": \"service\"," + " \"requestType\": \"createInstance\"," + " \"instanceReferences\": {" + - " \"serviceInstanceId\": \"f8791436-8d55-4fde-b4d5-72dd2cf13cfb\"," + + " \"serviceInstanceId\": \"" + DEFAULT_SERVICE_INSTANCE_ID + "\"," + " \"serviceInstanceName\": \"asdfasdf234234asdf\"," + " \"requestorId\": \"il883e\"" + " }," + @@ -61,17 +88,30 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { " \"requestState\": \"" + requestState + "\"," + " \"statusMessage\": \"" + getStatusMessage() + "\"," + " \"percentProgress\": 100," + - " \"finishTime\": \"Mon, 11 Dec 2017 07:27:53 GMT\"" + + " \"timestamp\": \"" + getTimeNow() + "\"" + " }" + " }" + "}"; + logger.info(body); + return body; } private String getStatusMessage() { - if (!StringUtils.isEmpty(statusMessage)) - return statusMessage; - return "COMPLETE".equals(requestState) ? - "Service Instance was created successfully." : - ("Service Instance was " + requestState.toLowerCase() + " successfully."); + return StringUtils.defaultIfEmpty(statusMessage, + "COMPLETE".equals(requestState) ? + "Service Instance was created successfully." : + ("Service Instance was " + requestState.toLowerCase() + " successfully.")); + } + + private String getTimeNow() { + return getTimeHoursAgo(0); + } + + private String getTimeHoursAgo(int delta) { + Instant instant = Instant.now(); + Instant instantMinus = instant.minus(delta, ChronoUnit.HOURS); + ZonedDateTime dateDayAgo = ZonedDateTime.ofInstant(instantMinus, ZoneOffset.UTC); + DateTimeFormatter formatter = DateTimeFormatter.RFC_1123_DATE_TIME; + return formatter.format(dateDayAgo); } } 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 new file mode 100644 index 000000000..3d83ca55d --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java @@ -0,0 +1,179 @@ +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; + +public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extends BaseMSOPreset { + + public PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork(ResponseDetails parentDetails, ResponseDetails childDetails, String parentInstanceId) { + this.parentDetails = parentDetails; + this.childDetails = childDetails; + this.parentInstanceId = parentInstanceId; + } + + public static class ResponseDetails { + public final String instanceName; + public final String requestId; + public final String status; + public final String type; + + public ResponseDetails(String instanceName, String requestId, String status, String type) { + this.instanceName = instanceName; + this.requestId = requestId; + this.status = status; + this.type = type; + } + } + + protected final ResponseDetails parentDetails; + protected final ResponseDetails childDetails; + protected final String parentInstanceId; + + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/orchestrationRequests/v."; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("filter", singletonList("serviceInstanceId:EQUALS:"+ parentInstanceId)); + } + + @Override + public Object getResponseBody() { + return "{" + + " \"requestList\": [{" + + " \"request\": {" + + " \"requestId\": \""+ parentDetails.requestId+"\"," + + " \"startTime\": \"Mon, 05 Nov 2018 09:22:23 GMT\"," + + " \"requestScope\": \""+ parentDetails.type+"\"," + + " \"requestType\": \"createInstance\"," + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelInvariantId\": \"1469946d-d566-467e-867b-88b29f6cb6c7\"," + + " \"modelType\": \""+ parentDetails.type+"\"," + + " \"modelName\": \"FCGI_5G_NC\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelVersionId\": \"ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1\"," + + " \"modelUuid\": \"ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1\"," + + " \"modelInvariantUuid\": \"1469946d-d566-467e-867b-88b29f6cb6c7\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"instanceName\": \""+ parentDetails.instanceName+"\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"subscriberInfo\": {" + + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }," + + " \"requestParameters\": {" + + " \"subscriptionServiceType\": \"TYLER SILVIA\"," + + " \"aLaCarte\": true," + + " \"testApi\": \"VNF_API\"" + + " }," + + " \"project\": {" + + " \"projectName\": \"DFW\"" + + " }," + + " \"owningEntity\": {" + + " \"owningEntityId\": \"3f592a6f-459b-435e-b0d4-59959ab1d385\"," + + " \"owningEntityName\": \"own1\"" + + " }" + + " }," + + " \"instanceReferences\": {" + + " \""+parentDetails.type+"InstanceId\": \"f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb\"," + + " \""+parentDetails.type+"InstanceName\": \""+parentDetails.instanceName+"\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"requestStatus\": {" + + " \"requestState\": \""+ parentDetails.status+"\"," + + " \"statusMessage\": \"STATUS: "+parentDetails.type+" Instance was created successfully.\"," + + " \"percentProgress\": 100," + + " \"finishTime\": \"Wed, 07 Nov 2018 09:22:35 GMT\"" + + " }" + + " }" + + " }, {" + + " \"request\": {" + + " \"requestId\": \""+childDetails.requestId+"\"," + + " \"startTime\": \"Mon, 05 Nov 2018 09:22:41 GMT\"," + + " \"requestScope\": \""+childDetails.type+"\"," + + " \"requestType\": \"createInstance\"," + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelCustomizationName\": \"FCGI 0\"," + + " \"modelInvariantId\": \"ba2ee320-23ce-4d2e-94dd-1ec450cec62c\"," + + " \"modelType\": \""+childDetails.type+"\"," + + " \"modelName\": \"FCGI\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelCustomizationUuid\": \"de9b7aea-9727-4a7c-8e72-292263fb61a9\"," + + " \"modelVersionId\": \"0d23f7bc-eee4-4151-9fb9-37f5bea834c2\"," + + " \"modelCustomizationId\": \"de9b7aea-9727-4a7c-8e72-292263fb61a9\"," + + " \"modelUuid\": \"0d23f7bc-eee4-4151-9fb9-37f5bea834c2\"," + + " \"modelInvariantUuid\": \"ba2ee320-23ce-4d2e-94dd-1ec450cec62c\"," + + " \"modelInstanceName\": \"FCGI 0\"" + + " }," + + " \"requestInfo\": {" + + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"source\": \"VID\"," + + " \"instanceName\": \""+childDetails.instanceName+"\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"relatedInstanceList\": [{" + + " \"relatedInstance\": {" + + " \"instanceId\": \"f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb\"," + + " \"modelInfo\": {" + + " \"modelInvariantId\": \"1469946d-d566-467e-867b-88b29f6cb6c7\"," + + " \"modelType\": \"service\"," + + " \"modelName\": \"FCGI_5G_NC\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelVersionId\": \"ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1\"," + + " \"modelUuid\": \"ed2a3691-c3f3-4ac3-98b3-b0b12acfd1b1\"," + + " \"modelInvariantUuid\": \"1469946d-d566-467e-867b-88b29f6cb6c7\"" + + " }" + + " }" + + " }" + + " ]," + + " \"cloudConfiguration\": {" + + " \"tenantId\": \"460f35aeb53542dc9f77105066483e83\"," + + " \"cloudOwner\": \"irma-aic\"," + + " \"lcpCloudRegionId\": \"olson5b\"" + + " }," + + " \"requestParameters\": {}," + + " \"platform\": {" + + " \"platformName\": \"plat1\"" + + " }," + + " \"lineOfBusiness\": {" + + " \"lineOfBusinessName\": \"ECOMP\"" + + " }" + + " }," + + " \"instanceReferences\": {" + + " \""+parentDetails.type+"InstanceId\": \"f4c4d4f7-311b-4ecb-bb86-eb3138aac0fb\"," + + " \""+childDetails.type+"InstanceId\": \"2f668980-7dbc-4231-a67c-8b69cd266b3a\"," + + " \""+childDetails.type+"InstanceName\": \""+childDetails.instanceName+"\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"requestStatus\": {" + + " \"requestState\": \""+childDetails.status+"\"," + + " \"statusMessage\": \"STATUS: "+childDetails.type+" has been created successfully.\"," + + " \"percentProgress\": 100," + + " \"finishTime\": \"Wed, 07 Nov 2018 09:22:45 GMT\"" + + " }" + + " }" + + " }" + + " ]" + + "}"; + + } +} 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 new file mode 100644 index 000000000..69780d0aa --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java @@ -0,0 +1,85 @@ +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; + +public class PresetMSOOrchestrationRequestsGetByRequestId extends BaseMSOPreset { + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/orchestrationRequests/v."; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("filter", singletonList("requestId:EQUALS:405652f4-ceb3-4a75-9474-8aea71480a77")); + } + + @Override + public Object getResponseBody() { + return "" + + "{ " + + " \"requestList\": [{ " + + " \"request\": {" + + " \"requestId\": \"405652f4-ceb3-4a75-9474-8aea71480a77\"," + + " \"startTime\": \"Mon, 13 Aug 2018 18:13:28 GMT\"," + + " \"requestScope\": \"service\"," + + " \"requestType\": \"createInstance\"," + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelInvariantId\": \"c42c7d13-435e-4a38-84e5-158972673ff2\"," + + " \"modelType\": \"service\"," + + " \"modelName\": \"CGWY27-SVC\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelVersionId\": \"c0e6858a-e467-412c-9766-3872f03ac0ab\"," + + " \"modelUuid\": \"c0e6858a-e467-412c-9766-3872f03ac0ab\"," + + " \"modelInvariantUuid\": \"c42c7d13-435e-4a38-84e5-158972673ff2\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"cb4449\"" + + " }," + + " \"subscriberInfo\": {" + + " \"globalSubscriberId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" + + " }," + + " \"requestParameters\": {" + + " \"subscriptionServiceType\": \"Kennedy\"," + + " \"aLaCarte\": true," + + " \"testApi\": \"VNF_API\"" + + " }," + + " \"project\": {" + + " \"projectName\": \"Kennedy\"" + + " }," + + " \"owningEntity\": {" + + " \"owningEntityId\": \"10c645f5-9924-4b89-bec0-b17cf49d3cad\"," + + " \"owningEntityName\": \"EMANUEL-CORE\"" + + " }" + + " }," + + " \"instanceReferences\": {" + + " \"requestorId\": \"cb4449\"" + + " }," + + " \"requestStatus\": {" + + " \"requestState\": \"FAILED\"," + + " \"statusMessage\": \"Service Instance was failed.\"," + + " \"percentProgress\": 100," + + " \"finishTime\": \"Mon, 13 Aug 2018 18:13:39 GMT\"" + + " }" + + " }" + + "}" + + " ] " + + "} "; + + + } +} 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 new file mode 100644 index 000000000..58686f26b --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java @@ -0,0 +1,158 @@ +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; + +public class PresetMSOOrchestrationRequestsGetByServiceInstanceId extends BaseMSOPreset { + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/orchestrationRequests/v."; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("filter", singletonList("serviceInstanceId:EQUALS:bc305d54-75b4-431b-adb2-eb6b9e546014")); + } + + @Override + public Object getResponseBody() { + return "" + + "{ " + + " \"requestList\": [{ " + + " \"request\": {" + + " \"requestId\": \"405652f4-ceb3-4a75-9474-8aea71480a77\"," + + " \"startTime\": \"Mon, 13 Aug 2018 18:13:28 GMT\"," + + " \"requestScope\": \"service\"," + + " \"requestType\": \"createInstance\"," + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelInvariantId\": \"c42c7d13-435e-4a38-84e5-158972673ff2\"," + + " \"modelType\": \"service\"," + + " \"modelName\": \"CGWY27-SVC\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelVersionId\": \"c0e6858a-e467-412c-9766-3872f03ac0ab\"," + + " \"modelUuid\": \"c0e6858a-e467-412c-9766-3872f03ac0ab\"," + + " \"modelInvariantUuid\": \"c42c7d13-435e-4a38-84e5-158972673ff2\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"instanceName\": \"instance name 1\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"cb4449\"" + + " }," + + " \"subscriberInfo\": {" + + " \"globalSubscriberId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" + + " }," + + " \"requestParameters\": {" + + " \"subscriptionServiceType\": \"Kennedy\"," + + " \"aLaCarte\": true," + + " \"testApi\": \"VNF_API\"" + + " }," + + " \"project\": {" + + " \"projectName\": \"Kennedy\"" + + " }," + + " \"owningEntity\": {" + + " \"owningEntityId\": \"10c645f5-9924-4b89-bec0-b17cf49d3cad\"," + + " \"owningEntityName\": \"EMANUEL-CORE\"" + + " }" + + " }," + + " \"instanceReferences\": {" + + " \"serviceInstanceId\": \"64f3123a-f9a8-4591-b481-d662134bcb52\"," + + " \"serviceInstanceName\": \"CGWY27-SVC-olson5b\"," + + " \"requestorId\": \"cb4449\"" + + " }," + + " \"requestStatus\": {" + + " \"requestState\": \"COMPLETE\"," + + " \"statusMessage\": \"Service Instance was created successfully.\"," + + " \"percentProgress\": 100," + + " \"finishTime\": \"Mon, 13 Aug 2018 18:13:39 GMT\"" + + " }" + + " }" + + "},{" + + " \"request\":{" + + " \"requestId\":\"688d40cd-6bfd-4a4b-95f4-5e4ffa6d6fc5\"," + + " \"startTime\":\"Mon, 13 Aug 2018 18:15:14 GMT\"," + + " \"requestScope\":\"vnf\"," + + " \"requestType\":\"createInstance\"," + + " \"requestDetails\":{" + + " \"modelInfo\":{" + + " \"modelCustomizationName\":\"CGWY27-VF 0\"," + + " \"modelInvariantId\":\"8f508753-a546-48be-b931-2c949e215972\"," + + " \"modelType\":\"vnf\"," + + " \"modelName\":\"CGWY27-VF\"," + + " \"modelVersion\":\"1.0\"," + + " \"modelCustomizationUuid\":\"fa35ceb6-38de-428a-93b2-89be64c19f86\"," + + " \"modelVersionId\":\"4d279e16-de09-4108-b32f-82b05df2f41a\"," + + " \"modelCustomizationId\":\"fa35ceb6-38de-428a-93b2-89be64c19f86\"," + + " \"modelUuid\":\"4d279e16-de09-4108-b32f-82b05df2f41a\"," + + " \"modelInvariantUuid\":\"8f508753-a546-48be-b931-2c949e215972\"," + + " \"modelInstanceName\":\"CGWY27-VF 0\"" + + " }," + + " \"requestInfo\":{" + + " \"productFamilyId\":\"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"," + + " \"source\":\"VID\"," + + " \"instanceName\":\"instance name 2\"," + + " \"suppressRollback\":false," + + " \"requestorId\":\"cb4449\"" + + " }," + + " \"relatedInstanceList\":[" + + " {" + + " \"relatedInstance\":{" + + " \"instanceId\":\"64f3123a-f9a8-4591-b481-d662134bcb52\"," + + " \"modelInfo\":{" + + " \"modelInvariantId\":\"c42c7d13-435e-4a38-84e5-158972673ff2\"," + + " \"modelType\":\"service\"," + + " \"modelName\":\"CGWY27-SVC\"," + + " \"modelVersion\":\"1.0\"," + + " \"modelVersionId\":\"c0e6858a-e467-412c-9766-3872f03ac0ab\"," + + " \"modelUuid\":\"c0e6858a-e467-412c-9766-3872f03ac0ab\"," + + " \"modelInvariantUuid\":\"c42c7d13-435e-4a38-84e5-158972673ff2\"" + + " }" + + " }" + + " }" + + " ]," + + " \"cloudConfiguration\":{" + + " \"tenantId\":\"8830e9086a0f40cc9cf868e792602c4d\"," + + " \"lcpCloudRegionId\":\"olson5b\"" + + " }," + + " \"requestParameters\":{" + + " \"testApi\":\"VNF_API\"" + + " }," + + " \"platform\":{" + + " \"platformName\":\"AIC\"" + + " }," + + " \"lineOfBusiness\":{" + + " \"lineOfBusinessName\":\"EMANUEL-CONSUMER\"" + + " }" + + " }," + + " \"instanceReferences\":{" + + " \"serviceInstanceId\":\"64f3123a-f9a8-4591-b481-d662134bcb52\"," + + " \"vnfInstanceId\":\"96c98f10-d20a-47a9-a790-94e3ac3dfb7e\"," + + " \"vnfInstanceName\":\"zolson5bcgwy22\"," + + " \"requestorId\":\"cb4449\"" + + " }," + + " \"requestStatus\":{" + + " \"requestState\":\"COMPLETE\"," + + " \"statusMessage\":\"Vnf has been created successfully.\"," + + " \"percentProgress\":100," + + " \"finishTime\":\"Mon, 13 Aug 2018 18:15:23 GMT\"" + + " }" + + " }" + + "}"+ + " ] " + + "} "; + + + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsManyInstanceStatusesGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsManyInstanceStatusesGet.java new file mode 100644 index 000000000..63d6110ba --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsManyInstanceStatusesGet.java @@ -0,0 +1,160 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; + +import java.util.List; +import java.util.Map; + +import static java.util.Collections.singletonList; + +public class PresetMSOOrchestrationRequestsManyInstanceStatusesGet extends BaseMSOPreset { + + + private String instanceIdType; + + private String instanceType; + + + public PresetMSOOrchestrationRequestsManyInstanceStatusesGet(String instanceIdType, String instanceType) { + this.instanceIdType = instanceIdType; + this.instanceType = instanceType; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/orchestrationRequests/v."; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("filter", singletonList(instanceIdType+":EQUALS:df305d54-75b4-431b-adb2-eb6b9e5460df")); + } + + @Override + public Object getResponseBody() { + return "" + + "{ " + + " \"requestList\": [{ " + + " \"request\": { " + + " \"requestId\": \"28502bd2-3aff-4a03-9f2b-5a0d1cb1ca24\", " + + " \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\", " + + " \"instanceReferences\": { " + + " \"instanceGroupId\": \"df305d54-75b4-431b-adb2-eb6b9e5460df\" " + + " }, " + + " \"requestScope\": \""+instanceType+"\", " + + " \"requestType\": \"createInstance\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \""+instanceType+"\", " + + " \"modelVersionId\": \"ddcbbf3d-f2c1-4ca0-8852-76a807285efc\" " + + " }, " + + " \"requestInfo\": { " + + " \"instanceName\": \"groupTestName\", " + + " \"source\": \"VID\", " + + " \"suppressRollback\": true, " + + " \"requestorId\": \"ah2345\" " + + " } " + + " }, " + + " \"requestStatus\": { " + + " \"timestamp\": \"Thu, 04 Jun 2009 02:53:39 GMT\", " + + " \"requestState\": \"IN_PROGRESS\", " + + " \"statusMessage\": \""+instanceType+" instance creation\", " + + " \"percentProgress\": \"50\" " + + " } " + + " } " + + " }, { " + + " \"request\": { " + + " \"requestId\": \"28502bd2-3aff-4a03-9f2b-5a0d1cb1ca24\", " + + " \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\", " + + " \"instanceReferences\": { " + + " \"instanceGroupId\": \"df305d54-75b4-431b-adb2-eb6b9e5460df\" " + + " }, " + + " \"requestScope\": \""+instanceType+"\", " + + " \"requestType\": \"createInstance\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \""+instanceType+"\", " + + " \"modelVersionId\": \"ddcbbf3d-f2c1-4ca0-8852-76a807285efc\" " + + " }, " + + " \"requestInfo\": { " + + " \"instanceName\": \"groupTestName\", " + + " \"source\": \"VID\", " + + " \"suppressRollback\": true, " + + " \"requestorId\": \"ah2345\" " + + " } " + + " }, " + + " \"requestStatus\": { " + + " \"timestamp\": \"Thu, 04 Jun 2009 02:53:39 GMT\", " + + " \"requestState\": \"COMPLETE\", " + + " \"statusMessage\": \""+instanceType+" instance creation\", " + + " \"percentProgress\": \"100\" " + + " } " + + " } " + + " }, { " + + " \"request\": { " + + " \"requestId\": \"f711f0ff-24b6-4d7f-9314-4b4eae15f48c\", " + + " \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\", " + + " \"instanceReferences\": { " + + " \"instanceGroupId\": \"df305d54-75b4-431b-adb2-eb6b9e5460df\" " + + " }, " + + " \"requestScope\": \""+instanceType+"\", " + + " \"requestType\": \"deleteInstance\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \""+instanceType+"\", " + + " \"modelVersionId\": \"ddcbbf3d-f2c1-4ca0-8852-76a807285efc\" " + + " }, " + + " \"requestInfo\": { " + + " \"instanceName\": \"groupTestName\", " + + " \"source\": \"VID\", " + + " \"suppressRollback\": true, " + + " \"requestorId\": \"ah2345\" " + + " } " + + " }, " + + " \"requestStatus\": { " + + " \"timestamp\": \"Thu, 04 Jun 2009 02:53:39 GMT\", " + + " \"requestState\": \"IN_PROGRESS\", " + + " \"statusMessage\": \""+instanceType+" instance deletion\", " + + " \"percentProgress\": \"50\" " + + " } " + + " } " + + " }, { " + + " \"request\": { " + + " \"requestId\": \"f711f0ff-24b6-4d7f-9314-4b4eae15f48c\", " + + " \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\", " + + " \"instanceReferences\": { " + + " \"instanceGroupId\": \"df305d54-75b4-431b-adb2-eb6b9e5460df\" " + + " }, " + + " \"requestScope\": \""+instanceType+"\", " + + " \"requestType\": \"deleteInstance\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \""+instanceType+"\", " + + " \"modelVersionId\": \"ddcbbf3d-f2c1-4ca0-8852-76a807285efc\" " + + " }, " + + " \"requestInfo\": { " + + " \"instanceName\": \"groupTestName\", " + + " \"source\": \"VID\", " + + " \"suppressRollback\": true, " + + " \"requestorId\": \"ah2345\" " + + " } " + + " }, " + + " \"requestStatus\": { " + + " \"timestamp\": \"Thu, 04 Jun 2009 02:53:39 GMT\", " + + " \"requestState\": \"COMPLETE\", " + + " \"statusMessage\": \""+instanceType+" instance deletion\", " + + " \"percentProgress\": \"100\" " + + " } " + + " } " + + " } " + + " ] " + + "} "; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsManyStatusesGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsManyStatusesGet.java new file mode 100644 index 000000000..268103588 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsManyStatusesGet.java @@ -0,0 +1,210 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; + +import java.util.List; +import java.util.Map; + +import static java.util.Collections.singletonList; + +public class PresetMSOOrchestrationRequestsManyStatusesGet extends BaseMSOPreset { + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/orchestrationRequests/v."; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("filter", singletonList("requestExecutionDate:EQUALS:01-01-2100")); + } + + @Override + public Object getResponseBody() { + return "" + + "{ " + + " \"requestList\": [{ " + + " \"request\": { " + + " \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e333\", " + + " \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\", " + + " \"instanceReferences\": { " + + " \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\" " + + " }, " + + " \"requestScope\": \"vnf\", " + + " \"requestType\": \"updateInstance\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\", " + + " \"modelVersionId\": \"ab6478e4-ea33-3346-ac12-ab121484a333\", " + + " \"modelName\": \"WanBonding\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"subscriberInfo\": { " + + " \"globalSubscriberId\": \"C12345\", " + + " \"subscriberName\": \"General Electric Division 12\" " + + " }, " + + " \"requestInfo\": { " + + " \"instanceName\": \"WanBonding Service\", " + + " \"source\": \"VID\", " + + " \"suppressRollback\": true, " + + " \"requestorId\": \"ah2345\" " + + " }, " + + " \"requestParameters\": { " + + " \"subscriptionServiceType\": \"Trinity\" " + + " } " + + " }, " + + " \"requestStatus\": { " + + " \"timestamp\": \"Thu, 04 Jun 2009 02:53:39 GMT\", " + + " \"requestState\": \"Complete\", " + + " \"statusMessage\": \"Service created successfully\", " + + " \"percentProgress\": \"100\" " + + " } " + + " } " + + " }, { " + + " \"request\": { " + + " \"requestId\": \"25faf364-6031-4f58-9703-26955815562a\", " + + " \"startTime\": \"Thu, 30 Jun 2009 03:52:59 GMT\", " + + " \"instanceReferences\": { " + + " \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\" " + + " }, " + + " \"requestScope\": \"vnf\", " + + " \"requestType\": \"applyUpdatedConfig\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\", " + + " \"modelName\": \"WanBonding\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"requestInfo\": { " + + " \"source\": \"VID\" " + + " } " + + " }, " + + " \"requestStatus\": { " + + " \"timestamp\": \"Thu, 30 Jun 2009 03:53:39 GMT\", " + + " \"requestState\": \"IN_PROGRESS\", " + + " \"statusMessage\": \"\", " + + " \"percentProgress\": \"30\" " + + " } " + + " } " + + " }, { " + + " \"request\": { " + + " \"requestId\": \"eaee7411-9281-4c25-a65f-aad5a725a61a\", " + + " \"startTime\": \"Thu, 30 Jun 2009 03:52:59 GMT\", " + + " \"instanceReferences\": { " + + " \"serviceInstanceId\": \"28d8a15f-c32c-475f-a7ae-5d23f3caee0e\" " + + " }, " + + " \"requestScope\": \"vnf\", " + + " \"requestType\": \"applyUpdatedConfig\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\", " + + " \"modelName\": \"WanBonding\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"requestInfo\": { " + + " \"source\": \"VID\" " + + " } " + + " }, " + + " \"requestStatus\": { " + + " \"timestamp\": \"Thu, 30 Jun 2009 03:53:39 GMT\", " + + " \"requestState\": \"PENDING\", " + + " \"statusMessage\": \"\", " + + " \"percentProgress\": \"30\" " + + " } " + + " } " + + " }, { " + + " \"request\": { " + + " \"requestId\": \"da6c17ba-4e8c-4983-b000-e4dcdbb60a51\", " + + " \"startTime\": \"Thu, 30 Jun 2009 03:52:59 GMT\", " + + " \"instanceReferences\": { " + + " \"serviceInstanceId\": \"39b5f85b-60bd-4ca6-8586-8340182b89b7\" " + + " }, " + + " \"requestScope\": \"vnf\", " + + " \"requestType\": \"applyUpdatedConfig\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\", " + + " \"modelName\": \"WanBonding\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"requestInfo\": { " + + " \"source\": \"VID\" " + + " } " + + " }, " + + " \"requestStatus\": { " + + " \"timestamp\": \"Thu, 30 Jun 2009 03:53:39 GMT\", " + + " \"requestState\": \"PENDING_MANUAL_TASK\", " + + " \"statusMessage\": \"\", " + + " \"percentProgress\": \"30\" " + + " } " + + " } " + + " }, { " + + " \"request\": { " + + " \"requestId\": \"7d6b6261-bede-4bfb-bde3-f225d63ee315\", " + + " \"startTime\": \"Thu, 30 Jun 2009 03:52:59 GMT\", " + + " \"instanceReferences\": { " + + " \"serviceInstanceId\": \"d4f74570-a03b-40f6-abe1-e979467ebbc1\" " + + " }, " + + " \"requestScope\": \"vnf\", " + + " \"requestType\": \"applyUpdatedConfig\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\", " + + " \"modelName\": \"WanBonding\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"requestInfo\": { " + + " \"source\": \"VID\" " + + " } " + + " }, " + + " \"requestStatus\": { " + + " \"timestamp\": \"Thu, 30 Jun 2009 03:53:39 GMT\", " + + " \"requestState\": \"STAM STATE\", " + + " \"statusMessage\": \"MSO just had a bad day :-(\", " + + " \"percentProgress\": \"30\" " + + " } " + + " } " + + " }, { " + + " \"request\": { " + + " \"requestId\": \"08e4a296-2fac-49c9-8a29-90c7eeee5ac2\", " + + " \"startTime\": \"Thu, 30 Jun 2009 03:52:59 GMT\", " + + " \"instanceReferences\": { " + + " \"serviceInstanceId\": \"48962b01-f021-4f75-ad52-1d54b6ee0bdb\" " + + " }, " + + " \"requestScope\": \"vnf\", " + + " \"requestType\": \"applyUpdatedConfig\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\", " + + " \"modelName\": \"WanBonding\", " + + " \"modelVersion\": \"1.0\" " + + " }, " + + " \"requestInfo\": { " + + " \"source\": \"VID\" " + + " } " + + " }, " + + " \"requestStatus\": { " + + " \"timestamp\": \"Thu, 30 Jun 2009 03:53:39 GMT\", " + + " \"requestState\": \"FAILED\", " + + " \"statusMessage\": \"\", " + + " \"percentProgress\": \"30\" " + + " } " + + " } " + + " } " + + " ] " + + "} "; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsManyStatusesInvalidResponseGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsManyStatusesInvalidResponseGet.java new file mode 100644 index 000000000..10222fee8 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsManyStatusesInvalidResponseGet.java @@ -0,0 +1,19 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSOOrchestrationRequestsManyStatusesInvalidResponseGet extends PresetMSOOrchestrationRequestsManyStatusesGet { + private final int responseCode; + + public PresetMSOOrchestrationRequestsManyStatusesInvalidResponseGet(int responseCode) { + this.responseCode = responseCode; + } + + @Override + public int getResponseCode() { + return responseCode; + } + + @Override + public Object getResponseBody() { + return "this payload is an invalid json"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2ErrorResponse.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2ErrorResponse.java index 881cc4634..9997f0a6d 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2ErrorResponse.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2ErrorResponse.java @@ -1,6 +1,6 @@ package org.onap.simulator.presetGenerator.presets.mso; -public class PresetMSOServiceInstanceGen2ErrorResponse extends PresetMSOBaseCreateServiceInstancePost { +public class PresetMSOServiceInstanceGen2ErrorResponse extends PresetMSOBaseCreateInstancePost { private final int responseCode; @@ -15,7 +15,7 @@ public class PresetMSOServiceInstanceGen2ErrorResponse extends PresetMSOBaseCrea @Override public String getReqPath() { - return getRootPath() + "/serviceInstantiation/v7/serviceInstances/assign"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/assign"; } @Override 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 98187b9a2..b851da2d2 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,22 +1,55 @@ package org.onap.simulator.presetGenerator.presets.mso; -import java.util.Map; +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.*; +import java.util.Map; +import vid.automation.test.infra.Features; -public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBaseCreateServiceInstancePost{ +public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBaseCreateInstancePost { public enum Keys { - SERVICE_NAME, VNF_NAME, VFM_NAME1, VFM_NAME2, VG_NAME + SERVICE_NAME, VNF_NAME, VNF_NAME2, VFM_NAME1, VFM_NAME2, VG_NAME + , VNF_GROUP1_ACTION, RELATED_VNF1_ACTION, RELATED_VNF2_ACTION, } - private final Map<Keys, String> names; + protected final Map<Keys, String> names; - private final String suffix; + protected final String suffix; public PresetMSOServiceInstanceGen2WithNames(Map<Keys, String> names, int suffix) { + this(names, suffix, PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID); + } + + public PresetMSOServiceInstanceGen2WithNames(Map<Keys, String> names, int suffix, String requestId) { + super(requestId); + this.names = names; + this.suffix = formatSuffix(suffix); + } + + public PresetMSOServiceInstanceGen2WithNames(Map<Keys, String> names, int suffix, String requestId, String responseInstanceId) { + super(requestId, responseInstanceId); this.names = names; - this.suffix = "_" + String.format("%03d", suffix); + this.suffix = formatSuffix(suffix); + } + + @Override + public boolean isStrictMatch() { + return true; + } + + 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\"," + + " \"availability_zone_0\": \"mtpocdv-kvm-az01\"" + + "}"; } @Override @@ -45,7 +78,7 @@ public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBas " \"productFamilyId\": \"myProductFamilyId\"," + " \"source\": \"VID\"," + " \"suppressRollback\": false," + - " \"requestorId\": \"vid1\"" + + " \"requestorId\": \"us16807000\"" + " }," + " \"requestParameters\": {" + " \"subscriptionServiceType\": \"mySubType\"," + @@ -71,7 +104,8 @@ public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBas " \"modelType\": \"vnf\"" + " }," + " \"cloudConfiguration\": {" + - " \"lcpCloudRegionId\": \"mtn3\"," + + " \"lcpCloudRegionId\": \"hvf3\"," + + addCloudOwnerIfNeeded() + " \"tenantId\": \"greatTenant\"" + " }," + " \"platform\": {" + @@ -81,7 +115,7 @@ public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBas " \"lineOfBusinessName\": \"lineOfBusinessName\"" + " }," + " \"productFamilyId\": \"myProductFamilyId\"," + - " \"instanceParams\": []," + + " \"instanceParams\": ["+getVnfInstanceParams()+"]," + " \"vfModules\": [" + " {" + " \"modelInfo\": {" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoChangeManagementBase.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoChangeManagementBase.java new file mode 100644 index 000000000..758e15e6e --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoChangeManagementBase.java @@ -0,0 +1,28 @@ +package org.onap.simulator.presetGenerator.presets.mso.changeManagement; + +import org.apache.commons.lang3.StringUtils; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; + +public abstract class PresetMsoChangeManagementBase extends PresetMSOBaseCreateInstancePost { + + protected final String serviceInstanceId; + protected final String vnfInstanceId; + private final String actionName; + + public PresetMsoChangeManagementBase(String serviceInstanceId, String vnfInstanceId, String actionName) { + super(DEFAULT_REQUEST_ID, vnfInstanceId); + this.serviceInstanceId = serviceInstanceId; + this.vnfInstanceId = vnfInstanceId; + this.actionName = actionName; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/"+vnfInstanceId+ getReqPathTrailer(); + } + + protected String getReqPathTrailer() { + return StringUtils.isEmpty(actionName) ? "" : "/"+ actionName; + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoVnfInPlaceSoftwareUpdate.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoVnfInPlaceSoftwareUpdate.java new file mode 100644 index 000000000..897db26bd --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoVnfInPlaceSoftwareUpdate.java @@ -0,0 +1,37 @@ +package org.onap.simulator.presetGenerator.presets.mso.changeManagement; + +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.springframework.http.HttpMethod; + +public class PresetMsoVnfInPlaceSoftwareUpdate extends PresetMsoChangeManagementBase { + + public PresetMsoVnfInPlaceSoftwareUpdate(String serviceInstanceId, String vnfInstanceId) { + super(serviceInstanceId, vnfInstanceId, "inPlaceSoftwareUpdate"); + this.cloudOwner = PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"mdt1\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"88a6ca3ee0394ade9403f075db23167e\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"az2016\"" + + " }," + + " \"requestParameters\": {" + + " \"payload\": \"{\\\"existing_software_version\\\": \\\"3.1\\\", \\\"new_software_version\\\": \\\"3.2\\\", \\\"operations_timeout\\\": \\\"3600\\\"}\"" + + " }" + + " }" + + "}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoVnfReplace.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoVnfReplace.java new file mode 100644 index 000000000..cbdb8f5f6 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoVnfReplace.java @@ -0,0 +1,58 @@ +package org.onap.simulator.presetGenerator.presets.mso.changeManagement; + +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.springframework.http.HttpMethod; + +public class PresetMsoVnfReplace extends PresetMsoChangeManagementBase { + + public PresetMsoVnfReplace(String serviceInstanceId, String vnfInstanceId) { + super(serviceInstanceId, vnfInstanceId, "replace"); + this.cloudOwner = PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelType\": \"vnf\"," + + " \"modelInvariantId\": \"ff5256d1-5a33-55df-13ab-12abad84e7ff\"," + + " \"modelVersionId\": \"254583ad-b38c-498b-bdbd-b8de5e07541b\"," + + " \"modelName\": \"vSAMP12\"," + + " \"modelVersion\": \"2.0\"," + + " \"modelCustomizationId\": \"c539433a-84a6-4082-a12e-5c9b00c3b960\"" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"mdt1\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"88a6ca3ee0394ade9403f075db23167e\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"az2016\"" + + " }," + + " \"relatedInstanceList\": [{" + + " \"relatedInstance\": {" + + " \"instanceId\": \""+serviceInstanceId+"\"," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelInvariantId\": \"ff3514e3-5a33-55df-13ab-12abad84e7ff\"," + + " \"modelVersionId\": \"9ebb1521-2e74-47a4-aac7-e71a79f73a79\"," + + " \"modelName\": \"fakeModelName\"," + + " \"modelVersion\": \"2.0\"" + + " }" + + " }" + + " }" + + " ]," + + " \"requestParameters\": {" + + " \"rebuildVolumeGroups\": false" + + " }" + + " }" + + "}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoVnfUpdate.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoVnfUpdate.java new file mode 100644 index 000000000..dee516005 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/changeManagement/PresetMsoVnfUpdate.java @@ -0,0 +1,67 @@ +package org.onap.simulator.presetGenerator.presets.mso.changeManagement; + +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.springframework.http.HttpMethod; + +public class PresetMsoVnfUpdate extends PresetMsoChangeManagementBase { + + + public PresetMsoVnfUpdate(String serviceInstanceId, String vnfInstanceId) { + super(serviceInstanceId, vnfInstanceId, ""); + this.cloudOwner = PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.PUT; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelType\": \"vnf\"," + + " \"modelInvariantId\": \"ff5256d1-5a33-55df-13ab-12abad84e7ff\"," + + " \"modelVersionId\": \"254583ad-b38c-498b-bdbd-b8de5e07541b\"," + + " \"modelName\": \"vSAMP12\"," + + " \"modelVersion\": \"2.0\"," + + // TODO Ask ZITELLA, MICHAEL V if the field is mandatory. Vid currently not send it + //" \"modelCustomizationName\": \"vSAMP12 1\"," + + " \"modelCustomizationId\": \"c539433a-84a6-4082-a12e-5c9b00c3b960\"" + + " }," + + " \"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"mdt1\"," + + addCloudOwnerIfNeeded() + + " \"tenantId\": \"88a6ca3ee0394ade9403f075db23167e\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"az2016\"" + + " }," + + " \"relatedInstanceList\": [" + + " {" + + " \"relatedInstance\": {" + + " \"instanceId\": \""+serviceInstanceId+"\"," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelInvariantId\": \"ff3514e3-5a33-55df-13ab-12abad84e7ff\"," + + " \"modelVersionId\": \"9ebb1521-2e74-47a4-aac7-e71a79f73a79\"," + + " \"modelName\": \"fakeModelName\"," + + " \"modelVersion\": \"2.0\"" + + " }" + + " }" + + " }" + + " ]," + + " \"requestParameters\": {" + + " \"usePreload\": true" + + " }" + + "}}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java new file mode 100644 index 000000000..6c4b722d6 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOActOnConfiguration.java @@ -0,0 +1,70 @@ +package org.onap.simulator.presetGenerator.presets.mso.configuration; + +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; + +public class PresetMSOActOnConfiguration extends PresetMSOBaseCreateInstancePost { + + private final String action; + + public PresetMSOActOnConfiguration(String action) { + this.action = action; + this.cloudOwner = "att-nc"; + } + + public PresetMSOActOnConfiguration(String action, String requestId, String responseInstanceId) { + super(requestId, responseInstanceId); + this.action = action; + this.cloudOwner = "att-nc"; + } + + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/" + action; + } + + @Override + public Object getRequestBody() { + return "" + + "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelType\": \"configuration\"," + + " \"modelInvariantId\": \"model-invariant-id-9533\"," + + " \"modelVersionId\": \"model-version-id-9533\"," + + " \"modelCustomizationId\": \"08a181aa-72eb-435f-9593-e88a3ad0a86b\"" + + " }," + + " \"cloudConfiguration\": {" + + addCloudOwnerIfNeeded() + + " \"lcpCloudRegionId\": \"mdt1\"," + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"relatedInstanceList\": [{" + + " \"relatedInstance\": {" + + " \"instanceId\": \"c187e9fe-40c3-4862-b73e-84ff056205f6\"," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelInvariantId\": \"b7d923c9-6175-41f1-91ba-4565c4953408\"," + + " \"modelVersionId\": \"ee6d61be-4841-4f98-8f23-5de9da846ca7\"," + + " \"modelName\": \"ServiceContainerMultiplepProbes\"," + + " \"modelVersion\": \"1.0\"" + + " }" + + " }" + + " }" + + " ]," + + " \"requestParameters\": {" + + " \"userParams\": []" + + " }" + + " }" + + "}"; + } + +} 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 new file mode 100644 index 000000000..bba0f20d8 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java @@ -0,0 +1,117 @@ +package org.onap.simulator.presetGenerator.presets.mso.configuration; + +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; + +public class PresetMSOCreateConfiguration extends PresetMSOBaseCreateInstancePost { + + protected final String serviceInstanceId; + protected final boolean isError; + private final int errorCode; + private final String errorPayload; + + public PresetMSOCreateConfiguration(String serviceInstanceId) { + super("b6dc9806-b094-42f7-9386-a48de8218ce8", "f36f5734-e9df-4fbf-9f35-61be13f028a1"); + this.serviceInstanceId = serviceInstanceId; + this.cloudOwner = "irma-aic"; + this.isError = false; + this.errorCode = 0; + this.errorPayload = null; + } + + public PresetMSOCreateConfiguration(String serviceInstanceId, int errorCode, String errorPayload) { + super("b6dc9806-b094-42f7-9386-a48de8218ce8", "f36f5734-e9df-4fbf-9f35-61be13f028a1"); + this.serviceInstanceId = serviceInstanceId; + this.cloudOwner = "irma-aic"; + this.isError = true; + this.errorCode = errorCode; + this.errorPayload = errorPayload; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public int getResponseCode() { + return isError ? errorCode : super.getResponseCode(); + } + + @Override + public Object getResponseBody() { + return isError ? errorPayload : super.getResponseBody(); + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstances/v./" + this.serviceInstanceId + "/configurations"; + } + + @Override + public Object getRequestBody() { + return "" + + "{" + + " \"requestDetails\": {" + + " \"modelInfo\": {" + + " \"modelType\": \"configuration\"," + + " \"modelInvariantId\": \"c30a024e-a6c6-4670-b73c-3df64eb57ff6\"," + + " \"modelVersionId\": \"f58d039d-4cfc-40ec-bd75-1f05f0458a6c\"," + + " \"modelName\": \"Port Mirroring Configuration By Policy\"," + + " \"modelVersion\": \"1.0\"," + + " \"modelCustomizationId\": \"4b7ebace-bad6-4526-9be6-bf248e20fc5f\"," + + " \"modelCustomizationName\": \"Port Mirroring Configuration By Policy 1\"" + + " }," + + " \"cloudConfiguration\": {" + + addCloudOwnerIfNeeded() + + " \"lcpCloudRegionId\": \"JANET25\"" + + " }," + + " \"requestInfo\": {" + + " \"instanceName\": \"dummy_instance\"," + + " \"source\": \"VID\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"relatedInstanceList\": [" + + " {" + + " \"relatedInstance\": {" + + " \"instanceId\": \"c187e9fe-40c3-4862-b73e-84ff056205f6\"," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelInvariantId\": \"b7d923c9-6175-41f1-91ba-4565c4953408\"," + + " \"modelVersionId\": \"ee6d61be-4841-4f98-8f23-5de9da846ca7\"," + + " \"modelName\": \"ServiceContainerMultiplepProbes\"," + + " \"modelVersion\": \"1.0\"" + + " }" + + " }" + + " }," + + " {" + + " \"relatedInstance\": {" + + " \"instanceId\": \"9be14a4f-7367-4cf9-96a1-f08f10f485a7\"," + + " \"instanceDirection\": \"source\"," + + " \"modelInfo\": {" + + " \"modelType\": \"vnf\"," + + " \"modelInvariantId\": \"51f2c559-1aba-4fd4-bbf9-8cbbef85ff2a\"," + + " \"modelVersionId\": \"cb05b259-9f26-4b33-b96c-13c2c202c091\"," + + " \"modelName\": \"vf_vEPDG\"," + + " \"modelVersion\": \"2.0\"," + + " \"modelCustomizationId\": \"35aeaae9-74f7-4b6a-adda-65edb0110361\"" + + " }" + + " }" + + " }," + + " {" + + " \"relatedInstance\": {" + + " \"instanceName\": \"AS-pnf2-10219--as988q\"," + + " \"instanceDirection\": \"destination\"," + + " \"modelInfo\": {" + + " \"modelType\": \"pnf\"" + + " }" + + " }" + + " }" + + " ]," + + " \"requestParameters\": {" + + " \"userParams\": []" + + " }" + + " }" + + "}"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java new file mode 100644 index 000000000..4d0582c91 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSODeleteConfiguration.java @@ -0,0 +1,53 @@ +package org.onap.simulator.presetGenerator.presets.mso.configuration; + +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; +import org.springframework.http.HttpMethod; + +public class PresetMSODeleteConfiguration extends PresetMSOBaseCreateInstancePost { + + public PresetMSODeleteConfiguration() { + this.cloudOwner = "att-nc"; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.DELETE; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113"; + } + + @Override + public Object getRequestBody() { + return "" + + "{" + + " \"requestDetails\": {" + + " \"cloudConfiguration\": {" + + addCloudOwnerIfNeeded() + + " \"lcpCloudRegionId\": \"mdt1\"" + + " }," + + " \"modelInfo\": {" + + " \"modelCustomizationId\": \"08a181aa-72eb-435f-9593-e88a3ad0a86b\"," + + " \"modelInvariantId\": \"model-invariant-id-9533\"," + + " \"modelVersionId\": \"model-version-id-9533\"," + + " \"modelType\": \"configuration\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"requestParameters\": {" + + " \"userParams\": []" + + " }" + + " }" + + "}"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java new file mode 100644 index 000000000..db18e0104 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMsoEnableDisablePort.java @@ -0,0 +1,76 @@ +package org.onap.simulator.presetGenerator.presets.mso.configuration; + +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; +import org.springframework.http.HttpMethod; + +public class PresetMsoEnableDisablePort extends PresetMSOBaseCreateInstancePost { + + private final String serviceInstanceId; + private final String configurationId; + private final String action; + + + public PresetMsoEnableDisablePort(String serviceInstanceId, String configurationId, String action) { + super("314cc766-b673-4a50-b9c5-471f68914585", serviceInstanceId); + this.serviceInstanceId = serviceInstanceId; + this.configurationId = configurationId; + this.action = action; + this.cloudOwner = PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public String getReqPath() { + return "/mso/serviceInstances/v./"+serviceInstanceId+"/configurations/"+configurationId+"/" + action; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + " \"cloudConfiguration\": {" + + addCloudOwnerIfNeeded() + + " \"lcpCloudRegionId\": \"mdt1\"" + + " }," + + " \"modelInfo\": {" + + " \"modelCustomizationId\": \"08a181aa-72eb-435f-9593-e88a3ad0a86b\"," + + " \"modelInvariantId\": \"model-invariant-id-9533\"," + + " \"modelVersionId\": \"model-version-id-9533\"," + + " \"modelType\": \"configuration\"" + + " }," + + " \"requestInfo\": {" + + " \"source\": \"VID\"," + + " \"requestorId\": \"us16807000\"" + + " }," + + " \"relatedInstanceList\": [" + + " {" + + " \"relatedInstance\": {" + + " \"instanceId\": \""+serviceInstanceId+"\"," + + " \"modelInfo\": {" + + " \"modelType\": \"service\"," + + " \"modelInvariantId\": \"b7d923c9-6175-41f1-91ba-4565c4953408\"," + + " \"modelName\": \"ServiceContainerMultiplepProbes\"," + + " \"modelVersionId\": \"ee6d61be-4841-4f98-8f23-5de9da846ca7\"," + + " \"modelVersion\": \"1.0\"" + + " }" + + " }" + + " }," + + " {" + + " \"relatedInstance\": {" + + " \"instanceId\": \"d35bf534-7d8e-4cb4-87f9-0a8bb6cd47b2\"," + + " \"instanceDirection\": \"source\"," + + " \"modelInfo\": {" + + " \"modelType\": \"connectionPoint\"" + + " }" + + " }" + + " }" + + " ]" + + " }" + + " }"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/scheduler/PresetGetSchedulerChangeManagementInvalidResponse.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/scheduler/PresetGetSchedulerChangeManagementInvalidResponse.java new file mode 100644 index 000000000..b79dc3ed2 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/scheduler/PresetGetSchedulerChangeManagementInvalidResponse.java @@ -0,0 +1,17 @@ +package org.onap.simulator.presetGenerator.presets.scheduler; + +public class PresetGetSchedulerChangeManagementInvalidResponse extends PresetGetSchedulerChangeManagements { + private int httpCode; + + public PresetGetSchedulerChangeManagementInvalidResponse(int httpCode) { + this.httpCode = httpCode; + } + + @Override + public int getResponseCode() { return httpCode; } + + @Override + public Object getResponseBody() { + return "this payload is an invalid json"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/scheduler/PresetGetSchedulerChangeManagements.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/scheduler/PresetGetSchedulerChangeManagements.java new file mode 100644 index 000000000..3763db2da --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/scheduler/PresetGetSchedulerChangeManagements.java @@ -0,0 +1,162 @@ +package org.onap.simulator.presetGenerator.presets.scheduler; + +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.springframework.http.HttpMethod; + +public class PresetGetSchedulerChangeManagements extends BasePreset { + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/scheduleDetails/"; + } + + @Override + protected String getRootPath() { + return "/scheduler/v1/ChangeManagement/schedules"; + } + + @Override + public Object getResponseBody() { + return "[" + + " {" + + " \"vnfName\": \"dbox0001v\"," + + " \"status\": \"Triggered\"," + + " \"aotsChangeId\": \"CHG000000000001\"," + + " \"aotsApprovalStatus\": \"Approved\"," + + " \"groupId\": \"groupId\"," + + " \"dispatchTime\": \"2018-05-09T14:05:43Z\"," + + " \"msoRequestId\": \"2fb4edd1-01c4-4fee-bd4a-4ae6282aa213\"," + + " \"scheduleRequest\": {" + + " \"id\": 1," + + " \"createDateTime\": \"2018-05-09T14:05:34Z\"," + + " \"optimizerAttemptsToSchedule\": 0," + + " \"optimizerTransactionId\": \"70f05563-6705-4be0-802a-8b6b78a69d63\"," + + " \"scheduleId\": \"70f05563-6705-4be0-802a-8b6b78a69d63\"," + + " \"scheduleName\": \"70f05563-6705-4be0-802a-8b6b78a69d63\"," + + " \"status\": \"Notifications Initiated\"," + + " \"userId\": \"wl849v\"," + + " \"domain\": \"ChangeManagement\"," + + " \"domainData\": [" + + " {" + + " \"id\": 1," + + " \"name\": \"WorkflowName\"," + + " \"value\": \"VNF In Place Software Update\"" + + " }," + + " {" + + " \"id\": 2," + + " \"name\": \"CallbackUrl\"," + + " \"value\": \"https://vid.onap.org:8000/vid/change-management/workflow/\"" + + " }," + + " {" + + " \"id\": 3," + + " \"name\": \"CallbackData\"," + + " \"value\": \"{\\\"requestType\\\":\\\"VNF In Place Software Update\\\",\\\"requestDetails\\\":[{\\\"vnfName\\\":\\\"dbox0001v\\\",\\\"vnfInstanceId\\\":\\\"815d38c0-b686-491c-9a74-0b49add524ca\\\",\\\"modelInfo\\\":{\\\"modelType\\\":\\\"vnf\\\",\\\"modelInvariantId\\\":\\\"59f4e0b2-e1b0-4e3b-bae3-e7b8c5d32985\\\",\\\"modelVersionId\\\":\\\"345643c1-3a51-423f-aac1-502e027d8dab\\\",\\\"modelName\\\":\\\"dbox0001v\\\",\\\"modelCustomizationId\\\":\\\"01ce23cb-d276-4d71-a5f1-f9d42d0df543\\\"},\\\"cloudConfiguration\\\":{\\\"lcpCloudRegionId\\\":\\\"dpa2b\\\",\\\"tenantId\\\":\\\"b60da4f71c1d4b35b8113d4eca6deaa1\\\"},\\\"requestInfo\\\":{\\\"source\\\":\\\"VID\\\",\\\"suppressRollback\\\":false,\\\"requestorId\\\":\\\"wl849v\\\"},\\\"relatedInstanceList\\\":[{\\\"relatedInstance\\\":{\\\"instanceId\\\":\\\"eb774932-e9fa-4c7f-bbc1-229b6b2b11e2\\\",\\\"modelInfo\\\":{\\\"modelType\\\":\\\"service\\\",\\\"modelInvariantId\\\":\\\"57dd617b-d64e-4441-a287-4d158b24ba65\\\",\\\"modelVersionId\\\":\\\"345643c1-3a51-423f-aac1-502e027d8dab\\\",\\\"modelName\\\":\\\"control_loop_dbe_svc\\\",\\\"modelVersion\\\":\\\"2.0\\\"}}}],\\\"requestParameters\\\":{\\\"payload\\\":\\\"{\\\\\\\"existing_software_version\\\\\\\":\\\\\\\"2\\\\\\\",\\\\\\\"new_software_version\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"operations_timeout\\\\\\\":\\\\\\\"3\\\\\\\"}\\\",\\\"testApi\\\":\\\"GR_API\\\"}}]}\"" + + " }" + + " ]," + + " \"scheduleApprovals\": []" + + " }," + + " \"schedulesId\": 0" + + " }," + + " {" + + " \"vnfName\": \"aaiaic25ctsf0002v\"," + + " \"vnfId\": \"\"," + + " \"status\": \"Cancelled\"," + + " \"aotsChangeId\": \"CHG000000000001\"," + + " \"aotsApprovalStatus\": \"Approved\"," + + " \"startTime\": \"2018-06-07T04:00:24Z\"," + + " \"finishTime\": \"2018-06-07T04:02:14Z\"," + + " \"groupId\": \"group\"," + + " \"lastInstanceStartTime\": \"2018-06-07T04:00:24Z\"," + + " \"policyId\": \"SNIRO_CM.TimeLimitAndVerticalTopology_pserver\"," + + " \"scheduleRequest\": {" + + " \"id\": 5," + + " \"createDateTime\": \"2018-06-06T13:00:25Z\"," + + " \"optimizerDateTime\": \"2018-06-06T13:00:34Z\"," + + " \"optimizerMessage\": \"A feasible scheduled has been found\"," + + " \"optimizerStatus\": \"complete\"," + + " \"optimizerAttemptsToSchedule\": 0," + + " \"optimizerReturnDateTime\": \"2018-06-06T13:07:02Z\"," + + " \"optimizerTransactionId\": \"01da00a6-9664-4db6-b97d-50847bc05144\"," + + " \"schedule\": \"[{\\\"groupId\\\":\\\"group\\\",\\\"startTime\\\":\\\"2018-06-07 04:00:24\\\",\\\"finishTime\\\":\\\"2018-06-07 04:02:14\\\",\\\"latestInstanceStartTime\\\":\\\"2018-06-07 04:00:24\\\",\\\"node\\\":[\\\"aaiaic25ctsf0002v\\\"]}]\"," + + " \"scheduleId\": \"01da00a6-9664-4db6-b97d-50847bc05144\"," + + " \"scheduleName\": \"01da00a6-9664-4db6-b97d-50847bc05144\"," + + " \"status\": \"Cancelled\"," + + " \"userId\": \"jf9860\"," + + " \"domain\": \"ChangeManagement\"," + + " \"deleteDateTime\": \"2018-06-06T13:07:11Z\"," + + " \"domainData\": [" + + " {" + + " \"id\": 5," + + " \"name\": \"CallbackData\"," + + " \"value\": \"{\\\"requestType\\\": \\\"Update\\\", \\\"requestDetails\\\": [{\\\"vnfInstanceId\\\": \\\"b8d99523-1e83-4fd1-b42f-849361ef7024\\\", \\\"relatedInstanceList\\\": [{\\\"relatedInstance\\\": {\\\"instanceId\\\": \\\"54ba3628-9ee5-4b32-8a2a-3abf001bed4e\\\", \\\"modelInfo\\\": {\\\"modelVersionId\\\": \\\"4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd\\\", \\\"modelVersion\\\": \\\"4.0\\\", \\\"modelName\\\": \\\"CHARLOTTE_2017_1011\\\", \\\"modelInvariantId\\\": \\\"e58733ef-43cb-4b6b-b641-922078b6c88b\\\", \\\"modelType\\\": \\\"service\\\"}}}], \\\"requestParameters\\\": {\\\"usePreload\\\": true}, \\\"requestInfo\\\": {\\\"source\\\": \\\"VID\\\", \\\"requestorId\\\": \\\"az2016\\\", \\\"suppressRollback\\\": false}, \\\"vnfName\\\": \\\"CHARLOTTE_2017_1011_oh22u_20171103\\\", \\\"modelInfo\\\": {\\\"modelVersionId\\\": \\\"4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd\\\", \\\"modelName\\\": \\\"CHARLOTTE_2017_1011_oh22u_20171103\\\", \\\"modelInvariantId\\\": \\\"93e16072-715a-42ef-9d0a-080052d6b716\\\", \\\"modelType\\\": \\\"vnf\\\", \\\"modelCustomizationId\\\": \\\"1779a999-ea17-4f31-98e9-75b6fbdd0acb\\\"}, \\\"cloudConfiguration\\\": {\\\"tenantId\\\": \\\"88a6ca3ee0394ade9403f075db23167e\\\", \\\"lcpCloudRegionId\\\": \\\"mdt1\\\"}}]}\"" + + " }," + + " {" + + " \"id\": 9," + + " \"name\": \"WorkflowName\"," + + " \"value\": \"Update\"" + + " }," + + " {" + + " \"id\": 13," + + " \"name\": \"CallbackUrl\"," + + " \"value\": \"http://127.0.0.1:8900/scheduler/v1/loopbacktest/vid\"" + + " }" + + " ]," + + " \"scheduleApprovals\": [" + + " {" + + " \"approvalDateTime\": \"2018-06-06T13:07:08Z\"," + + " \"status\": \"Accepted\"," + + " \"userId\": \"jf9860\"," + + " \"approvalTypeId\": 1" + + " }" + + " ]" + + " }," + + " \"schedulesId\": 0" + + " }," + + " {" + + " \"vnfName\": \"Zolson1MMSC04ee0f\"," + + " \"status\": \"Pending Schedule\"," + + " \"groupId\": \"\"," + + " \"policyId\": \"SNIRO.TimeLimitAndVerticalTopology\"," + + " \"scheduleRequest\": {" + + " \"id\": 9," + + " \"createDateTime\": \"2018-06-06T13:07:16Z\"," + + " \"optimizerDateTime\": \"2018-06-06T13:07:24Z\"," + + " \"optimizerMessage\": \"Error while processing request ID: CM-502adbb3-1c37-4cc6-bc9f-6777ad4227a3 -- Failed Processing; cause: Traceback (most recent call last):\\n File \\\"/opt/app/sniro/sniroapp/sniro/optimizers/cmopt/rcscheduler/local_opt_processor.py\\\", line 15, in process_local_cm_scheduler_opt\\n full_process_local_cm_scheduler_opt(request_json, policies, sniro_config)\\n File \\\"/opt/app/sniro/sniroapp/sniro/optimizers/cmopt/rcscheduler/local_opt_processor.py\\\", line 38, in full_process_local_cm_scheduler_opt\\n json_req = create_cm_scheduler_request(request_json, policies, all_req_info)\\n File \\\"/opt/app/sniro/sniroapp/sniro/optimizers/cmopt/rcscheduler/request_builder.py\\\", line 16, in create_cm_scheduler_request\\n cm = vertical_topology.VerticalConflicts(request_json) # TODO: rename + refactor\\n File \\\"/opt/app/sniro/sniroapp/sniro/datasources/aai/vertical_topology.py\\\", line 68, in __init__\\n self.tzinfo = dict((x, tzxref[self.clli[x]]) for x in self.vnfs)\\n File \\\"/opt/app/sniro/sniroapp/sniro/datasources/aai/vertical_topology.py\\\", line 68, in <genexpr>\\n self.tzinfo = dict((x, tzxref[self.clli[x]]) for x in self.vnfs)\\nKeyError: ('Zolson1MMSC04ee0f', '(Unable to get timezones for some elements)')\\n\"," + + " \"optimizerStatus\": \"failed\"," + + " \"optimizerAttemptsToSchedule\": 0," + + " \"optimizerReturnDateTime\": \"2018-06-06T13:13:47Z\"," + + " \"optimizerTransactionId\": \"645c4cfb-e00f-4995-bf23-a7df892eee0f\"," + + " \"scheduleId\": \"645c4cfb-e00f-4995-bf23-a7df892eee0f\"," + + " \"scheduleName\": \"645c4cfb-e00f-4995-bf23-a7df892eee0f\"," + + " \"status\": \"Optimization Failed\"," + + " \"userId\": \"jf9860\"," + + " \"domain\": \"ChangeManagement\"," + + " \"domainData\": [" + + " {" + + " \"id\": 17," + + " \"name\": \"CallbackData\"," + + " \"value\": \"{\\\"requestType\\\": \\\"Update\\\", \\\"requestDetails\\\": [{\\\"vnfInstanceId\\\": \\\"b8d99523-1e83-4fd1-b42f-849361ef7024\\\", \\\"relatedInstanceList\\\": [{\\\"relatedInstance\\\": {\\\"instanceId\\\": \\\"54ba3628-9ee5-4b32-8a2a-3abf001bed4e\\\", \\\"modelInfo\\\": {\\\"modelVersionId\\\": \\\"4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd\\\", \\\"modelVersion\\\": \\\"4.0\\\", \\\"modelName\\\": \\\"CHARLOTTE_2017_1011\\\", \\\"modelInvariantId\\\": \\\"e58733ef-43cb-4b6b-b641-922078b6c88b\\\", \\\"modelType\\\": \\\"service\\\"}}}], \\\"requestParameters\\\": {\\\"usePreload\\\": true}, \\\"requestInfo\\\": {\\\"source\\\": \\\"VID\\\", \\\"requestorId\\\": \\\"az2016\\\", \\\"suppressRollback\\\": false}, \\\"vnfName\\\": \\\"CHARLOTTE_2017_1011_oh22u_20171103\\\", \\\"modelInfo\\\": {\\\"modelVersionId\\\": \\\"4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd\\\", \\\"modelName\\\": \\\"CHARLOTTE_2017_1011_oh22u_20171103\\\", \\\"modelInvariantId\\\": \\\"93e16072-715a-42ef-9d0a-080052d6b716\\\", \\\"modelType\\\": \\\"vnf\\\", \\\"modelCustomizationId\\\": \\\"1779a999-ea17-4f31-98e9-75b6fbdd0acb\\\"}, \\\"cloudConfiguration\\\": {\\\"tenantId\\\": \\\"88a6ca3ee0394ade9403f075db23167e\\\", \\\"lcpCloudRegionId\\\": \\\"mdt1\\\"}}]}\"" + + " }," + + " {" + + " \"id\": 21," + + " \"name\": \"WorkflowName\"," + + " \"value\": \"Replace\"" + + " }," + + " {" + + " \"id\": 25," + + " \"name\": \"CallbackUrl\"," + + " \"value\": \"http://127.0.0.1:8900/scheduler/v1/loopbacktest/vid\"" + + " }" + + " ]," + + " \"scheduleApprovals\": []" + + " }," + + " \"schedulesId\": 0" + + " }" + + "]"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceMetadataGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceMetadataGet.java index 9b1ea80af..00a47b7db 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceMetadataGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceMetadataGet.java @@ -1,12 +1,14 @@ package org.onap.simulator.presetGenerator.presets.sdc; import org.springframework.http.HttpMethod; +import vid.automation.test.infra.ModelInfo; -/** - * Created by itzikliderman on 21/12/2017. - */ public class PresetSDCGetServiceMetadataGet extends SdcPresetWithModelVersionId { + public PresetSDCGetServiceMetadataGet(ModelInfo modelInfo) { + this(modelInfo.modelVersionId, modelInfo.modelInvariantId, modelInfo.zipFileName); + } + public PresetSDCGetServiceMetadataGet(String modelVersionId, String modelInvariantId, String zipFileName) { super(modelVersionId); this.modelInvariantId = modelInvariantId; @@ -25,7 +27,7 @@ public class PresetSDCGetServiceMetadataGet extends SdcPresetWithModelVersionId " \"name\": \"action-data\"," + " \"version\": \"1.0\"," + " \"toscaModelURL\": \"./"+zipFileName+"\"," + - " \"category\": \"Mobility\"," + + " \"category\": \"Emanuel\"," + " \"lifecycleState\": \"CERTIFIED\"," + " \"lastUpdaterUserId\": \"rg276b\"," + " \"lastUpdaterFullName\": null," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceToscaModelGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceToscaModelGet.java index e243dc321..303f5a4e1 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceToscaModelGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceToscaModelGet.java @@ -1,14 +1,16 @@ package org.onap.simulator.presetGenerator.presets.sdc; import org.springframework.http.HttpMethod; +import vid.automation.test.infra.ModelInfo; -/** - * Created by itzikliderman on 21/12/2017. - */ public class PresetSDCGetServiceToscaModelGet extends SdcPresetWithModelVersionId { private String file; + public PresetSDCGetServiceToscaModelGet(ModelInfo modelInfo) { + this(modelInfo.modelVersionId, modelInfo.zipFileName); + } + public PresetSDCGetServiceToscaModelGet(String modelVersionId, String file) { super(modelVersionId); this.file = file; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceToscaModelGetEmptyResult.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceToscaModelGetEmptyResult.java new file mode 100644 index 000000000..f6f67136e --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceToscaModelGetEmptyResult.java @@ -0,0 +1,24 @@ +package org.onap.simulator.presetGenerator.presets.sdc; + +import org.springframework.http.HttpMethod; + +public class PresetSDCGetServiceToscaModelGetEmptyResult extends SdcPresetWithModelVersionId { + + public PresetSDCGetServiceToscaModelGetEmptyResult(String modelVersionId) { + super(modelVersionId); + } + + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return super.getReqPath()+"/toscaModel"; + } + + @Override + public Object getResponseBody() { + return ""; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceToscaModelGetInvalidResponse.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceToscaModelGetInvalidResponse.java new file mode 100644 index 000000000..7676062e5 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceToscaModelGetInvalidResponse.java @@ -0,0 +1,32 @@ +package org.onap.simulator.presetGenerator.presets.sdc; + +import org.springframework.http.HttpMethod; + +public class PresetSDCGetServiceToscaModelGetInvalidResponse extends SdcPresetWithModelVersionId { + + private final int httpCode; + + public PresetSDCGetServiceToscaModelGetInvalidResponse(String modelVersionId, int httpCode) { + super(modelVersionId); + this.httpCode = httpCode; + } + + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return super.getReqPath()+"/toscaModel"; + } + + @Override + public Object getResponseBody() { + return "simulated error description from sdc"; + } + + @Override + public int getResponseCode() { + return httpCode; + } +} 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 new file mode 100644 index 000000000..2a6b012fe --- /dev/null +++ b/vid-automation/src/main/java/org/onap/vid/api/AsyncInstantiationBase.java @@ -0,0 +1,573 @@ +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; +import org.hamcrest.BaseMatcher; +import org.hamcrest.CoreMatchers; +import org.hamcrest.Description; +import org.hamcrest.MatcherAssert; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseDelete; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNames; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.vid.model.asyncInstantiation.JobAuditStatus; +import org.onap.vid.model.asyncInstantiation.ServiceInfo; +import org.onap.vid.model.mso.MsoResponseWrapper2; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.DataProvider; +import vid.automation.test.infra.Features; +import vid.automation.test.infra.Wait; +import vid.automation.test.model.JobStatus; +import vid.automation.test.model.ServiceAction; +import vid.automation.test.services.AsyncJobsService; +import vid.automation.test.services.SimulatorApi; + +public class AsyncInstantiationBase extends BaseMsoApiTest { + + public static final String CREATE_BULK_OF_ALACARTE_REQUEST_WITH_VNF = "asyncInstantiation/vidRequestCreateALaCarteWithVnf.json"; + protected static final String CREATE_BULK_OF_MACRO_REQUEST = "asyncInstantiation/vidRequestCreateBulkOfMacro.json"; + + protected static final String MSO_BASE_ERROR = + "Received error from SDN-C: java.lang.IllegalArgumentException: All keys must be specified for class org."+ + "opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.assignments.vf."+ + "module.assignments.vms.VmKey. Missing key is getVmType. Supplied key is VmKey []."; + protected static final String MSO_ERROR = MSO_BASE_ERROR + StringUtils.repeat(" and a lot of sentences for long message", 60); + + @BeforeClass + protected void muteAndDropNameCounter() { + AsyncJobsService asyncJobsService = new AsyncJobsService(); + asyncJobsService.muteAllAsyncJobs(); + asyncJobsService.dropAllFromNameCounter(); + } + + @AfterMethod + protected void muteAllAsyncJobs() { + AsyncJobsService asyncJobsService = new AsyncJobsService(); + asyncJobsService.muteAllAsyncJobs(); + } + + @DataProvider + public static Object[][] trueAndFalse() { + return new Object[][]{{TRUE},{FALSE}}; + } + + protected String getCreateBulkUri() { + return uri.toASCIIString() + "/asyncInstantiation/bulk"; + } + + protected String getHideServiceUri(String jobId) { + return uri.toASCIIString() + "/asyncInstantiation/hide/"+jobId; + } + + protected String getServiceInfoUrl() { + return uri.toASCIIString() + "/asyncInstantiation"; + } + + protected String getJobAuditUrl() { + return uri.toASCIIString() + "/asyncInstantiation/auditStatus/{JOB_ID}?source={SOURCE}"; + } + + protected String getMsoJobAuditUrl() { + return uri.toASCIIString() + "/asyncInstantiation/auditStatus/{JOB_ID}/mso"; + } + + protected String getDeleteServiceUrl(String uuid) { + return uri.toASCIIString() + "/asyncInstantiation/job/" + uuid; + } + + protected String getInstanceAuditInfoUrl() { + return uri.toASCIIString() + "/asyncInstantiation/auditStatus/{TYPE}/{INSTANCE_ID}/mso"; + } + + protected String getRetryJobUrl() { + return uri.toASCIIString() + "/asyncInstantiation/retry/{JOB_ID}"; + } + protected String getTopologyForRetryUrl() { + return uri.toASCIIString() + "/asyncInstantiation/bulkForRetry/{JOB_ID}"; + } + + + protected String getRetryJobWithChangedDataUrl() { + return uri.toASCIIString() + "/asyncInstantiation/retryJobWithChangedData/{JOB_ID}"; + } + + protected boolean getExpectedRetryEnabled(JobStatus jobStatus) { + return Features.FLAG_1902_RETRY_JOB.isActive() && (jobStatus==JobStatus.FAILED || jobStatus==JobStatus.COMPLETED_WITH_ERRORS); + } + + public List<BasePreset> getPresets(List<PresetMSOBaseDelete> presetOnDeleteList, List<PresetMSOBaseCreateInstancePost> presetOnCreateList, List<PresetMSOOrchestrationRequestGet> presetInProgressList) { + + final ImmutableList.Builder<BasePreset> basePresetBuilder = new ImmutableList.Builder<>(); + basePresetBuilder + .add(new PresetGetSessionSlotCheckIntervalGet()) + .add(new PresetAAIGetSubscribersGet()) + .addAll(presetOnDeleteList) + .addAll(presetOnCreateList) + .addAll(presetInProgressList); + return basePresetBuilder.build(); + } + + public List<BasePreset> getDeletePresets(List<PresetMSOBaseDelete> presetOnDeleteList, List<PresetMSOOrchestrationRequestGet> presetInProgressList) { + return getPresets(presetOnDeleteList, emptyList(), presetInProgressList); + } + + public List<BasePreset> getPresets(List<PresetMSOBaseCreateInstancePost> presetOnCreateList, List<PresetMSOOrchestrationRequestGet> presetInProgressList) { + return getPresets(emptyList(), presetOnCreateList, presetInProgressList); + } + + public void assertServiceInfoSpecific1(String jobId, JobStatus jobStatus, String serviceInstanceName, String userName) { + assertServiceInfoSpecific1(jobId, jobStatus, serviceInstanceName, userName, null, ServiceAction.INSTANTIATE); + } + + public void assertServiceInfoSpecific1(String jobId, JobStatus jobStatus, String serviceInstanceName, String userName, String instanceId, ServiceAction action) { + assertExpectedStatusAndServiceInfo(jobStatus, jobId, new ServiceInfo( + userName, jobStatus, false, + "038d99af-0427-42c2-9d15-971b99b9b489", "Lucine Sarika", "zasaki", + "de738e5f-3704-4a14-b98f-3bf86ac0c0a0", "voloyakane-senamo", + "c85f0e80-0636-44a4-8cb2-4ec00d056e79", "Hedvika Wendelin", + "a93f8383-707e-43fa-8191-a6e69a1aab17", null, + "TYLER SILVIA", "SILVIA ROBBINS", + instanceId, serviceInstanceName, + "e3c34d88-a216-4f1d-a782-9af9f9588705", "gayawabawe", "5.1", + jobId, null, action, false) + ); + } + + public void assertServiceInfoSpecific1(String jobId, JobStatus jobStatus, String serviceInstanceName) { + assertServiceInfoSpecific1(jobId, jobStatus, serviceInstanceName, "us16807000"); + } + + protected void assertAuditStatuses(String jobId, List<JobAuditStatus> expectedVidStatuses, List<JobAuditStatus> expectedMsoStatuses) { + assertAuditStatuses(jobId, expectedVidStatuses, expectedMsoStatuses, 15); + } + + protected void assertAuditStatuses(String jobId, List<JobAuditStatus> expectedVidStatuses, List<JobAuditStatus> expectedMsoStatuses, long timeoutInSeconds) { + assertAndRetryIfNeeded(() -> { + final List<JobAuditStatus> auditVidStatuses = getAuditStatuses(jobId, JobAuditStatus.SourceStatus.VID.name()); + assertThat(auditVidStatuses, hasItemsFromCollection(expectedVidStatuses)); + if (expectedMsoStatuses!=null) { + final List<JobAuditStatus> auditMsoStatuses = getAuditStatuses(jobId, JobAuditStatus.SourceStatus.MSO.name()); + assertThat(auditMsoStatuses, containsInAnyOrder(expectedMsoStatuses.toArray())); + } + }, timeoutInSeconds); + } + + protected void assertAndRetryIfNeeded(Runnable asserter, long timeoutInSeconds) { + final Instant expiry = Instant.now().plusSeconds(timeoutInSeconds); + while (true) { + try { + asserter.run(); + break; // we're cool, assertion passed + } catch (AssertionError fail) { + Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS); + if (Instant.now().isAfter(expiry)) { + throw fail; + } else { + System.out.println("retrying after: " + fail); + } + } + } + } + + protected ImmutableList<JobAuditStatus> vidAuditStatusesCompletedWithErrors(String jobId) { + return ImmutableList.of( + vidAuditStatus(jobId, "PENDING", false), + vidAuditStatus(jobId, "IN_PROGRESS", false), + vidAuditStatus(jobId, "COMPLETED_WITH_ERRORS", true) + ); + } + + protected ImmutableList<JobAuditStatus> vidAuditStatusesFailed(String jobId) { + return ImmutableList.of( + vidAuditStatus(jobId, "PENDING", false), + vidAuditStatus(jobId, "IN_PROGRESS", false), + vidAuditStatus(jobId, "FAILED", true) + ); + } + + protected JobAuditStatus vidAuditStatus(String jobId, String jobStatus, boolean isFinal) { + return new JobAuditStatus(UUID.fromString(jobId), jobStatus, JobAuditStatus.SourceStatus.VID, null, null, isFinal); + } + + public static class JobIdAndStatusMatcher extends BaseMatcher<ServiceInfo> { + protected String expectedJobId; + + public JobIdAndStatusMatcher(String expectedJobId) { + this.expectedJobId = expectedJobId; + } + + @Override + public boolean matches(Object item) { + if (!(item instanceof ServiceInfo)) { + return false; + } + ServiceInfo serviceInfo = (ServiceInfo) item; + return expectedJobId.equals(serviceInfo.jobId); + } + + @Override + public void describeTo(Description description) { + description.appendText("failed to find job with uuid ") + .appendValue(expectedJobId); + } + } + + + + protected Map<Keys,String> generateNames() { + return Stream.of(Keys.values()).collect( + Collectors.toMap(x->x, x -> UUID.randomUUID().toString().replace("-",""))); + } + + protected ImmutableList<BasePreset> addPresetsForCreateBulkOfCreateInstances(int bulkSize, Map<Keys, String> names){ + ImmutableList<BasePreset> msoBulkPresets = generateMsoCreateBulkPresets(bulkSize, names); + ImmutableList<BasePreset> presets = new ImmutableList.Builder<BasePreset>() + .add(new PresetGetSessionSlotCheckIntervalGet()) + .add(new PresetAAIGetSubscribersGet()) + .add(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN3_TO_ATT_SABABA) + .addAll(msoBulkPresets) + .add(new PresetMSOOrchestrationRequestGet()) + .build(); + return presets; + + } + + protected ImmutableList<BasePreset> generateMsoCreateBulkPresets(int bulkSize, Map<Keys, String> names) { + return IntStream.rangeClosed(0, bulkSize-1). + mapToObj(i-> new PresetMSOCreateServiceInstanceGen2WithNames(names, i)) + .collect(ImmutableList.toImmutableList()); + } + + protected ResponseEntity<List<JobAuditStatus>> auditStatusCall(String url) { + return restTemplate.exchange( + url, + org.springframework.http.HttpMethod.GET, + null, + new ParameterizedTypeReference<List<JobAuditStatus>>() {}); + } + + @DataProvider + public static Object[][] auditSources() { + return new Object[][]{{JobAuditStatus.SourceStatus.VID},{JobAuditStatus.SourceStatus.MSO}}; + } + + + + protected List<String> createBulkAndWaitForBeCompleted(int bulkSize){ + Map<Keys, String> names = generateNames(); + ImmutableList<BasePreset> presets = addPresetsForCreateBulkOfCreateInstances(bulkSize, names); + final List<String> jobIds = createBulkOfMacroInstances(presets, false, bulkSize, names); + Assert.assertEquals(jobIds.size(),bulkSize); + + assertTrue(String.format("Not all services with ids: %s are in state completed after 30 sec", + jobIds.stream().collect(joining(","))), + + Wait.waitFor(y-> serviceListCall().getBody().stream() + .filter(si -> jobIds.contains(si.jobId)) + .filter(si -> si.jobStatus==JobStatus.COMPLETED) + .count() == bulkSize, + null, 30, 1 )); + return jobIds; + } + + protected List<JobAuditStatus> getJobMsoAuditStatusForAlaCarte(String jobUUID, String requestId, String serviceInstanceId){ + String url = getMsoJobAuditUrl().replace("{JOB_ID}",jobUUID); + + if(!StringUtils.isEmpty(requestId)) { + url = url + "?requestId=" + requestId; + if(!StringUtils.isEmpty(serviceInstanceId)) { + url = url + "&serviceInstanceId=" + serviceInstanceId; + } + } + return callAuditStatus(url); + } + + protected List<JobAuditStatus> getAuditStatuses(String jobUUID, String source){ + String url = getJobAuditUrl().replace("{JOB_ID}",jobUUID).replace("{SOURCE}", source); + return callAuditStatus(url); + } + + protected List<JobAuditStatus> getAuditStatusesForInstance(String type, String instanceId){ + String url = getInstanceAuditInfoUrl().replace("{TYPE}",type).replace("{INSTANCE_ID}", instanceId); + return callAuditStatus(url); + } + + private List<JobAuditStatus> callAuditStatus(String url) { + ResponseEntity<List<JobAuditStatus>> statusesResponse = auditStatusCall(url); + assertThat(statusesResponse.getStatusCode(), CoreMatchers.equalTo(HttpStatus.OK)); + return statusesResponse.getBody(); + } + + protected Map<String, JobStatus> addBulkAllPendingButOneInProgress(){ + return addBulkAllPendingButOneInProgress(3); + } + + protected Map<String, JobStatus> addBulkAllPendingButOneInProgress(int bulkSize){ + Map<Keys, String> names = generateNames(); + ImmutableList<BasePreset> msoBulkPresets = generateMsoCreateBulkPresets(bulkSize, names); + ImmutableList<BasePreset> presets = new ImmutableList.Builder<BasePreset>() + .add(new PresetGetSessionSlotCheckIntervalGet()) + .add(new PresetAAIGetSubscribersGet()) + .add(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN3_TO_ATT_SABABA) + .addAll(msoBulkPresets) + .add(new PresetMSOOrchestrationRequestGet("IN_PROGRESS")) + .build(); + final List<String> jobIds = createBulkOfMacroInstances(presets, false, bulkSize, names); + + // wait for single IN_PROGRESS, so statuses will stop from changing + Wait.waitFor(foo -> serviceListCall().getBody().stream() + .filter(si -> jobIds.contains(si.jobId)) + .anyMatch(si -> si.jobStatus.equals(JobStatus.IN_PROGRESS)), + null, 20, 1); + + final Map<String, JobStatus> statusMapBefore = serviceListCall().getBody().stream() + .filter(si -> jobIds.contains(si.jobId)) + .collect(toMap(si -> si.jobId, si -> si.jobStatus)); + + assertThat(jobIds, hasSize(bulkSize)); + + + return statusMapBefore; + } + + protected String deleteOneJobHavingTheStatus(Map<String, JobStatus> jobIdToStatus, JobStatus jobStatus) { + final String jobToDelete = jobIdToStatus.entrySet().stream() + .filter(entry -> entry.getValue().equals(jobStatus)) + .map(Map.Entry::getKey) + .findFirst().orElseThrow(() -> new AssertionError("no job in " + jobStatus + " state: " + jobIdToStatus)); + + + restTemplate.delete(getDeleteServiceUrl(jobToDelete)); + + return jobToDelete; + } + + + protected MsoResponseWrapper2 hideService(String jobId) { + MsoResponseWrapper2 responseWrapper2 = callMsoForResponseWrapper(org.springframework.http.HttpMethod.POST, getHideServiceUri(jobId), ""); + return responseWrapper2; + } + + protected List<String> createBulkOfInstancesAndAssert(ImmutableList<BasePreset> presets, boolean isPause, int bulkSize, JobStatus finalState, Map<Keys, String> names){ + List<String> jobIds = createBulkOfMacroInstances(presets, isPause, bulkSize, names); + Assert.assertEquals(jobIds.size(), bulkSize); + for(String jobId: jobIds) { + assertExpectedStatusAndServiceInfo(isPause, finalState, names, jobId); + } + + return jobIds; + } + + protected void assertExpectedStatusAndServiceInfo(boolean isPause, JobStatus finalState, Map<Keys, String> names, String jobId) { + assertExpectedStatusAndServiceInfo(finalState, jobId, new ServiceInfo("us16807000", JobStatus.IN_PROGRESS, isPause, "someID", + "someName", "myProject", "NFT1", "NFTJSSSS-NFT1", "greatTenant", "greatTenant", "hvf3", null, + "mySubType", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", null, names.get(Keys.SERVICE_NAME), + "5c9e863f-2716-467b-8799-4a67f378dcaa", "AIM_TRANSPORT_00004", "1.0", jobId, null, ServiceAction.INSTANTIATE, false)); + } + + protected void assertExpectedStatusAndServiceInfo(JobStatus finalState, String jobId, ServiceInfo expectedServiceInfo) { + assertExpectedStatusAndServiceInfo(finalState, jobId, false, expectedServiceInfo); + } + + protected void assertExpectedStatusAndServiceInfo(JobStatus finalState, String jobId, boolean longWait, ServiceInfo expectedServiceInfo) { + JobInfoChecker<Integer> jobInfoChecker = new JobInfoChecker<>( + restTemplate, ImmutableSet.of(JobStatus.PENDING, JobStatus.IN_PROGRESS, finalState), jobId, expectedServiceInfo); + boolean result = jobInfoChecker.test(null); + assertTrue("service info of jobId: " + jobId + " was in status: " + jobInfoChecker.lastStatus, result); + + jobInfoChecker.setExpectedJobStatus(ImmutableSet.of(finalState)); + 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); + assertTrue("service info of jobId: " + jobId + " was in status: " + jobInfoChecker.lastStatus, result); + } + + 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); + } + + public List<String> createBulkOfInstances(boolean isPause, int bulkSize, Map<Keys, String> names, String requestDetailsFileName){ + + String requestBody = TestUtils.convertRequest(objectMapper, requestDetailsFileName); + requestBody = requestBody.replace("\"IS_PAUSE_VALUE\"", String.valueOf(isPause)).replace("\"BULK_SIZE\"", String.valueOf(bulkSize)); + for (Map.Entry<Keys, String> e : names.entrySet()) { + requestBody = requestBody.replace(e.getKey().name(), e.getValue()); + } + MsoResponseWrapper2 responseWrapper2 = callMsoForResponseWrapper(org.springframework.http.HttpMethod.POST, getCreateBulkUri(), requestBody); + assertNotNull(responseWrapper2); + return (List<String>)responseWrapper2.getEntity(); + } + + protected List<String> retryJob(String jobId) { + ResponseEntity<String> retryBulkPayload = getRetryBulk(jobId); + return retryJobWithChangedData(jobId, retryBulkPayload.getBody()); + } + + protected List<String> retryJobWithChangedData(String jobId, String requestBody) { + String retryUri = getRetryJobWithChangedDataUrl(); + retryUri = retryUri.replace("{JOB_ID}", jobId); + MsoResponseWrapper2 responseWrapper2 = callMsoForResponseWrapper(HttpMethod.POST, retryUri, requestBody); + assertNotNull(responseWrapper2); + return (List<String>)responseWrapper2.getEntity(); + } + + protected ResponseEntity<String> getRetryBulk(String jobId) { + String retryUri = getTopologyForRetryUrl(); + retryUri = retryUri.replace("{JOB_ID}", jobId); + return restTemplateErrorAgnostic.getForEntity(retryUri, String.class); + } + + protected Object getResourceAuditInfo(String trackById) { + return restTemplate.getForObject(buildUri("/asyncInstantiation/auditStatusForRetry/{trackById}"), Object.class, trackById); + } + + public class JobInfoChecker<Integer> implements Predicate<Integer> { + + protected final RestTemplate restTemplate; + protected Set<JobStatus> expectedJobStatus; + protected ServiceInfo expectedServiceInfo; + protected final String jobId; + protected JobStatus lastStatus; + + public JobInfoChecker(RestTemplate restTemplate, Set<JobStatus> expectedJobStatus, String jobId, ServiceInfo expectedServiceInfo) { + this.restTemplate = restTemplate; + this.expectedJobStatus = expectedJobStatus; + this.jobId = jobId; + this.expectedServiceInfo = expectedServiceInfo; + } + + public void setExpectedJobStatus(Set<JobStatus> expectedJobStatus) { + this.expectedJobStatus = expectedJobStatus; + } + + @Override + public boolean test(Integer integer) { + ResponseEntity<List<ServiceInfo>> serviceListResponse = serviceListCall(); + assertThat(serviceListResponse.getStatusCode(), CoreMatchers.equalTo(HttpStatus.OK)); + assertThat(serviceListResponse.getBody(), hasItem(new JobIdAndStatusMatcher(jobId))); + ServiceInfo serviceInfoFromDB = serviceListResponse.getBody().stream() + .filter(serviceInfo -> serviceInfo.jobId.equals(jobId)) + .findFirst().orElse(null); + Assert.assertNotNull(serviceInfoFromDB); + Assert.assertEquals(serviceInfoDataReflected(expectedServiceInfo), serviceInfoDataReflected(serviceInfoFromDB)); + assertTrue("actual service instance doesn't contain template service name:" + expectedServiceInfo.serviceInstanceName, + serviceInfoFromDB.serviceInstanceName.contains(expectedServiceInfo.serviceInstanceName)); + + if (expectedServiceInfo.serviceInstanceId != null && ImmutableList.of(JobStatus.COMPLETED, JobStatus.PAUSE, JobStatus.COMPLETED_WITH_ERRORS).contains(serviceInfoFromDB.jobStatus)) { + MatcherAssert.assertThat("service instance id is wrong", serviceInfoFromDB.serviceInstanceId, CoreMatchers.is(expectedServiceInfo.serviceInstanceId)); + } + if (expectedJobStatus.size()==1) { + assertEquals("job status is wrong", getExpectedRetryEnabled((JobStatus)(expectedJobStatus.toArray()[0])), serviceInfoFromDB.isRetryEnabled); + } + lastStatus = serviceInfoFromDB.jobStatus; + return expectedJobStatus.contains(serviceInfoFromDB.jobStatus); + } + } + + protected ResponseEntity<List<ServiceInfo>> serviceListCall() { + return restTemplate.exchange( + getServiceInfoUrl(), + org.springframework.http.HttpMethod.GET, + null, + new ParameterizedTypeReference<List<ServiceInfo>>() {}); + } + + //serialize fields except of fields we cannot know ahead of time + protected static String serviceInfoDataReflected(ServiceInfo service1) { + return new ReflectionToStringBuilder(service1, ToStringStyle.SHORT_PREFIX_STYLE) + .setExcludeFieldNames("jobStatus", "templateId", "statusModifiedDate", "createdBulkDate", "serviceInstanceId", "serviceInstanceName", "isRetryEnabled") + .toString(); + } + + protected void addBulkPendingWithCustomList(List<BasePreset> customPresets){ + Map<Keys, String> names = generateNames(); + final int bulkSize = 2 + customPresets.size(); + + List<BasePreset> msoBulkPresets = generateMsoCreateBulkPresets(bulkSize, names); + ImmutableList<BasePreset> presets = new ImmutableList.Builder<BasePreset>() + .add(new PresetGetSessionSlotCheckIntervalGet()) + .add(new PresetAAIGetSubscribersGet()) + .addAll(msoBulkPresets) + .addAll(customPresets) + .build(); + + List<String> jobIds = createBulkOfMacroInstances(presets, false, bulkSize, names); + Assert.assertEquals(jobIds.size(),bulkSize); + } + + protected void verifyAuditStatuses(String jobId, List<String> statuses, JobAuditStatus.SourceStatus source) { + int statusesSize = statuses.size(); + AtomicReference<List<JobAuditStatus>> actualAudits = new AtomicReference<>(); + if (source.equals(JobAuditStatus.SourceStatus.VID)) { + actualAudits.set(getAuditStatuses(jobId, JobAuditStatus.SourceStatus.VID.name())); + org.junit.Assert.assertEquals("Received number of VID statuses is not as expected", statusesSize, actualAudits.get().size()); + } else { + boolean isStatusedSizeAsExpected = Wait.waitFor(x-> { + actualAudits.set(getAuditStatuses(jobId, JobAuditStatus.SourceStatus.MSO.name())); + return actualAudits.get().size() == statusesSize; + },null,5,1); + org.junit.Assert.assertTrue("Received number of MSO statuses is not as expected. Expected: " + statusesSize + ". Received: " + actualAudits.get().size(), isStatusedSizeAsExpected); + } + IntStream.range(0, statusesSize).forEach(i-> org.junit.Assert.assertEquals(source + " status #" + i + " is not as expected", statuses.get(i), actualAudits.get().get(i).getJobStatus())); + } + + protected void verifyInstanceAuditStatuses(List<JobAuditStatus> expectedStatuses, List<JobAuditStatus> actualStatuses) { + final int expectedSize = expectedStatuses.size(); + assertTrue("Expected statuses size is "+ expectedSize +", actual size is "+actualStatuses.size(), new Integer(expectedSize).equals(actualStatuses.size())); + IntStream.range(0, expectedSize).forEach(i-> { + + final JobAuditStatus expectedStatus = expectedStatuses.get(i); + final JobAuditStatus actualStatus = actualStatuses.get(i); + org.junit.Assert.assertEquals("MSO status #" + i + " is not as expected", expectedStatus.getJobStatus(), actualStatus.getJobStatus()); + org.junit.Assert.assertEquals("MSO requestId #" + i + " is not as expected", expectedStatus.getRequestId(), actualStatus.getRequestId()); + org.junit.Assert.assertEquals("MSO additionalInfo #" + i + " is not as expected", expectedStatus.getAdditionalInfo(), actualStatus.getAdditionalInfo()); + org.junit.Assert.assertEquals("MSO jobID #" + i + " is not as expected", expectedStatus.getJobId(), actualStatus.getJobId()); + org.junit.Assert.assertEquals("MSO instanceName #" + i + " is not as expected", expectedStatus.getInstanceName(), actualStatus.getInstanceName()); + org.junit.Assert.assertEquals("MSO instanceType #" + i + " is not as expected", expectedStatus.getInstanceType(), actualStatus.getInstanceType()); + }); + } +} diff --git a/vid-automation/src/test/java/org/onap/vid/api/BaseApiTest.java b/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java index e7c6045a4..5b7b1b214 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/BaseApiTest.java +++ b/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java @@ -1,47 +1,42 @@ package org.onap.vid.api; +import static java.util.Collections.singletonList; +import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals; +import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; +import static org.apache.commons.text.StringEscapeUtils.unescapeJson; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.isEmptyOrNullString; +import static org.hamcrest.Matchers.not; + import com.fasterxml.jackson.core.JsonProcessingException; -import com.google.common.primitives.Ints; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import java.io.IOException; +import java.io.InputStream; +import java.net.URI; +import java.net.URL; +import java.util.List; +import java.util.Properties; +import java.util.Random; +import java.util.TimeZone; +import javax.ws.rs.client.Client; +import javax.ws.rs.client.ClientBuilder; import org.apache.commons.io.IOUtils; -import org.apache.log4j.LogManager; -import org.apache.log4j.Logger; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.uri.internal.JerseyUriBuilder; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.springframework.http.HttpHeaders; -import org.springframework.http.MediaType; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; +import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.RestTemplate; -import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import vid.automation.test.infra.FeaturesTogglingConfiguration; import vid.automation.test.services.UsersService; import vid.automation.test.utils.CookieAndJsonHttpHeadersInterceptor; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import java.io.IOException; -import java.io.InputStream; -import java.net.URI; -import java.net.URL; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.List; -import java.util.Properties; -import java.util.Random; - -import static java.util.Collections.singletonList; -import static org.apache.commons.text.StringEscapeUtils.unescapeJson; -import static org.hamcrest.CoreMatchers.everyItem; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; - public class BaseApiTest { protected static final Logger LOGGER = LogManager.getLogger(BaseApiTest.class); @@ -60,7 +55,7 @@ public class BaseApiTest { @BeforeClass public void init() { uri = getUri(); - objectMapper.configure(SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS, false); + objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); client = ClientBuilder.newClient(); client.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true); random = new Random(System.currentTimeMillis()); @@ -68,15 +63,29 @@ public class BaseApiTest { } private URI getUri() { - String host = System.getProperty("VID_HOST", "127.0.0.1"); - Integer port = Integer.valueOf(System.getProperty("VID_PORT", "8080")); + String host = System.getProperty("VID_HOST", "10.0.0.10"); + int port = Integer.valueOf(System.getProperty("VID_PORT", "8080")); return new JerseyUriBuilder().host(host).port(port).scheme("http").path("vid").build(); } public void login() { - UserCredentials userCredentials = getUserCredentials(); + login(getUserCredentials()); + } + + public void login(UserCredentials userCredentials) { final List<ClientHttpRequestInterceptor> interceptors = singletonList(new CookieAndJsonHttpHeadersInterceptor(getUri(), userCredentials)); restTemplate.setInterceptors(interceptors); + restTemplate.setErrorHandler(new DefaultResponseErrorHandler() { + @Override + public void handleError(ClientHttpResponse response) throws IOException { + try { + super.handleError(response); + } catch (HttpStatusCodeException e) { + LOGGER.error("HTTP {}: {}", e.getStatusCode(), e.getResponseBodyAsString(), e); + throw e; + } + } + }); restTemplateErrorAgnostic.setInterceptors(interceptors); restTemplateErrorAgnostic.setErrorHandler(new DefaultResponseErrorHandler() { @@ -88,70 +97,14 @@ public class BaseApiTest { } - static class DB_CONFIG { - static String url = String.format("jdbc:mariadb://%s:%d/vid_portal", - System.getProperty("DB_HOST", System.getProperty("VID_HOST", "127.0.0.1")), - Integer.valueOf(System.getProperty("DB_PORT", "3306")) - ); - static String username = "euser"; - static String password = "euser"; - - static final int userId = 2222; - static final String loginId = "vid1"; - static final int roleId = 2222221; - static final int logRoleId = 2222222; - } - - + //set time zone to UTC so clock will go closely with VID app @BeforeClass - protected void createNewTestUser() { - - deleteNewTestUser(); - - LOGGER.debug("Connecting database..."); - - try (Connection connection = DriverManager.getConnection(DB_CONFIG.url, DB_CONFIG.username, DB_CONFIG.password)) { - - LOGGER.debug("Database connected!"); - //create new user with specific role - Statement stmt = connection.createStatement(); - stmt.addBatch("INSERT INTO `fn_user` (`USER_ID`, `ORG_USER_ID`, `LOGIN_ID`, `LOGIN_PWD`) VALUES (" + DB_CONFIG.userId + ", 'Porfirio Gerhardt', '" + DB_CONFIG.loginId + "', '" + DB_CONFIG.loginId + "')"); - stmt.addBatch("INSERT INTO `fn_role` (`ROLE_ID`, `ROLE_NAME`, `ACTIVE_YN`, `PRIORITY`) VALUES (" + DB_CONFIG.roleId + ", 'PACKET CORE___vFlowLogic', 'Y', 5)"); - stmt.addBatch("INSERT INTO `fn_role` (`ROLE_ID`, `ROLE_NAME`, `ACTIVE_YN`, `PRIORITY`) VALUES (" + DB_CONFIG.logRoleId + ", 'READ___LOGS___PERMITTED', 'Y', 5)"); - stmt.addBatch("INSERT INTO `fn_user_role` (`USER_ID`, `ROLE_ID`, `PRIORITY`, `APP_ID`) VALUES (" + DB_CONFIG.userId + ", " + DB_CONFIG.roleId + ", NULL, 1)"); - stmt.addBatch("INSERT INTO `fn_user_role` (`USER_ID`, `ROLE_ID`, `PRIORITY`, `APP_ID`) VALUES (" + DB_CONFIG.userId + ", " + DB_CONFIG.logRoleId + ", NULL, 1)"); - - - int[] executeBatch = stmt.executeBatch(); - assertThat(Ints.asList(executeBatch), everyItem(greaterThan(0))); - - } catch (SQLException e) { - throw new IllegalStateException("Cannot connect the database!", e); - } - - } - - @AfterClass - protected void deleteNewTestUser() { - LOGGER.debug("Connecting database..."); - - try (Connection connection = DriverManager.getConnection(DB_CONFIG.url, DB_CONFIG.username, DB_CONFIG.password)) { - LOGGER.debug("Database connected!"); - Statement stmt = connection.createStatement(); - stmt.addBatch("DELETE FROM `fn_user_role` WHERE `USER_ID` = " + DB_CONFIG.userId); - stmt.addBatch("DELETE FROM `fn_user` WHERE `USER_ID` = " + DB_CONFIG.userId); - stmt.addBatch("DELETE FROM `fn_role` WHERE `ROLE_ID` = " + DB_CONFIG.roleId); - stmt.addBatch("DELETE FROM `fn_role` WHERE `ROLE_ID` = " + DB_CONFIG.logRoleId); - - - int[] executeBatch = stmt.executeBatch(); - - } catch (SQLException e) { - throw new IllegalStateException("Cannot connect the database!", e); - } + public void setDefaultTimeZoneToUTC() { + System.setProperty("user.timezone", "UTC"); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); //since TimeZone cache previous user.timezone } - protected UserCredentials getUserCredentials() { + public UserCredentials getUserCredentials() { final Properties configProp = new Properties(); try { InputStream input = ClassLoader.getSystemResourceAsStream("test_config.properties"); @@ -160,8 +113,6 @@ public class BaseApiTest { throw new RuntimeException(e); } - HttpHeaders loginRequestHeaders = new HttpHeaders(); - loginRequestHeaders.setContentType(MediaType.APPLICATION_FORM_URLENCODED); String loginId = configProp.getProperty("test.loginId", "i'm illegal"); String loginPassword = configProp.getProperty("test.loginPassword", "i'm illegal"); return new UserCredentials(loginId, loginPassword, null, null, null); @@ -200,4 +151,13 @@ public class BaseApiTest { } } + protected void assertJsonEquals(String actual, String expected) { + LOGGER.info(actual); + assertThat(actual, not(isEmptyOrNullString())); + + assertThat(actual, jsonEquals(expected) + .when(IGNORING_ARRAY_ORDER) + ); + } + } diff --git a/vid-automation/src/test/java/org/onap/vid/api/BaseMsoApiTest.java b/vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java index 1495f1852..175638008 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/BaseMsoApiTest.java +++ b/vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java @@ -2,6 +2,8 @@ package org.onap.vid.api; import com.google.common.collect.ImmutableMap; import org.json.JSONException; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; import org.onap.vid.model.mso.MsoResponseWrapper2; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; @@ -15,9 +17,10 @@ import vid.automation.test.services.SimulatorApi.RegistrationStrategy; import java.io.IOException; import java.lang.reflect.Method; +import java.util.List; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; public class BaseMsoApiTest extends BaseApiTest { @@ -28,6 +31,20 @@ public class BaseMsoApiTest extends BaseApiTest { protected void callMsoWithSimulatedErrorResponse(String expectationJsonFileName, ImmutableMap<String, Object> replacementsForJson, String targetUri, String basicRequestBody, int expectedErrorCode, String expectedResult, HttpMethod method) throws IOException { SimulatorApi.registerExpectation(expectationJsonFileName, replacementsForJson, RegistrationStrategy.CLEAR_THEN_SET); + callMsoAndAssertError(targetUri, basicRequestBody, expectedErrorCode, expectedResult, method); + } + + protected void callMsoWithSimulatedErrorResponse(BaseMSOPreset expectation, String targetUri, String basicRequestBody, int expectedErrorCode, String expectedResult, HttpMethod method) throws IOException { + SimulatorApi.registerExpectationFromPreset(expectation, RegistrationStrategy.CLEAR_THEN_SET); + callMsoAndAssertError(targetUri, basicRequestBody, expectedErrorCode, expectedResult, method); + } + + protected void callMsoWithSimulatedErrorResponse(List<BasePreset> expectations, String targetUri, String basicRequestBody, int expectedErrorCode, String expectedResult, HttpMethod method) throws IOException { + SimulatorApi.registerExpectationFromPresets(expectations, RegistrationStrategy.CLEAR_THEN_SET); + callMsoAndAssertError(targetUri, basicRequestBody, expectedErrorCode, expectedResult, method); + } + + private void callMsoAndAssertError(String targetUri, String basicRequestBody, int expectedErrorCode, String expectedResult, HttpMethod method) throws IOException { try { MsoResponseWrapper2 responseWrapper = callMsoForResponseWrapper(method, targetUri, basicRequestBody); @@ -41,7 +58,20 @@ public class BaseMsoApiTest extends BaseApiTest { protected void callMsoWithFineRequest(String expectationJsonFileName, ImmutableMap<String, Object> replacementsForJson, String targetUri, String requestBody, int expectedStatusCode, String expectedResult, HttpMethod method) throws IOException { SimulatorApi.registerExpectation(expectationJsonFileName, replacementsForJson, RegistrationStrategy.CLEAR_THEN_SET); + callMsoAndAssertSuccess(targetUri, requestBody, expectedStatusCode, expectedResult, method); + } + + protected void callMsoWithFineRequest(BaseMSOPreset expectation, String targetUri, String requestBody, int expectedStatusCode, String expectedResult, HttpMethod method) throws IOException { + SimulatorApi.registerExpectationFromPreset(expectation, RegistrationStrategy.CLEAR_THEN_SET); + callMsoAndAssertSuccess(targetUri, requestBody, expectedStatusCode, expectedResult, method); + } + + protected void callMsoWithFineRequest(List<BasePreset> expectations, String targetUri, String requestBody, int expectedStatusCode, String expectedResult, HttpMethod method) throws IOException { + SimulatorApi.registerExpectationFromPresets(expectations, RegistrationStrategy.CLEAR_THEN_SET); + callMsoAndAssertSuccess(targetUri, requestBody, expectedStatusCode, expectedResult, method); + } + private void callMsoAndAssertSuccess(String targetUri, String requestBody, int expectedStatusCode, String expectedResult, HttpMethod method) throws IOException { MsoResponseWrapper2 responseWrapper = callMsoForResponseWrapper(method, targetUri, requestBody); assertThat("Wrong propagated status from MSO", responseWrapper.getStatus(), is(expectedStatusCode)); diff --git a/vid-automation/src/main/java/org/onap/vid/api/CreateInstanceWithFailedService.java b/vid-automation/src/main/java/org/onap/vid/api/CreateInstanceWithFailedService.java new file mode 100644 index 000000000..6c8f3fade --- /dev/null +++ b/vid-automation/src/main/java/org/onap/vid/api/CreateInstanceWithFailedService.java @@ -0,0 +1,87 @@ +package org.onap.vid.api; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.mso.*; +import org.springframework.http.ResponseEntity; +import vid.automation.test.model.JobStatus; +import vid.automation.test.model.ServiceAction; +import vid.automation.test.services.SimulatorApi; + +import java.util.List; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; +import static org.onap.vid.api.AsyncInstantiationBase.CREATE_BULK_OF_ALACARTE_REQUEST_WITH_VNF; +import static org.onap.vid.api.TestUtils.hasOrLacksOfEntry; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPreset; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; + +public class CreateInstanceWithFailedService { + private CreateServiceWithFailedVnf.ResourceIds firstIds = new CreateServiceWithFailedVnf.ResourceIds(); + private AsyncInstantiationBase asyncInstantiationBase; + private List<PresetMSOBaseCreateInstancePost> createPresets; + private String serviceInstanceName = TestUtils.generateRandomAlphaNumeric(10); + private ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names; + private List<PresetMSOOrchestrationRequestGet> inProgressPresets; + private List<String> uuids; + private String originalJobId; + ObjectMapper objectMapper = new ObjectMapper(); + + + public CreateInstanceWithFailedService(AsyncInstantiationBase asyncInstantiationALaCarteApiTest) { + this.asyncInstantiationBase = asyncInstantiationALaCarteApiTest; + } + + private CreateInstanceWithFailedService createInstanceWithFailedService() { + + names = ImmutableMap.of(SERVICE_NAME, serviceInstanceName); + + final String serviceFailedStatusMessage = "The service instantiation is failed."; + createPresets = ImmutableList.of( + new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService(names, 0, firstIds.serviceReqId, firstIds.serviceId) + ); + inProgressPresets = ImmutableList.of( + new PresetMSOOrchestrationRequestGet("FAILED", firstIds.serviceReqId, serviceFailedStatusMessage) + ); + List<BasePreset> presets = asyncInstantiationBase.getPresets(createPresets, inProgressPresets); + + registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); + registerExpectationFromPreset(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC, SimulatorApi.RegistrationStrategy.APPEND); + + uuids = asyncInstantiationBase.createBulkOfInstances(false, 1, names, CREATE_BULK_OF_ALACARTE_REQUEST_WITH_VNF); + return this; + } + + protected void deployServiceFailedInstance() { + createInstanceWithFailedService(); + firstTimeAssertion(); + prepareAndAssertJsonFileForCypressTest(); + } + + private void prepareAndAssertJsonFileForCypressTest() { + final ResponseEntity<String> responseEntity = asyncInstantiationBase.getRetryBulk(originalJobId); + String expected = TestUtils.convertRequest(objectMapper, "asyncInstantiation/ServiceWithFailedServiceInstance.json"); + expected = expected + .replace("SERVICE_NAME", serviceInstanceName); + String originalResponse = responseEntity.getBody(); + String responseToCompare = originalResponse.replaceFirst("(instanceName\":\")(.*?)(\")", "$1INSTANCE_NAME$3").replaceAll("(trackById\":\")(.*?)(\")", "$1TRACK_BY_ID$3"); + asyncInstantiationBase.assertJsonEquals(responseToCompare, expected); + } + + private void firstTimeAssertion() { + assertThat(uuids, hasSize(1)); + originalJobId = uuids.get(0); + asyncInstantiationBase.assertServiceInfoSpecific1(originalJobId, JobStatus.FAILED, names.get(SERVICE_NAME), "us16807000", firstIds.serviceId, ServiceAction.INSTANTIATE); + asyncInstantiationBase.assertAuditStatuses(originalJobId, asyncInstantiationBase.vidAuditStatusesFailed(originalJobId), null); + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + hasOrLacksOfEntry(createPresets.get(0).getReqPath(), 1L), + hasOrLacksOfEntry(inProgressPresets.get(0).getReqPath(), 1L) + )); + } +} diff --git a/vid-automation/src/main/java/org/onap/vid/api/CreateServiceWithFailedVnf.java b/vid-automation/src/main/java/org/onap/vid/api/CreateServiceWithFailedVnf.java new file mode 100644 index 000000000..30076a964 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/vid/api/CreateServiceWithFailedVnf.java @@ -0,0 +1,226 @@ +package org.onap.vid.api; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import org.hamcrest.Matchers; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.mso.*; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.onap.vid.model.asyncInstantiation.ServiceInfo; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import vid.automation.test.infra.ModelInfo; +import vid.automation.test.model.JobStatus; +import vid.automation.test.model.ServiceAction; +import vid.automation.test.services.SimulatorApi; + +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME; +import static org.onap.vid.api.TestUtils.hasOrLacksOfEntry; +import static org.testng.Assert.assertTrue; +import static org.testng.AssertJUnit.assertFalse; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPreset; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; + +//CreateServiceWithFailedVnf is common for API test and UI test, +//so if you change it, make sure both test are compatible with your changes +public class CreateServiceWithFailedVnf { + private AsyncInstantiationBase asyncInstantiationBase; + private ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names; + private List<PresetMSOBaseCreateInstancePost> createPresets; + private List<PresetMSOOrchestrationRequestGet> inProgressPresets; + private List<String> uuids; + private List<String> retryUuids; + private String originalJobId; + private String serviceInstanceName = TestUtils.generateRandomAlphaNumeric(10); + private ResourceIds firstIds = new ResourceIds(); + private ResourceIds retryIds = new ResourceIds(); + private String vnfEditedName = TestUtils.generateRandomAlphaNumeric(10); + ObjectMapper objectMapper = new ObjectMapper(); + public final ModelInfo serviceComplexService = new ModelInfo("e3c34d88-a216-4f1d-a782-9af9f9588705", "0367689e-d41e-483f-b200-eab17e4a7f8d", "service-Complexservice-aLaCarte-csar-2.zip"); + + public CreateServiceWithFailedVnf(AsyncInstantiationBase asyncInstantiationALaCarteApiTest) { + this.asyncInstantiationBase = asyncInstantiationALaCarteApiTest; + } + + public ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> getNames() { + return names; + } + + public ResourceIds getFirstIds() { + return firstIds; + } + + public static class ResourceIds { + public String serviceId =UUID.randomUUID().toString(); + public String serviceReqId =UUID.randomUUID().toString(); + public String vnfId =UUID.randomUUID().toString(); + public String vnfReqId =UUID.randomUUID().toString(); + } + + + public CreateServiceWithFailedVnf createServicesWithVnfCompletedWithError() { +/* +Legit Preset || deploy 1 Service, 1 VNF which will fail + -> JobStatus of service is COMPLETED_WITH_ERRORS, audit + is adequate; strict simulator comapre + */ + + names = ImmutableMap.of(SERVICE_NAME, serviceInstanceName, VNF_NAME, serviceInstanceName+"_vnf"); + + + + final String vnfFailedStatusMessage = "Vnf failed."; + createPresets = ImmutableList.of( + new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService(names, 0, firstIds.serviceReqId, firstIds.serviceId), + new PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance(names.get(VNF_NAME),firstIds.vnfReqId , firstIds.serviceId, firstIds.vnfId, 0) + ); + inProgressPresets = ImmutableList.of( + new PresetMSOOrchestrationRequestGet("COMPLETE", firstIds.serviceReqId), + new PresetMSOOrchestrationRequestGet("FAILED", firstIds.vnfReqId, vnfFailedStatusMessage) + ); + List<BasePreset> presets = asyncInstantiationBase.getPresets(createPresets, inProgressPresets); + + registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); + registerExpectationFromPreset(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC, SimulatorApi.RegistrationStrategy.APPEND); + + uuids = asyncInstantiationBase.createBulkOfInstances(false, 1, names, AsyncInstantiationBase.CREATE_BULK_OF_ALACARTE_REQUEST_WITH_VNF); + return this; + } + + public void firstTimeAssertion() { + assertThat(uuids, hasSize(1)); + originalJobId = uuids.get(0); + + asyncInstantiationBase.assertServiceInfoSpecific1(originalJobId, JobStatus.COMPLETED_WITH_ERRORS, names.get(SERVICE_NAME), "us16807000", firstIds.serviceId, ServiceAction.INSTANTIATE); + asyncInstantiationBase.assertAuditStatuses(originalJobId, asyncInstantiationBase.vidAuditStatusesCompletedWithErrors(originalJobId),null); + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + hasOrLacksOfEntry(createPresets.get(0).getReqPath(), 1L), + hasOrLacksOfEntry(createPresets.get(1).getReqPath(), 1L), + hasOrLacksOfEntry(inProgressPresets.get(0).getReqPath(), 1L), + hasOrLacksOfEntry(inProgressPresets.get(1).getReqPath(), 1L) + )); + } + + public String getBulkForRetry(){ + final ResponseEntity<String> responseEntity= asyncInstantiationBase.getRetryBulk(originalJobId); + String expected = TestUtils.convertRequest(objectMapper, "asyncInstantiation/ServiceTreeForRetry_serviceInstance.json"); + expected = expected + .replace("SERVICE_NAME", serviceInstanceName); + String originalResponse = responseEntity.getBody(); + String responseToCompare = originalResponse.replaceFirst( "(instanceId\":\")(.*?)(\")", "$1INSTANCE_ID$3") + .replaceAll( "(trackById\":\")(.*?)(\")", "$1TRACK_BY_ID$3"); + asyncInstantiationBase.assertJsonEquals(responseToCompare, expected); + return originalResponse; + } + + public void getBulkForRetryNotFound() { + UUID jobId= UUID.randomUUID(); + final ResponseEntity<String> response = asyncInstantiationBase.getRetryBulk(jobId.toString()); + assertThat(response.getStatusCode(), is(HttpStatus.NOT_FOUND)); + assertThat(response.getBody(),containsString("Failed to retrieve class org.onap.vid.dao.JobRequest with JOB_ID "+jobId+" from table. no resource found")); + } + + private void secondRegistration(String vnfName) { + createPresets = ImmutableList.of( + new PresetMSOCreateVNFInstanceOnlyRelatedServiceInstance(vnfName, retryIds.vnfReqId, firstIds.serviceId, retryIds.vnfId, 0) + ); + inProgressPresets = ImmutableList.of( + new PresetMSOOrchestrationRequestGet("COMPLETE", retryIds.vnfReqId) + ); + + registerExpectationFromPresets(asyncInstantiationBase.getPresets(createPresets, inProgressPresets), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); + registerExpectationFromPresets(ImmutableList.of( + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC, + new PresetSDCGetServiceMetadataGet(serviceComplexService), + new PresetSDCGetServiceToscaModelGet(serviceComplexService)), + SimulatorApi.RegistrationStrategy.APPEND); + + + } + + public String deployService1FailedVnf(){ + createServicesWithVnfCompletedWithError(); + firstTimeAssertion(); + return getBulkForRetry(); + } + + public void assertResourceAuditStatus(String bulkForRetry) { + String vnfTrackById = extractVnfTrackById(bulkForRetry); + + Map<String, Object> auditStatus = (Map) asyncInstantiationBase.getResourceAuditInfo(vnfTrackById); + assertThat(auditStatus.get("jobStatus"), equalTo("FAILED")); + assertThat(auditStatus.get("additionalInfo"), equalTo("Vnf failed.")); + assertThat(auditStatus.get("requestId"), equalTo(firstIds.vnfReqId)); + } + + private String extractVnfTrackById(String bulk) { + Map<String, Object> serviceInstantiation = null; + try { + serviceInstantiation = objectMapper.readValue(bulk, new TypeReference<Map<String, Object>>(){}); + Map<String, Object> vnf = (Map) ((Map) serviceInstantiation.get("vnfs")).get("vSAMP12 1"); + return vnf.get("trackById").toString(); + } catch (IOException e) { + return null; + } + } + + + public void secondRegistration() { + secondRegistration(names.get(VNF_NAME)); + } + + public void retryJob() { + //retry the previous job + retryUuids = asyncInstantiationBase.retryJob(originalJobId); + } + + public void retryJobWithOtherDataAndAssert(String requestBody){ + retryUuids = asyncInstantiationBase.retryJobWithChangedData(originalJobId, requestBody); + retryAssertion(); + simulatorCallsAssertion(); + } + + public String changeSomeDataAndRegisterToSimulator(String payload){ + payload = payload.replace(names.get(VNF_NAME), vnfEditedName); + secondRegistration(vnfEditedName); + return payload; + } + + + public void retryAssertion() { + + assertThat(retryUuids, Matchers.hasSize(1)); + String retryJobId = retryUuids.get(0); + assertThat(retryJobId, not(equalTo(originalJobId))); + asyncInstantiationBase.assertServiceInfoSpecific1(retryJobId, JobStatus.COMPLETED, names.get(SERVICE_NAME), "us16807000", firstIds.serviceId, ServiceAction.UPDATE); + + //make sure original job is retry is disabled. + Optional<ServiceInfo> optionalServiceInfo = asyncInstantiationBase.serviceListCall().getBody().stream().filter(si -> originalJobId.equals(si.jobId)).findFirst(); + assertTrue(optionalServiceInfo.isPresent()); + assertFalse(optionalServiceInfo.get().isRetryEnabled); + } + + public void simulatorCallsAssertion() { + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + hasOrLacksOfEntry(createPresets.get(0).getReqPath(), 1L), + hasOrLacksOfEntry(inProgressPresets.get(0).getReqPath(), 1L) + )); + } + + +} diff --git a/vid-automation/src/test/java/org/onap/vid/api/TestUtils.java b/vid-automation/src/main/java/org/onap/vid/api/TestUtils.java index 76c122c48..a2fe82e9d 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/TestUtils.java +++ b/vid-automation/src/main/java/org/onap/vid/api/TestUtils.java @@ -1,8 +1,10 @@ package org.onap.vid.api; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import org.apache.commons.text.RandomStringGenerator; +import org.hamcrest.Matcher; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PathMatchingResourcePatternResolver; import org.springframework.core.io.support.ResourcePatternResolver; @@ -10,14 +12,17 @@ import org.springframework.http.HttpStatus; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.Response; -import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.util.Map; import java.util.Scanner; -/** - * Created by Oren on 6/7/17. - */ +import static org.apache.commons.text.CharacterPredicates.DIGITS; +import static org.apache.commons.text.CharacterPredicates.LETTERS; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.*; +import static vid.automation.test.utils.RegExMatcher.matchesRegEx; + public class TestUtils { protected static ObjectMapper objectMapper = new ObjectMapper(); @@ -27,7 +32,7 @@ public class TestUtils { } public static void assertHttpStatus(Object request, WebTarget webTarget, Response response, HttpStatus exceptedHttpStatus) throws IOException { - objectMapper.configure(SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS, false); + objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false); org.testng.Assert.assertEquals(response.getStatus(), exceptedHttpStatus.value(), String.format("Failed post URI: %s with request %s. Got Status:%d and body: %s", @@ -39,14 +44,14 @@ public class TestUtils { public static String convertRequest(ObjectMapper objectMapper, String msoRequestDetailsFileName) { - ClassLoader cl = pProbeMsoApiTest.class.getClassLoader(); + ClassLoader cl = TestUtils.class.getClassLoader(); ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(cl); Resource[] resources; try { resources = resolver.getResources(msoRequestDetailsFileName); - String content; - File file = resources[0].getFile(); - content = new Scanner(file).useDelimiter("\\Z").next(); + //using InputStream and not file. see https://stackoverflow.com/questions/14876836/file-inside-jar-is-not-visible-for-spring/51131841#51131841 + InputStream inputStream = resources[0].getInputStream(); + String content = new Scanner(inputStream).useDelimiter("\\Z").next(); objectMapper.configure(JsonParser.Feature.ALLOW_COMMENTS, true); return objectMapper.writeValueAsString(objectMapper.readValue(content, Object.class)); } @@ -78,4 +83,17 @@ public class TestUtils { } return getNestedPropertyInMap(((Map<String,Object>)item).get(pathes[index]), pathes, ++index); } + + static Matcher hasOrLacksOfEntry(String pathRegex, Long expectedCounter) { + return expectedCounter.equals(0L) ? not(hasKey(matchesRegEx(pathRegex))) : hasEntry(matchesRegEx(pathRegex), is(expectedCounter)); + } + + private static RandomStringGenerator generator = new RandomStringGenerator.Builder() + .withinRange('0', 'z') + .filteredBy(LETTERS, DIGITS) + .build(); + + public static String generateRandomAlphaNumeric(int length) { + return generator.generate(length); + } } diff --git a/vid-automation/src/test/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java b/vid-automation/src/main/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java index 7c1481562..b012628e0 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java +++ b/vid-automation/src/main/java/org/onap/vid/model/asyncInstantiation/JobAuditStatus.java @@ -25,6 +25,22 @@ public class JobAuditStatus { this.isFinal = isFinal; } + public JobAuditStatus(UUID jobId, String jobStatus, SourceStatus source, UUID requestId, String additionalInfo, Boolean isFinal, String instanceName) { + this(jobId, jobStatus, source, requestId, additionalInfo, isFinal); + this.instanceName = instanceName; + } + + public JobAuditStatus(String instanceName, String jobStatus, UUID requestId, String additionalInfo, Boolean isFinal, String instanceType) { + this.instanceType = instanceType; + this.instanceName = instanceName; + this.jobStatus = jobStatus; + this.requestId = requestId; + this.additionalInfo = additionalInfo; + this.isFinal = isFinal; + } + + + public enum SourceStatus { @@ -37,8 +53,12 @@ public class JobAuditStatus { private SourceStatus source; private UUID requestId; private String additionalInfo; + private String instanceName; + private String instanceType; + public String getInstanceType() {return instanceType;} + public void setInstanceType(String instanceType) {this.instanceType = instanceType; } private Boolean isFinal; @@ -62,7 +82,9 @@ public class JobAuditStatus { return requestId; } - + public String getInstanceName() { + return instanceName; + } public Boolean isFinal(){ return isFinal; @@ -80,6 +102,7 @@ public class JobAuditStatus { ", source=" + source + ", requestId=" + requestId + ", additionalInfo='" + additionalInfo + '\'' + + ", instanceName='" + instanceName + '\'' + ", isFinal=" + isFinal + '}'; } @@ -88,7 +111,7 @@ public class JobAuditStatus { public boolean equals(Object o) { if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (!(o instanceof JobAuditStatus)) return false; JobAuditStatus that = (JobAuditStatus) o; @@ -98,6 +121,7 @@ public class JobAuditStatus { .append(source, that.source) .append(requestId, that.requestId) .append(additionalInfo, that.additionalInfo) + .append(instanceName, that.instanceName) .append(isFinal, that.isFinal) .isEquals(); } @@ -110,12 +134,8 @@ public class JobAuditStatus { .append(source) .append(requestId) .append(additionalInfo) + .append(instanceName) .append(isFinal) .toHashCode(); } - - - - - } diff --git a/vid-automation/src/test/java/org/onap/vid/model/asyncInstantiation/ServiceInfo.java b/vid-automation/src/main/java/org/onap/vid/model/asyncInstantiation/ServiceInfo.java index 371aaf81e..8f40fc098 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/asyncInstantiation/ServiceInfo.java +++ b/vid-automation/src/main/java/org/onap/vid/model/asyncInstantiation/ServiceInfo.java @@ -2,6 +2,7 @@ package org.onap.vid.model.asyncInstantiation; import vid.automation.test.model.JobStatus; +import vid.automation.test.model.ServiceAction; import java.util.Date; @@ -31,12 +32,14 @@ public class ServiceInfo { public String serviceModelName; public String serviceModelVersion; public Date createdBulkDate; + public ServiceAction action; + public boolean isRetryEnabled; public ServiceInfo(){ } - public ServiceInfo(String userId, JobStatus jobStatus, boolean pause, String owningEntityId, String owningEntityName, String project, String aicZoneId, String aicZoneName, String tenantId, String tenantName, String regionId, String regionName, String serviceType, String subscriberName, String serviceInstanceId, String serviceInstanceName, String serviceModelId, String serviceModelName, String serviceModelVersion, String jobId, String templateId) { + public ServiceInfo(String userId, JobStatus jobStatus, boolean pause, String owningEntityId, String owningEntityName, String project, String aicZoneId, String aicZoneName, String tenantId, String tenantName, String regionId, String regionName, String serviceType, String subscriberName, String serviceInstanceId, String serviceInstanceName, String serviceModelId, String serviceModelName, String serviceModelVersion, String jobId, String templateId, ServiceAction action, boolean isRetryEnabled) { this.userId = userId; this.jobStatus = jobStatus; this.pause = pause; @@ -58,6 +61,8 @@ public class ServiceInfo { this.serviceModelVersion = serviceModelVersion; this.jobId = jobId; this.templateId = templateId; + this.action = action; + this.isRetryEnabled = isRetryEnabled; } public JobStatus getJobStatus() { diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapper2.java b/vid-automation/src/main/java/org/onap/vid/model/mso/MsoResponseWrapper2.java index 29fa931d5..40bf86b26 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapper2.java +++ b/vid-automation/src/main/java/org/onap/vid/model/mso/MsoResponseWrapper2.java @@ -1,5 +1,6 @@ package org.onap.vid.model.mso; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; import com.fasterxml.jackson.core.JsonProcessingException; @@ -42,8 +43,7 @@ public class MsoResponseWrapper2<T> implements MsoResponseWrapperInterface { } @Override - @org.codehaus.jackson.annotate.JsonIgnore - @com.fasterxml.jackson.annotation.JsonIgnore + @JsonIgnore public String getResponse() { try { return objectMapper.writeValueAsString(this); diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java b/vid-automation/src/main/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java index eb305d2df..8a20ff187 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java +++ b/vid-automation/src/main/java/org/onap/vid/model/mso/MsoResponseWrapperInterface.java @@ -1,5 +1,6 @@ package org.onap.vid.model.mso; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonProperty; public interface MsoResponseWrapperInterface { @@ -9,7 +10,6 @@ public interface MsoResponseWrapperInterface { @JsonProperty("status") int getStatus(); - @org.codehaus.jackson.annotate.JsonIgnore - @com.fasterxml.jackson.annotation.JsonIgnore + @JsonIgnore String getResponse(); } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RestObject.java b/vid-automation/src/main/java/org/onap/vid/model/mso/RestObject.java index b91ea410a..043766dac 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RestObject.java +++ b/vid-automation/src/main/java/org/onap/vid/model/mso/RestObject.java @@ -24,8 +24,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.MoreObjects; import javax.ws.rs.core.Response; -import java.text.DateFormat; -import java.text.SimpleDateFormat; /** * The Class RestObject. @@ -34,8 +32,6 @@ import java.text.SimpleDateFormat; */ public class RestObject<T> { - final static DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss:SSSS"); - final static ObjectMapper objectMapper = new ObjectMapper(); /** diff --git a/vid-automation/src/main/java/vid/automation/test/Constants.java b/vid-automation/src/main/java/vid/automation/test/Constants.java index e10a9675b..3df26f6ab 100644 --- a/vid-automation/src/main/java/vid/automation/test/Constants.java +++ b/vid-automation/src/main/java/vid/automation/test/Constants.java @@ -27,6 +27,7 @@ public class Constants { public static final String DROPDOWN_PERMITTED_ASSERT_FAIL_MESSAGE = "Dropdown permitted options are not according to user permissions."; public static final String CONFIRM_BUTTON_TESTS_ID = "confirmButton"; public static final String CONFIRM_RESUME_DELETE_TESTS_ID = "confirmResumeDeleteButton"; + public static final String SOFT_DELETE_TESTS_ID = "softDeleteButton"; public static final String CLOSE_BUTTON_TEXT = "Close"; public static final String CANCEL_BUTTON_TEST_ID = "cancelButton"; public static final String COMMIT_CLOSE_BUTTON_ID = "msoCommitDialogCloseButton"; @@ -59,8 +60,10 @@ public class Constants { public static final String DELETE_CONFIGURATION_BUTTON = "deleteConfigurationButton"; public static final String ACTIVATE_DEACTIVATE_BUTTON = "activateDeactivateButton"; public static final String ENABLE_DISABLE_BUTTON = "enableDisableButton"; + public static final String SUBSCRIBER_SELECT_ID= "subscriber-name-select"; public static final String PNF_SERVICE_TYPE = "pnf"; + public static final String GR_API = "GR_API"; public class bugFixes{ public static final String HEADER_CONTAINER = "headerContainer"; @@ -96,11 +99,11 @@ public class Constants { public static final String newModalWorkFlowInputId = "workflow"; public static final String newModalConfigUpdateInputId = "config-update-input"; public static final String newModalTargetVersionInputsClass = "vnf-versions-select-as-text"; - public static final String newModalSubscriberText = "FIREWALL/MISC"; - public static final String newModalServiceTypeText = "vFlowLogic"; + public static final String newModalSubscriberText = "CRAIG/ROBERTS"; + public static final String newModalServiceTypeText = "vRichardson"; public static final String newModalVnfTypeText = "vMobileDNS"; public static final String newModalSourceVersionText = "1.0"; - public static final String newModalVnfNameText = "zrdm3amdns02test2"; + public static final String newModalVnfNameText = "zolson3amdns02test2"; public static final String newModalWorkflowText = "VNF Config Update"; @@ -168,11 +171,11 @@ public class Constants { public static final String AVAILABLE_MODELS_TREE = "available-models-tree"; public static final String DRAWING_BOARD_TREE = "drawing-board-tree"; public static final String NODE_PREFIX = "node-"; - public static final String SEARCH_LEFT_TREE = "search-left-tree"; + public static final String SEARCH_LEFT_TREE = "search-left-tree-input"; public static final String ADD_BUTTON = "-add-btn"; public static final String CONTEXT_MENU_BUTTON = "-menu-btn"; public static final String ALERT_ICON = "-alert-icon"; - public static final String CONTEXT_MENU_ITEM = "context-menu-item"; + public static final String CONTEXT_MENU_EDIT = "context-menu-edit"; public static final String TOGGLE_CHILDREN = "toggle-children"; public static final String TREE_NODE_LEAF = "tree-node-leaf"; public static final String HIGHLIGHTED_COLOR = "rgb(0, 159, 219)"; @@ -182,6 +185,8 @@ public class Constants { public static final String CONTEXT_MENU_HEADER_DELETE_ITEM = "context-menu-header-delete-item"; public static final String SERVICE_QUANTITY = "servicesQuantity"; public static final String BACK_BUTTON = "backBtn"; + public static final String STOP_INSTANTIATION_BUTTON = "button-stop-instantiation"; + public static final String CANCEL_BUTTON = "button-cancel"; public static final String DEPLOY_BUTTON = "deployBtn"; public static final String DEFAULT_SERVICE_NAME = "<Automatically Assigned>"; public static final String SERVICE_NAME = "serviceName"; @@ -190,16 +195,20 @@ public class Constants { public static final String SERVICE_INSTANCE_TEST_ID = "serviceInstance"; public static final String QUANTITY_LABEL_TEST_ID = "quantityLabel"; public static final String QUANTITY_LABEL_VALUE = "Scale Times:"; + public static final String CONTEXT_MENU_SHOW_AUDIT = "context-menu-showAuditInfo"; } public class InstantiationStatus { + public static final String CONTEXT_MENU_REMOVE = "context-menu-remove"; public static final String CONTEXT_MENU_DELETE = "context-menu-delete"; public static final String CONTEXT_MENU_HIDE = "context-menu-hide"; public static final String CONTEXT_MENU_HEADER_OPEN_ITEM = "context-menu-open"; + public static final String CONTEXT_MENU_RETRY = "context-menu-retry"; public static final String CONTEXT_MENU_HEADER_AUDIT_INFO_ITEM = "context-menu-audit-info"; + public static final String CONTEXT_MENU_DUPLICATE = "context-menu-duplicate"; public static final String TD_JOB_STATUS_ICON = "jobStatusIcon"; } @@ -270,7 +279,7 @@ public class Constants { public static final String CREATE_SERVICE_INSTANCE = "Create Service Instance"; public static final String AIC_OPTION_CLASS = "aicZoneOption"; public static class NewServicePopup { - public static final String SET_BUTTON = "service-form-set"; + public static final String SET_BUTTON = "form-set"; public static final String CANCEL_BUTTON = "cancelButton"; public static final String INSTANCE_NAME = "instanceName"; public static final String SERVICE_UUID = "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"; @@ -287,7 +296,7 @@ public class Constants { }}; } - public static final String CREATE_SERVICE_INSTANCE_MACRO_MODAL = "create a new service instance"; + public static final String CREATE_SERVICE_INSTANCE_MACRO_MODAL = "Set a new service instance"; } @@ -366,6 +375,7 @@ public class Constants { public static final String DELETE_VF_MODULE_BUTTON_TEST_ID = "deleteVFModuleButton-"; public static final String DELETE_VNF_VOLUME_GROUP_BUTTON_TEST_ID = "deleteVNFVolumeGroupButton"; public static final String ACTIVATE_BUTTON_TEST_ID = "activateButton"; + public static final String ACTIVATE_FABRIC_CONFIGURATION_BUTTON_TEST_ID = "activateFabricConfigurationButton"; public static final String SHOW_ASSIGNMENTS_BUTTON_TEST_ID = "showAssignmentsButton"; public static final String OPTION_IN_DROPDOWN_NOT_EXISTS = "the option %s in dropdown %s not exists"; public static final String DISSOCIATE_BTN_CLASS = "dissociate-pnf"; @@ -445,6 +455,7 @@ public class Constants { public static final String INFO_TEST_ID_PREFIX = "info-test-data-id-"; public static final String SERVIICE_NAME_KEY = "ServiceName"; public static final String ROLLBACK_ON_FAILURE_ID = "rollbackOnFailure"; + public static final String ROLLBACK_ON_FAILURE_TEST_ID = "rollback"; public static final String SUBSCRIBER_NAME_KEY = "SubscriberName"; public static final String SERVICE_INSTANCE_NAME = "ServiceInstanceName"; public static final String MODEL_NAME = "ModelName"; @@ -491,10 +502,10 @@ public class Constants { public class Users { public static final String READONLY = "readonly"; - public static final String USP_VOICE_VIRTUAL_USP = "uspVoiceVirtualUsp"; - public static final String MOBILITY_MOBILITY = "mobilityMobility"; - public static final String FIREWALL_MISC_AIM_TRANSPORT = "FIREWALL_AIM_Trans"; - public static final String MOBILITY_VMMSC = "mobilityVMMSC"; + public static final String SILVIA_ROBBINS_TYLER_SILVIA = "uspVoiceVirtualUsp"; + public static final String EMANUEL_EMANUEL = "emanuelEmanuel"; + public static final String CRAIG_ROBERTS_AIM_TRANSPORT = "FIREWALL_AIM_Trans"; + public static final String EMANUEL_vWINIFRED = "emanuelvWINIFRED"; public static final String SUPRE_USER = "su"; } @@ -502,18 +513,17 @@ public class Constants { //separated simulated json files according to pages public class SearchForServiceInstance { - public static final String GET_FULL_SUBSCRIBERS = "search_for_service_instance/aai_get_full_subscribers.json"; public static final String GET_SERVICES = "search_for_service_instance/aai_get_services.json"; public static final String FILTER_SERVICE_INSTANCE_BY_ID = "search_for_service_instance/aai_filter_service_instance_by_id.json"; public static final String FILTER_CR_SERVICE_INSTANCE_BY_ID = "search_for_service_instance/aai_filter_cr_service_instance_by_id.json"; public static final String FILTER_SERVICE_INSTANCE_BY_ID_2 = "search_for_service_instance/aai_filter_service_instance_by_id_2.json"; public static final String FILTER_SERVICE_INSTANCE_BY_ID_PM = "search_for_service_instance/aai_filter_service_instance_by_id_test_sssdad.json"; public static final String FILTER_SERVICE_INSTANCE_BY_ID_NO_MODEL_VER_ID = "search_for_service_instance/aai_filter_service_instance_by_id_test_without_model_ver_id.json"; - public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_USP_VOICE = "search_for_service_instance/aai_get_subscribers_for_customer_USP-VOICE.json"; - public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_USP_VOICE_CR = "search_for_service_instance/aai_get_subscribers_for_customer_USP-VOICE_cr.json"; + public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_SILVIA_ROBBINS = "search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json"; + public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_SILVIA_ROBBINS_CR = "search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS_cr.json"; public static final String GET_MSO_INSTANCE_ORCH_STATUS_REQ = "search_for_service_instance/mso_instance_orch_status_req.json"; - public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_Mobility = "search_for_service_instance/aai_get_subscribers_for_customer_Mobility.json"; - public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_FIREWALL_MISC = "search_for_service_instance/aai_get_subscribers_for_customer_FIREWALL-MISC.json"; + public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_Emanuel = "search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json"; + public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_CRAIG_ROBERTS = "search_for_service_instance/aai_get_subscribers_for_customer_CRAIG-ROBERTS.json"; public static final String NAMED_QUERY_VIEW_EDIT = "search_for_service_instance/aai_named_query_for_view_edit.json"; public static final String NAMED_QUERY_CR_VIEW_EDIT = "search_for_service_instance/aai_named_query_for_cr_view_edit.json"; public static final String NAMED_QUERY_VIEW_EDIT_2 = "search_for_service_instance/aai_named_query_for_view_edit_2.json"; @@ -525,7 +535,7 @@ public class Constants { public class AddSubinterface { public static final String FILTER_VFC_IG_SERVICE_INSTANCE_BY_ID = "add_subinterface/aai_filter_vfc_ig_service_instance_by_id.json"; - public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_USP_VOICE_VFC_IG = "add_subinterface/aai_get_subscribers_for_customer_USP-VOICE_vfc_ig.json"; + public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_SILVIA_ROBBINS_VFC_IG = "add_subinterface/aai_get_subscribers_for_customer_SILVIA-ROBBINS_vfc_ig.json"; public static final String GET_MSO_VFC_IG_INSTANCE_ORCH_STATUS_REQ = "add_subinterface/mso_vfc_ig_instance_orch_status_req.json"; public static final String NAMED_QUERY_VFC_IG_VIEW_EDIT = "add_subinterface/aai_named_query_for_vfc_ig_view_edit.json"; public static final String GET_SDC_CATALOG_SERVICE_VID_TEST_444 = "add_subinterface/get_sdc_catalog_services_vid-test-333.json"; @@ -555,16 +565,6 @@ public class Constants { public static final String GET_PNF_INSTANCES = "create_configuration/aai_get_pnf_instances_by_region.json"; public static final String GET_MODEL_BY_ONE_INVARIANT_ID = "create_configuration/aai_get_model_by_one_invariant_id.json"; public static final String GET_MODEL_BY_2_INVARIANT_IDS = "create_configuration/aai_get_model_by_2_invariant_ids.json"; - public static final String MSO_CREATE_CONFIGURATION = "create_configuration/mso_create_configuration_pProbe.json"; - public static final String MSO_CREATE_CONFIGURATION_ORCH_REQ = "create_configuration/mso_create_configuration_orch_req.json"; - public static final String MSO_CREATE_CONFIGURATION_ERROR = "create_configuration/mso_create_configuration_pProbe_error.json"; - public static final String MSO_UNASSIGN_ACTIVE_SERVICE = "mso_unassign_service.json"; - public static final String MSO_DELETE_CONFIGURATION = "create_configuration/mso_delete_configuration.json"; - public static final String MSO_ACTIVATE_CONFIGURATION = "create_configuration/mso_activate_configuration.json"; - public static final String MSO_ENABLE_DISABLE_PORT = "create_configuration/mso_enable_disable_port.json"; - - - public static final String MSO_DEACTIVATE_CONFIGURATION = "create_configuration/mso_activate_configuration.json"; } public class addNetwork{ @@ -574,17 +574,14 @@ public class Constants { public static final String AAI_NAMED_QUERY_FOR_VIEW_EDIT ="add_network/aai_named_query_for_view_edit_test_network-vl.json"; public static final String AAI_GET_TENANTS = "add_network/aai_get_tenants.json"; public static final String MSO_ADD_NETWORK_ERROR = "add_network/mso_add_network_error.json"; - public static final String MSO_ADD_NETWORK = "add_network/mso_add_network.json"; - public static final String MSO_ADD_NETWORK_ORCH_REQ = "add_network/mso_add_network_orch_req.json"; } public class CreateNewServiceInstance { - public static final String GET_FULL_SUBSCRIBES = "create_new_instance/aai_get_full_subscribers.json"; public static final String GET_SERVICES = "create_new_instance/aai_get_services.json"; - public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_MSO_1610_ST = "create_new_instance/aai_get_subscribers_for_customer_MSO_1610_ST.json"; - public static final String GET_MODELS_BY_SERVICE_TYPE_MSO_1610_ST = "create_new_instance/aai_get_models_by_service_type_MSO_1610_ST.json"; - public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_USP_VOICE = "create_new_instance/aai_get_subscribers_for_customer_USP_VOICE.json"; - public static final String GET_MODELS_BY_SERVICE_TYPE_USP_VOICE= "create_new_instance/aai_get_models_by_service_type_USP_VOICE.json"; + public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_CAR_2020_ER = "create_new_instance/aai_get_subscribers_for_customer_CAR_2020_ER.json"; + public static final String GET_MODELS_BY_SERVICE_TYPE_CAR_2020_ER = "create_new_instance/aai_get_models_by_service_type_CAR_2020_ER.json"; + public static final String GET_SUBSCRIBERS_FOR_CUSTOMER_SILVIA_ROBBINS = "create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json"; + public static final String GET_MODELS_BY_SERVICE_TYPE_SILVIA_ROBBINS= "create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json"; public class deploy { public static final String SDC_GET_CATALOG = "create_new_instance/deploy/get_sdc_catalog_services_1707vidnf.json"; diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Click.java b/vid-automation/src/main/java/vid/automation/test/infra/Click.java index 8c6bf4831..0b5f40b84 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Click.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Click.java @@ -1,10 +1,8 @@ package vid.automation.test.infra; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.Alert; -import org.openqa.selenium.By; -import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.Select; @@ -12,38 +10,40 @@ import org.openqa.selenium.support.ui.WebDriverWait; import java.util.List; +import static org.onap.sdc.ci.tests.utilities.GeneralUIUtils.getDriver; + public class Click { public static void byText(String text) { WebElement element = GeneralUIUtils.findByText(text); Assert.assertTrue(element != null); - element.click(); + clickWhenClickable(element); } public static void byId(String id) { WebElement element = Get.byId(id); Assert.assertTrue(element != null); - element.click(); + clickWhenClickable(element); } public static void byTestId(String testId) { WebElement element = Get.byTestId(testId); Assert.assertTrue(element != null); - element.click(); + clickWhenClickable(element); } public static void byClass(String className) { List<WebElement> elements = Get.byClass(className); Assert.assertTrue(elements != null && elements.size() > 0); - elements.get(0).click(); + clickWhenClickable(elements.get(0)); } public static void byXpath(String xpath) { WebElement element = Get.byXpath(xpath); Assert.assertNotNull(element); - element.click(); + clickWhenClickable(element); } @@ -73,7 +73,7 @@ public class Click { public static void byClassAndVisibleText(String className, String text ) { WebElement element = Get.byClassAndText(className, text); - element.click(); + clickWhenClickable(element); } @@ -83,4 +83,11 @@ public class Click { Assert.assertTrue(alert != null); alert.accept(); } + + private static void clickWhenClickable(WebElement element) { + new WebDriverWait(getDriver(), 1) + .until(ExpectedConditions.elementToBeClickable(element)) + .click(); + } + } diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Features.java b/vid-automation/src/main/java/vid/automation/test/infra/Features.java index 37698fe36..cd632ff12 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Features.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Features.java @@ -7,7 +7,6 @@ public enum Features implements Feature { CREATE_INSTANCE_TEST, EMPTY_DRAWING_BOARD_TEST, - FLAG_REGION_ID_FROM_REMOTE, FLAG_ASYNC_JOBS, FLAG_ADD_MSO_TESTAPI_FIELD, FLAG_ASYNC_INSTANTIATION, @@ -16,8 +15,32 @@ public enum Features implements Feature { FLAG_NETWORK_TO_ASYNC_INSTANTIATION, FLAG_COLLECTION_RESOURCE_SUPPORT, FLAG_SHOW_ASSIGNMENTS, + FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS, FLAG_SHOW_VERIFY_SERVICE, - FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD; + FLAG_DUPLICATE_VNF, + FLAG_DEFAULT_VNF, + FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD, + FLAG_RESTRICTED_SELECT, + FLAG_5G_IN_NEW_INSTANTIATION_UI, + FLAG_ASYNC_ALACARTE_VNF, + FLAG_A_LA_CARTE_AUDIT_INFO, + FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS, + FLAG_ASYNC_ALACARTE_VFMODULE, + FLAG_SUPPLEMENTARY_FILE, + FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF, + FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI, + FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY, + FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST, + FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE, + FLAG_1810_IDENTIFY_SERVICE_FOR_NEW_UI, + FLAG_1902_NEW_VIEW_EDIT, + FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER, + FLAG_1902_VNF_GROUPING, + FLAG_1902_RETRY_JOB, + FLAG_VF_MODULE_RESUME_STATUS_CREATE, + FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL, + FLAG_1906_INSTANTIATION_API_USER_VALIDATION, + ; public boolean isActive() { return FeatureContext.getFeatureManager().isActive(this); diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Get.java b/vid-automation/src/main/java/vid/automation/test/infra/Get.java index fc1d06070..9bcad7b64 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Get.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Get.java @@ -1,7 +1,7 @@ package vid.automation.test.infra; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.*; import org.openqa.selenium.support.ui.WebDriverWait; @@ -20,7 +20,7 @@ public class Get { public static WebElement byTestId(String dataTestId) { try { - return GeneralUIUtils.getDriver().findElement(By.xpath("//*[@data-tests-id='" + dataTestId + "']")); + return GeneralUIUtils.getDriver().findElement(getXpathForDataTestId(dataTestId)); } catch (Exception var2) { return null; } @@ -34,6 +34,14 @@ public class Get { } } + public static WebElement byXpath(WebElement context, String xpath) { + try { + return context.findElement(By.xpath(xpath)); + } catch (Exception var2) { + return null; + } + } + public static WebElement byXpath(String xpath, int timeout) { try { return GeneralUIUtils.getWebElementBy(By.xpath(xpath), timeout); @@ -152,4 +160,16 @@ public class Get { } }; } + + public static List<WebElement> listByTestId(String dataTestId) { + try { + return GeneralUIUtils.getDriver().findElements(getXpathForDataTestId(dataTestId)); + } catch (Exception var2) { + return null; + } + } + + public static By getXpathForDataTestId(String dataTestId) { + return By.xpath("//*[@data-tests-id='" + dataTestId + "']"); + } } diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Input.java b/vid-automation/src/main/java/vid/automation/test/infra/Input.java index 896ceae56..b937a9d42 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Input.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Input.java @@ -1,6 +1,6 @@ package vid.automation.test.infra; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.utils.ReadFile; diff --git a/vid-automation/src/main/java/vid/automation/test/infra/ModelInfo.java b/vid-automation/src/main/java/vid/automation/test/infra/ModelInfo.java new file mode 100644 index 000000000..1284a8b42 --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/infra/ModelInfo.java @@ -0,0 +1,81 @@ +package vid.automation.test.infra; + +import com.google.common.collect.ImmutableList; + +public class ModelInfo { + public final String modelVersionId; //aka model uuid + public final String modelInvariantId; + public final String zipFileName; + + public static class ModelInfoWithMultipleVersions { + public final String modelInvariantId; + public final String modelVersionId1; + public final String modelVersionId2; + public final String modelVersionId3; + public final String modelName; + + + ModelInfoWithMultipleVersions(String modelInvariantId, String modelVersionId1, String modelVersionId2, String modelVersionId3, String modelName) { + this.modelInvariantId = modelInvariantId; + this.modelVersionId1 = modelVersionId1; + this.modelVersionId2 = modelVersionId2; + this.modelVersionId3 = modelVersionId3; + this.modelName = modelName; + } + + public static final ModelInfoWithMultipleVersions modelInfoWithMultipleVersions = new ModelInfoWithMultipleVersions( + "5d353b28-e5b7-419b-98e8-cad5d258be13", + "5e7970bc-a292-4955-8a1b-8a44f586f527", + "04743c62-ab58-41a0-bc53-1052ef1c094a", + "d2415de6-dde3-4737-b9b0-4f9fa02fab68", + "serviceWithGreatNameForMultiple"); + } + + public ModelInfo(String modelVersionId, String modelInvariantId, String zipFileName) { + this.modelVersionId = modelVersionId; + this.modelInvariantId = modelInvariantId; + this.zipFileName = zipFileName; + } + + public ModelInfo(String modelVersionId, String modelInvariantId) { + this(modelVersionId, modelInvariantId, "fakeCsarName.zip"); + } + + public static final ModelInfo macroForBrowseSdc = new ModelInfo("4d71990b-d8ad-4510-ac61-496288d9078e","d27e42cf-087e-4d31-88ac-6c4b7585f800"); + public static final ModelInfo aLaCarteForBrowseSdc = new ModelInfo("4d71990b-d8ad-4510-ac61-496288d9078e","a8dcd72d-d44d-44f2-aa85-53aa9ca99cba"); + public static final ModelInfo serviceWithOneVersion = new ModelInfo("16a3133f-cd29-44df-aa3c-79a75e40802a", "a313c1fb-b8ce-4e5f-abfa-ad6611203350"); + + public static final ModelInfo instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID = new ModelInfo ("95eb2c44-bff2-4e8b-ad5d-8266870b7717", "31a229a2-71d0-48e1-9003-850c2696d6d4", "csar15782222_instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID.zip"); + public static final ModelInfo macroSriovWithDynamicFieldsEcompNamingTruePartialModelDetails = new ModelInfo ("2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", "45aee87d-883b-4644-9006-e0ca48d33cbf", "csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip"); + public static final ModelInfo macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails = new ModelInfo ("1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", "cdb90b57-ed78-4d44-a5b4-7f43a02ec632", "csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip"); + public static final ModelInfo macroSriovWithDynamicFieldsEcompNamingFalsePartialModelDetailsVnfEcompNamingFalse = new ModelInfo("6b528779-44a3-4472-bdff-9cd15ec93450", "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0" , "csar-withDynamicFields-ecompNamingFalse-partialModelDetails-vnfEcompNamingFalse.zip"); + public static final ModelInfo macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse = new ModelInfo("4a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", "4140a873-00bb-4f57-ac46-0494cc9e674a", "csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip"); + public static final ModelInfo aLaCarteNetworkProvider5G = new ModelInfo("4659e8bd-0920-4eed-8ec5-550b4c8dceeb", "16e56d12-40b3-4db1-a40e-d48c36679e2e", "service-SrIovProvider1-csar.zip"); + public static final ModelInfo PASQUALEVmxVpeBvService488Annotations = new ModelInfo("f4d84bb4-a416-4b4e-997e-0059973630b9", "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9", "service-PASQUALEVmxVpeBvService488-csar-annotations.zip"); + public static final ModelInfo macroDrawingBoardComplexService = new ModelInfo("6e59c5de-f052-46fa-aa7e-2fca9d674c44","cfef8302-d90f-475f-87cc-3f49a62ef14c", "service-Complexservice-csar.zip" ); + public static final ModelInfo aLaCarteServiceCreationTest = new ModelInfo("f913c5d0-206e-45c2-9284-1c68f4e67dc7", "45e61192-876c-4e28-9139-5a0c47410379", "serviceCreationTest.zip"); + public static final ModelInfo aLaCarteVnfGroupingService = new ModelInfo("4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", "7ee41ce4-4827-44b0-a48e-2707a59905d2", "csar15782222_instantiationTypeAlacarte_VnfGrouping.zip"); + public static final ModelInfo serviceFabricSriovService = new ModelInfo("253f1467-fe68-4e80-ba71-308000caec31", "c15fe228-7d40-4f99-afa7-10abeedf9aac", "service-fabric-SriovService-csar.zip"); + + public static final ImmutableList<ModelInfo> superSetOfModelInfos = buildModelInfos(); + + public static ImmutableList<ModelInfo> buildModelInfos() { + return new ImmutableList.Builder<ModelInfo>() + .add(macroForBrowseSdc) + .add(aLaCarteForBrowseSdc) + .add(serviceWithOneVersion) + .add(instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID) + .add(macroSriovWithDynamicFieldsEcompNamingTruePartialModelDetails) + .add(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails) + .add(macroSriovWithDynamicFieldsEcompNamingFalsePartialModelDetailsVnfEcompNamingFalse) + .add(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse) + .add(aLaCarteNetworkProvider5G) + .add(PASQUALEVmxVpeBvService488Annotations) + .add(macroDrawingBoardComplexService) + .add(aLaCarteServiceCreationTest) + .add(aLaCarteVnfGroupingService) + .build(); + } +} + + diff --git a/vid-automation/src/main/java/vid/automation/test/infra/SelectOption.java b/vid-automation/src/main/java/vid/automation/test/infra/SelectOption.java index dc792cfc3..cd766c5bf 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/SelectOption.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/SelectOption.java @@ -1,11 +1,14 @@ package vid.automation.test.infra; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import com.google.common.collect.ImmutableList; +import org.apache.commons.lang3.ObjectUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.Select; import vid.automation.test.Constants; import java.util.List; +import java.util.concurrent.TimeUnit; /** * Created by itzikliderman on 18/07/2017. @@ -56,6 +59,13 @@ public class SelectOption { } + public static void waitForOptionInSelect(String option, String selectTestId) { + Wait.waitFor(foo -> + ObjectUtils.defaultIfNull(SelectOption.getList(selectTestId), ImmutableList.<WebElement>of()) + .stream().map(o -> o.getText()).filter(o -> option.equals(o)).findAny().isPresent(), + "", 10, 200, TimeUnit.MILLISECONDS); + } + public static void selectOptionsFromMultiselectById(String multiSelectId, List<String> options) { Click.byId(multiSelectId); try { diff --git a/vid-automation/src/main/java/vid/automation/test/infra/Wait.java b/vid-automation/src/main/java/vid/automation/test/infra/Wait.java index 848107c83..cab3a2d5b 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/Wait.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/Wait.java @@ -1,7 +1,7 @@ package vid.automation.test.infra; import org.apache.commons.collections.CollectionUtils; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.NoSuchElementException; import vid.automation.test.Constants; @@ -58,6 +58,10 @@ public class Wait { return waitFor((x->Get.byTestId(dataTestId)!=null),null, timeoutInSeconds, 1); } + public static boolean waitByIdAndText(String id, String text, int timeoutInSeconds) { + return waitFor((x->Get.byId(id).getText().equals(text)),null, timeoutInSeconds, 1); + } + public static void angularHttpRequestsLoaded() { JavascriptExecutor js = (JavascriptExecutor) GeneralUIUtils.getDriver(); for (int i=0; i<Constants.generalRetries; i++) { diff --git a/vid-automation/src/main/java/vid/automation/test/model/Credentials.java b/vid-automation/src/main/java/vid/automation/test/model/Credentials.java index 0dc26aefd..46d44b296 100644 --- a/vid-automation/src/main/java/vid/automation/test/model/Credentials.java +++ b/vid-automation/src/main/java/vid/automation/test/model/Credentials.java @@ -1,8 +1,5 @@ package vid.automation.test.model; -/** - * Created by itzikliderman on 26/06/2017. - */ public class Credentials { public String userId; public String password; diff --git a/vid-automation/src/main/java/vid/automation/test/model/JobBulk.java b/vid-automation/src/main/java/vid/automation/test/model/JobBulk.java deleted file mode 100644 index 80d4109a6..000000000 --- a/vid-automation/src/main/java/vid/automation/test/model/JobBulk.java +++ /dev/null @@ -1,23 +0,0 @@ -package vid.automation.test.model; - -import java.util.List; - -public class JobBulk { - - private List<JobModel> jobs; - - public JobBulk() { - } - - public JobBulk(List<JobModel> jobs) { - this.jobs = jobs; - } - - public List<JobModel> getJobs() { - return jobs; - } - - public void setJobs(List<JobModel> jobs) { - this.jobs = jobs; - } -} diff --git a/vid-automation/src/main/java/vid/automation/test/model/JobStatus.java b/vid-automation/src/main/java/vid/automation/test/model/JobStatus.java index 0e92a1f35..a51336ec6 100644 --- a/vid-automation/src/main/java/vid/automation/test/model/JobStatus.java +++ b/vid-automation/src/main/java/vid/automation/test/model/JobStatus.java @@ -2,9 +2,11 @@ package vid.automation.test.model; public enum JobStatus { COMPLETED, + COMPLETED_WITH_NO_ACTION, FAILED, IN_PROGRESS, PAUSE, PENDING, - STOPPED; + STOPPED, + COMPLETED_WITH_ERRORS; } diff --git a/vid-automation/src/main/java/vid/automation/test/model/Service.java b/vid-automation/src/main/java/vid/automation/test/model/Service.java index 4ed51eeb1..4aa4a7f9e 100644 --- a/vid-automation/src/main/java/vid/automation/test/model/Service.java +++ b/vid-automation/src/main/java/vid/automation/test/model/Service.java @@ -1,5 +1,7 @@ package vid.automation.test.model; +import com.google.common.base.MoreObjects; + /** * Created by itzikliderman on 19/06/2017. */ @@ -33,4 +35,18 @@ public class Service { this.description = description; this.serviceRole = serviceRole; } + + @Override + public String toString() { + return MoreObjects.toStringHelper(this) + .add("type", type) + .add("uuid", uuid) + .add("invariantUuid", invariantUuid) + .add("name", name) + .add("version", version) + .add("category", category) + .add("description", description) + .add("serviceRole", serviceRole) + .toString(); + } } diff --git a/vid-automation/src/main/java/vid/automation/test/model/ServiceAction.java b/vid-automation/src/main/java/vid/automation/test/model/ServiceAction.java new file mode 100644 index 000000000..a155c6c72 --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/model/ServiceAction.java @@ -0,0 +1,7 @@ +package vid.automation.test.model; + +public enum ServiceAction { + INSTANTIATE, + DELETE, + UPDATE +}
\ No newline at end of file diff --git a/vid-automation/src/main/java/vid/automation/test/sections/BrowseASDCPage.java b/vid-automation/src/main/java/vid/automation/test/sections/BrowseASDCPage.java index 53a67821d..febbe6e83 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/BrowseASDCPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/BrowseASDCPage.java @@ -1,7 +1,7 @@ package vid.automation.test.sections; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; import vid.automation.test.infra.Get; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/ChangeManagementPage.java b/vid-automation/src/main/java/vid/automation/test/sections/ChangeManagementPage.java index ca0b55b36..953219547 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/ChangeManagementPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/ChangeManagementPage.java @@ -1,6 +1,6 @@ package vid.automation.test.sections; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import vid.automation.test.Constants; import vid.automation.test.infra.Click; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/CreateConfigurationPage.java b/vid-automation/src/main/java/vid/automation/test/sections/CreateConfigurationPage.java index bb68d9b9e..4b837a0ac 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/CreateConfigurationPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/CreateConfigurationPage.java @@ -1,7 +1,7 @@ package vid.automation.test.sections; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; import vid.automation.test.infra.SelectOption; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/CreateNewInstancePage.java b/vid-automation/src/main/java/vid/automation/test/sections/CreateNewInstancePage.java index d63b8a191..68e673b68 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/CreateNewInstancePage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/CreateNewInstancePage.java @@ -1,6 +1,6 @@ package vid.automation.test.sections; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import vid.automation.test.Constants; import vid.automation.test.model.Service; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialog.java b/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialog.java index ae7573333..e7288ea79 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialog.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialog.java @@ -1,6 +1,6 @@ package vid.automation.test.sections; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; @@ -13,7 +13,7 @@ public class DeployMacroDialog extends DeployMacroDialogBase { public void assertTitle(){ WebElement modalTitle = GeneralUIUtils.getWebElementByTestID(Constants.CREATE_MODAL_TITLE_ID, 30); - assertThat(modalTitle.getText().toLowerCase(), containsString(dialogTitle)); + assertThat(modalTitle.getText(), containsString(dialogTitle)); } @Override public void closeDialog(){ diff --git a/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialogOld.java b/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialogOld.java index 032852099..e0e391b4d 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialogOld.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/DeployMacroDialogOld.java @@ -1,7 +1,7 @@ package vid.automation.test.sections; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/DrawingBoardPage.java b/vid-automation/src/main/java/vid/automation/test/sections/DrawingBoardPage.java index 7cffd37b9..acbb4d991 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/DrawingBoardPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/DrawingBoardPage.java @@ -1,7 +1,8 @@ package vid.automation.test.sections; import com.google.common.collect.ImmutableList; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import com.google.common.collect.Sets; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.NoSuchElementException; @@ -12,9 +13,9 @@ import vid.automation.test.infra.Click; import vid.automation.test.infra.Get; import vid.automation.test.infra.Wait; -import java.util.Collection; -import java.util.Map; +import java.util.*; import java.util.function.Function; +import java.util.function.Predicate; import java.util.stream.Collectors; import static org.hamcrest.CoreMatchers.equalTo; @@ -189,7 +190,7 @@ public class DrawingBoardPage extends VidBasePage { public void checkContextMenu(String node){ String contextMenuButton = Constants.DrawingBoard.NODE_PREFIX + node + Constants.DrawingBoard.CONTEXT_MENU_BUTTON; - final String contextMenu = Constants.DrawingBoard.CONTEXT_MENU_ITEM; + final String contextMenu = Constants.DrawingBoard.CONTEXT_MENU_EDIT; checkThatPseudoElementNotExist(contextMenuButton); checkThatContextMenuNotExist(contextMenu); @@ -254,4 +255,33 @@ public class DrawingBoardPage extends VidBasePage { Assert.assertEquals(Get.byTestId(SERVICE_QUANTITY).getText(), (String.valueOf(expectedQuantity))); } + public static class ServiceStatusChecker implements Predicate<Boolean> { + private String actualInstanceName; + private Set<String> expectedStatuses; + private Set<String> columnClassesSet; + + public ServiceStatusChecker(String actualInstanceName, Set<String> expectedStatuses) { + this.actualInstanceName = actualInstanceName; + this.expectedStatuses = expectedStatuses; + } + + @Override + public boolean test(Boolean noMeaning) { + InstantiationStatusPage.clickRefreshButton(); + final WebElement row = InstantiationStatusPage.getInstantiationStatusRow(actualInstanceName); + if (row == null) { + System.err.println("**********************" + actualInstanceName + "************************************************"); + columnClassesSet = Collections.singleton(actualInstanceName + " NOT FOUND"); + return false; // treat missing row as if test condition not fulfilled + } else { + columnClassesSet = new HashSet<>(Arrays.asList( + row.findElements(By.xpath(".//*[@id='" + "jobStatus" + "']")).get(0).getAttribute("class").split(" "))); + return !(Sets.intersection(expectedStatuses, columnClassesSet).isEmpty()); + } + } + + public Set<String> getColumnClassesSet() { + return columnClassesSet; + } + } } diff --git a/vid-automation/src/main/java/vid/automation/test/sections/InstantiationStatusPage.java b/vid-automation/src/main/java/vid/automation/test/sections/InstantiationStatusPage.java index e5dd1bb39..1bb095fda 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/InstantiationStatusPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/InstantiationStatusPage.java @@ -1,22 +1,36 @@ package vid.automation.test.sections; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.apache.http.NameValuePair; +import org.apache.http.client.utils.URLEncodedUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; +import vid.automation.test.Constants; +import vid.automation.test.infra.Click; import vid.automation.test.infra.Get; +import vid.automation.test.infra.Wait; +import java.nio.charset.Charset; +import java.util.List; import java.util.Map; +import java.util.function.Consumer; import java.util.stream.Collectors; +import static java.util.stream.Collectors.toMap; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; +import static org.testng.Assert.assertEquals; public abstract class InstantiationStatusPage extends VidBasePage { public static final String refreshButtonId = "refresh-btn"; + private static final String NEW_VIEW_EDIT_RELATIVE_URL = "serviceModels.htm#/servicePlanning"; + + public static String getWebTrTdSpanElementByParentID(WebElement tr, String id, int timeout) { return tr.findElements(By.xpath(".//*[@id='" + id + "']//span")).get(0).getText(); } @@ -55,5 +69,78 @@ public abstract class InstantiationStatusPage extends VidBasePage { GeneralUIUtils.ultimateWait(); } + public static void checkMenuItem(String actualInstanceName, String contextMenuItem, boolean shouldBeEnabled, Consumer<String> doIfEnabled) { + Wait.waitFor(name -> { + if (null == getInstantiationStatusRow(name)) { + clickRefreshButton(); + return false; + } else { + return true; + } + }, actualInstanceName, 8, 1); + final WebElement row = getInstantiationStatusRow(actualInstanceName); + row.findElement(By.className("menu-div")).click(); + String clazz = Get.byXpath("//div[@data-tests-id='" + contextMenuItem + "']/ancestor::li").getAttribute("class"); + assertThat("item " + contextMenuItem + " of " + actualInstanceName + + " should be " + (shouldBeEnabled ? "enabled" : "disabled"), !clazz.equals("disabled"), is(shouldBeEnabled)); + if (shouldBeEnabled) { + doIfEnabled.accept(contextMenuItem); + } else { + // dismiss menu + Get.byTestId("instantiation-status-title").click(); + } + } + public void showTooltipByHoverAboveStatusIcon(String elementTestId){ + WebElement selectedElement = GeneralUIUtils.getWebElementByTestID(elementTestId, 30); + } + + public static void openDrawingBoardForRetry(String serviceInstanceName) { + InstantiationStatusPage.checkMenuItem(serviceInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_RETRY, true, contextMenuRetry -> { + Click.byTestId(contextMenuRetry); + VidBasePage.goOutFromIframe(); + verifyUrlPrefixMatchNewViewEdit("RETRY_EDIT"); + }); + } + + public static void verifyOpenNewViewEdit(String serviceInstanceName, String serviceInstanceId, String serviceModelId, String serviceType, String subscriberId, String mode) { + InstantiationStatusPage.checkMenuItem(serviceInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_HEADER_OPEN_ITEM, true, contextMenuOpen -> { + Click.byTestId(contextMenuOpen); + VidBasePage.goOutFromIframe(); + verifyUrlMatchNewViewEdit(serviceInstanceId, serviceModelId, serviceType, subscriberId, mode); + SideMenu.navigateToMacroInstantiationStatus(); + }); + } + + public static void verifyOpenNewViewEdit(String serviceInstanceName, boolean openShouldBeEnabled, String expectedMode) { + InstantiationStatusPage.checkMenuItem(serviceInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_HEADER_OPEN_ITEM, openShouldBeEnabled, contextMenuOpen -> { + Click.byTestId(contextMenuOpen); + VidBasePage.goOutFromIframe(); + verifyUrlPrefixMatchNewViewEdit(expectedMode); + SideMenu.navigateToMacroInstantiationStatus(); + }); + } + + public static void verifyUrlMatchNewViewEdit(String serviceInstanceId, String serviceModelId, String serviceType, String subscriberId, String expectedMode) { + verifyUrlPrefixMatchNewViewEdit(expectedMode); + Map<String, String> paramsMap = extractQueryParamsFromCurrentURL(NEW_VIEW_EDIT_RELATIVE_URL + "/" + expectedMode + "?"); + //assertEquals(paramsMap.get("mode"), expectedMode); + assertEquals(paramsMap.get("serviceInstanceId"), serviceInstanceId); + assertEquals(paramsMap.get("serviceModelId"), serviceModelId); + assertEquals(paramsMap.get("serviceType"), serviceType); + assertEquals(paramsMap.get("subscriberId"), subscriberId); + } + + protected static Map<String, String> extractQueryParamsFromCurrentURL(String relativePath) { + String currentUrl = GeneralUIUtils.getDriver().getCurrentUrl(); + //unfortunately parse(final URI uri, final String charset) can't handle with the #/ part of the uri + String urlSuffix = currentUrl.substring(currentUrl.indexOf(relativePath)+relativePath.length()); + List<NameValuePair> params = URLEncodedUtils.parse(urlSuffix, Charset.forName("UTF-8")); + return params.stream().collect(toMap(NameValuePair::getName, NameValuePair::getValue)); + } + + public static void verifyUrlPrefixMatchNewViewEdit(String expectedMode) { + String currentUrl = GeneralUIUtils.getDriver().getCurrentUrl(); + assertThat(currentUrl, containsString(NEW_VIEW_EDIT_RELATIVE_URL + "/" + expectedMode)); + } } diff --git a/vid-automation/src/main/java/vid/automation/test/sections/LoginExternalPage.java b/vid-automation/src/main/java/vid/automation/test/sections/LoginExternalPage.java index c1053d2a5..7a13e4d1b 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/LoginExternalPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/LoginExternalPage.java @@ -1,7 +1,7 @@ package vid.automation.test.sections; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import static org.junit.Assert.*; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/PnfSearchAssociationPage.java b/vid-automation/src/main/java/vid/automation/test/sections/PnfSearchAssociationPage.java index 3f8061a78..2efb9f3c8 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/PnfSearchAssociationPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/PnfSearchAssociationPage.java @@ -1,7 +1,7 @@ package vid.automation.test.sections; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/PreviousVersionDialog.java b/vid-automation/src/main/java/vid/automation/test/sections/PreviousVersionDialog.java index d5f39d959..cfbf025a6 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/PreviousVersionDialog.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/PreviousVersionDialog.java @@ -1,7 +1,7 @@ package vid.automation.test.sections; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import org.openqa.selenium.remote.RemoteWebElement; import vid.automation.test.infra.Get; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/SearchExistingPage.java b/vid-automation/src/main/java/vid/automation/test/sections/SearchExistingPage.java index edfcd0e56..aa9675b76 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/SearchExistingPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/SearchExistingPage.java @@ -1,7 +1,7 @@ package vid.automation.test.sections; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; import vid.automation.test.infra.Click; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/ServiceProxyPage.java b/vid-automation/src/main/java/vid/automation/test/sections/ServiceProxyPage.java index a47870290..82f45ce7f 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/ServiceProxyPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/ServiceProxyPage.java @@ -1,7 +1,7 @@ package vid.automation.test.sections; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; import vid.automation.test.infra.SelectOption; @@ -24,6 +24,11 @@ public class ServiceProxyPage extends VidBasePage { GeneralUIUtils.ultimateWait(); return this; } + public void assertCollectorServiceType(String collectorServiceType) { + String displayedCollectorServiceType = SelectOption.getSelectedOption("collectorServiceType"); + Assert.assertEquals("The displayed collector service type is incorrect", collectorServiceType, displayedCollectorServiceType); + } + public ServiceProxyPage chooseCollector(String collector){ GeneralUIUtils.ultimateWait(); SelectOption.byTestIdAndVisibleText(collector, Constants.ConfigurationCreation.COLLECTOR_DROPDOWN_TEST_ID); diff --git a/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java b/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java index 0ba49f2d8..dc3de78dd 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/SideMenu.java @@ -1,12 +1,16 @@ package vid.automation.test.sections; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.ElementClickInterceptedException; import org.openqa.selenium.UnhandledAlertException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import vid.automation.test.Constants; public class SideMenu { + static final Logger logger = LoggerFactory.getLogger(SideMenu.class); + public static void navigateToBrowseASDCPage() { navigateToPage(Constants.SideMenu.BROWSE_ASDC_SERVICE_MODELS); } @@ -24,7 +28,7 @@ public class SideMenu { } public static void navigateToMacroInstantiationStatus() { - navigateToPage("Macro Instantiation Status"); + navigateToPage("Instantiation Status"); new VidBasePage().goToIframe(); } @@ -47,6 +51,7 @@ public class SideMenu { } }); GeneralUIUtils.ultimateWait(); + logger.info("navigated to {}", PageName); } public static void navigateToWelcomePage() { diff --git a/vid-automation/src/main/java/vid/automation/test/sections/TestEnvironmentPage.java b/vid-automation/src/main/java/vid/automation/test/sections/TestEnvironmentPage.java index f63906323..71c6e0bd4 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/TestEnvironmentPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/TestEnvironmentPage.java @@ -1,6 +1,6 @@ package vid.automation.test.sections; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.testng.Assert; diff --git a/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java b/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java index 69aee494a..f749df02b 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/VidBasePage.java @@ -1,17 +1,10 @@ package vid.automation.test.sections; -import com.aventstack.extentreports.Status; -import org.junit.Assert; -import org.openecomp.sdc.ci.tests.execute.setup.ExtentTestActions; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.ui.ExpectedConditions; -import org.openqa.selenium.support.ui.WebDriverWait; -import vid.automation.test.Constants; -import vid.automation.test.infra.*; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.onap.sdc.ci.tests.utilities.GeneralUIUtils.getDriver; +import com.aventstack.extentreports.Status; import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; @@ -20,11 +13,25 @@ import java.util.Calendar; import java.util.Date; import java.util.List; import java.util.function.Function; - -import static org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils.getDriver; +import org.junit.Assert; +import org.onap.sdc.ci.tests.execute.setup.ExtentTestActions; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.ui.ExpectedConditions; +import org.openqa.selenium.support.ui.WebDriverWait; +import vid.automation.test.Constants; +import vid.automation.test.infra.Click; +import vid.automation.test.infra.Exists; +import vid.automation.test.infra.Get; +import vid.automation.test.infra.Input; +import vid.automation.test.infra.SelectOption; +import vid.automation.test.infra.Wait; public class VidBasePage { + public VidBasePage setInstanceName(String name) { setInputText(Constants.INSTANCE_NAME_SELECT_TESTS_ID, name); return this; @@ -97,6 +104,7 @@ public class VidBasePage { public VidBasePage clickDeployServiceButtonByServiceUUID(String serviceUUID) { Input.replaceText(serviceUUID, Constants.BROWSE_SEARCH); + GeneralUIUtils.ultimateWait(); String elementTestId = Constants.DEPLOY_BUTTON_TESTS_ID_PREFIX + serviceUUID; GeneralUIUtils.clickOnElementByTestId(elementTestId, 30); GeneralUIUtils.ultimateWait(); @@ -158,6 +166,11 @@ public class VidBasePage { return this; } + public VidBasePage clickButtonByTestId(String testId) { + GeneralUIUtils.clickOnElementByTestId(testId); + return this; + } + public VidBasePage clickCommitCloseButton() { GeneralUIUtils.clickOnElementByTestId(Constants.COMMIT_CLOSE_BUTTON_ID, 30); return this; @@ -174,11 +187,13 @@ public class VidBasePage { public VidBasePage selectLcpRegion(String lcpRegion) { + GeneralUIUtils.ultimateWait(); SelectOption.byValue(lcpRegion, Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID); return this; } public VidBasePage selectTenant(String tenant) { + GeneralUIUtils.ultimateWait(); SelectOption.byValue(tenant, Constants.ViewEdit.TENANT_SELECT_TESTS_ID); return this; } @@ -263,12 +278,12 @@ public class VidBasePage { Assert.assertEquals(expectedText, alertText); Click.acceptAlert(); } - public void goToIframe() { + public static void goToIframe() { final long start = System.currentTimeMillis(); goOutFromIframe(); GeneralUIUtils.ultimateWait(); System.out.println("ultimateWait waited " + (System.currentTimeMillis() - start)); - final WebDriver iframeReady = new WebDriverWait(getDriver(), 10).until( + final WebDriver iframeReady = new WebDriverWait(getDriver(), 20).until( ExpectedConditions.frameToBeAvailableAndSwitchToIt(By.tagName("iframe")) ); Assert.assertNotNull("failed going into iframe", iframeReady); @@ -278,12 +293,41 @@ public class VidBasePage { System.out.println("ultimateWait waited " + (System.currentTimeMillis() - start2)); } - public void goOutFromIframe(){ + public static void goOutFromIframe(){ getDriver().switchTo().defaultContent(); } + public void verifyOpenOldViewEdit(String serviceInstanceName, String serviceInstanceId, boolean openShouldBeEnabled, boolean checkPortMirroring, boolean checkAddVnf) { + InstantiationStatusPage.checkMenuItem(serviceInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_HEADER_OPEN_ITEM, openShouldBeEnabled, contextMenuOpen -> { + Click.byTestId(contextMenuOpen); + VidBasePage.goOutFromIframe(); + GeneralUIUtils.ultimateWait(); + Wait.byText("View/Edit Service Instance"); + if (serviceInstanceId != null) { + Wait.byText(serviceInstanceId); + } + Wait.byText(serviceInstanceName); + + if (checkPortMirroring) { + Wait.byText("Add node instance"); + Wait.byText("i'm a port"); + } + + if (checkAddVnf) { + // Validate bug fix - we open old popup in view/edit + Click.byTestId("addVNFButton"); + Click.byTestId("addVNFOption-2017-488_PASQUALE-vPE 0"); + assertThat(Get.byTestId("create-modal-title").getText(), containsString("a la carte")); + Click.byTestId("cancelButton"); + //end of bug fix validation + } + + screenshotDeployDialog("view-edit-" + serviceInstanceName); + SideMenu.navigateToMacroInstantiationStatus(); + }); + } public static WebDriverWait waitUntilDriverIsReady(int time) { diff --git a/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java b/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java index 633feb83d..e10c872ee 100644 --- a/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java +++ b/vid-automation/src/main/java/vid/automation/test/sections/ViewEditPage.java @@ -1,19 +1,16 @@ package vid.automation.test.sections; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; +import vid.automation.test.infra.Features; import vid.automation.test.infra.Get; import vid.automation.test.infra.SelectOption; -import vid.automation.test.infra.Wait; -import org.hamcrest.core.Is; import static org.hamcrest.core.Is.is; -import java.util.List; - /** * Created by itzikliderman on 13/06/2017. */ @@ -70,8 +67,12 @@ public class ViewEditPage extends VidBasePage { return this; } - public ViewEditPage selectLCPRegion(String lcpRegion){ - SelectOption.byValue(lcpRegion, Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID); + public ViewEditPage selectLcpRegion(String lcpRegion, String cloudOwner){ + selectLcpRegion(lcpRegion); + if (Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST.isActive()) { + String selectedOption = SelectOption.getSelectedOption(Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID); + Assert.assertEquals(lcpRegion + " (" + cloudOwner.toUpperCase() + ")", selectedOption); + } return this; } @@ -91,6 +92,10 @@ public class ViewEditPage extends VidBasePage { return this; } + public VidBasePage clickActivateFabricConfigurationButton() { + GeneralUIUtils.clickOnElementByTestId(Constants.ViewEdit.ACTIVATE_FABRIC_CONFIGURATION_BUTTON_TEST_ID, 60); + return this; + } public VidBasePage clickInfoButton() { GeneralUIUtils.clickOnElementByTestId(Constants.ViewEdit.INFOSERVICEBUTTON, 30); return this; diff --git a/vid-automation/src/main/java/vid/automation/test/services/AsyncJobsService.java b/vid-automation/src/main/java/vid/automation/test/services/AsyncJobsService.java index 01158fa66..35849b481 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/AsyncJobsService.java +++ b/vid-automation/src/main/java/vid/automation/test/services/AsyncJobsService.java @@ -1,44 +1,54 @@ package vid.automation.test.services; +import com.google.common.collect.ImmutableList; import vid.automation.test.utils.DB_CONFIG; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.sql.Statement; +import java.util.List; public class AsyncJobsService { public void dropAllAsyncJobs() { + runStatementsInDb(ImmutableList.of( + "DELETE FROM `vid_service_info`", + "DELETE FROM `vid_job`", + "DELETE FROM `vid_job_audit_status`", + "DELETE FROM `vid_name_counter`" + )); + } + + public void runStatementsInDb(List<String> sqlStatements) { System.out.println("Connecting database..."); try (Connection connection = DriverManager.getConnection(DB_CONFIG.url, DB_CONFIG.username, DB_CONFIG.password)) { System.out.println("Database connected!"); - Statement stmt = connection.createStatement(); - stmt.addBatch("DELETE FROM `vid_service_info`"); - stmt.addBatch("DELETE FROM `vid_job`"); - stmt.addBatch("DELETE FROM `vid_job_audit_status`"); - int[] executeBatch = stmt.executeBatch(); + try (Statement stmt = connection.createStatement()) { + for (String sql: sqlStatements) { + stmt.addBatch(sql); + } + stmt.executeBatch(); + } } catch (SQLException e) { throw new IllegalStateException("Cannot connect the database!", e); } } - public void muteAllAsyncJobs() { - System.out.println("Connecting database..."); + public void runStatementInDb(String sqlStatement) { + runStatementsInDb(ImmutableList.of(sqlStatement)); + } - try (Connection connection = DriverManager.getConnection(DB_CONFIG.url, DB_CONFIG.username, DB_CONFIG.password)) { - System.out.println("Database connected!"); - Statement stmt = connection.createStatement(); - stmt.addBatch("UPDATE `vid_job` set `TAKEN_BY`='muteAllAsyncJobs', `AGE`=`AGE`+5"); - int[] executeBatch = stmt.executeBatch(); + public void muteAllAsyncJobs() { + runStatementInDb("UPDATE `vid_job` SET `TAKEN_BY`='muteAllAsyncJobs', `JOB_STATUS`=CONCAT('MUTED_', `JOB_STATUS`), `AGE`=`AGE`+5 WHERE `TAKEN_BY` is NULL or `TAKEN_BY`<>'muteAllAsyncJobs'"); + } - } catch (SQLException e) { - throw new IllegalStateException("Cannot connect the database!", e); - } + public void dropAllFromNameCounter() { + runStatementInDb("DELETE FROM `vid_name_counter`"); } } diff --git a/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java b/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java index c6de040ea..0f0839537 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java +++ b/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java @@ -1,14 +1,28 @@ package vid.automation.test.services; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; +import static vid.automation.test.infra.ModelInfo.serviceFabricSriovService; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.onap.simulator.presetGenerator.presets.aai.PresetAAICloudRegionAndSourceFromConfigurationPut; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIFilterServiceInstanceById; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetHomingForVfModule; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetModelsByOwningEntity; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetModelsByProject; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkZones; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetPortMirroringSourcePorts; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsWithoutInstancesGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetTenants; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIPostNamedQueryForViewEdit; -import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModuleInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOActivateFabricConfiguration; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModule; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeactivateAndCloudDelete; import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteInstanceOrchestrationRequestGet; import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteNetwork; import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteService; @@ -16,33 +30,57 @@ import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteVfModule; import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteVnf; import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteVolumeGroup; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.mso.configuration.PresetMSOActOnConfiguration; +import org.onap.simulator.presetGenerator.presets.mso.configuration.PresetMSOCreateConfiguration; +import org.onap.simulator.presetGenerator.presets.mso.configuration.PresetMSODeleteConfiguration; +import org.onap.simulator.presetGenerator.presets.mso.configuration.PresetMsoEnableDisablePort; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; import vid.automation.test.Constants; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; - public class BulkRegistration { public static void searchExistingServiceInstance() { searchExistingServiceInstance("Active"); } - public static void searchExistingServiceInstance(String orchStatus) { + public static void searchExistingServiceInstance(String orchStatus) { + searchExistingServiceInstance(orchStatus, "pending-delete"); + } + + public static void searchExistingServiceInstance(String orchStatus, String vfModuleOrchStatus) { genericSearchExistingServiceInstance(); SimulatorApi.registerExpectation( new String [] { - Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_USP_VOICE, + Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_SILVIA_ROBBINS, Constants.RegisterToSimulator.SearchForServiceInstance.FILTER_SERVICE_INSTANCE_BY_ID, Constants.RegisterToSimulator.SearchForServiceInstance.NAMED_QUERY_VIEW_EDIT, Constants.RegisterToSimulator.SearchForServiceInstance.GET_SDC_CATALOG_SERVICE_VID_TEST_444, Constants.RegisterToSimulator.CreateNewServiceInstance.deploy.GET_AIC_ZONES - }, ImmutableMap.<String, Object>of("<ORCH_STATUS>", orchStatus), SimulatorApi.RegistrationStrategy.APPEND); + }, ImmutableMap.<String, Object>of("<ORCH_STATUS>", orchStatus, "<VF_MODULE_ORCH_STATUS>", vfModuleOrchStatus), SimulatorApi.RegistrationStrategy.APPEND); + } + + public static void searchExistingServiceInstanceWithFabric(String orchStatus) { + genericSearchExistingServiceInstance(); + SimulatorApi.registerExpectationFromPresets( + ImmutableList.of( + new PresetAAIFilterServiceInstanceById("e433710f-9217-458d-a79d-1c7aff376d89", + "TYLER SILVIA", + "c187e9fe-40c3-4862-b73e-84ff056205f61234"), + new PresetAAIGetSubDetailsGet("e433710f-9217-458d-a79d-1c7aff376d89", orchStatus), + new PresetAAIGetSubDetailsWithoutInstancesGet("e433710f-9217-458d-a79d-1c7aff376d89", true), + new PresetAAIPostNamedQueryForViewEdit("c187e9fe-40c3-4862-b73e-84ff056205f61234", false, true), + new PresetSDCGetServiceMetadataGet(serviceFabricSriovService), + new PresetSDCGetServiceToscaModelGet(serviceFabricSriovService), + new PresetAAIGetNetworkZones(), + new PresetMSOActivateFabricConfiguration("c187e9fe-40c3-4862-b73e-84ff056205f61234"), + new PresetMSOOrchestrationRequestGet("COMPLETE", "318cc766-b673-4a50-b9c5-471f68914584", "Success")), + SimulatorApi.RegistrationStrategy.APPEND); } public static void searchExistingServiceInstanceByOEAndProject(){ SimulatorApi.registerExpectationFromPresets(ImmutableList.of( - new PresetAAIGetModelsByOwningEntity("Wireline"), + new PresetAAIGetModelsByOwningEntity("Melissa"), new PresetAAIGetModelsByProject("x1"), new PresetAAIGetModelsByProject("yyy1") ), APPEND); @@ -52,7 +90,7 @@ public class BulkRegistration { genericSearchExistingServiceInstance(); SimulatorApi.registerExpectation( new String [] { - Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_USP_VOICE_CR, + Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_SILVIA_ROBBINS_CR, Constants.RegisterToSimulator.SearchForServiceInstance.FILTER_CR_SERVICE_INSTANCE_BY_ID, Constants.RegisterToSimulator.SearchForServiceInstance.NAMED_QUERY_CR_VIEW_EDIT, Constants.RegisterToSimulator.SearchForServiceInstance.GET_SDC_CATALOG_SERVICE_VID_TEST_CR, @@ -65,7 +103,7 @@ public class BulkRegistration { genericSearchExistingServiceInstance(); SimulatorApi.registerExpectation( new String [] { - Constants.RegisterToSimulator.AddSubinterface.GET_SUBSCRIBERS_FOR_CUSTOMER_USP_VOICE_VFC_IG, + Constants.RegisterToSimulator.AddSubinterface.GET_SUBSCRIBERS_FOR_CUSTOMER_SILVIA_ROBBINS_VFC_IG, Constants.RegisterToSimulator.AddSubinterface.FILTER_VFC_IG_SERVICE_INSTANCE_BY_ID, Constants.RegisterToSimulator.AddSubinterface.NAMED_QUERY_VFC_IG_VIEW_EDIT, Constants.RegisterToSimulator.AddSubinterface.GET_SDC_CATALOG_SERVICE_VID_TEST_444, @@ -77,17 +115,16 @@ public class BulkRegistration { SimulatorApi.registerExpectation( new String [] { Constants.RegisterToSimulator.genericRequest.ECOMP_PORTAL_GET_SESSION_SLOT_CHECK_INTERVAL, - Constants.RegisterToSimulator.SearchForServiceInstance.GET_FULL_SUBSCRIBERS, Constants.RegisterToSimulator.SearchForServiceInstance.GET_SERVICES - }, ImmutableMap.<String, Object>of(), SimulatorApi.RegistrationStrategy.APPEND); + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(),SimulatorApi.RegistrationStrategy.APPEND); } public static void searchExistingServiceInstance2(String orchStatus) { genericSearchExistingServiceInstance(); SimulatorApi.registerExpectation( new String [] { - Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_FIREWALL_MISC, + Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_CRAIG_ROBERTS, Constants.RegisterToSimulator.SearchForServiceInstance.FILTER_SERVICE_INSTANCE_BY_ID_2, Constants.RegisterToSimulator.SearchForServiceInstance.NAMED_QUERY_VIEW_EDIT_2 }, ImmutableMap.<String, Object>of("<ORCH_STATUS>", orchStatus), SimulatorApi.RegistrationStrategy.APPEND); @@ -105,9 +142,10 @@ public class BulkRegistration { SimulatorApi.registerExpectationFromPreset(new PresetAAICloudRegionAndSourceFromConfigurationPut(configurationId, desiredCloudRegionId), APPEND); SimulatorApi.registerExpectationFromPreset(new PresetAAIGetPortMirroringSourcePorts(configurationId, portInterfaceId, "i'm a port", isMirrored), APPEND); + SimulatorApi.registerExpectationFromPreset(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC, APPEND); SimulatorApi.registerExpectation( new String [] { - Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_USP_VOICE, + Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_SILVIA_ROBBINS, Constants.RegisterToSimulator.SearchForServiceInstance.FILTER_SERVICE_INSTANCE_BY_ID_PM, Constants.RegisterToSimulator.SearchForServiceInstance.NAMED_QUERY_VIEW_EDIT_PM, Constants.RegisterToSimulator.SearchForServiceInstance.GET_SDC_CATALOG_SERVICE_PM, @@ -170,33 +208,24 @@ public class BulkRegistration { } - public static void activateDeactivateConfiguration(String orchStatus, String action, String desiredCloudRegionId) { - SimulatorApi.registerExpectation( - new String [] { - Constants.RegisterToSimulator.createConfiguration.MSO_ACTIVATE_CONFIGURATION, - }, ImmutableMap.<String, Object>of("<ACTION>",action,"mdt1", desiredCloudRegionId), SimulatorApi.RegistrationStrategy.APPEND); + public static void activateDeactivateConfiguration(String action) { + appendWithGetStatus(new PresetMSOActOnConfiguration(action), PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC); } - public static void deleteConfiguration(String desiredCloudRegionId) { - SimulatorApi.registerExpectation( - new String [] { - Constants.RegisterToSimulator.createConfiguration.MSO_DELETE_CONFIGURATION, - Constants.RegisterToSimulator.createConfiguration.MSO_CREATE_CONFIGURATION_ORCH_REQ - }, ImmutableMap.of("mdt1", desiredCloudRegionId), SimulatorApi.RegistrationStrategy.APPEND); + public static void deleteConfiguration() { + appendWithGetStatus(new PresetMSODeleteConfiguration(), PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC); } - public static void enableDisablePort(String action, String desiredCloudRegionId){ - SimulatorApi.registerExpectation( - new String [] { - Constants.RegisterToSimulator.createConfiguration.MSO_ACTIVATE_CONFIGURATION, - Constants.RegisterToSimulator.createConfiguration.MSO_ENABLE_DISABLE_PORT, - }, ImmutableMap.<String, Object>of("<ACTION>", action,"mdt1", desiredCloudRegionId), SimulatorApi.RegistrationStrategy.APPEND); + public static void enableDisablePort(String action){ + appendWithGetStatus(new PresetMsoEnableDisablePort( + "c187e9fe-40c3-4862-b73e-84ff056205f6", + "9533-config-LB1113", action), PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC); } public static void addNetwork() { SimulatorApi.registerExpectation( new String [] { - Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_Mobility, + Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_Emanuel, Constants.RegisterToSimulator.addNetwork.AAI_GET_TENANTS, Constants.RegisterToSimulator.addNetwork.AAI_NAMED_QUERY_FOR_VIEW_EDIT, Constants.RegisterToSimulator.addNetwork.FILTER_SERVICE_INSTANCE_BY_ID, @@ -205,13 +234,7 @@ public class BulkRegistration { }, ImmutableMap.<String, Object>of(), SimulatorApi.RegistrationStrategy.APPEND); } - public static void msoAddNetwork(String instanceName){ - SimulatorApi.registerExpectation( - new String [] { - Constants.RegisterToSimulator.addNetwork.MSO_ADD_NETWORK_ORCH_REQ, - Constants.RegisterToSimulator.addNetwork.MSO_ADD_NETWORK - }, ImmutableMap.<String, Object>of("<SERVICE_INSTANCE_NAME>",instanceName), SimulatorApi.RegistrationStrategy.APPEND); - } + public static void msoAddNetworkError(String instanceName){ SimulatorApi.registerExpectation( new String [] { @@ -227,13 +250,15 @@ public class BulkRegistration { } - public static void createPolicyConfiguration(boolean isSuccessFlow, String desiredCloudRegionId) { + public static void createPolicyConfiguration(boolean isSuccessFlow, String serviceType) { createConfiguration(); - SimulatorApi.registerExpectation( - new String []{ - Constants.RegisterToSimulator.createConfiguration.GET_PNF_INSTANCES, - Constants.RegisterToSimulator.createConfiguration.GET_MODEL_BY_ONE_INVARIANT_ID - } , ImmutableMap.<String, Object>of("mdt1", desiredCloudRegionId), SimulatorApi.RegistrationStrategy.APPEND); + + SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.APPEND, + Constants.RegisterToSimulator.createConfiguration.GET_MODEL_BY_ONE_INVARIANT_ID); + + SimulatorApi.registerExpectation(Constants.RegisterToSimulator.createConfiguration.GET_PNF_INSTANCES, + ImmutableMap.of("<SERVICE-TYPE>", serviceType), SimulatorApi.RegistrationStrategy.APPEND); + if (isSuccessFlow) { msoCreatePProbeConfiguration(); } else { @@ -241,38 +266,33 @@ public class BulkRegistration { } } - public static void deletePolicyConfiguration(boolean isSuccessFlow, String desiredCloudRegionId) { + public static void deletePolicyConfiguration(boolean isSuccessFlow) { createConfiguration(); - SimulatorApi.registerExpectation( - new String []{ - Constants.RegisterToSimulator.createConfiguration.GET_PNF_INSTANCES, - Constants.RegisterToSimulator.createConfiguration.GET_MODEL_BY_ONE_INVARIANT_ID, - Constants.RegisterToSimulator.createConfiguration.MSO_DELETE_CONFIGURATION, - - } , ImmutableMap.<String, Object>of("mdt1", desiredCloudRegionId), SimulatorApi.RegistrationStrategy.APPEND); - if (isSuccessFlow) { - msoCreatePProbeConfiguration(); - } else { - msoCreatePProbeConfigurationError(); - } + SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.APPEND, + Constants.RegisterToSimulator.createConfiguration.GET_MODEL_BY_ONE_INVARIANT_ID); + appendWithGetStatus(new PresetMSODeleteConfiguration(), PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC); } private static void msoCreatePProbeConfiguration() { - SimulatorApi.registerExpectation( - new String []{ - Constants.RegisterToSimulator.createConfiguration.MSO_CREATE_CONFIGURATION, - Constants.RegisterToSimulator.createConfiguration.MSO_CREATE_CONFIGURATION_ORCH_REQ - } , ImmutableMap.<String, Object>of(), SimulatorApi.RegistrationStrategy.APPEND); + appendWithGetStatus(new PresetMSOCreateConfiguration("c187e9fe-40c3-4862-b73e-84ff056205f6"), PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AAIAIC25_TO_ATT_AIC); + } + + private static void appendWithGetStatus(PresetMSOBaseCreateInstancePost createInstancePreset, PresetAAIGetCloudOwnersByCloudRegionId cloudOwnerPreset) { + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + createInstancePreset, + cloudOwnerPreset, + new PresetMSOOrchestrationRequestGet(PresetMSOOrchestrationRequestGet.COMPLETE, createInstancePreset.getRequestId(), "Success")), + SimulatorApi.RegistrationStrategy.APPEND); } private static void msoCreatePProbeConfigurationError() { - SimulatorApi.registerExpectation( - new String []{ - Constants.RegisterToSimulator.createConfiguration.MSO_CREATE_CONFIGURATION_ERROR - } , ImmutableMap.<String, Object>of(), SimulatorApi.RegistrationStrategy.APPEND); + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + new PresetMSOCreateConfiguration("c187e9fe-40c3-4862-b73e-84ff056205f6", 500, null), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AAIAIC25_TO_ATT_AIC), + SimulatorApi.RegistrationStrategy.APPEND); } public static void createConfiguration() { @@ -295,31 +315,28 @@ public class BulkRegistration { } public static void createNewServiceInstance(String subscriber) { - SimulatorApi.registerExpectation( - new String []{ - Constants.RegisterToSimulator.CreateNewServiceInstance.GET_FULL_SUBSCRIBES, - Constants.RegisterToSimulator.CreateNewServiceInstance.GET_SERVICES - } , ImmutableMap.<String, Object>of(), SimulatorApi.RegistrationStrategy.APPEND); + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(),SimulatorApi.RegistrationStrategy.APPEND); + SimulatorApi.registerExpectation(Constants.RegisterToSimulator.CreateNewServiceInstance.GET_SERVICES, SimulatorApi.RegistrationStrategy.APPEND); switch (subscriber) { - case "USP VOICE": createNewServiceInstanceUspVoice(); break; - case "MSO_1610_ST": createNewServiceInstanceMso1610ST(); break; + case "SILVIA ROBBINS": createNewServiceInstanceUspVoice(); break; + case "CAR_2020_ER": createNewServiceInstanceMso1610ST(); break; } } private static void createNewServiceInstanceMso1610ST() { SimulatorApi.registerExpectation( new String []{ - Constants.RegisterToSimulator.CreateNewServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_MSO_1610_ST, - Constants.RegisterToSimulator.CreateNewServiceInstance.GET_MODELS_BY_SERVICE_TYPE_MSO_1610_ST + Constants.RegisterToSimulator.CreateNewServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_CAR_2020_ER, + Constants.RegisterToSimulator.CreateNewServiceInstance.GET_MODELS_BY_SERVICE_TYPE_CAR_2020_ER } , ImmutableMap.<String, Object>of(), SimulatorApi.RegistrationStrategy.APPEND); } private static void createNewServiceInstanceUspVoice() { SimulatorApi.registerExpectation( new String []{ - Constants.RegisterToSimulator.CreateNewServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_USP_VOICE, - Constants.RegisterToSimulator.CreateNewServiceInstance.GET_MODELS_BY_SERVICE_TYPE_USP_VOICE + Constants.RegisterToSimulator.CreateNewServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_SILVIA_ROBBINS, + Constants.RegisterToSimulator.CreateNewServiceInstance.GET_MODELS_BY_SERVICE_TYPE_SILVIA_ROBBINS } , ImmutableMap.<String, Object>of(), SimulatorApi.RegistrationStrategy.APPEND); } @@ -336,26 +353,34 @@ public class BulkRegistration { public static void searchExistingServiceInstanceWithoutModelVerId() { SimulatorApi.registerExpectation( new String []{ - Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_FIREWALL_MISC, + Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_CRAIG_ROBERTS, Constants.RegisterToSimulator.SearchForServiceInstance.FILTER_SERVICE_INSTANCE_BY_ID_NO_MODEL_VER_ID, // Constants.RegisterToSimulator.SearchForServiceInstance.NAMED_QUERY_VIEW_EDIT_NO_MODEL_VER_ID } , ImmutableMap.<String, Object>of(), SimulatorApi.RegistrationStrategy.APPEND); } - public static void deleteExistingInstance(String orchStatus, String type) { + public static void deleteExistingInstance(String orchStatus, String type) { + deleteExistingInstance(orchStatus, type, "pending-delete"); + } + + public static void deleteExistingInstance(String orchStatus, String type, String vfModuleOrchStatus) { genericSearchExistingServiceInstance(); SimulatorApi.registerExpectation( new String [] { - Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_USP_VOICE, + Constants.RegisterToSimulator.SearchForServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_SILVIA_ROBBINS, Constants.RegisterToSimulator.SearchForServiceInstance.NAMED_QUERY_VIEW_EDIT, Constants.RegisterToSimulator.CreateNewServiceInstance.deploy.GET_AIC_ZONES - }, ImmutableMap.<String, Object>of("<ORCH_STATUS>", orchStatus), SimulatorApi.RegistrationStrategy.APPEND); + }, ImmutableMap.<String, Object>of("<ORCH_STATUS>", orchStatus, "<VF_MODULE_ORCH_STATUS>", vfModuleOrchStatus), SimulatorApi.RegistrationStrategy.APPEND); SimulatorApi.registerExpectationFromPresets( ImmutableList.of( new PresetAAIGetTenants(), new PresetMSODeleteInstanceOrchestrationRequestGet(type), new PresetSDCGetServiceMetadataGet("7a6ee536-f052-46fa-aa7e-2fca9d674c44", "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "service-Complexservice-aLaCarte-csar.zip"), - new PresetSDCGetServiceToscaModelGet("7a6ee536-f052-46fa-aa7e-2fca9d674c44", "service-Complexservice-aLaCarte-csar.zip")), + new PresetSDCGetServiceToscaModelGet("7a6ee536-f052-46fa-aa7e-2fca9d674c44", "service-Complexservice-aLaCarte-csar.zip"), + new PresetMSODeactivateAndCloudDelete("3f93c7cb-2fd0-4557-9514-e189b7b04f9d", "c015cc0f-0f37-4488-aabf-53795fd93cd3", + "a231a99c-7e75-4d6d-a0fb-5c7d26f30f77", "c0011670-0e1a-4b74-945d-8bf5aede1d9c", "irma-aic"), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC + ), SimulatorApi.RegistrationStrategy.APPEND); } @@ -383,7 +408,23 @@ public class BulkRegistration { deleteExistingInstance(orchStatus, "Service"); SimulatorApi.registerExpectationFromPresets(ImmutableList.of( new PresetMSODeleteService(), - new PresetAAIPostNamedQueryForViewEdit("3f93c7cb-2fd0-4557-9514-e189b7b04f9d", false)), SimulatorApi.RegistrationStrategy.APPEND); + new PresetAAIPostNamedQueryForViewEdit("3f93c7cb-2fd0-4557-9514-e189b7b04f9d", false, false)), SimulatorApi.RegistrationStrategy.APPEND); + } + + public static void resumeWithHomingDataVfModule(String serviceOrchStatus, String vfModuleOrchStatus, String vfModuleName) { + SimulatorApi.registerExpectation(Constants.RegisterToSimulator.SearchForServiceInstance.NAMED_QUERY_VIEW_EDIT, + ImmutableMap.<String, Object>of("<ORCH_STATUS>", serviceOrchStatus, "<VF_MODULE_ORCH_STATUS>", vfModuleOrchStatus), + SimulatorApi.RegistrationStrategy.APPEND); + + SimulatorApi.registerExpectationFromPresets( + ImmutableList.of ( + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC, + new PresetAAIGetHomingForVfModule("c015cc0f-0f37-4488-aabf-53795fd93cd3", "a231a99c-7e75-4d6d-a0fb-5c7d26f30f77", "092eb9e8e4b7412e8787dd091bc58e86", "mdt1"), + new PresetMSOCreateVfModule("3f93c7cb-2fd0-4557-9514-e189b7b04f9d", + "c015cc0f-0f37-4488-aabf-53795fd93cd3", ATT_NC, vfModuleName, + "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "ComplexService"), + new PresetMSOOrchestrationRequestGet("COMPLETE","c0011670-0e1a-4b74-945d-8bf5aede1d9c",Constants.ViewEdit.VF_MODULE_CREATED_SUCCESSFULLY_TEXT)), + SimulatorApi.RegistrationStrategy.APPEND); } public static void resumeVfModule(String serviceInstanceId, String vnfInstanceId ){ @@ -391,7 +432,8 @@ public class BulkRegistration { SimulatorApi.registerExpectationFromPresets( ImmutableList.of ( new PresetAAIGetTenants(), - new PresetMSOCreateVfModuleInstancePost(serviceInstanceId,vnfInstanceId), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC, + new PresetMSOCreateVfModule(serviceInstanceId,vnfInstanceId, ATT_NC), new PresetMSOOrchestrationRequestGet("COMPLETE","c0011670-0e1a-4b74-945d-8bf5aede1d9c",Constants.ViewEdit.VF_MODULE_CREATED_SUCCESSFULLY_TEXT)), SimulatorApi.RegistrationStrategy.APPEND); diff --git a/vid-automation/src/main/java/vid/automation/test/services/DropTestApiField.java b/vid-automation/src/main/java/vid/automation/test/services/DropTestApiField.java index e175b88b1..bb50438ca 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/DropTestApiField.java +++ b/vid-automation/src/main/java/vid/automation/test/services/DropTestApiField.java @@ -1,64 +1,73 @@ -package vid.automation.test.services; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.node.ObjectNode; -import vid.automation.test.infra.Features; - -import java.io.IOException; -import java.util.Arrays; -import java.util.function.UnaryOperator; - -public class DropTestApiField { - - public static UnaryOperator<String> dropTestApiFieldFromString() { - if (Features.FLAG_ADD_MSO_TESTAPI_FIELD.isActive()) { - // do nothing - return in -> in; - } else { - final ObjectMapper objectMapper = new ObjectMapper(); - return in -> { - if (!in.contains("testApi")) { - // short circuit - return in; - } - - try { - final JsonNode tree = objectMapper.readTree(in); - final JsonNode node = tree.path("simulatorRequest"); - if (removePath(node, "body", "requestDetails", "requestParameters", "testApi") != null) { - // tree modified, write back to string - return objectMapper.writeValueAsString(tree); - } else { - // else... - return in; - } - } catch (IOException e) { - return in; - } - }; - } - } - - private static JsonNode removePath(JsonNode tree, String... nodes) { - // remove the nodes; remove also the parent, if an empty object was left - // returns the removed node - // returns null if no modification to tree - if (nodes.length > 1) { - final JsonNode node = tree.path(nodes[0]); - final JsonNode removed = removePath(node, Arrays.copyOfRange(nodes, 1, nodes.length)); - if (removed != null && node.size() == 0) { - return removePath(tree, nodes[0]); - } else { - return removed; // non-null if node.size() != 0 - } - } else { - if (tree instanceof ObjectNode) { - return ((ObjectNode) tree).remove(nodes[0]); - } else { - return null; - } - } - } - -} +package vid.automation.test.services;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import vid.automation.test.infra.Features;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.function.UnaryOperator;
+
+public class DropTestApiField {
+
+ public static UnaryOperator<String> dropTestApiFieldFromString() {
+ return dropFieldFromString("testApi", Features.FLAG_ADD_MSO_TESTAPI_FIELD,
+ "simulatorRequest", "body", "requestDetails", "requestParameters", "testApi");
+ }
+
+ public static UnaryOperator<String> dropFieldCloudOwnerFromString() {
+ return dropFieldFromString("cloudOwner", Features.FLAG_ADD_MSO_TESTAPI_FIELD,
+ "simulatorRequest", "body", "requestDetails", "cloudConfiguration", "cloudOwner");
+ }
+ private static UnaryOperator<String> dropFieldFromString(String text, Features featureFlag, String basePath, String... nodes){
+ if (featureFlag.isActive()) {
+ // do nothing
+ return in -> in;
+ } else {
+ final ObjectMapper objectMapper = new ObjectMapper();
+ return in -> {
+ if (!in.contains(text)) {
+ // short circuit
+ return in;
+ }
+
+ try {
+ final JsonNode tree = objectMapper.readTree(in);
+ final JsonNode node = tree.path(basePath);
+ if (removePath(node, nodes) != null) {
+ // tree modified, write back to string
+ return objectMapper.writeValueAsString(tree);
+ } else {
+ // else...
+ return in;
+ }
+ } catch (IOException e) {
+ return in;
+ }
+ };
+ }
+ }
+
+ private static JsonNode removePath(JsonNode tree, String... nodes) {
+ // remove the nodes; remove also the parent, if an empty object was left
+ // returns the removed node
+ // returns null if no modification to tree
+ if (nodes.length > 1) {
+ final JsonNode node = tree.path(nodes[0]);
+ final JsonNode removed = removePath(node, Arrays.copyOfRange(nodes, 1, nodes.length));
+ if (removed != null && node.size() == 0) {
+ return removePath(tree, nodes[0]);
+ } else {
+ return removed; // non-null if node.size() != 0
+ }
+ } else {
+ if (tree instanceof ObjectNode) {
+ return ((ObjectNode) tree).remove(nodes[0]);
+ } else {
+ return null;
+ }
+ }
+ }
+
+}
diff --git a/vid-automation/src/main/java/vid/automation/test/services/ServicesService.java b/vid-automation/src/main/java/vid/automation/test/services/ServicesService.java index 34303a972..264b2c16d 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/ServicesService.java +++ b/vid-automation/src/main/java/vid/automation/test/services/ServicesService.java @@ -1,7 +1,7 @@ package vid.automation.test.services; import com.fasterxml.jackson.databind.ObjectMapper; -import org.openecomp.sdc.ci.tests.utilities.FileHandling; +import org.onap.sdc.ci.tests.utilities.FileHandling; import vid.automation.test.model.Service; import vid.automation.test.model.ServiceModel; import vid.automation.test.model.ServiceModelsList; diff --git a/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java b/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java index 29f6eae7c..65ef3679c 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java +++ b/vid-automation/src/main/java/vid/automation/test/services/SimulatorApi.java @@ -1,30 +1,36 @@ package vid.automation.test.services; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; +import static org.testng.Assert.assertEquals; +import static vid.automation.test.services.DropTestApiField.dropFieldCloudOwnerFromString; +import static vid.automation.test.services.DropTestApiField.dropTestApiFieldFromString; + +import com.fasterxml.jackson.databind.DeserializationFeature; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import org.glassfish.jersey.client.ClientProperties; -import org.glassfish.jersey.uri.internal.JerseyUriBuilder; -import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.onap.simulator.presetGenerator.presets.model.RegistrationRequest; -import org.springframework.http.HttpStatus; -import vid.automation.test.utils.ReadFile; - +import java.net.URI; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.function.UnaryOperator; +import java.util.stream.Collectors; import javax.ws.rs.client.Client; import javax.ws.rs.client.ClientBuilder; import javax.ws.rs.client.Entity; import javax.ws.rs.client.WebTarget; +import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import java.net.URI; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.function.UnaryOperator; - -import static org.testng.Assert.assertEquals; -import static vid.automation.test.services.DropTestApiField.dropTestApiFieldFromString; +import org.glassfish.jersey.client.ClientProperties; +import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJaxbJsonProvider; +import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider; +import org.glassfish.jersey.uri.internal.JerseyUriBuilder; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.model.RegistrationRequest; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import vid.automation.test.utils.ReadFile; public class SimulatorApi { @@ -32,15 +38,31 @@ public class SimulatorApi { APPEND, CLEAR_THEN_SET } + private static final Logger logger = LoggerFactory.getLogger(SimulatorApi.class); + + /* + these classes are partial representation of org.mockserver.model.HttpRequest. + We can not use HttpRequest since it contains Map with NottableString and jackson throw the following error : + com.fasterxml.jackson.databind.JsonMappingException: Can not find a (Map) Key deserializer for type + [simple type, class org.mockserver.model.NottableString] + */ + public static class Path { + public String value; + } + + public static class HttpRequest{ + public Path path; + } + private static final URI uri; //uri for registration private static final URI simulationUri; //uri for getting simulated responses private static final Client client; private static final List<UnaryOperator<String>> presetStringPostProccessors = - ImmutableList.of(dropTestApiFieldFromString()); + ImmutableList.of(dropTestApiFieldFromString(), dropFieldCloudOwnerFromString()); static { - String host = System.getProperty("VID_HOST", "127.0.0.1" ); + String host = System.getProperty("VID_HOST", "10.0.0.10" ); Integer port = Integer.valueOf(System.getProperty("SIM_PORT", System.getProperty("VID_PORT", "8080"))); //port for registration uri = new JerseyUriBuilder().host(host).port(port).scheme("http").path("vidSimulator").build(); client = ClientBuilder.newClient(); @@ -49,6 +71,7 @@ public class SimulatorApi { // org.glassfish.jersey.message.internal.MessageBodyProviderNotFoundException: // MessageBodyWriter not found for media type=application/json JacksonJsonProvider jacksonJsonProvider = new JacksonJaxbJsonProvider(); + jacksonJsonProvider.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); client.register(jacksonJsonProvider); Integer simulationPort = Integer.valueOf(System.getProperty("SIMULATION_PORT", "1080")); //port getting simulated responses @@ -84,13 +107,13 @@ public class SimulatorApi { content = content.replaceAll(templateParam.getKey(), templateParam.getValue().toString()); } - registerToSimulatorAndAssertSuccess(content, registrationStrategy); + registerToSimulatorAndAssertSuccess(expectationTemplateFilename, content, registrationStrategy); } public static void registerExpectationFromPreset(BasePreset preset, RegistrationStrategy registrationStrategy) { RegistrationRequest content = preset.generateScenario(); - registerToSimulatorAndAssertSuccess(content, registrationStrategy); + registerToSimulatorAndAssertSuccess(preset.getClass().getCanonicalName(), content, registrationStrategy); } public static void registerExpectationFromPresets(Collection<BasePreset> presets, RegistrationStrategy registrationStrategy) { @@ -99,7 +122,7 @@ public class SimulatorApi { } presets.forEach( preset-> { - try {registerToSimulatorAndAssertSuccess(preset.generateScenario());} + try {registerToSimulatorAndAssertSuccess(preset.getClass().getCanonicalName(), preset.generateScenario());} catch (RuntimeException e) { throw new RuntimeException("Failed to register preset "+preset.getClass().getName(), e); } @@ -107,14 +130,31 @@ public class SimulatorApi { ); } - private static void registerToSimulatorAndAssertSuccess(Object content, RegistrationStrategy registrationStrategy) { +// public static List<HttpRequest> retrieveRecordedRequests() { +// Response response = client.target(uri).path("retrieveRecordedRequests").request().get(); +// return response.readEntity(new GenericType<List<HttpRequest>>(){}); +// } + + /* + This method return counter of requests that has been sent to simulator. + The key of the map is a path, and the value is counter + */ + public static Map<String, Long> retrieveRecordedRequestsPathCounter() { + Response response = client.target(uri).path("retrieveRecordedRequests").request().get(); + List<HttpRequest> httpRequests = response.readEntity(new GenericType<List<HttpRequest>>(){}); + return httpRequests.stream().map(x->x.path.value).collect( + Collectors.groupingBy(Function.identity(), Collectors.counting())); + } + + private static void registerToSimulatorAndAssertSuccess(String name, Object content, RegistrationStrategy registrationStrategy) { if (registrationStrategy == RegistrationStrategy.CLEAR_THEN_SET) { clearRegistrations(); } - registerToSimulatorAndAssertSuccess(content); + registerToSimulatorAndAssertSuccess(name, content); } - private static void registerToSimulatorAndAssertSuccess(Object content) { + private static void registerToSimulatorAndAssertSuccess(String name, Object content) { + logger.info("Setting {}", name); content = postProccessContent(content); @@ -137,6 +177,7 @@ public class SimulatorApi { } private static void clearRegistrations() { + logger.info("Clearing Registrations"); Response response = createSimulatorRegistrationWebTarget().request().delete(); assertEquals(response.getStatus(), HttpStatus.OK.value()); } diff --git a/vid-automation/src/main/java/vid/automation/test/services/UsersService.java b/vid-automation/src/main/java/vid/automation/test/services/UsersService.java index ac8af4511..aae7917f7 100644 --- a/vid-automation/src/main/java/vid/automation/test/services/UsersService.java +++ b/vid-automation/src/main/java/vid/automation/test/services/UsersService.java @@ -1,12 +1,10 @@ package vid.automation.test.services; -import com.google.common.primitives.Ints; -import org.apache.commons.lang3.StringUtils; -import vid.automation.test.model.User; -import vid.automation.test.model.UsersObject; -import vid.automation.test.utils.DB_CONFIG; -import vid.automation.test.utils.ReadFile; +import static org.hamcrest.CoreMatchers.everyItem; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import com.google.common.primitives.Ints; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -15,10 +13,11 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; - -import static org.hamcrest.CoreMatchers.everyItem; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; +import org.apache.commons.lang3.StringUtils; +import vid.automation.test.model.User; +import vid.automation.test.model.UsersObject; +import vid.automation.test.utils.DB_CONFIG; +import vid.automation.test.utils.ReadFile; /** * Created by itzikliderman on 08/09/2017. @@ -53,7 +52,7 @@ public class UsersService { /* Creates a user in the DB, were: - Login user name is a deterministic number, hashed from the userId string, with 3 trailing zeroes, - and two leading letters from the userId itself; e.g. "mo26063000" for mobility. + and two leading letters from the userId itself; e.g. "mo26063000" for emanuel. - Login user name == user password - 'user.credentials.userId' and 'user.credentials.password' input fields are overridden with the generated values. - Roles are "read" (roleId==16) and all other roles in object (like subscriberName___serviceType___tenant). @@ -77,7 +76,7 @@ public class UsersService { user.credentials.password = getLoginId(userId); stmt.addBatch("INSERT INTO `fn_user` (`USER_ID`, `ORG_USER_ID`, `FIRST_NAME`, `LOGIN_ID`, `LOGIN_PWD`) " + - "VALUES (" + userNumber + ", '" + userId + "', '" + userId + "', '" + user.credentials.userId + "', '" + user.credentials.password + "')"); + "VALUES (" + userNumber + ", '" + user.credentials.userId + "', '" + userId + "', '" + user.credentials.userId + "', '" + user.credentials.password + "')"); List<String> roles = user.roles != null ? user.roles : new LinkedList<>(); roles.add("Standard User"); diff --git a/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java b/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java index 7f641d303..69c619b2a 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ALaCarteflowTest.java @@ -1,9 +1,26 @@ package vid.automation.test.test; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.MDT_1; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.PRESET_SOME_LEGACY_REGION_TO_ATT_AIC; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.SOME_LEGACY_REGION; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; + +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModuleOldViewEdit; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfALaCarteOldViewEdit; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVolumeGroupOldViewEdit; import org.openqa.selenium.WebElement; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; @@ -19,32 +36,26 @@ import vid.automation.test.sections.ViewEditPage; import vid.automation.test.services.ServicesService; import vid.automation.test.services.SimulatorApi; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; - public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { - static final String SUBSCRIBER = "Mobility"; + static final String SUBSCRIBER = "Emanuel"; static final String SERVICE_NAME = "ggghhh"; static final String SERVICE_ID = "537d3eb0-b7ab-4fe8-a438-6166ab6af49b"; static final String VNF_ID = "0eb38f69-d96b-4d5e-b8c9-3736c292f0f7"; - static final String DEFAULT_TEST_API_VALUE = "GR_API"; + static final String DEFAULT_TEST_API_VALUE = "VNF_API"; public static final String SERVICE_INSTANCE_ID = "SERVICE_INSTANCE_ID"; public static final String A_LACARTE_FLOW_GET_ORCHESTRATION = "aLacarteFlow/get_orchestration_request_status.json"; public static final String ORCHESTRATION_REQUEST_ID = "orchestrationRequestId"; public static final String STATUS_MESSAGE = "status_message"; public static final String REQUEST_TYPE = "REQUEST-TYPE"; public static final String CREATE = "Create"; - public static final String AAIAIC_25 = "AAIAIC25"; + public static final String AAIAIC_25 = "JANET25"; + public static final String AIC = "AIC"; public static final String TENANT = "092eb9e8e4b7412e8787dd091bc58e86"; public static final String FALSE = "false"; - public static final String NODE_INSTANCE = "VSP1710PID298109_vMMSC 0"; + public static final String NODE_INSTANCE = "VSP1710PID298109_vWINIFRED 0"; public static final String MODEL = "959a7ba0-89ee-4984-9af6-65d5bdda4b0e"; - public static final String LEGACY_REGION = "some legacy region"; + private static final String CREATE_VNF_REQUEST_ID = "dbe54591-c8ed-46d3-abc7-d3a24873dfbd"; @BeforeClass @@ -54,12 +65,11 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { "ecompportal_getSessionSlotCheckInterval.json", "search_for_service_instance/aai_get_services.json" , "create_configuration/aai_get_tenants.json" - , "sanity/get_aai_get_subscribers.json" , "sanity/get_aai_sub_details.json" , "aLacarteFlow/get_aai_search_named_query.json" , "aLacarteFlow/get_sdc_catalog_services_ggghhh.json" ); - + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), SimulatorApi.RegistrationStrategy.APPEND); } @@ -68,15 +78,30 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { withMsoTestApiConfiguration(msoTestApiOption, msoTestApiValue, () -> { final String REQUEST_ID = "dbe54591-c8ed-46d3-abc7-d3a24873bddd"; final String MODEL_UUID = "d205e01d-e5da-4e68-8c52-f95cb0607959"; - SimulatorApi.registerExpectation("aLacarteFlow/mso_create_vf_module.json", ImmutableMap.of(SERVICE_INSTANCE_ID, SERVICE_ID, "VNF_INSTANCE_ID", VNF_ID, "REQUEST_ID", REQUEST_ID, DEFAULT_TEST_API_VALUE, msoTestApiValue), APPEND); + + String vfModuleName = viewEditPage.generateInstanceName(Constants.ViewEdit.VF_MODULE_INSTANCE_NAME_PREFIX); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + PRESET_MDT1_TO_ATT_NC, + new PresetMSOCreateVfModuleOldViewEdit( + REQUEST_ID, + BaseMSOPreset.DEFAULT_INSTANCE_ID, + SERVICE_ID, + VNF_ID, + vfModuleName, + msoTestApiValue, + ATT_NC)), + SimulatorApi.RegistrationStrategy.APPEND); + + SimulatorApi.registerExpectation(A_LACARTE_FLOW_GET_ORCHESTRATION, ImmutableMap.of(ORCHESTRATION_REQUEST_ID, REQUEST_ID, STATUS_MESSAGE, Constants.ViewEdit.VF_MODULE_CREATED_SUCCESSFULLY_TEXT, REQUEST_TYPE, CREATE), APPEND); GeneralUIUtils.ultimateWait(); goToInstance(); ServiceModel serviceInstance = new ServicesService().getServiceModel(MODEL_UUID); - addVFModule("Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8", AAIAIC_25, - TENANT, FALSE, "mdt1", getCurrentUser().tenants, serviceInstance); + addVFModule("Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8", vfModuleName, AAIAIC_25, AIC, + TENANT, FALSE, MDT_1, getCurrentUser().tenants, serviceInstance); }); } @@ -84,17 +109,17 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { @Test private void testTenant() throws Exception { ViewEditPage viewEditPage = new ViewEditPage(); - User user = usersService.getUser("Mobility_with_tenant"); + User user = usersService.getUser("Emanuel_with_tenant"); relogin(user.credentials); goToInstance(); viewEditPage.selectNodeInstanceToAdd(NODE_INSTANCE); viewEditPage.setInstanceName("New and fun instance"); viewEditPage.selectProductFamily("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"); - viewEditPage.selectLCPRegion("mtn6"); + viewEditPage.selectLcpRegion("hvf6", AIC); List<WebElement> tenantOptions = Get.byClass(Constants.ViewEdit.TENANT_OPTION_CLASS); List<WebElement> enabledTenantOption = tenantOptions.stream().filter(webElement -> webElement.isEnabled()).collect(Collectors.toList()); Assert.assertTrue(enabledTenantOption.size() == 1); - Assert.assertTrue(enabledTenantOption.get(0).getText().equals("test-mtn6-09")); + Assert.assertTrue(enabledTenantOption.get(0).getText().equals("test-hvf6-09")); // SimulatorApi.registerExpectation("aLacarteFlow/get_sdc_catalog_services_ggghhh.json",APPEND); } @@ -104,20 +129,23 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { withMsoTestApiConfiguration(msoTestApiOption, msoTestApiValue, () -> { final String MODEL_UUID = MODEL; String instanceName = new VidBasePage().generateInstanceName(Constants.ViewEdit.VNF_INSTANCE_NAME_PREFIX); - SimulatorApi.registerExpectation("aLacarteFlow/mso_create_vnf.json", ImmutableMap.of( - SERVICE_INSTANCE_ID, SERVICE_ID, - "</?LOB>", "", - "INSTANCE_NAME", instanceName, - DEFAULT_TEST_API_VALUE, msoTestApiValue - ), APPEND); + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + PRESET_SOME_LEGACY_REGION_TO_ATT_AIC, + new PresetMSOCreateVnfALaCarteOldViewEdit( + CREATE_VNF_REQUEST_ID, + SERVICE_ID, + instanceName, + true, + msoTestApiValue)), + SimulatorApi.RegistrationStrategy.APPEND); SimulatorApi.registerExpectation(A_LACARTE_FLOW_GET_ORCHESTRATION, ImmutableMap.of(ORCHESTRATION_REQUEST_ID, "dbe54591-c8ed-46d3-abc7-d3a24873dfbd", STATUS_MESSAGE, Constants.ViewEdit.VNF_CREATED_SUCCESSFULLY_TEXT, REQUEST_TYPE, CREATE), APPEND); GeneralUIUtils.ultimateWait(); goToInstance(); ServiceModel serviceInstance = new ServicesService().getServiceModel(MODEL_UUID); - addVNF(NODE_INSTANCE, AAIAIC_25, TENANT, - FALSE, LEGACY_REGION, "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", "platform", getCurrentUser().tenants, new ArrayList<>(Arrays.asList("ECOMP")), serviceInstance, instanceName); + addVNF(NODE_INSTANCE, AAIAIC_25, AIC, TENANT, + FALSE, SOME_LEGACY_REGION, "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", "platform", getCurrentUser().tenants, new ArrayList<>(Arrays.asList("ONAP")), serviceInstance, instanceName); }); } @@ -126,19 +154,22 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { withMsoTestApiConfiguration(msoTestApiOption, msoTestApiValue, () -> { goToInstance(); String instanceName = new VidBasePage().generateInstanceName(Constants.ViewEdit.VNF_INSTANCE_NAME_PREFIX); - SimulatorApi.registerExpectation("aLacarteFlow/mso_create_vnf.json", ImmutableMap.of( - SERVICE_INSTANCE_ID, SERVICE_ID, - "<LOB>.*</LOB>", "", - "INSTANCE_NAME", instanceName, - DEFAULT_TEST_API_VALUE, msoTestApiValue - ), APPEND); + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + PRESET_SOME_LEGACY_REGION_TO_ATT_AIC, + new PresetMSOCreateVnfALaCarteOldViewEdit( + CREATE_VNF_REQUEST_ID, + SERVICE_ID, + instanceName, + false, + msoTestApiValue)), + SimulatorApi.RegistrationStrategy.APPEND); SimulatorApi.registerExpectation(A_LACARTE_FLOW_GET_ORCHESTRATION, ImmutableMap.of( ORCHESTRATION_REQUEST_ID, "dbe54591-c8ed-46d3-abc7-d3a24873dfbd", STATUS_MESSAGE, Constants.ViewEdit.VNF_CREATED_SUCCESSFULLY_TEXT, REQUEST_TYPE, CREATE ), APPEND); - openAndFillVnfPopup(NODE_INSTANCE, AAIAIC_25, TENANT, - FALSE, LEGACY_REGION, "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", "platform", getCurrentUser().tenants, null, null, instanceName); + openAndFillVnfPopup(NODE_INSTANCE, AAIAIC_25, AIC, TENANT, + FALSE, SOME_LEGACY_REGION, "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", "platform", getCurrentUser().tenants, null, null, instanceName); assertConfirmShowMissingDataErrorOnCurrentPopup(Constants.ViewEdit.LINE_OF_BUSINESS_TEXT); successConfirmVnfAndClosePopup(); }); @@ -146,7 +177,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { @Test private void emptyLobAfterReopenCreateVnfDialog() throws Exception { - final String lobToSelect = "ECOMP"; + final String lobToSelect = "ONAP"; goToInstance(); ViewEditPage viewEditPage = new ViewEditPage(); viewEditPage.selectNodeInstanceToAdd(NODE_INSTANCE); @@ -164,20 +195,30 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { withMsoTestApiConfiguration(msoTestApiOption, msoTestApiValue, () -> { final String REQUEST_ID = "dbe54591-c8ed-46d3-abc7-d3a24873bdaa"; final String MODEL_UUID = "13f022c4-651e-4326-b8e1-61e9a8c7a7ad"; - SimulatorApi.registerExpectation("aLacarteFlow/mso_create_volume_group.json", ImmutableMap.of(SERVICE_INSTANCE_ID, SERVICE_ID, "VNF_INSTANCE_ID", VNF_ID, "REQUEST_ID", REQUEST_ID, DEFAULT_TEST_API_VALUE, msoTestApiValue), SimulatorApi.RegistrationStrategy.APPEND); + String vgName = viewEditPage.generateInstanceName(Constants.ViewEdit.VOLUME_GROUP_INSTANCE_NAME_PREFIX); + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + PRESET_SOME_LEGACY_REGION_TO_ATT_AIC, + new PresetMSOCreateVolumeGroupOldViewEdit( + REQUEST_ID, + BaseMSOPreset.DEFAULT_INSTANCE_ID, + SERVICE_ID, + VNF_ID, + vgName, + msoTestApiValue)), + SimulatorApi.RegistrationStrategy.APPEND); SimulatorApi.registerExpectation(A_LACARTE_FLOW_GET_ORCHESTRATION, ImmutableMap.of(ORCHESTRATION_REQUEST_ID, REQUEST_ID, STATUS_MESSAGE, Constants.ViewEdit.VOLUME_GROUP_CREATED_SUCCESSFULLY_TEXT, REQUEST_TYPE, CREATE), SimulatorApi.RegistrationStrategy.APPEND); GeneralUIUtils.ultimateWait(); goToInstance(); ServiceModel serviceInstance = new ServicesService().getServiceModel(MODEL_UUID); - addVolumeGroup("Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3", AAIAIC_25, TENANT, - FALSE, LEGACY_REGION, getCurrentUser().tenants, serviceInstance); + addVolumeGroup("Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3", vgName, AAIAIC_25, AIC, TENANT, + FALSE, SOME_LEGACY_REGION, getCurrentUser().tenants, serviceInstance); }); } private User getCurrentUser() { - return usersService.getUser(Constants.Users.MOBILITY_VMMSC); + return usersService.getUser(Constants.Users.EMANUEL_vWINIFRED); } private void goToInstance() { @@ -189,14 +230,14 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { @Override protected UserCredentials getUserCredentials() { User user = getCurrentUser(); - return new UserCredentials(user.credentials.userId, user.credentials.password, Constants.Users.MOBILITY_VMMSC, "", ""); + return new UserCredentials(user.credentials.userId, user.credentials.password, Constants.Users.EMANUEL_vWINIFRED, "", ""); } @DataProvider public static Object[][] msoTestApiOptions() { return new Object[][]{ - {"GR_API (new)", DEFAULT_TEST_API_VALUE} - , {"VNF_API (old)", "VNF_API"} + {"VNF_API (old)", DEFAULT_TEST_API_VALUE} + , {"GR_API (new)", "GR_API"} }; } @@ -209,7 +250,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { test.run(); } finally { // back to default - selectMsoTestApiOption("GR_API (new)"); + selectMsoTestApiOption("VNF_API (old)"); } } } diff --git a/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java b/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java index 0251e365c..d53b5011a 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/AddNetworkTest.java @@ -1,6 +1,13 @@ package vid.automation.test.test; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; +import com.google.common.collect.ImmutableList; +import java.util.HashMap; +import java.util.Map; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateNetworkALaCarteOldViewEdit; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; import org.testng.annotations.Test; import vid.automation.test.Constants; import vid.automation.test.model.User; @@ -8,27 +15,37 @@ import vid.automation.test.sections.ViewEditPage; import vid.automation.test.services.BulkRegistration; import vid.automation.test.services.SimulatorApi; -import java.util.HashMap; -import java.util.Map; - public class AddNetworkTest extends VidBaseTestCase { private ViewEditPage viewEditPage = new ViewEditPage(); private String serviceInstanceIdWithNetwork = "d198cc45-158b-480e-8d2c-03943c51268e"; - private String currentUser; @Test - public void testAddNetworkFullFlow() throws Exception { - User user = usersService.getUser(Constants.Users.MOBILITY_MOBILITY); + public void testAddNetworkFullFlow() { + User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); SimulatorApi.clearAll(); BulkRegistration.genericSearchExistingServiceInstance(); BulkRegistration.addNetwork(); String instanceName = viewEditPage.generateInstanceName(Constants.ViewEdit.NETWORK_INSTANCE_NAME_PREFIX); - BulkRegistration.msoAddNetwork(instanceName); + SimulatorApi.registerExpectationFromPresets( + ImmutableList.of( + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_ONE_TO_ATT_AIC, + new PresetMSOCreateNetworkALaCarteOldViewEdit( + PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID, + "d198cc45-158b-480e-8d2c-03943c51268e", + "c187e9fe-40c3-4862-b73e-84ff056205f6", + instanceName + ), + new PresetMSOOrchestrationRequestGet( + PresetMSOOrchestrationRequestGet.COMPLETE, + PresetMSOOrchestrationRequestGet.DEFAULT_REQUEST_ID, + "Success")), + SimulatorApi.RegistrationStrategy.APPEND); + goToExistingInstanceById(serviceInstanceIdWithNetwork); Map<String, String> networkMetadata= getNetworkExpectedMetadata(); - addNetwork(networkMetadata,instanceName, "AIC30_CONTRAIL_BASIC 0", "One","a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","xxx1", "y1","c630e297a3ae486497d63eacec1d7c14", + addNetwork(networkMetadata,instanceName, "AIC30_CONTRAIL_BASIC 0", "One", "FUSION", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","xxx1", "y1","c630e297a3ae486497d63eacec1d7c14", "false", "some legacy region",user.tenants); } @@ -36,7 +53,7 @@ public class AddNetworkTest extends VidBaseTestCase { return new HashMap<String, String>(){ { put(Constants.NetworkModelInfo.SERVICE_NAME, "Using VID for VoIP Network Instantiations Shani"); - put(Constants.NetworkModelInfo.SUBSCRIBER_NAME, "Mobility"); + put(Constants.NetworkModelInfo.SUBSCRIBER_NAME, "Emanuel"); put(Constants.NetworkModelInfo.SERVICE_INSTANCE_NAME, "service_with_network_shani"); put(Constants.NetworkModelInfo.MODEL_NAME, "AIC30_CONTRAIL_BASIC"); put(Constants.NetworkModelInfo.MODEL_INVARIANT_UUID, "de01afb5-532b-451d-aac4-ff9ff0644060"); @@ -49,7 +66,7 @@ public class AddNetworkTest extends VidBaseTestCase { @Override protected UserCredentials getUserCredentials() { - User user = usersService.getUser(Constants.Users.MOBILITY_MOBILITY); - return new UserCredentials(user.credentials.userId, user.credentials.password, Constants.Users.MOBILITY_MOBILITY, "", ""); + User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); + return new UserCredentials(user.credentials.userId, user.credentials.password, Constants.Users.EMANUEL_EMANUEL, "", ""); } } diff --git a/vid-automation/src/main/java/vid/automation/test/test/AssociatePnfTest.java b/vid-automation/src/main/java/vid/automation/test/test/AssociatePnfTest.java index 5ee961215..7bec56013 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/AssociatePnfTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/AssociatePnfTest.java @@ -1,12 +1,14 @@ package vid.automation.test.test; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; +import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import vid.automation.test.Constants; import vid.automation.test.infra.Wait; import vid.automation.test.sections.PnfSearchAssociationPage; +import vid.automation.test.sections.SideMenu; import vid.automation.test.sections.VidBasePage; import vid.automation.test.sections.ViewEditPage; import vid.automation.test.services.BulkRegistration; @@ -21,6 +23,11 @@ public class AssociatePnfTest extends VidBaseTestCase { private String pnfInstanceName = "MX_960-F722"; private String pnfModelName = "pnf 0"; + @BeforeMethod + public void navigateToWelcomePage() { + SideMenu.navigateToWelcomePage(); + } + @Test public void testAssociatePnf() throws Exception { SimulatorApi.clearAll(); @@ -132,7 +139,7 @@ public class AssociatePnfTest extends VidBaseTestCase { //ubscriber NameModel Invariant UUID elementTestId = Constants.ServiceModelInfo.INFO_TEST_ID_PREFIX + Constants.ServiceModelInfo.SUBSCRIBER_NAME_KEY; infoItemText = GeneralUIUtils.getWebElementByTestID(elementTestId, 60).getText(); - Assert.assertEquals(String.format(Constants.ServiceModelInfo.METADETA_ERROR_MESSAGE,elementTestId),infoItemText,"USP VOICE"); + Assert.assertEquals(String.format(Constants.ServiceModelInfo.METADETA_ERROR_MESSAGE,elementTestId),infoItemText,"SILVIA ROBBINS"); //Model Version elementTestId = Constants.ServiceModelInfo.INFO_TEST_ID_PREFIX + Constants.ServiceModelInfo.MODEL_VERSION; infoItemText = GeneralUIUtils.getWebElementByTestID(elementTestId, 60).getText(); diff --git a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java index 4f055fe29..2b5a09823 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/BrowseASDCTest.java @@ -1,83 +1,82 @@ package vid.automation.test.test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static vid.automation.test.infra.Features.FLAG_5G_IN_NEW_INSTANTIATION_UI; +import static vid.automation.test.infra.ModelInfo.aLaCarteForBrowseSdc; +import static vid.automation.test.infra.ModelInfo.aLaCarteServiceCreationTest; +import static vid.automation.test.infra.ModelInfo.instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID; +import static vid.automation.test.infra.ModelInfo.macroForBrowseSdc; + import com.google.common.collect.ImmutableList; -import org.glassfish.jersey.uri.internal.JerseyUriBuilder; +import java.util.List; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.hamcrest.Matchers; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServiceModelList; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut; import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import org.springframework.http.client.ClientHttpRequestInterceptor; -import org.springframework.web.client.RestTemplate; import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import vid.automation.test.Constants; -import vid.automation.test.infra.*; +import vid.automation.test.infra.Click; +import vid.automation.test.infra.Exists; +import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Features; +import vid.automation.test.infra.Get; +import vid.automation.test.infra.ModelInfo; +import vid.automation.test.infra.SelectOption; import vid.automation.test.model.Service; import vid.automation.test.model.User; -import vid.automation.test.sections.*; +import vid.automation.test.sections.BrowseASDCPage; +import vid.automation.test.sections.DeployMacroDialogBase; +import vid.automation.test.sections.DeployMacroDialogOld; +import vid.automation.test.sections.SideMenu; +import vid.automation.test.sections.ViewEditPage; import vid.automation.test.services.ServicesService; import vid.automation.test.services.SimulatorApi; -import vid.automation.test.utils.CookieAndJsonHttpHeadersInterceptor; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.List; - -import static java.util.Collections.singletonList; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; public class BrowseASDCTest extends CreateInstanceDialogBaseTest { - private final String invariantUUIDAlacarte = "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba"; - private final String invariantUUIDMacro = "d27e42cf-087e-4d31-88ac-6c4b7585f800"; + private final String invariantUUIDAlacarte = aLaCarteForBrowseSdc.modelInvariantId; + private final String invariantUUIDMacro = macroForBrowseSdc.modelInvariantId; private final String instantiationTypeNameAlacarte = "a la carte"; private final String instantiationTypeNameMacro = "macro"; private final String oldMacro = "old macro"; - private String modelInvariantUUID1 = "aeababbc-010b-4a60-8df7-e64c07389466"; - private String modelInvariantUUID2 = "aa2f8e9c-9e47-4b15-a95c-4a9385599abc"; - private String modelInvariantUUID3 = "d849c57d-b6fe-4843-8349-4ab8bbb08d71"; - private String modelUuid = "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba"; - protected final RestTemplate restTemplate = new RestTemplate(); + private final String newAlacarte = "new a la carte"; + public static final String modelInvariantUUID1 = "aeababbc-010b-4a60-8df7-e64c07389466"; + public static final String modelInvariantUUID2 = "aa2f8e9c-9e47-4b15-a95c-4a9385599abc"; + public static final String modelInvariantUUID3 = "d849c57d-b6fe-4843-8349-4ab8bbb08d71"; + public static final String modelUuid = "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba"; private ServicesService servicesService = new ServicesService(); - final URI envUrI; - protected final URI uri; - public BrowseASDCTest() throws URISyntaxException { - this.envUrI = new URI(System.getProperty("ENV_URL")); - this.uri = new JerseyUriBuilder().host(envUrI.getHost()).port(envUrI.getPort()).scheme("http").path("vid").build(); - } + private final Logger logger = LogManager.getLogger(BrowseASDCTest.class); @BeforeClass - public void login() { - UserCredentials userCredentials = getUserCredentials(); - final List<ClientHttpRequestInterceptor> interceptors = singletonList(new CookieAndJsonHttpHeadersInterceptor(uri, userCredentials)); - restTemplate.setInterceptors(interceptors); + public void beforeClass() { + resetGetServicesCache(); } @BeforeMethod - public void invalidateTheCacheSelenium() { - if (Features.FLAG_SERVICE_MODEL_CACHE.isActive()) { - restTemplate.postForObject(uri + "/rest/models/reset", "", Object.class); - } + public void resetSdcModelCaches() { + invalidateSdcModelsCache(); } @Override protected UserCredentials getUserCredentials() { - User user = usersService.getUser(Constants.Users.MOBILITY_MOBILITY); - return new UserCredentials(user.credentials.userId, user.credentials.password, Constants.Users.MOBILITY_MOBILITY, "", ""); + User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); + return new UserCredentials(user.credentials.userId, user.credentials.password, Constants.Users.EMANUEL_EMANUEL, "", ""); } @Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) @@ -87,7 +86,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { SideMenu.navigateToBrowseASDCPage(); browseASDCPage.clickDeployServiceButtonByServiceUUID(service.uuid); assertThatServiceCreationDialogIsVisible(); - validatePNFCreationDialog(service, "Mobility", "pnf"); + validatePNFCreationDialog(service, "Emanuel", "pnf"); } private void validatePNFCreationDialog(Service service, String serviceType, String serviceRole) { @@ -103,7 +102,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { @Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) private void testPNFMacroInstantation() throws Exception { - User user = usersService.getUser(Constants.Users.MOBILITY_MOBILITY); + User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); relogin(user.credentials); BrowseASDCPage browseASDCPage = new BrowseASDCPage(); @@ -115,9 +114,9 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { browseASDCPage.selectProductFamily("ebc3bc3d-62fd-4a3f-a037-f619df4ff034"); GeneralUIUtils.ultimateWait(); - browseASDCPage.selectServiceTypeByName("Mobility"); + browseASDCPage.selectServiceTypeByName("Emanuel"); GeneralUIUtils.ultimateWait(); - browseASDCPage.selectLcpRegion("mtn16"); + browseASDCPage.selectLcpRegion("hvf16"); browseASDCPage.selectTenant("a259ae7b7c3f493cb3d91f95a7c18149"); assertAllIsPermitted(Constants.BrowseASDC.AIC_OPTION_CLASS); @@ -136,15 +135,6 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { viewEditPage.clickActivateButton(); } -// @Test -// private void browseServiceModel_deployServiceUnexpectedDeploymentMode_creationPopupIsMacro() throws Exception { -// deployServiceAndAssertInstantiationType( -// "don't know.zip", -// "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba", -// "macro" -// ); -// } - @Test private void browseServiceModel_deployServiceALaCarteByBackendInput_creationPopupIsALaCarte() throws Exception { // model uuid should be of macro @@ -156,6 +146,15 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { } @Test + @FeatureTogglingTest(FLAG_5G_IN_NEW_INSTANTIATION_UI) + private void browseServiceModel_deployServiceALaCarteByBackendInputHintNewUI_creationPopupIsAngular2() throws Exception { + deployServiceAndAssertInstantiationType( + instantiationTypeAlacarte_vidNotionsInstantiationUIByUUID, + newAlacarte + ); + } + + @Test private void browseServiceModel_deployServiceALaCarteBecauseNotOnMACRO_SERVICESConfig_creationPopupIsALaCarte() throws Exception { deployServiceAndAssertInstantiationType( "csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip", @@ -167,7 +166,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { @Test private void browseServiceModel_deployServiceMacroByBackendInput_creationPopupIsMacro() throws Exception { deployServiceAndAssertInstantiationType( - "csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip", + "csar15782222_instantiationTypeMacro_invariantUUIDAlacarte_withoutNetworks.zip", invariantUUIDAlacarte, instantiationTypeNameMacro ); @@ -215,17 +214,20 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { private void deployServiceAndAssertInstantiationType(String modelZipFileName, String modelInvariantId, String expectedInstantiationType) throws Exception { - String modelVersionId = "4d71990b-d8ad-4510-ac61-496288d9078e"; + deployServiceAndAssertInstantiationType(new ModelInfo("4d71990b-d8ad-4510-ac61-496288d9078e", modelInvariantId, modelZipFileName), expectedInstantiationType); + } - registerExpectationForLegacyServiceDeployment(modelVersionId, modelInvariantId, modelZipFileName, null); - User user = usersService.getUser(Constants.Users.MOBILITY_MOBILITY); + private void deployServiceAndAssertInstantiationType(ModelInfo modelInfo, String expectedInstantiationType) throws Exception { + + registerExpectationForLegacyServiceDeployment(modelInfo, "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"); + User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); relogin(user.credentials); BrowseASDCPage browseASDCPage = new BrowseASDCPage(); SideMenu.navigateToBrowseASDCPage(); GeneralUIUtils.ultimateWait(); - browseASDCPage.clickDeployServiceButtonByServiceUUID(modelVersionId); + browseASDCPage.clickDeployServiceButtonByServiceUUID(modelInfo.modelVersionId); DeployMacroDialogBase macroDialog = null; if (expectedInstantiationType.equals(instantiationTypeNameAlacarte)) { GeneralUIUtils.ultimateWait(); @@ -239,28 +241,26 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { @Test private void testServiceInstantiationAlaCarte() throws Exception { - User user = usersService.getUser(Constants.Users.MOBILITY_MOBILITY); + User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); relogin(user.credentials); - String zipFileName = "serviceCreationTest.zip"; - String modelVersionId = "aa2f8e9c-9e47-4b15-a95c-4a9385599abc"; //uuid of model. must be same as in serviceCreationTest.zip - String modelInvariantId = invariantUUIDAlacarte; //must be same as in serviceCreationTest.zip - - registerExpectationForLegacyServiceDeployment(modelVersionId, modelInvariantId, zipFileName, null); + registerExpectationForLegacyServiceDeployment(aLaCarteServiceCreationTest, "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"); BrowseASDCPage browseASDCPage = new BrowseASDCPage(); SideMenu.navigateToBrowseASDCPage(); Service service = new Service( "pnf", - modelVersionId, - modelInvariantId, + aLaCarteServiceCreationTest.modelVersionId, + aLaCarteServiceCreationTest.modelInvariantId, "action-data", "1.0", "Network L1-3", - "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", + "PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", null); + + logger.info("Expected service model properties: "+service.toString()); browseASDCPage.clickDeployServiceButtonByServiceUUID(service.uuid); validateServiceCreationDialog(service); @@ -269,7 +269,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { assertDropdownPermittedItemsByLabel(user.subscriberNames, Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS); browseASDCPage.selectSubscriberById("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"); - String serviceType = "Mobility"; + String serviceType = "Emanuel"; GeneralUIUtils.findAndWaitByText(serviceType, 30); assertDropdownPermittedItemsByValue(user.serviceTypes, Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS); @@ -297,14 +297,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { @Test(dataProvider = "filterTexts") public void testFilterOptionsInBrowseSdc(String filterText){ - SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.APPEND, - "ecompportal_getSessionSlotCheckInterval.json", - "browseASDC/aai_get_services.json", - "browseASDC/get_aai_get_subscribers.json", - "browseASDC/get_sdc_catalog_services_2f80c596.json", - "browseASDC/service_design_and_creation.json"); - SideMenu.navigateToBrowseASDCPage(); - BrowseASDCPage browseAsdcPage = new BrowseASDCPage(); + BrowseASDCPage browseAsdcPage = registerSimulatorAndGoToBrowseSDC(); GeneralUIUtils.ultimateWait(); assertThat(browseAsdcPage.countCurrentRowsInTable(),(Matchers.greaterThan(1))); browseAsdcPage.fillFilterText(filterText); @@ -316,16 +309,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { @Test private void testCategoryParamsDropdownsExistsInCreationDialog() throws Exception { - SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.APPEND, - "ecompportal_getSessionSlotCheckInterval.json", - "browseASDC/aai_get_services.json", - "browseASDC/get_aai_get_subscribers.json", - "browseASDC/get_sdc_catalog_services_2f80c596.json", - "browseASDC/service_design_and_creation.json"); - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); - relogin(user.credentials); - BrowseASDCPage browseASDCPage = new BrowseASDCPage(); - SideMenu.navigateToBrowseASDCPage(); + BrowseASDCPage browseASDCPage = registerSimulatorAndGoToBrowseSDC(); Service service = servicesService.getService("2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"); browseASDCPage.clickDeployServiceButtonByServiceUUID(service.uuid); DeployMacroDialogBase deployMacroDialog = getMacroDialog(); @@ -334,9 +318,24 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { deployMacroDialog.clickOwningEntitySelect(); } + private BrowseASDCPage registerSimulatorAndGoToBrowseSDC() { + SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET, + "ecompportal_getSessionSlotCheckInterval.json", + "browseASDC/aai_get_services.json", + "browseASDC/get_sdc_catalog_services_2f80c596.json" + ); + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + new PresetAAIGetSubscribersGet(), + new PresetAAIServiceDesignAndCreationPut() + ), + SimulatorApi.RegistrationStrategy.APPEND); + SideMenu.navigateToBrowseASDCPage(); + return new BrowseASDCPage(); + } + @Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) private void testOwningEntityRequiredAndProjectOptional() throws Exception { - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); relogin(user.credentials); BrowseASDCPage browseASDCPage = new BrowseASDCPage(); @@ -352,7 +351,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { assertDropdownPermittedItemsByLabel(user.subscriberNames, Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS); browseASDCPage.selectSubscriberById("e433710f-9217-458d-a79d-1c7aff376d89"); - String serviceType = "VIRTUAL USP"; + String serviceType = "TYLER SILVIA"; GeneralUIUtils.findAndWaitByText(serviceType, 30); assertDropdownPermittedItemsByValue(user.serviceTypes, Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS); @@ -371,7 +370,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { @Test(groups = {"shouldBeMigratedToWorkWithSimulator"}) protected void testLineOfBusinessOptionalAndPlatformRequired() throws Exception { - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); relogin(user.credentials); BrowseASDCPage browseASDCPage = new BrowseASDCPage(); @@ -387,7 +386,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { assertDropdownPermittedItemsByLabel(user.subscriberNames, Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS); browseASDCPage.selectSubscriberById("e433710f-9217-458d-a79d-1c7aff376d89"); - String serviceType = "VIRTUAL USP"; + String serviceType = "TYLER SILVIA"; GeneralUIUtils.findAndWaitByText(serviceType, 30); assertDropdownPermittedItemsByValue(user.serviceTypes, Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS); @@ -404,10 +403,10 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { //now add the VNF ViewEditPage viewEditPage = new ViewEditPage(); - viewEditPage.selectNodeInstanceToAdd("VID-PCRF-05-15-17 0"); + viewEditPage.selectNodeInstanceToAdd("VID-RODERICK-05-15-17 0"); viewEditPage.generateAndSetInstanceName(Constants.ViewEdit.VNF_INSTANCE_NAME_PREFIX); viewEditPage.selectProductFamily("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"); - viewEditPage.selectLCPRegion("AAIAIC25"); + viewEditPage.selectLcpRegion("JANET25", "AIC"); viewEditPage.selectTenant("092eb9e8e4b7412e8787dd091bc58e86"); viewEditPage.setLegacyRegion("llkjhlkjhlkjh"); @@ -427,7 +426,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { ImmutableList<BasePreset> presets = ImmutableList.of( new PresetGetSessionSlotCheckIntervalGet(), new PresetAAIGetSubscribersGet(), - new PresetAAIGetServiceModelList(modelUuid, modelInvariantUUID1, modelInvariantUUID2, modelInvariantUUID3), + new PresetAAIServiceDesignAndCreationPut(), new PresetAAIGetServicesGet()); SimulatorApi.registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); @@ -437,6 +436,8 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { private void browseSDCServiceModelListCheckAAIResponse(){ prepareSimulatorWithServiceModelListBeforeBrowseASDCService(); SideMenu.navigateToBrowseASDCPage(); + BrowseASDCPage browseASDCPage = new BrowseASDCPage(); + browseASDCPage.fillFilterText("CheckAAIResponse"); GeneralUIUtils.ultimateWait(); WebElement sdcTableElement = Get.byId("sdcModelsTable"); @@ -460,9 +461,9 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { //Check Names By name = By.className("name"); - assertEquals("AAAvIRC_mm779p_Service" , sdcFirstModel.findElement(name).getText()); - assertEquals("BBBvIRC_mm779p_Service" , sdcSecondModel.findElement(name).getText()); - assertEquals("CCCvIRC_mm779p_Service" , sdcThirdModel.findElement(name).getText()); + assertEquals("CheckAAIResponse_AAAvIRC_mm779p_Service" , sdcFirstModel.findElement(name).getText()); + assertEquals("CheckAAIResponse_BBBvIRC_mm779p_Service" , sdcSecondModel.findElement(name).getText()); + assertEquals("CheckAAIResponse_CCCvIRC_mm779p_Service" , sdcThirdModel.findElement(name).getText()); //Check distribution Status By distributionStatus = By.className("distributionStatus"); @@ -474,8 +475,10 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { assertEquals("service" , sdcFirstModel.findElement(By.className("category")).getText()); assertEquals("1.0" , sdcFirstModel.findElement(By.className("version")).getText()); } + @Test - public void browseSdcModel_getEmptyList_noModelsMessageIsShown() throws Exception { + public void browseSdcModel_getEmptyList_noModelsMessageIsShown() { + resetGetServicesCache(); SimulatorApi.clearAll(); SimulatorApi.registerExpectationFromPresets(ImmutableList.of( new PresetAAIServiceDesignAndCreationPut(true), @@ -484,5 +487,6 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { GeneralUIUtils.ultimateWait(); WebElement serviceModelsTbody = Get.byXpath("//table[@data-tests-id='serviceModelsTable']/tbody"); assertFalse(Exists.tagNameInAnotherElement(serviceModelsTbody, "tr"), "Table should be empty on empty results"); + resetGetServicesCache(); } } diff --git a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java index eadf38f4f..179eb968c 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java @@ -1,42 +1,54 @@ package vid.automation.test.test; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.everyItem; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.notNullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.collection.IsEmptyCollection.empty; +import static org.hamcrest.core.IsNot.not; + import com.google.common.collect.ImmutableMap; import com.google.common.primitives.Ints; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.json.JSONException; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebElement; -import org.openqa.selenium.interactions.Actions; import org.openqa.selenium.remote.RemoteWebElement; import org.openqa.selenium.support.ui.Select; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; -import org.testng.annotations.*; +import org.testng.annotations.AfterClass; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; import vid.automation.test.Constants; -import vid.automation.test.infra.*; +import vid.automation.test.infra.Click; +import vid.automation.test.infra.Exists; +import vid.automation.test.infra.Get; +import vid.automation.test.infra.Input; +import vid.automation.test.infra.SelectOption; +import vid.automation.test.infra.Wait; import vid.automation.test.model.User; import vid.automation.test.sections.ChangeManagementPage; import vid.automation.test.services.SimulatorApi; import vid.automation.test.utils.DB_CONFIG; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static org.hamcrest.CoreMatchers.*; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.collection.IsEmptyCollection.empty; -import static org.hamcrest.core.IsNot.not; - public class ChangeManagementTest extends VidBaseTestCase { public static final String SCHEDULED_ID = "0b87fe60-50b0-4bac-a0a7-49e951b0ba9e"; @@ -119,16 +131,19 @@ public class ChangeManagementTest extends VidBaseTestCase { static final int vnfZrdm3amdns02test2Id = 11822; static final int vnfHarrisonKrisId = 12822; static String subscriberId = "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"; - static String serviceType = "vFlowLogic"; + static String serviceType = "vRichardson"; static String vnfType = "vMobileDNS"; static String vnfSourceVersion = "1.0"; - static String vnfName = "zrdm3amdns02test2"; + static String vnfName = "zolson3amdns02test2"; static String vnfTargetVersion = "5.0"; static String workflowName = "VNF In Place Software Update"; } @AfterClass protected void dropSpecialVNFs() { + + resetGetServicesCache(); + System.out.println("Connecting database..."); try (Connection connection = DriverManager.getConnection(DB_CONFIG.url, DB_CONFIG.username, DB_CONFIG.password)) { @@ -154,7 +169,6 @@ public class ChangeManagementTest extends VidBaseTestCase { SimulatorApi.clearAll(); SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.APPEND, "changeManagement/ecompportal_getSessionSlotCheckInterval.json" - , "changeManagement/get_aai_get_subscribers.json" , "changeManagement/get_aai_sub_details.json" , "changeManagement/get_sdc_catalog_services_2f80c596.json" , "changeManagement/get_service-design-and-creation.json" @@ -163,8 +177,10 @@ public class ChangeManagementTest extends VidBaseTestCase { , "changeManagement/mso_get_manual_task.json" , "changeManagement/mso_post_manual_task.json" ); + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(),SimulatorApi.RegistrationStrategy.APPEND); registerDefaultTablesData(); + resetGetServicesCache(); } private void registerDefaultTablesData() { @@ -217,7 +233,7 @@ public class ChangeManagementTest extends VidBaseTestCase { @Override protected UserCredentials getUserCredentials() { - String userName = Constants.Users.MOBILITY_VMMSC; + String userName = Constants.Users.EMANUEL_vWINIFRED; User user = usersService.getUser(userName); return new UserCredentials(user.credentials.userId, user.credentials.password, userName, "", ""); } @@ -520,11 +536,24 @@ public class ChangeManagementTest extends VidBaseTestCase { Click.byId(Constants.ChangeManagement.dashboardFinishedTabId); Assert.assertTrue(Exists.byId(Constants.ChangeManagement.dashboardFinishedTableId)); Assert.assertTrue(Exists.byId(Constants.ChangeManagement.dashboardFinishedTheadId)); + Click.byId(Constants.ChangeManagement.dashboardActiveTabId); } @Test - public void testMainDashboardTableContent() { + public void testFinishedSectionIncludeUnlockedItem() { + ChangeManagementPage.openChangeManagementPage(); + Click.byId(Constants.ChangeManagement.dashboardFinishedTabId); + Assert.assertThat(Get.byClassAndText("vnf-name","Unlocked instance"),is(notNullValue())); + + } + + + + + + @Test + public void testMainDashboardTableContent () { ChangeManagementPage.openChangeManagementPage(); GeneralUIUtils.ultimateWait(); List<WebElement> webElements = Get.multipleElementsByTestId(Constants.ChangeManagement.activeTableRowId); diff --git a/vid-automation/src/main/java/vid/automation/test/test/CreateInstanceDialogBaseTest.java b/vid-automation/src/main/java/vid/automation/test/test/CreateInstanceDialogBaseTest.java index b486d27df..0837f79ca 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/CreateInstanceDialogBaseTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/CreateInstanceDialogBaseTest.java @@ -1,7 +1,7 @@ package vid.automation.test.test; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; import vid.automation.test.infra.Click; @@ -17,7 +17,7 @@ import java.util.List; public class CreateInstanceDialogBaseTest extends VidBaseTestCase { - private ViewEditPage viewEditPage= new ViewEditPage(); + protected ViewEditPage viewEditPage= new ViewEditPage(); void assertServiceMetadata(String expectedMetadata, String actualMetadata) { WebElement serviceNameElem = GeneralUIUtils.getWebElementByTestID(actualMetadata); @@ -67,18 +67,11 @@ public class CreateInstanceDialogBaseTest extends VidBaseTestCase { assertServiceMetadata(expectedServiceInstance.modelCustomizationUuid, Constants.CreateNewInstance.MODEL_CUSTOMIZATION_UUID); } - private String fillDetailsInDialogWithGeneratedName(String name, String lcpRegion, String tenant, String suppressRollback, - String legacyRegion, ArrayList<String> permittedTenants) - { - String generatedInstanceName = viewEditPage.generateInstanceName(name); - return fillDetailsInDialog(generatedInstanceName, lcpRegion, tenant, suppressRollback, legacyRegion, permittedTenants); - } - - private String fillDetailsInDialog(String name, String lcpRegion, String tenant, String suppressRollback, + private String fillDetailsInDialog(String name, String lcpRegion, String cloudOwner, String tenant, String suppressRollback, String legacyRegion, ArrayList<String> permittedTenants) { viewEditPage.setInstanceName(name); - viewEditPage.selectLCPRegion(lcpRegion); + viewEditPage.selectLcpRegion(lcpRegion, cloudOwner); assertDropdownPermittedItemsByValue(permittedTenants, Constants.ViewEdit.TENANT_OPTION_CLASS); viewEditPage.selectTenant(tenant); viewEditPage.selectSuppressRollback(suppressRollback); @@ -87,13 +80,13 @@ public class CreateInstanceDialogBaseTest extends VidBaseTestCase { } - protected String addVFModule(String name, String lcpRegion, String tenant, String suppressRollback, + protected String addVFModule(String modelName, String instanceName, String lcpRegion, String cloudOwner, String tenant, String suppressRollback, String legacyRegion, ArrayList<String> permittedTenants,ServiceModel expectedServiceInstance) { - viewEditPage.selectVfModuleToAdd(name); + viewEditPage.selectVfModuleToAdd(modelName); if(expectedServiceInstance != null) { validateNodeTemplateCreationDialog(expectedServiceInstance); } - String instanceName = fillDetailsInDialogWithGeneratedName(Constants.INSTANCE_NAME_SELECT_TESTS_ID, lcpRegion, tenant, suppressRollback, legacyRegion, permittedTenants); + fillDetailsInDialog(instanceName, lcpRegion, cloudOwner, tenant, suppressRollback, legacyRegion, permittedTenants); viewEditPage.clickConfirmButton(); assertSuccessfulVFModuleCreation(); viewEditPage.clickCloseButton(); @@ -101,28 +94,28 @@ public class CreateInstanceDialogBaseTest extends VidBaseTestCase { return instanceName; } - protected void addVolumeGroup (String name, String lcpRegion, String tenant, String suppressRollback, + protected void addVolumeGroup (String modelName, String instanceName, String lcpRegion, String cloudOwner, String tenant, String suppressRollback, String legacyRegion, ArrayList<String> permittedTenants, ServiceModel expectedServiceInstance) { - viewEditPage.selectVolumeGroupToAdd(name); + viewEditPage.selectVolumeGroupToAdd(modelName); if(expectedServiceInstance != null) { validateNodeTemplateCreationDialog(expectedServiceInstance); } - fillDetailsInDialogWithGeneratedName(Constants.ViewEdit.VOLUME_GROUP_INSTANCE_NAME_PREFIX, lcpRegion, tenant, suppressRollback, legacyRegion, permittedTenants); + fillDetailsInDialog(instanceName, lcpRegion, cloudOwner, tenant, suppressRollback, legacyRegion, permittedTenants); viewEditPage.clickConfirmButton(); assertSuccessfulVolumeGroupCreation(); viewEditPage.clickCloseButton(); GeneralUIUtils.ultimateWait(); } - protected void addVNF(String name, String lcpRegion, String tenant, String suppressRollback, + protected void addVNF(String name, String lcpRegion, String cloudOwner, String tenant, String suppressRollback, String legacyRegion, String productFamily, String platform, ArrayList<String> permittedTenants, List<String> lobs, ServiceModel serviceModel, String instanceName) { - openAndFillVnfPopup(name, lcpRegion, tenant, suppressRollback, legacyRegion, productFamily, platform,permittedTenants, lobs, serviceModel, instanceName); + openAndFillVnfPopup(name, lcpRegion, cloudOwner, tenant, suppressRollback, legacyRegion, productFamily, platform,permittedTenants, lobs, serviceModel, instanceName); viewEditPage.clickConfirmButton(); successConfirmVnfAndClosePopup(); } - protected void openAndFillVnfPopup(String name, String lcpRegion, String tenant, String suppressRollback, + protected void openAndFillVnfPopup(String name, String lcpRegion, String cloudOwner, String tenant, String suppressRollback, String legacyRegion, String productFamily, String platform, ArrayList<String> permittedTenants, List<String> lobs, ServiceModel serviceModel, String instanceName) { viewEditPage.selectNodeInstanceToAdd(name); GeneralUIUtils.ultimateWait(); @@ -139,7 +132,7 @@ public class CreateInstanceDialogBaseTest extends VidBaseTestCase { if(lobs != null) { SelectOption.selectOptionsFromMultiselectById(Constants.OwningEntity.LOB_SELECT_TEST_ID, lobs); } - fillDetailsInDialog(instanceName, lcpRegion, tenant, suppressRollback, legacyRegion, permittedTenants); + fillDetailsInDialog(instanceName, lcpRegion, cloudOwner, tenant, suppressRollback, legacyRegion, permittedTenants); } protected void successConfirmVnfAndClosePopup() { diff --git a/vid-automation/src/main/java/vid/automation/test/test/CreateNewInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/CreateNewInstanceTest.java index 55a1e22ce..bb13514bf 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/CreateNewInstanceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/CreateNewInstanceTest.java @@ -1,6 +1,8 @@ package vid.automation.test.test; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import java.io.IOException; +import java.util.List; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import org.testng.Assert; import org.testng.annotations.Test; @@ -16,11 +18,6 @@ import vid.automation.test.services.BulkRegistration; import vid.automation.test.services.ServicesService; import vid.automation.test.services.SimulatorApi; -import java.io.IOException; -import java.time.LocalDate; -import java.time.format.DateTimeFormatter; -import java.util.List; - public class CreateNewInstanceTest extends CreateInstanceDialogBaseTest { private ServicesService servicesService = new ServicesService(); @@ -37,22 +34,22 @@ public class CreateNewInstanceTest extends CreateInstanceDialogBaseTest { } SimulatorApi.clearAll(); - BulkRegistration.createNewServiceInstance("USP VOICE"); + BulkRegistration.createNewServiceInstance("SILVIA ROBBINS"); - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); relogin(user.credentials); SideMenu.navigateToCreateNewServicePage(); CreateNewInstancePage createNewInstancePage = new CreateNewInstancePage(); - String subscriberName = "USP VOICE"; + String subscriberName = "SILVIA ROBBINS"; assertDropdownPermittedItemsByLabel(user.subscriberNames, Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS); createNewInstancePage.selectSubscriberById("e433710f-9217-458d-a79d-1c7aff376d89"); createNewInstancePage.clickSubmitButton(); assertSuccessfulSelection(Constants.CreateNewInstance.SELECTED_SUBSCRIBER_NAME_TEST_ID, subscriberName); - String serviceType = "VIRTUAL USP"; + String serviceType = "TYLER SILVIA"; assertDropdownPermittedItemsByName(user.serviceTypes, Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS); createNewInstancePage.selectServiceTypeByName(serviceType); createNewInstancePage.clickSubmitButton(); @@ -68,7 +65,7 @@ public class CreateNewInstanceTest extends CreateInstanceDialogBaseTest { validateServiceCreationDialog(service, subscriberName, serviceType); createNewInstancePage.setInstanceName(instanceName); - SelectOption.byTestIdAndVisibleText("MetroPacketCore", Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID); + SelectOption.byTestIdAndVisibleText("WayneHolland", Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID); SelectOption.byTestIdAndVisibleText("x1", Constants.OwningEntity.PROJECT_SELECT_TEST_ID); createNewInstancePage.selectSuppressRollback("false"); createNewInstancePage.clickConfirmButton(); @@ -79,20 +76,20 @@ public class CreateNewInstanceTest extends CreateInstanceDialogBaseTest { } @Test - public void testSearchServicesWithSubscriberMSO_1610_ST() throws Exception { + public void testSearchServicesWithSubscriberCAR_2020_ER() throws Exception { SimulatorApi.clearAll(); - BulkRegistration.createNewServiceInstance("MSO_1610_ST"); + BulkRegistration.createNewServiceInstance("CAR_2020_ER"); - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); relogin(user.credentials); SideMenu.navigateToCreateNewServicePage(); CreateNewInstancePage createNewInstancePage = new CreateNewInstancePage(); - String subscriberName = "MSO_1610_ST"; + String subscriberName = "CAR_2020_ER"; assertDropdownPermittedItemsByLabel(user.subscriberNames, Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS); - createNewInstancePage.selectSubscriberById("MSO_1610_ST"); + createNewInstancePage.selectSubscriberById("CAR_2020_ER"); createNewInstancePage.clickSubmitButton(); assertSuccessfulSelection(Constants.CreateNewInstance.SELECTED_SUBSCRIBER_NAME_TEST_ID, subscriberName); diff --git a/vid-automation/src/main/java/vid/automation/test/test/CreatePortMirroringConfigurationTest.java b/vid-automation/src/main/java/vid/automation/test/test/CreatePortMirroringConfigurationTest.java index f4ba8c6dc..89e28d7a6 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/CreatePortMirroringConfigurationTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/CreatePortMirroringConfigurationTest.java @@ -1,22 +1,23 @@ package vid.automation.test.test; import com.google.common.collect.ImmutableMap; +import java.util.HashMap; +import java.util.Map; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import vid.automation.test.Constants; -import vid.automation.test.infra.*; +import vid.automation.test.infra.Exists; +import vid.automation.test.infra.Features; +import vid.automation.test.infra.Get; +import vid.automation.test.infra.Wait; import vid.automation.test.sections.CreateConfigurationPage; import vid.automation.test.sections.ServiceProxyPage; import vid.automation.test.sections.ViewEditPage; import vid.automation.test.services.BulkRegistration; import vid.automation.test.services.SimulatorApi; -import java.util.HashMap; -import java.util.Map; - public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { private ViewEditPage viewEditPage = new ViewEditPage(); @@ -27,29 +28,30 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { private String policyConfigurationModelName_0 = "Port Mirroring Configuration 0"; private String policyConfigurationModelName_1 = "Port Mirroring Configuration By Policy 1"; private String pnfInstanceName = "AS-pnf2-10219--as988q"; - private String vnfServiceType = "VIRTUAL USP"; - private String vnfInstanceName = "zmtn6aepdg01"; + private String pnfServiceType = "DARREN MCGEE"; + private String vnfServiceType = "TYLER SILVIA"; + private String defaultCollectorServiceType = "TYLER SILVIA"; + private String vnfInstanceName = "zhvf6aepdg01"; private String active = "Active"; - private String desiredCloudRegionId; - + private String desiredCloudRegionId = "mdt1"; - public CreatePortMirroringConfigurationTest() throws Exception {} + private boolean featureFlagLetsSelectingCollector() { + return Features.FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY.isActive(); + } - @BeforeMethod - public void setupDesiredCloudRegionId() { - desiredCloudRegionId = Features.FLAG_REGION_ID_FROM_REMOTE.isActive() ? "someCloudRegionIdFromAai" : "mdt1"; + private String expectedPnfCollectorServiceType() { + return (featureFlagLetsSelectingCollector() ? pnfServiceType : defaultCollectorServiceType).replace(" ", "%20"); } @Test public void testCreatePolicyConfiguration() { SimulatorApi.clearAll(); - BulkRegistration.searchExistingServiceInstancePortMirroring("Active", desiredCloudRegionId); - BulkRegistration.searchExistingServiceInstance(); + BulkRegistration.searchExistingServiceInstancePortMirroring("Active", "mdt1"); BulkRegistration.getNetworkNodeFormData(); - BulkRegistration.createPolicyConfiguration(true, desiredCloudRegionId); + BulkRegistration.createPolicyConfiguration(true, expectedPnfCollectorServiceType()); - goToExistingInstanceById(serviceInstanceId);//test_sssdad + navigateToViewEditPageOf_test_sssdad(); selectConfigurationNode(policyConfigurationModelName_1, getConfigurationExpectedMetadata()); fillAllFormFields(); createConfigurationPage.clickNextButton(); @@ -60,7 +62,7 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { createConfigurationPage.clickNextButton(); //assert service proxy models (circles) names - serviceProxyPage.assertSourceModelName("vmmeService2 Service Proxy"); + serviceProxyPage.assertSourceModelName("vflorenceService2 Service Proxy"); serviceProxyPage.assertCollectorModelName("pProbeService Service Proxy"); //assert service proxy models metadata @@ -68,6 +70,10 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { assertMetadataModal(Constants.ConfigurationCreation.COLLECTOR_INFO_BUTTON_TEST_ID, getCollectorServiceProxyExpectedMetadata()); //select source & collector + if (featureFlagLetsSelectingCollector()) { + serviceProxyPage.assertCollectorServiceType(defaultCollectorServiceType); + serviceProxyPage.chooseCollectorServiceType(pnfServiceType); + } serviceProxyPage.chooseCollector(pnfInstanceName); serviceProxyPage.assertSelectedInstanceIcon(Constants.ConfigurationCreation.COLLECTOR_INSTANCE_SELECTED_ICON_TEST_ID); @@ -91,10 +97,9 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { public void testDeletePolicyConfiguration() { SimulatorApi.clearAll(); BulkRegistration.searchExistingServiceInstancePortMirroring("Created", desiredCloudRegionId); - BulkRegistration.searchExistingServiceInstance(); BulkRegistration.getNetworkNodeFormData(); - BulkRegistration.deletePolicyConfiguration(true, desiredCloudRegionId); - goToExistingInstanceById(serviceInstanceId);//test_sssdad + BulkRegistration.deletePolicyConfiguration(true); + navigateToViewEditPageOf_test_sssdad(); serviceProxyPage.clickDeleteConfigurationButton(); serviceProxyPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT); } @@ -103,10 +108,9 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { public void testConfigurationCreatedPortEnabled(){ SimulatorApi.clearAll(); BulkRegistration.searchExistingServiceInstancePortMirroring("Created", desiredCloudRegionId); - BulkRegistration.searchExistingServiceInstance(); BulkRegistration.getNetworkNodeFormData(); - BulkRegistration.activateDeactivateConfiguration("deactivate","deactivate", desiredCloudRegionId); - goToExistingInstanceById(serviceInstanceId);//test_sssdad + BulkRegistration.activateDeactivateConfiguration("deactivate"); + navigateToViewEditPageOf_test_sssdad(); WebElement isPortEnableButtonExists = Get.byTestId("enableDisableButton"); Assert.assertNull(isPortEnableButtonExists); } @@ -114,8 +118,8 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { @Test public void testDisablePort() { enableDisablePortPresets(active, true); - BulkRegistration.enableDisablePort("disablePort", desiredCloudRegionId); - goToExistingInstanceById(serviceInstanceId);//test_sssdad + BulkRegistration.enableDisablePort("disablePort"); + navigateToViewEditPageOf_test_sssdad(); serviceProxyPage.clickEnableDisableButton(); serviceProxyPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT); } @@ -123,8 +127,8 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { @Test public void testEnablePort() { enableDisablePortPresets(active, false); - BulkRegistration.enableDisablePort("enablePort", desiredCloudRegionId); - goToExistingInstanceById(serviceInstanceId);//test_sssdad + BulkRegistration.enableDisablePort("enablePort"); + navigateToViewEditPageOf_test_sssdad(); serviceProxyPage.clickEnableDisableButton(); serviceProxyPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT); } @@ -135,7 +139,6 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { private void enableDisablePortPresets(String orchStatus, boolean isMirrored){ SimulatorApi.clearAll(); BulkRegistration.searchExistingServiceInstancePortMirroring(orchStatus, isMirrored, desiredCloudRegionId); - BulkRegistration.searchExistingServiceInstance(); BulkRegistration.getNetworkNodeFormData(); } @@ -145,10 +148,9 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { public void testActivateConfigurationTest(){ SimulatorApi.clearAll(); BulkRegistration.searchExistingServiceInstancePortMirroring("Created", desiredCloudRegionId); - BulkRegistration.searchExistingServiceInstance(); BulkRegistration.getNetworkNodeFormData(); - BulkRegistration.activateDeactivateConfiguration("activate","activate", desiredCloudRegionId); - goToExistingInstanceById(serviceInstanceId);//test_sssdad + BulkRegistration.activateDeactivateConfiguration("activate"); + navigateToViewEditPageOf_test_sssdad(); serviceProxyPage.assertDeleteConfigurationButtonExists(true); serviceProxyPage.clickActivateDeactivateButton(); serviceProxyPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT); @@ -159,10 +161,9 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { public void testDeleteConfigurationTest(){ SimulatorApi.clearAll(); BulkRegistration.searchExistingServiceInstancePortMirroring("Created", desiredCloudRegionId); - BulkRegistration.searchExistingServiceInstance(); BulkRegistration.getNetworkNodeFormData(); - BulkRegistration.deleteConfiguration(desiredCloudRegionId); - goToExistingInstanceById(serviceInstanceId);//test_sssdad + BulkRegistration.deleteConfiguration(); + navigateToViewEditPageOf_test_sssdad(); serviceProxyPage.clickDeleteConfigurationButton(); serviceProxyPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT); } @@ -172,10 +173,9 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { public void testDeactivateConfigurationTest(){ SimulatorApi.clearAll(); BulkRegistration.searchExistingServiceInstancePortMirroring("Active", desiredCloudRegionId); - BulkRegistration.searchExistingServiceInstance(); BulkRegistration.getNetworkNodeFormData(); - BulkRegistration.activateDeactivateConfiguration("deactivate","deactivate", desiredCloudRegionId); - goToExistingInstanceById(serviceInstanceId);//test_sssdad + BulkRegistration.activateDeactivateConfiguration("deactivate"); + navigateToViewEditPageOf_test_sssdad(); serviceProxyPage.assertDeleteConfigurationButtonExists(false); serviceProxyPage.clickActivateDeactivateButton(); serviceProxyPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT); @@ -186,19 +186,18 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { @Test public void testCreatePortMirroringConfiguration() { SimulatorApi.clearAll(); -// BulkRegistration.searchExistingServiceInstancePortMirroring(); BulkRegistration.searchExistingServiceInstance(); BulkRegistration.getNetworkNodeFormData(); - BulkRegistration.createPolicyConfiguration(true, desiredCloudRegionId); + BulkRegistration.createPolicyConfiguration(true, expectedPnfCollectorServiceType()); BulkRegistration.createConfiguration("model-version-id=7482279e-5901-492f-a963-6331aa6b995e&model-invariant-id=f2ae9911-95c4-40d0-8908-0175c206ab2d"); - goToExistingInstanceById(serviceInstanceId_vidTest444);//test_sssdad + navigateToViewEditPageOfuspVoiceVidTest444("240376de-870e-48df-915a-31f140eedd2c"); selectConfigurationNode(policyConfigurationModelName_0, ImmutableMap.<String, String>builder() .put(Constants.ServiceModelInfo.SERVIICE_NAME_KEY, "Demo Service 1") .put(Constants.ServiceModelInfo.MODEL_NAME, "Port Mirroring Configuration") .put(Constants.ServiceModelInfo.SERVICE_INSTANCE_NAME, "vid-test-444") .put(Constants.ServiceModelInfo.MODEL_INVARIANT_UUID, "5dd839fa-5e09-47d4-aa5c-5ba62161b569") - .put(Constants.ServiceModelInfo.SUBSCRIBER_NAME_KEY, "USP VOICE") + .put(Constants.ServiceModelInfo.SUBSCRIBER_NAME_KEY, "SILVIA ROBBINS") .put(Constants.ServiceModelInfo.MODEL_VERSION, "1.0") .put(Constants.ServiceModelInfo.MODEL_UUID, "9d6b09b1-7527-49b1-b6cf-398cb67c5523") .put(Constants.ServiceModelInfo.MODEL_CUSTOMIZATION_UUID, "3db39baa-35bc-4b97-b199-44e758823502") @@ -224,7 +223,6 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { .put(Constants.ServiceProxyModelInfo.MODEL_TYPE, "Service Proxy") .put(Constants.ServiceProxyModelInfo.MODEL_INVARIANT_UUID, "0aaefad3-9409-4ab1-be00-a1571e8a0545") .put(Constants.ServiceProxyModelInfo.MODEL_UUID, "8685fd6a-c0b1-40f7-be94-ab232e4424c1") -// .put(Constants.ServiceProxyModelInfo.MODEL_CUSTOMIZATION_UUID, "2ac4bd62-dee8-452f-b799-b9c925ee1b9f") .put(Constants.ServiceProxyModelInfo.SOURCE_MODEL_UUID, "7482279e-5901-492f-a963-6331aa6b995e") .put(Constants.ServiceProxyModelInfo.SOURCE_MODEL_INVARIANT, "f2ae9911-95c4-40d0-8908-0175c206ab2d") .put(Constants.ServiceProxyModelInfo.SOURCE_MODEL_NAME, "Service 1") @@ -233,6 +231,7 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { assertMetadataModal(Constants.ConfigurationCreation.COLLECTOR_INFO_BUTTON_TEST_ID, expectedMetadata); //select source & collector + serviceProxyPage.assertCollectorServiceType(defaultCollectorServiceType); serviceProxyPage.chooseCollectorServiceType(vnfServiceType); serviceProxyPage.chooseCollector(vnfInstanceName); serviceProxyPage.assertSelectedInstanceIcon(Constants.ConfigurationCreation.COLLECTOR_INSTANCE_SELECTED_ICON_TEST_ID); @@ -242,14 +241,6 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { serviceProxyPage.assertSelectedInstanceIcon(Constants.ConfigurationCreation.SOURCE_INSTANCE_SELECTED_ICON_TEST_ID); serviceProxyPage.assertButtonState(Constants.ConfigurationCreation.CREATE_BUTTON_TEST_ID,true); -// serviceProxyPage.clickCreateButton(); -// serviceProxyPage.assertButtonState(Constants.ConfigurationCreation.CREATE_BUTTON_TEST_ID,false); -// serviceProxyPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT); -// serviceProxyPage.clickCloseButton(); - - //assert redirect back to view/edit -// GeneralUIUtils.ultimateWait(); -// Assert.assertTrue(Exists.byTestId(Constants.ViewEdit.ADD_VNF_BUTTON_TEST_ID)); } @Test @@ -258,13 +249,19 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { SimulatorApi.clearAll(); BulkRegistration.searchExistingServiceInstancePortMirroring("Active", desiredCloudRegionId); BulkRegistration.getNetworkNodeFormData(); - BulkRegistration.createPolicyConfiguration(false, desiredCloudRegionId); + BulkRegistration.createPolicyConfiguration(false, expectedPnfCollectorServiceType()); - goToExistingInstanceById(serviceInstanceId);//test_sssdad + navigateToViewEditPageOf_test_sssdad(); selectConfigurationNode(policyConfigurationModelName_1, getConfigurationExpectedMetadata()); fillAllFormFields(); createConfigurationPage.clickNextButton(); - //select source & collector + serviceProxyPage.assertButtonState(Constants.ConfigurationCreation.CREATE_BUTTON_TEST_ID,false); + + //select source & collector + if (featureFlagLetsSelectingCollector()) { + serviceProxyPage.assertCollectorServiceType(defaultCollectorServiceType); + serviceProxyPage.chooseCollectorServiceType(pnfServiceType); + } serviceProxyPage.chooseCollector(pnfInstanceName); serviceProxyPage.chooseSourceServiceType(vnfServiceType); serviceProxyPage.chooseSource(vnfInstanceName); @@ -273,6 +270,7 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { serviceProxyPage.clickCloseButton(); serviceProxyPage.assertButtonState(Constants.ConfigurationCreation.CREATE_BUTTON_TEST_ID,true); } + @Test public void testRainyNoResultsInDropdowns(){ SimulatorApi.clearAll(); @@ -280,7 +278,7 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { BulkRegistration.getNetworkNodeFormData(); //not register createPolicyConfiguration for no results in DDLs - goToExistingInstanceById(serviceInstanceId);//test_sssdad + navigateToViewEditPageOf_test_sssdad(); selectConfigurationNode(policyConfigurationModelName_1, getConfigurationExpectedMetadata()); fillAllFormFields(); createConfigurationPage.clickNextButton(); @@ -313,7 +311,7 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { createConfigurationPage.assertButtonState(Constants.ConfigurationCreation.TENANT_DROPDOWN_TEST_ID,false); //WebElement tenantDDL= Get.byTestId(Constants.ConfigurationCreation.TENANT_DROPDOWN_TEST_ID); - createConfigurationPage.chooseRegion("AAIAIC25"); + createConfigurationPage.chooseRegion("JANET25"); GeneralUIUtils.ultimateWait(); // Wait.waitByTestId(Constants.ConfigurationCreation.TENANT_DROPDOWN_TEST_ID, 30); createConfigurationPage.chooseTenant("USP-SIP-IC-24335-T-01"); @@ -321,7 +319,7 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { } private void assertFormFields() { Assert.assertEquals("dummy_instance",createConfigurationPage.getInstanceName()); - Assert.assertEquals("AAIAIC25", createConfigurationPage.getRegion()); + Assert.assertEquals("JANET25", createConfigurationPage.getRegion()); Assert.assertEquals("USP-SIP-IC-24335-T-01",createConfigurationPage.getTenant()); createConfigurationPage.assertButtonState(Constants.ConfigurationCreation.NEXT_BUTTON_TEST_ID,true); @@ -334,7 +332,7 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { put(Constants.ServiceModelInfo.MODEL_NAME, "Port Mirroring Configuration By Policy"); put(Constants.ServiceModelInfo.SERVICE_INSTANCE_NAME, "test_sssdad"); put(Constants.ServiceModelInfo.MODEL_INVARIANT_UUID, "c30a024e-a6c6-4670-b73c-3df64eb57ff6"); - put(Constants.ServiceModelInfo.SUBSCRIBER_NAME_KEY, "USP VOICE"); + put(Constants.ServiceModelInfo.SUBSCRIBER_NAME_KEY, "SILVIA ROBBINS"); put(Constants.ServiceModelInfo.MODEL_VERSION, "1.0"); put(Constants.ServiceModelInfo.MODEL_UUID, "f58d039d-4cfc-40ec-bd75-1f05f0458a6c"); put(Constants.ServiceModelInfo.MODEL_CUSTOMIZATION_UUID, "4b7ebace-bad6-4526-9be6-bf248e20fc5f"); @@ -346,16 +344,16 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { private Map<String, String> getSourceServiceProxyExpectedMetadata() { return new HashMap<String, String>(){ { - put(Constants.ServiceProxyModelInfo.MODEL_NAME, "vmmeService2 Service Proxy"); + put(Constants.ServiceProxyModelInfo.MODEL_NAME, "vflorenceService2 Service Proxy"); put(Constants.ServiceProxyModelInfo.MODEL_VERSION, "1.0"); - put(Constants.ServiceProxyModelInfo.MODEL_DESCRIPTION, "A Proxy for Service vmmeService2"); + put(Constants.ServiceProxyModelInfo.MODEL_DESCRIPTION, "A Proxy for Service vflorenceService2"); put(Constants.ServiceProxyModelInfo.MODEL_TYPE, "Service Proxy"); put(Constants.ServiceProxyModelInfo.MODEL_INVARIANT_UUID, "2933b574-d28d-45ea-bf22-4df2907e4a10"); put(Constants.ServiceProxyModelInfo.MODEL_UUID, "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee"); put(Constants.ServiceProxyModelInfo.MODEL_CUSTOMIZATION_UUID, "060be63d-5f9c-4fd0-8ef7-830d5e8eca17"); put(Constants.ServiceProxyModelInfo.SOURCE_MODEL_UUID, "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6"); put(Constants.ServiceProxyModelInfo.SOURCE_MODEL_INVARIANT, "a7eac2b3-8444-40ee-92e3-b3359b32445c"); - put(Constants.ServiceProxyModelInfo.SOURCE_MODEL_NAME, "vmmeService2"); + put(Constants.ServiceProxyModelInfo.SOURCE_MODEL_NAME, "vflorenceService2"); } }; } diff --git a/vid-automation/src/main/java/vid/automation/test/test/DeleteResumeTest.java b/vid-automation/src/main/java/vid/automation/test/test/DeleteResumeTest.java index 2e3580f0c..55ab567dc 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/DeleteResumeTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/DeleteResumeTest.java @@ -1,30 +1,22 @@ package vid.automation.test.test; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.testng.annotations.Test; import vid.automation.test.Constants; import vid.automation.test.model.User; import vid.automation.test.services.BulkRegistration; import vid.automation.test.services.SimulatorApi; -import vid.automation.test.services.UsersService; - -import java.io.IOException; public class DeleteResumeTest extends CreateInstanceDialogBaseTest { - private UsersService usersService = new UsersService(); - - public DeleteResumeTest() throws IOException { - } - @Test() - private void testResumePendingActivationVfModule() throws Exception { - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); + @Test + private void testResumePendingActivationVfModule() { + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); String serviceInstanceId = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; String vnfInstanceId = "c015cc0f-0f37-4488-aabf-53795fd93cd3"; SimulatorApi.clearAll(); BulkRegistration.resumeVfModule(serviceInstanceId,vnfInstanceId); navigateToViewEditPageOfuspVoiceVidTest444("240376de-870e-48df-915a-31f140eedd2c"); - resumeVFModule("aa","AAIAIC25","092eb9e8e4b7412e8787dd091bc58e86","mdt1",user.tenants); + resumeVFModule("aa","JANET25", "AIC", "092eb9e8e4b7412e8787dd091bc58e86","mdt1",user.tenants); } }
\ No newline at end of file diff --git a/vid-automation/src/main/java/vid/automation/test/test/DrawingBoardTest.java b/vid-automation/src/main/java/vid/automation/test/test/DrawingBoardTest.java index d022f5c9b..bacd83155 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/DrawingBoardTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/DrawingBoardTest.java @@ -1,40 +1,51 @@ package vid.automation.test.test; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import static org.testng.AssertJUnit.assertFalse; +import static vid.automation.test.Constants.DrawingBoard.AVAILABLE_MODELS_TREE; +import static vid.automation.test.Constants.DrawingBoard.BACK_BUTTON; +import static vid.automation.test.Constants.DrawingBoard.CONTEXT_MENU_BUTTON_HEADER; +import static vid.automation.test.Constants.DrawingBoard.CONTEXT_MENU_HEADER_EDIT_ITEM; +import static vid.automation.test.Constants.DrawingBoard.DEFAULT_SERVICE_NAME; +import static vid.automation.test.Constants.DrawingBoard.DRAWING_BOARD_TREE; +import static vid.automation.test.Constants.DrawingBoard.SEARCH_LEFT_TREE; +import static vid.automation.test.Constants.DrawingBoard.SERVICE_QUANTITY; +import static vid.automation.test.infra.Features.FLAG_ASYNC_INSTANTIATION; +import static vid.automation.test.infra.ModelInfo.macroDrawingBoardComplexService; +import static vid.automation.test.infra.ModelInfo.macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails; + +import com.google.common.collect.ImmutableList; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; import org.testng.Assert; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import vid.automation.test.Constants; -import vid.automation.test.infra.*; +import vid.automation.test.infra.Click; +import vid.automation.test.infra.Exists; +import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Get; +import vid.automation.test.infra.Input; +import vid.automation.test.infra.ModelInfo; +import vid.automation.test.infra.SelectOption; +import vid.automation.test.infra.Wait; import vid.automation.test.model.User; import vid.automation.test.sections.BrowseASDCPage; import vid.automation.test.sections.DrawingBoardPage; import vid.automation.test.sections.VidBasePage; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsString; -import static org.hamcrest.Matchers.endsWith; -import static org.testng.Assert.assertNotNull; -import static org.testng.AssertJUnit.assertEquals; -import static vid.automation.test.Constants.DrawingBoard.*; -import static vid.automation.test.infra.Features.FLAG_ASYNC_INSTANTIATION; - @FeatureTogglingTest(FLAG_ASYNC_INSTANTIATION) public class DrawingBoardTest extends VidBaseTestCase { private DrawingBoardPage drawingBoardPage = new DrawingBoardPage(); - private String loadedServiceModelId = ""; - private final String defaultServiceModelForMostTests = "6e59c5de-f052-46fa-aa7e-2fca9d674c44"; - + private String loadedServiceModelId = macroDrawingBoardComplexService.modelVersionId; @Override protected UserCredentials getUserCredentials() { - String userName = Constants.Users.USP_VOICE_VIRTUAL_USP; + String userName = Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA; User user = usersService.getUser(userName); return new UserCredentials(user.credentials.userId, user.credentials.password, userName, "", ""); } @@ -44,7 +55,7 @@ public class DrawingBoardTest extends VidBaseTestCase { @AfterClass private void goOutFromIframe() { - new VidBasePage().goOutFromIframe(); + VidBasePage.goOutFromIframe(); } @@ -53,21 +64,22 @@ public class DrawingBoardTest extends VidBaseTestCase { final String currentUrl = getDriver().getCurrentUrl(); System.out.println("currentUrl in @BeforeMethod setNewServiceToDefault: " + currentUrl); - if (currentUrl.endsWith("/servicePlanning?serviceModelId=" + defaultServiceModelForMostTests)) { + if (currentUrl.endsWith("/servicePlanning?serviceModelId=" + macroDrawingBoardComplexService.modelVersionId)) { getDriver().navigate().refresh(); } else { - setNewService("service-Complexservice-csar.zip", defaultServiceModelForMostTests, null); + setNewService(macroDrawingBoardComplexService, null); } GeneralUIUtils.ultimateWait(); drawingBoardPage.goToIframe(); } - private void setNewService(String zipFileName, String serviceModelId, String instanceName) { + private void setNewService(ModelInfo modelInfo, String instanceName) { goOutFromIframe(); BrowseASDCPage browseASDCPage = new BrowseASDCPage(); - loadedServiceModelId = serviceModelId; - loadServicePopup(zipFileName, serviceModelId); + prepareServicePreset(modelInfo.zipFileName, modelInfo.modelVersionId); + + loadServicePopup(modelInfo.modelVersionId); if (instanceName != null) { Input.text(instanceName,Constants.BrowseASDC.NewServicePopup.INSTANCE_NAME); @@ -76,37 +88,50 @@ public class DrawingBoardTest extends VidBaseTestCase { Wait.waitByClassAndText("subscriber","",3); GeneralUIUtils.ultimateWait(); VidBasePage.selectSubscriberById("e433710f-9217-458d-a79d-1c7aff376d89"); + + GeneralUIUtils.ultimateWait(); GeneralUIUtils.ultimateWait(); browseASDCPage.selectProductFamily("e433710f-9217-458d-a79d-1c7aff376d89"); - String serviceType = "VIRTUAL USP"; - Wait.waitByClassAndText(Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS, serviceType, 30); + GeneralUIUtils.ultimateWait(); + String serviceType = "TYLER SILVIA"; +// Wait.waitByClassAndText(Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS, serviceType, 30); browseASDCPage.selectServiceTypeByName(serviceType); GeneralUIUtils.ultimateWait(); GeneralUIUtils.ultimateWait(); - browseASDCPage.selectLcpRegion("mtn6"); + browseASDCPage.selectLcpRegion("hvf6"); browseASDCPage.selectTenant("3f21eeea6c2c486bba31dab816c05a32"); - Click.onFirstSelectOptionById(Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID); + Click.onFirstSelectOptionByTestId(Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID); browseASDCPage.selectAicZone("NFT1"); - Click.onFirstSelectOptionById(Constants.OwningEntity.PROJECT_SELECT_TEST_ID); + Click.onFirstSelectOptionByTestId(Constants.OwningEntity.PROJECT_SELECT_TEST_ID); // select mandatory field - Click.onFirstSelectOptionById(Constants.ServiceModelInfo.ROLLBACK_ON_FAILURE_ID); + Click.onFirstSelectOptionByTestId(Constants.ServiceModelInfo.ROLLBACK_ON_FAILURE_TEST_ID); + + Click.byTestId("form-set"); + VidBasePage.goOutFromIframe(); + } - Click.byTestId("service-form-set"); - browseASDCPage.goOutFromIframe(); + private void prepareServicePreset(String zipFileName, String serviceModelId) { + String modelInvariantId = "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0"; + String subscriberId = "e433710f-9217-458d-a79d-1c7aff376d89"; + registerExpectationForServiceDeployment( + ImmutableList.of( + new ModelInfo(serviceModelId, modelInvariantId, zipFileName) + ), + subscriberId, new PresetMSOCreateServiceInstanceGen2()); } - static final String leftTreeNodeName = "VF_vMee 0"; + static final String leftTreeNodeName = "VF_vGeraldine 0"; static final String leftTreeNodeNameWithoutChildren = "Port Mirroring Configuration By Policy 0"; - static final String[] leftTreeNodeChildren = {"vf_vmee0..VfVmee..vmme_vlc..module-1", "vf_vmee0..VfVmee..vmme_gpb..module-2", "vf_vmee0..VfVmee..base_vmme..module-0"}; - static final String[] leftTreeInitialElements = new String[]{"V", "VF_vMee 0", "C","Port Mirroring Configuration By Policy 0","N", "ExtVL 0"}; + static final String[] leftTreeNodeChildren = {"vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1", "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2", "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0"}; + static final String[] leftTreeInitialElements = new String[]{"VNF", "VF_vGeraldine 0", "1", "C","Port Mirroring Configuration By Policy 0"}; - static final String rightTreeNodeName = "d6557200-ecf2-4641-8094-5393ae3aae60-VF_vMee 0"; + static final String rightTreeNodeName = "d6557200-ecf2-4641-8094-5393ae3aae60-VF_vGeraldine 0"; static final String rightTreeNodeNameWithoutChildren = "ddc3f20c-08b5-40fd-af72-c6d14636b986-ExtVL 0"; - static final String[] rightTreeNodeChildren = {"522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vmee0..VfVmee..vmme_vlc..module-1", "41708296-e443-4c71-953f-d9a010f059e1-vf_vmee0..VfVmee..vmme_gpb..module-2", "a27f5cfc-7f12-4f99-af08-0af9c3885c87-vf_vmee0..VfVmee..base_vmme..module-0"}; + static final String[] rightTreeNodeChildren = {"522159d5-d6e0-4c2a-aa44-5a542a12a830-vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1", "41708296-e443-4c71-953f-d9a010f059e1-vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2", "a27f5cfc-7f12-4f99-af08-0af9c3885c87-vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0"}; - private static final String EMPTY_BOARD_TITLE = "Please add objects (VNFs, network, modules etc.) from the left tree to design the service instance"; + private static final String EMPTY_BOARD_TITLE = "Please add objects (VNF a-la-carteVNFs, network, modules etc.) from the left tree to design the service instance"; private static final String EMPTY_BOARD_SUBTITLE = "Once done, click Deploy to start instantiation"; @@ -127,7 +152,7 @@ public class DrawingBoardTest extends VidBaseTestCase { private void expandCollapseLeftTreeByClickOnRow() { Wait.byText(leftTreeNodeName); drawingBoardPage.expandTreeByClickingNode(leftTreeNodeName, leftTreeNodeChildren); - //should checking with Golan if click also collapse + //should chec king with Golan if click also collapse //drawingBoardPage.collapseTreeByClickingNode(leftTreeNodeName, leftTreeNodeChildren))); drawingBoardPage.verifyNonCollapsableTreeByClickingNode(leftTreeNodeName, leftTreeNodeChildren); } @@ -178,17 +203,6 @@ public class DrawingBoardTest extends VidBaseTestCase { drawingBoardPage.checkLeafNodeHasNoExpander(rightTreeNodeNameWithoutChildren); } - @Test - public void testEmptyDrawingBoard() { - assertNotNull(Get.byClassAndText("text-title", EMPTY_BOARD_TITLE)); - assertNotNull(Get.byClassAndText("text-subtitle", EMPTY_BOARD_SUBTITLE)); - WebElement icon = Get.byTestId("no-content-icon"); - assertEquals("img", icon.getTagName()); - assertThat(icon.getAttribute("src"), endsWith("UPLOAD.svg")); - assertThat(icon.getAttribute("class"), containsString("no-content-icon")); - assertThat(icon.getAttribute("class"), containsString("upload-icon-service-planing")); - } - @Test(groups = { "underDevelopment" }) private void clickRightTreeNode_verifyLeftTreeNodeIsBlueAndExpanded() { @@ -259,12 +273,12 @@ public class DrawingBoardTest extends VidBaseTestCase { */ @Test private void insertTestInSerachBox_verifyMatchesMarkedAndVisible() { - Wait.byText("vf_vmee0..VfVmee..vmme_vlc..module-1"); + Wait.byText("vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1"); drawingBoardPage.checkSearch(); - final String searchTerm = "Vmee..vmme"; + final String searchTerm = "Vgeraldine..vflorence"; GeneralUIUtils.setWebElementByTestId(SEARCH_LEFT_TREE, searchTerm); - drawingBoardPage.checkNodesVisibleAndMatchIsHighlighted(searchTerm,"vf_vmee0..VfVmee..vmme_vlc..module-1", "vf_vmee0..VfVmee..vmme_gpb..module-2"); + drawingBoardPage.checkNodesVisibleAndMatchIsHighlighted(searchTerm,"vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1", "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2"); } /* @@ -308,7 +322,7 @@ public class DrawingBoardTest extends VidBaseTestCase { private void setAndAssertServiceWithName(String instanceName){ goOutFromIframe(); - setNewService("csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip", "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", instanceName); + setNewService(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails, instanceName); GeneralUIUtils.ultimateWait(); drawingBoardPage.goToIframe(); drawingBoardPage.checkServiceInstanceName(instanceName); @@ -324,7 +338,7 @@ public class DrawingBoardTest extends VidBaseTestCase { final int updatedQuantity = 10; Click.byTestId(CONTEXT_MENU_BUTTON_HEADER); Click.byTestId(CONTEXT_MENU_HEADER_EDIT_ITEM); - Assert.assertTrue(Exists.byId("service-popup"), "context menu should not appear"); + Assert.assertTrue(Exists.byId("instance-popup"), "context menu should not appear"); SelectOption.byIdAndVisibleText("quantity-select", String.valueOf(updatedQuantity)); Input.replaceText(updatedInstanceName,Constants.BrowseASDC.NewServicePopup.INSTANCE_NAME ); Click.byTestId(Constants.BrowseASDC.NewServicePopup.SET_BUTTON); @@ -342,7 +356,7 @@ public class DrawingBoardTest extends VidBaseTestCase { String initialQuantity = Get.byTestId(SERVICE_QUANTITY).getText(); Click.byTestId(CONTEXT_MENU_BUTTON_HEADER); Click.byTestId(CONTEXT_MENU_HEADER_EDIT_ITEM); - Assert.assertTrue(Exists.byId("service-popup"), "context menu should not appear"); + Assert.assertTrue(Exists.byId("instance-popup"), "context menu should not appear"); SelectOption.byIdAndVisibleText("quantity-select", String.valueOf(updatedQuantity)); Input.replaceText(updatedInstanceName,Constants.BrowseASDC.NewServicePopup.INSTANCE_NAME ); Click.byTestId(Constants.BrowseASDC.NewServicePopup.CANCEL_BUTTON); @@ -356,10 +370,10 @@ public class DrawingBoardTest extends VidBaseTestCase { private void checkHeader_verifyElementsExist(){ drawingBoardPage.checkExistsAndEnabled(BACK_BUTTON); drawingBoardPage.checkServiceInstanceName(DEFAULT_SERVICE_NAME); - drawingBoardPage.checkServiceStatus(); drawingBoardPage.checkQuantityNumberIsCorrect(1); drawingBoardPage.checkExistsAndEnabled(CONTEXT_MENU_BUTTON_HEADER); - //drawingBoardPage.checkDeployButtonDisabled(); + assertFalse(Get.byTestId("orchStatusLabel").isDisplayed()); + assertFalse(Get.byTestId("orchStatusValue").isDisplayed()); } private void assertResultsInBrowseAsdcPage(){ @@ -372,7 +386,7 @@ public class DrawingBoardTest extends VidBaseTestCase { private void BackButtonWithCancel_verifyStayInTheSamePage(){ String currentUrl = getCurrentUrl(); Click.byTestId(BACK_BUTTON); - Click.byText(Constants.Modals.CANCEL); + Click.byTestId(Constants.DrawingBoard.CANCEL_BUTTON); String newUrl = getCurrentUrl(); org.testng.Assert.assertEquals(currentUrl, newUrl); } @@ -385,22 +399,9 @@ public class DrawingBoardTest extends VidBaseTestCase { @Test private void BackButton_verifyReturnToSearchResults(){ Click.byTestId(BACK_BUTTON); - Click.byText(Constants.Modals.STOP_INSTANTIATION); - assertResultsInBrowseAsdcPage(); - } - - @Test - private void deleteButon_verifyReturnToSearchResults() { - Click.byTestId(CONTEXT_MENU_BUTTON_HEADER); - Click.byTestId(CONTEXT_MENU_HEADER_DELETE_ITEM); - Click.byText(Constants.Modals.STOP_INSTANTIATION); + Click.byTestId(Constants.DrawingBoard.STOP_INSTANTIATION_BUTTON); assertResultsInBrowseAsdcPage(); } - - - - - } diff --git a/vid-automation/src/main/java/vid/automation/test/test/EnvironmentsTest.java b/vid-automation/src/main/java/vid/automation/test/test/EnvironmentsTest.java index 01af276e5..f21a76d83 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/EnvironmentsTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/EnvironmentsTest.java @@ -2,7 +2,7 @@ package vid.automation.test.test; import com.google.common.collect.ImmutableMap; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import org.springframework.http.HttpStatus; import org.testng.annotations.BeforeClass; @@ -385,11 +385,12 @@ public class EnvironmentsTest extends VidBaseTestCase { assertTrue("Failed to find Activate button for test env with id: "+envId, activationButton.isDisplayed()); activationButton.click(); updateEnvManifestFile(inputFileName); - WebElement manifestFileName = Get.byId("manifestFileName"); - assertEquals("Manifest file name is wrong in test environment activation modal", inputFileName, manifestFileName.getText()); + assertTrue("Manifest file name is wrong in test environment activation modal", + Wait.waitByIdAndText("manifestFileName", inputFileName, 10)); } private void updateEnvManifestFile(String inputFileName) { + GeneralUIUtils.ultimateWait(); Input.file("applicationEnvironment/"+inputFileName, "testEnvManifestFileInput"); GeneralUIUtils.ultimateWait(); } diff --git a/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java b/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java index 184592188..2bb97aa2e 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/HealthStatusTest.java @@ -5,6 +5,7 @@ import com.google.common.collect.ImmutableList; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.remote.RemoteWebElement; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -59,6 +60,7 @@ public class HealthStatusTest extends VidBaseTestCase { private void refreshStatus() { vidBasePage.navigateTo("app/ui/#/healthStatus"); + GeneralUIUtils.ultimateWait(); Click.byClass("icon-refresh"); } diff --git a/vid-automation/src/main/java/vid/automation/test/test/InstantiationStatusTest.java b/vid-automation/src/main/java/vid/automation/test/test/InstantiationStatusTest.java index 899eed9a1..a3480f8c2 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/InstantiationStatusTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/InstantiationStatusTest.java @@ -1,42 +1,60 @@ package vid.automation.test.test; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME; +import static org.testng.Assert.assertEquals; +import static org.testng.AssertJUnit.assertTrue; +import static vid.automation.test.Constants.DrawingBoard.DEPLOY_BUTTON; +import static vid.automation.test.infra.Features.FLAG_ASYNC_INSTANTIATION; + import com.google.common.collect.ImmutableMap; +import java.util.Collections; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; -import org.openqa.selenium.JavascriptExecutor; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames; +import org.onap.vid.api.AsyncInstantiationBase; +import org.onap.vid.api.CreateServiceWithFailedVnf; +import org.onap.vid.api.TestUtils; +import org.openqa.selenium.By; +import org.openqa.selenium.WebElement; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import vid.automation.test.Constants; +import vid.automation.test.infra.Click; import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Features; +import vid.automation.test.infra.Get; +import vid.automation.test.infra.Wait; +import vid.automation.test.sections.DrawingBoardPage; import vid.automation.test.sections.InstantiationStatusPage; import vid.automation.test.sections.SideMenu; +import vid.automation.test.sections.VidBasePage; import vid.automation.test.services.AsyncJobsService; -import java.util.UUID; - -import static vid.automation.test.infra.Features.FLAG_ASYNC_INSTANTIATION; -import static vid.automation.test.sections.InstantiationStatusPage.assertInstantiationStatusRow; -import static vid.automation.test.sections.InstantiationStatusPage.getNumberOfTableRows; - @FeatureTogglingTest(FLAG_ASYNC_INSTANTIATION) public class InstantiationStatusTest extends VidBaseTestCase { + private final String serviceModelVersion = "5.1"; + private final String regionId = "a93f8383-707e-43fa-8191-a6e69a1aab17"; + final static String owningEntityName = "Lucine Sarika"; + final static String subscriberName = "SILVIA ROBBINS"; + private static final String COMPLETED = "COMPLETED"; + private static final String CREATE_BULK_OF_ALACARTE_REQUEST = "asyncInstantiation/vidRequestCreateALaCarte.json"; + private final VidBasePage vidBasePage = new VidBasePage(); - private final String serviceModelVersion = "1.0"; - private final String subscriberId = "ac040e8a-b43a-441b-ab87-603f5b70be55"; - private final String regionId = "my-expected-region-id"; - private final String projectName = "a-project-name"; - final static String owningEntityName = "expected-owningEntityName"; - final static String subscriberName = "expected-subscriberName"; - - - private String currentUUI; + private AsyncInstantiationBase asyncInstantiationBase; @BeforeClass protected void dropAllAsyncJobs() { AsyncJobsService asyncJobsService = new AsyncJobsService(); asyncJobsService.dropAllAsyncJobs(); + asyncInstantiationBase = new AsyncInstantiationBase(); + asyncInstantiationBase.init(); + UserCredentials userCredentials = getUserCredentials(); + //login for API test (needed besides selenium test via browser) + asyncInstantiationBase.login(userCredentials); } @AfterClass @@ -45,58 +63,21 @@ public class InstantiationStatusTest extends VidBaseTestCase { asyncJobsService.muteAllAsyncJobs(); } - @BeforeMethod - protected void createJobsData() { - addOneJob(); - SideMenu.navigateToMacroInstantiationStatus(); - } - private String addOneJob() { - currentUUI = UUID.randomUUID().toString(); - final JavascriptExecutor javascriptExecutor = (JavascriptExecutor) GeneralUIUtils.getDriver(); - Object result = javascriptExecutor.executeScript( - "return (function postJob(){var xhttp = new XMLHttpRequest(); " + - " " + - " xhttp.onreadystatechange = function() { " + - " return this.responseText; " + - " }; " + - " " + - " xhttp.open(\"POST\", '/vid/asyncInstantiation/bulk', false); " + - " xhttp.setRequestHeader(\"Content-type\", \"application/json\"); " + - " xhttp.send(`{ " + - " \"modelInfo\": { " + - " \"modelType\": \"service\", " + - " \"modelInvariantId\": \"300adb1e-9b0c-4d52-bfb5-fa5393c4eabb\", " + - " \"modelVersionId\": \"5c9e863f-2716-467b-8799-4a67f378dcaa\", " + - " \"modelName\": \"AIM_TRANSPORT_00004\", " + - " \"modelVersion\": \"" + serviceModelVersion + "\" " + - " }, " + - " \"owningEntityId\" : \"someID\", " + - " \"owningEntityName\": \"" + owningEntityName + "\", " + - " \"projectName\" : \"" + projectName + currentUUI + "\", " + - " \"globalSubscriberId\": \"" + subscriberId + "\", " + - " \"subscriberName\": \"" + subscriberName + "\", " + - " \"productFamilyId\" : \"myProductFamilyId\", " + - " \"instanceName\" : \"MichaelJordan\", " + - " \"subscriptionServiceType\" : \"mySubType\", " + - " \"lcpCloudRegionId\" : \"" + regionId + "\", " + - " \"tenantId\" : \"greatTenant\", " + - " \"bulkSize\": 1, " + - " \"isUserProvidedNaming\": \"true\", " + - " \"vnfs\": {} " + - "} `); " + - " " + - "return JSON.parse(xhttp.responseText).entity;})()" - ); - - return result.toString(); + String serviceName = TestUtils.generateRandomAlphaNumeric(8); + final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = + ImmutableMap.of(SERVICE_NAME, serviceName); + asyncInstantiationBase.createBulkOfInstances(false, 1, names, CREATE_BULK_OF_ALACARTE_REQUEST).get(0); + return serviceName; } @Test public void testServiceInfoIsPresentedInTable() { + String serviceName = addOneJob(); + SideMenu.navigateToMacroInstantiationStatus(); InstantiationStatusPage.clickRefreshButton(); - assertInstantiationStatusRow(projectName + currentUUI, ImmutableMap.of( + InstantiationStatusPage.assertInstantiationStatusRow(serviceName, ImmutableMap.of( "subscriberName", subscriberName, "regionId", regionId, "serviceModelVersion", serviceModelVersion, @@ -104,15 +85,84 @@ public class InstantiationStatusTest extends VidBaseTestCase { )); } - @Test public void testServiceInfoDataUpdatingAfterClickRefresh() { - long numberOfRows = getNumberOfTableRows(60); + addOneJob(); + SideMenu.navigateToMacroInstantiationStatus(); + InstantiationStatusPage.clickRefreshButton(); + long numberOfRows = InstantiationStatusPage.getNumberOfTableRows(60); addOneJob(); InstantiationStatusPage.clickRefreshButton(); - int numberOfRowsAfterRefresh = getNumberOfTableRows(60); + int numberOfRowsAfterRefresh = InstantiationStatusPage.getNumberOfTableRows(60); Assert.assertEquals(numberOfRows + 1 , numberOfRowsAfterRefresh); } + + @Test + @FeatureTogglingTest(Features.FLAG_1902_RETRY_JOB) + public void testRedeployFromDrawingBoardOfServiceWithFailedVnf() { + SideMenu.navigateToMacroInstantiationStatus(); + + CreateServiceWithFailedVnf createServiceWithFailedVnf = createServiceWithFailedVnfAssertStausAndSimulatorRegistration(); + String originalServiceName = createServiceWithFailedVnf.getNames().get(SERVICE_NAME); + + InstantiationStatusPage.clickRefreshButton(); + + //Open job + InstantiationStatusPage.openDrawingBoardForRetry(originalServiceName); + DrawingBoardPage.goToIframe(); + + Wait.waitByTestId("error-msg-wrapper", 10); + boolean isErrorShown = Wait.waitByClassAndText("sub-title", "Attention: You are currently viewing instances from the MSO. 1 of the instances failed, please try again.", 10); + assertTrue(isErrorShown); + + //validate audit info for failed vnf + String originalVnfName = createServiceWithFailedVnf.getNames().get(VNF_NAME); + hoverAndClickMenuByName(originalVnfName, "fe042c22-ba82-43c6-b2f6-8f1fc4164091-vSAMP12 1", Constants.DrawingBoard.CONTEXT_MENU_SHOW_AUDIT); + checkFailedAuditInfoOnRetry(originalVnfName, createServiceWithFailedVnf.getFirstIds().vnfReqId, "Vnf failed."); + + Click.byTestId(DEPLOY_BUTTON); + VidBasePage.goOutFromIframe(); + GeneralUIUtils.ultimateWait(); + vidBasePage.goToIframe(); + GeneralUIUtils.ultimateWait(); + + checkRetryRequestToBeComplete(createServiceWithFailedVnf, originalServiceName); + } + + private void checkFailedAuditInfoOnRetry(String instanceName, String requestId, String message) { + WebElement webElement = Get.byTestId("model-item-value-instance_name"); + assertEquals(webElement.getText(), instanceName, "Instance Name must be equal"); + + WebElement msoTableElement = Get.byId("service-instantiation-audit-info-mso"); + assertEquals(3, msoTableElement.findElement(By.tagName("thead")).findElements(By.tagName("th")).size(), "Audit info MSO table must contain 3 columns"); + assertEquals(requestId, msoTableElement.findElement(By.id("msoRequestId")).getText(), "Audit info Request Id is not equal"); + assertEquals("Failed", msoTableElement.findElement(By.id("msoJobStatus")).getText(), "Audit info Job Status is not equal"); + assertEquals(message, msoTableElement.findElement(By.id("msoAdditionalInfo")).getText(), "Audit info AdditionalInfo is not equal"); + + vidBasePage.screenshotDeployDialog("retry-audit-info-" + instanceName); + Click.byId(Constants.AuditInfoModal.CANCEL_BUTTON); + GeneralUIUtils.ultimateWait(); + } + + private CreateServiceWithFailedVnf createServiceWithFailedVnfAssertStausAndSimulatorRegistration() { + + //CreateServiceWithFailedVnf is common for API test and UI test, + //so if you change it, make sure both test are compatible with your changes + CreateServiceWithFailedVnf createServiceWithFailedVnf = new CreateServiceWithFailedVnf(asyncInstantiationBase); + createServiceWithFailedVnf.createServicesWithVnfCompletedWithError(); + createServiceWithFailedVnf.firstTimeAssertion(); + createServiceWithFailedVnf.secondRegistration(); + return createServiceWithFailedVnf; + } + + private void checkRetryRequestToBeComplete(CreateServiceWithFailedVnf createServiceWithFailedVnf, String originalServiceName) { + DrawingBoardPage.ServiceStatusChecker serviceStatusChecker = new DrawingBoardPage.ServiceStatusChecker(originalServiceName, Collections.singleton(COMPLETED)); + //there shall be 2 rows with same service name, one with completed with error and one completed + //so the following line might be buggy, and we need to improve it one day ... + boolean statusIsShown = Wait.waitFor(serviceStatusChecker, null, 30, 2); + assertTrue("service " + originalServiceName + " wasn't completed after in time", statusIsShown); + createServiceWithFailedVnf.simulatorCallsAssertion(); + } } diff --git a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java index 173897095..42749c15f 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/NewServiceInstanceTest.java @@ -1,51 +1,110 @@ package vid.automation.test.test; -import com.google.common.collect.*; -import org.apache.commons.lang3.RandomStringUtils; -import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateServiceInstancePost; -import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; +import static junit.framework.TestCase.assertNull; +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.startsWith; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.PRESET_SOME_LEGACY_REGION_TO_ATT_AIC; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.DEFAULT_SERVICE_INSTANCE_ID; +import static org.testng.Assert.assertEquals; +import static org.testng.AssertJUnit.assertTrue; +import static vid.automation.test.infra.Features.FLAG_1902_VNF_GROUPING; +import static vid.automation.test.infra.Features.FLAG_5G_IN_NEW_INSTANTIATION_UI; +import static vid.automation.test.infra.Features.FLAG_ASYNC_INSTANTIATION; +import static vid.automation.test.infra.ModelInfo.PASQUALEVmxVpeBvService488Annotations; +import static vid.automation.test.infra.ModelInfo.aLaCarteNetworkProvider5G; +import static vid.automation.test.infra.ModelInfo.aLaCarteVnfGroupingService; +import static vid.automation.test.infra.ModelInfo.macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails; +import static vid.automation.test.infra.ModelInfo.macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse; +import static vid.automation.test.infra.ModelInfo.macroSriovWithDynamicFieldsEcompNamingFalsePartialModelDetailsVnfEcompNamingFalse; +import static vid.automation.test.infra.ModelInfo.macroSriovWithDynamicFieldsEcompNamingTruePartialModelDetails; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPreset; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; +import static vid.automation.test.test.ALaCarteflowTest.AIC; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Lists; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; +import org.apache.commons.lang3.mutable.MutableInt; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.hamcrest.Matchers; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetTenants; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIPostNamedQueryForViewEdit; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateNetworkALaCarte5G; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.ResponseDetails; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; +import org.openqa.selenium.remote.RemoteWebElement; import org.testng.Assert; -import org.testng.annotations.*; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; import vid.automation.test.Constants; import vid.automation.test.Constants.BrowseASDC.NewServicePopup; -import vid.automation.test.infra.*; +import vid.automation.test.infra.Click; +import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Features; +import vid.automation.test.infra.Get; +import vid.automation.test.infra.Input; +import vid.automation.test.infra.ModelInfo; +import vid.automation.test.infra.SelectOption; +import vid.automation.test.infra.Wait; import vid.automation.test.model.Service; import vid.automation.test.model.User; -import vid.automation.test.sections.*; +import vid.automation.test.sections.BrowseASDCPage; +import vid.automation.test.sections.DrawingBoardPage; +import vid.automation.test.sections.InstantiationStatusPage; +import vid.automation.test.sections.SideMenu; +import vid.automation.test.sections.VidBasePage; import vid.automation.test.services.AsyncJobsService; import vid.automation.test.services.ServicesService; import vid.automation.test.services.SimulatorApi; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.function.Consumer; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import static junit.framework.TestCase.assertNull; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.testng.Assert.assertEquals; -import static org.testng.AssertJUnit.assertTrue; -import static vid.automation.test.infra.Features.FLAG_ASYNC_INSTANTIATION; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; +import vid.automation.test.utils.ReadFile; @FeatureTogglingTest(FLAG_ASYNC_INSTANTIATION) public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { + private static final String COMPLETED = "COMPLETED"; + private static final String IN_PROGRESS = "IN_PROGRESS"; + private static final String PENDING = "PENDING"; + private final String vfModule0Name = "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0"; + private final String vfModule0UUID = "f8360508-3f17-4414-a2ed-6bc71161e8db"; private ServicesService servicesService = new ServicesService(); private DrawingBoardPage drawingBoardPage = new DrawingBoardPage(); List<String> serviceModelLabelList = Arrays.asList("Model version", "Description", "Category", "UUID", "Invariant UUID", "Service type", "Service role"); List<String> mandatoryServiceModelLabelList = Arrays.asList("Model version", "UUID", "Invariant UUID"); - private final String defaultServiceModelForMostTests = "6e59c5de-f052-46fa-aa7e-2fca9d674c44"; private final VidBasePage vidBasePage = new VidBasePage(); + public static final String VNF_SET_BUTTON_TEST_ID = "form-set"; + private static final Logger logger = LogManager.getLogger(NewServiceInstanceTest.class); @BeforeClass protected void dropAllAsyncJobs() { @@ -60,36 +119,77 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { } @BeforeMethod - protected void refreshPage() { - GeneralUIUtils.ultimateWait(); - - vidBasePage.refreshPage(); + protected void goToWelcome() { + SideMenu.navigateToWelcomePage(); } @Override protected UserCredentials getUserCredentials() { - String userName = Constants.Users.USP_VOICE_VIRTUAL_USP; + String userName = Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA; User user = usersService.getUser(userName); return new UserCredentials(user.credentials.userId, user.credentials.password, userName, "", ""); } @Test public void createNewServiceInstance_fullModelData_LeftPaneLabelsCorrect() throws Exception { - loadMacroServicePopup_noDynamicFields_fullModelDetails_ecompNamingFalse(); + prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails, false); + loadServicePopup(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails); assertServiceModelLabelsCorrect(serviceModelLabelList); } @Test public void createNewServiceInstance_partialModelData_LeftPaneLabelsCorrect() throws Exception { - loadMacroServicePopup_withDynamicFields_partialModelDetails_ecompNamingTrue(); + prepareServicePreset(macroSriovWithDynamicFieldsEcompNamingTruePartialModelDetails, false); + loadServicePopup(macroSriovWithDynamicFieldsEcompNamingTruePartialModelDetails); assertServiceModelLabelsCorrect(mandatoryServiceModelLabelList); } + @Test + public void createNewServiceInstance_setFieldValue_resetDependenciesListsAndValues() { + resetGetTenantsCache(); + try { + BrowseASDCPage browseASDCPage = new BrowseASDCPage(); + prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails, false); + SimulatorApi.registerExpectation(Constants.RegisterToSimulator.CreateNewServiceInstance.GET_SUBSCRIBERS_FOR_CUSTOMER_CAR_2020_ER, SimulatorApi.RegistrationStrategy.APPEND); + registerExpectationFromPreset( + new PresetAAIGetTenants( + "CAR_2020_ER", + "MSO-dev-service-type", + "registration_to_simulator/create_new_instance/aai_get_tenants_for_customer_CAR_2020_ER.json"), + SimulatorApi.RegistrationStrategy.APPEND); + + loadServicePopup(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails); + Wait.waitByClassAndText(Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS, "SILVIA ROBBINS", 30); + VidBasePage.selectSubscriberById("e433710f-9217-458d-a79d-1c7aff376d89"); + GeneralUIUtils.ultimateWait(); + String serviceType = "TYLER SILVIA"; + Wait.waitByClassAndText(Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS, serviceType, 30); + browseASDCPage.selectServiceTypeByName(serviceType); + String lcpRegion = "hvf6"; + Wait.waitByClassAndText("lcpRegionOption", lcpRegion, 30); + viewEditPage.selectLcpRegion(lcpRegion, AIC); + browseASDCPage.selectTenant("bae71557c5bb4d5aac6743a4e5f1d054"); + + VidBasePage.selectSubscriberById("CAR_2020_ER"); + assertElementDisabled("lcpRegion-select"); + serviceType = "MSO-dev-service-type"; + Wait.waitByClassAndText(Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS, serviceType, 30); + browseASDCPage.selectServiceTypeByName(serviceType); + lcpRegion = "CAR_2020_ER"; + Wait.waitByClassAndText("lcpRegionOption", lcpRegion, 30); + viewEditPage.selectLcpRegion(lcpRegion, AIC); + browseASDCPage.selectTenant("092eb9e8e4b7412e8787dd091bc58e66"); + } finally { + resetGetTenantsCache(); + } + } + /** * asserts that the provided labels list is visible and that no other detail item appears in the model details panel. */ protected void assertServiceModelLabelsCorrect(List<String> serviceModelLabelList) throws Exception { - WebElement modelInformation = getDriver().findElement(By.id("model-information")); + WebElement genericPopup = getDriver().findElement(By.tagName("generic-form-popup")); + WebElement modelInformation = genericPopup.findElement(By.id("model-information")); List<WebElement> modelInformationItems = modelInformation.findElements(By.xpath("./div")); assertEquals(modelInformationItems.size(), serviceModelLabelList.size()); serviceModelLabelList.forEach(label -> { @@ -101,179 +201,456 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { @Test public void createNewServiceInstance_leftPane_serviceModelDataCorrect() { - Service service = servicesService.getService(NewServicePopup.SERVICE_UUID); + Service service = servicesService.getService(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails.modelVersionId); String prefix = NewServicePopup.SERVICE_MODEL_DATA_TEST_ID_VALUE_PREFIX; - loadMacroServicePopup_noDynamicFields_fullModelDetails_ecompNamingFalse(); - setNewInstance_leftPane_assertModelDataCorrect(NewServicePopup.SERVICE_MODEL_FIELD_TO_DATA_TESTS_ID, prefix, service); + prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails, false); + loadServicePopup(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails); + logger.info("Expected service model properties: "+service.toString()); + assertModelDataCorrect(NewServicePopup.SERVICE_MODEL_FIELD_TO_DATA_TESTS_ID, prefix, service); } @Test public void createNewServiceInstance_macro_validPopupDataAndUI__ecompNamingFalse() { - ServiceData serviceData = new ServiceData("csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip", - "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + ServiceData serviceData = new ServiceData( + macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails.modelVersionId, new ArrayList<>(), false, true, true, true, - "2017-488_ADIOD-vPE 0", - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1", 0, 1, ImmutableList.of("Bandwidth", "Bandwidth units")); + "2017-488_PASQUALE-vPE 0", + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", 0, 1, new ArrayList<>(), "25284168-24bb-4698-8cb4-3f509146eca5"); - String serviceInstanceName = deployServiceInstance(serviceData, false); - vidBasePage.screenshotDeployDialog(serviceInstanceName); - deployAndVerifyModuleInPendingTable(serviceInstanceName); - verifyOpenAuditInfo(serviceInstanceName); - verifyOpenViewEdit(serviceInstanceName); - verifyDeleteJob(serviceInstanceName); - verifyHideJob(serviceInstanceName); + prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails, false); + + final String serviceInstanceName = createSriovService(serviceData, true); + createVnf(serviceData, true, true, serviceInstanceName); + + createVfModule(serviceData, serviceInstanceName, false, false); + + } + + @Test(groups = "underDevelopment") + public void createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse_DEV() { + /* + Upon failure in test dynamicFieldsEcompNamingFalse_FLESH(), exception will provide + the needed data for this DEV method: + + 1. "Current step" when the failure occurred + 2. "Random alphabetic" that was randomized while test + 3. "Starting reduxState" that was on the step that failed. + + These data can be used for, accordingly, 1. startInStep param; 2, randomAlphabetic + param; 3. reduxForStep param. + */ + + // It should be easier to put `reduxForStep` in this file, to avoid Java's code-clutter and json escaping. + final String reduxForStep = ReadFile.loadResourceAsString( + "NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json"); + + createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse_FLESH("DEV", 5, reduxForStep, "mCaNk"); + } + + @Test + public void createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse() { + createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse_FLESH("RUNTIME", 0, null, randomAlphabetic(5)); + } + + private void createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse_FLESH(String mode, int startInStep, String reduxForStep, String randomAlphabetic) { + + MutableInt i = new MutableInt(); + Map<String, String> reduxStates = new HashMap<>(); + + ServiceData serviceData = new ServiceData( + macroSriovWithDynamicFieldsEcompNamingFalsePartialModelDetailsVnfEcompNamingFalse.modelVersionId, + Collections.singletonList("2017488 PASQUALEvpe0 asn:"), + false, false, true, false, + "2017-488_PASQUALE-vPE 0", + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", 0, 1, ImmutableList.of("Bandwidth", "Bandwidth units"), + "25284168-24bb-4698-8cb4-3f509146eca5"); + + // this is the instance-name that createSriovService is going to use + String serviceInstanceName = randomAlphabetic + "instancename"; + + doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () -> { + prepareServicePreset(macroSriovWithDynamicFieldsEcompNamingFalsePartialModelDetailsVnfEcompNamingFalse, + false); + createSriovService(serviceData, false, randomAlphabetic); + }); + + doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () -> + createVnf(serviceData, false, true, serviceInstanceName) + ); + + final String vnfInstanceName2 = randomAlphabetic + "instanceName"; + final String vnfName2 = "2017-388_PASQUALE-vPE"; + + doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () -> + createVnf(new VnfData(vnfName2 + " 0", "afacccf6-397d-45d6-b5ae-94c39734b168", vnfInstanceName2, false), + false, Features.FLAG_DEFAULT_VNF.isActive(), serviceInstanceName) + ); + + doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () -> + createVfModule(serviceData, serviceInstanceName, false, true) + ); + + doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () -> { + + editVfModuleAndJustSetName(vfModule0Name, vfModule0UUID); + if (Features.FLAG_DUPLICATE_VNF.isActive()) { + duplicateVnf(serviceData.vnfData, 2); + } + vidBasePage.screenshotDeployDialog(serviceInstanceName); + }); + + doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () -> { + prepareServicePreset(macroSriovWithDynamicFieldsEcompNamingFalsePartialModelDetailsVnfEcompNamingFalse, + true); + + final String vfModuleName1 = "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0"; + final String vfModuleName2 = "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1"; + final String request1 = PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID; + final String request2 = "ce010256-3fdd-4cb5-aed7-37112a2c6e93"; + final ImmutableMap<Keys, String> vars = ImmutableMap.<Keys, String>builder() + .put(Keys.SERVICE_NAME, serviceInstanceName) + .put(Keys.VNF_NAME, cleanSeparators("2017-488_PASQUALE-vPE", serviceData.vnfData.vnfInstanceName)) + .put(Keys.VFM_NAME1, cleanSeparators(vfModuleName1 , "VF instance name ZERO")) + .put(Keys.VFM_NAME2, cleanSeparators(vfModuleName2 , "VF instance name")) + .put(Keys.VG_NAME, cleanSeparators(vfModuleName2 , "VF instance name") + "_vol_abc") + .put(Keys.VNF_NAME2, cleanSeparators(vnfName2, vnfInstanceName2)) + .build(); + registerExpectationFromPresets(ImmutableList.of( + // although "some legacy region" is provided for vnf, Service's region "hvf6" overrides it + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC, + new PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse(vars, 0, request1), + new PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse(vars, 1, request2) + ), SimulatorApi.RegistrationStrategy.APPEND); + + deployAndVerifyModuleInPendingTableMacro(serviceInstanceName, request1, request2); + verifyOpenAuditInfo(serviceInstanceName); + verifyOpenViewEdit(serviceInstanceName); + verifyDeleteJob(serviceInstanceName); + verifyHideJob(serviceInstanceName); + }); + } + + @Test + @FeatureTogglingTest(FLAG_1902_VNF_GROUPING) + public void createNewServiceInstance_aLaCarte_VnfGrouping() { + + String randomAlphabetic = randomAlphabetic(5); + + ServiceData serviceData = new ServiceData( + aLaCarteVnfGroupingService.modelVersionId, + ImmutableList.of(), + false, false, true, false, + null, null, 0, 1, ImmutableList.of(), null); + prepareServicePreset(aLaCarteVnfGroupingService, false); + + createALaCarteService(serviceData, randomAlphabetic); + + // this is the instance-name that createALaCarteService is using + String serviceInstanceName = randomAlphabetic + "instancename"; + + final String requestId = PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID; + final String serviceInstanceId = "d2391436-8d55-4fde-b4d5-72dd2cf13cgh"; + final ImmutableMap<Keys, String> names = ImmutableMap.<Keys, String>builder() + .put(Keys.SERVICE_NAME, serviceInstanceName) + .build(); + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService(names, 0, requestId, serviceInstanceId, "us16807000"), + new PresetAAIPostNamedQueryForViewEdit(serviceInstanceId, serviceInstanceName, false, false) + ), SimulatorApi.RegistrationStrategy.APPEND); + + deploy(); + verifyModuleInPendingTable(serviceInstanceName, requestId, null, ImmutableSet.of(IN_PROGRESS), false, false); + verifyModuleInPendingTable(serviceInstanceName, requestId, null, ImmutableSet.of(COMPLETED), false, true); + InstantiationStatusPage.verifyOpenNewViewEdit(serviceInstanceName, serviceInstanceId, aLaCarteVnfGroupingService.modelVersionId, "TYLER SILVIA", "e433710f-9217-458d-a79d-1c7aff376d89", "EDIT"); + } + + public interface Invoker{ + void invoke(); + } + + private void doReduxStep(Map<String, String> reduxStates, String randomAlphabetic, int startInStep, String reduxForStep, MutableInt currentStep, String mode, Invoker todo) { + try { + switch (mode) { + case "DEV": + if (currentStep.getValue() < startInStep) { + // skip up to startInStep + return; + } else if (currentStep.getValue() == startInStep) { + + setReduxState(reduxForStep); + + vidBasePage.navigateTo("serviceModels.htm#/servicePlanning?serviceModelId=6b528779-44a3-4472-bdff-9cd15ec93450"); + vidBasePage.goToIframe(); + } + + reduxStates.put(String.valueOf(currentStep), getReduxState()); + break; + + case "RUNTIME": + default: + // log current redux state, before invocation + reduxStates.put(String.valueOf(currentStep), getReduxState()); + logger.info("reduxGator runtime reduxState for step {}:\n{}", currentStep, getReduxState()); + break; + } + + try { + todo.invoke(); + } catch (AssertionError | Exception e) { + throw new AssertionError(String.join("\n", + "Current step: " + currentStep, + "Random alphabetic: " + randomAlphabetic, + "Starting reduxState: " + reduxStates.get(String.valueOf(currentStep)), + "Current reduxState: " + getReduxState() + ), e); + } + } finally { + logger.info("Cumulative reduxState: {}", reduxStates); + currentStep.increment(); + } + } + + private void duplicateVnf(VnfData vnfData, int count) { + hoverAndClickDuplicateButton(extractNodeToEdit(vnfData)); + vidBasePage.screenshotDeployDialog("duplicateVnf-" + vnfData.vnfName); + List<WebElement> options = ((RemoteWebElement)Get.byId("duplicate-select")).findElementsByTagName("option"); + assertThat(options.stream().map(x -> x.getText()).collect(Collectors.toList()), Matchers.contains("1","2")); + SelectOption.byIdAndVisibleText("duplicate-select", String.valueOf(count)); + Click.byClassAndVisibleText("sdc-button__primary", "DUPLICATE"); + } + + private String cleanSeparators(String... s) { + return String.join("", s).replace(" ", ""); + } + + private void editVfModuleAndJustSetName(String vfModuleName, String vfModuleUUID) { + if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) { + hoverAndClickEditButton(vfModuleUUID + "-" + vfModuleName); + } else { + drawingBoardPage.clickAddButtonByNodeName(vfModuleName); + } + Input.text("VF instance name ZERO", "instanceName"); + Click.byTestId("form-set"); } @Test public void createNewServiceInstance_macro_validPopupDataAndUI__ecompNamingServiceFalseVnfTrue_vgNameFalse() { - ServiceData serviceData = new ServiceData("csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip", - "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + ServiceData serviceData = new ServiceData( + macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails.modelVersionId, new ArrayList<>(), false, true, false, true, - "2017-488_ADIOD-vPE 0", - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", 1, 1, new ArrayList<>()); + "2017-488_PASQUALE-vPE 0", + vfModule0Name, 1, 1, new ArrayList<>(), vfModule0UUID); + + prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails, false); + + final String serviceInstanceName = createSriovService(serviceData, true); + createVnf(serviceData, true, true, serviceInstanceName); + createVfModule(serviceData, serviceInstanceName, true, false); - deployServiceInstance(serviceData); } @Test public void createNewServiceInstance_macro_validPopupDataAndUI__ecompNamingServiceFalseVnfFalse_vgNameFalse() { - ServiceData serviceData = new ServiceData("csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip", - "4a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + ServiceData serviceData = new ServiceData( + macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse.modelVersionId, new ArrayList<>(), false, false, false, false, - "2017-488_ADIOD-vPE 0", - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", 1, 1, new ArrayList<>()); + "2017-488_PASQUALE-vPE 0", + vfModule0Name, 1, 1, new ArrayList<>(), vfModule0UUID); + + prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse, false); + + final String serviceInstanceName = createSriovService(serviceData, true); + createVnf(serviceData, true, true, serviceInstanceName); + createVfModule(serviceData, serviceInstanceName, true, false); - deployServiceInstance(serviceData); } @Test - public void createNewServiceInstance_macro_validPopupDataAndUI__ecompNamingServiceFalseVnfFalse_vgNameTrue() { - ServiceData serviceData = new ServiceData("csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596-vnfEcompNamingFalse.zip", - "4a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + public void createNewServiceInstance_macro_validPopupDataAndUI__ecompNamingServiceFalseVnfFalse_vgNameTrue() throws Exception { + ServiceData serviceData = new ServiceData( + macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse.modelVersionId, new ArrayList<>(), false, false, true, false, - "2017-488_ADIOD-vPE 0", - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1", 0, 1, new ArrayList<>()); + "2017-488_PASQUALE-vPE 0", + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", 0, 1, new ArrayList<>(), "25284168-24bb-4698-8cb4-3f509146eca5"); - deployServiceInstance(serviceData); - } + prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse, false); + + final String serviceInstanceName = createSriovService(serviceData, true); + createVnf(serviceData, true, true, serviceInstanceName); + clickRemoveVfModule(vfModule0UUID, vfModule0Name); + createVfModule(serviceData, serviceInstanceName, false, true); - private void deployServiceInstance(ServiceData serviceData) { - deployServiceInstance(serviceData, true); } - private String deployServiceInstance(ServiceData serviceData, boolean tryCancelsAndReentries) { - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); - final String serviceInstanceName = createSriovService( - user, serviceData.dynamicFields, serviceData.csarName, serviceData.modelUuid, - serviceData.isGeneratedNaming, serviceData.multiStageDesign, - tryCancelsAndReentries); + @Test + @FeatureTogglingTest(FLAG_5G_IN_NEW_INSTANTIATION_UI) + public void createNewServiceInstance_aLaCarte_validPopupDataAndUI() { + String serviceInstanceName = "NcService"+randomAlphabetic(5); + String networkInstanceName= "NcNetowrk"+randomAlphabetic(5); + String defactoNetworkInstanceName = "ExtVL"+networkInstanceName; + BrowseASDCPage browseASDCPage = new BrowseASDCPage(); + prepareServicePreset(aLaCarteNetworkProvider5G, true); + String serviceRequestId = UUID.randomUUID().toString(); + String networkRequestId = UUID.randomUUID().toString(); + String requestorID = getUserCredentials().getUserId(); + registerExpectationFromPresets( + ImmutableList.of( + new PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork( + ImmutableMap.of(Keys.SERVICE_NAME, serviceInstanceName), + serviceRequestId, + requestorID), + new PresetMSOOrchestrationRequestGet(COMPLETE, serviceRequestId), + PRESET_SOME_LEGACY_REGION_TO_ATT_AIC, + new PresetMSOCreateNetworkALaCarte5G(networkRequestId, DEFAULT_SERVICE_INSTANCE_ID, defactoNetworkInstanceName, requestorID), + new PresetMSOOrchestrationRequestGet(COMPLETE, networkRequestId), + new PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork( + new ResponseDetails(serviceInstanceName, serviceRequestId, COMPLETE, "service"), + new ResponseDetails(defactoNetworkInstanceName, networkRequestId, COMPLETE, "network"), + DEFAULT_SERVICE_INSTANCE_ID) + ), + APPEND + ); + loadServicePopup(aLaCarteNetworkProvider5G.modelVersionId); + WebElement instanceNameInput = Get.byId("instanceName"); + instanceNameInput.sendKeys(serviceInstanceName); + VidBasePage.selectSubscriberById("e433710f-9217-458d-a79d-1c7aff376d89"); + String serviceType = "TYLER SILVIA"; + Wait.waitByClassAndText(Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS, serviceType, 30); + browseASDCPage.selectServiceTypeByName(serviceType); + SelectOption.byTestIdAndVisibleText("WayneHolland", (Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID)); + SelectOption.byTestIdAndVisibleText("WATKINS", Constants.OwningEntity.PROJECT_SELECT_TEST_ID); + Click.byTestId("form-set"); + VidBasePage.goOutFromIframe(); + browseASDCPage.goToIframe(); + VnfData networkData = new VnfData("SR-IOV Provider-1", "840ffc47-e4cf-46de-8e23-525fd8c6fdc3", defactoNetworkInstanceName, false); + createNetwork(networkData, false, false, serviceInstanceName); + drawingBoardPage.clickDeployButton(); - createVnf(serviceData.vnfData.isGeneratedNaming, serviceData.vnfData.vnfName, serviceInstanceName, tryCancelsAndReentries); + VidBasePage.goOutFromIframe(); + GeneralUIUtils.ultimateWait(); + vidBasePage.goToIframe(); + GeneralUIUtils.ultimateWait(); - createVfModule( - serviceData.vfData.vfName, serviceData.vnfData.isGeneratedNaming, - serviceData.vfData.vgEnabled, serviceData.vfData.vfMin, serviceData.vfData.vfMax, - serviceData.vfData.dynamicFields, serviceInstanceName); + DrawingBoardPage.ServiceStatusChecker serviceStatusChecker = new DrawingBoardPage.ServiceStatusChecker(serviceInstanceName, Collections.singleton(COMPLETED)); + boolean statusIsShown = Wait.waitFor(serviceStatusChecker, null, 20, 2); + assertTrue("service "+serviceInstanceName+" wasnt completed after in time", statusIsShown); - return serviceInstanceName; + VidBasePage.goOutFromIframe(); } - @Test - public void createNewServiceInstance_macro_validPopupDataAndUI__ecompNamingTrue() { + public void createNewServiceInstance_macro_validPopupDataAndUI() { - List<String> serviceDynamicFields = Arrays.asList("2017488 adiodvpe0 asn:"); - ServiceData serviceData = new ServiceData("csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip", - "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + List<String> serviceDynamicFields = Arrays.asList("2017488 PASQUALEvpe0 asn:"); + ServiceData serviceData = new ServiceData( + macroSriovWithDynamicFieldsEcompNamingTruePartialModelDetails.modelVersionId, serviceDynamicFields, - true, true, false, false, - "2017-488_ADIOD-vPE 0", - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1", 0, 1, new ArrayList<>()); + true, true, true, false, + "2017-488_PASQUALE-vPE 0", + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", 0, 1, new ArrayList<>(), "25284168-24bb-4698-8cb4-3f509146eca5"); - deployServiceInstance(serviceData); + prepareServicePreset(macroSriovWithDynamicFieldsEcompNamingTruePartialModelDetails, false); + + final String serviceInstanceName = createSriovService(serviceData, true); + createVnf(serviceData, true, true, serviceInstanceName); + clickRemoveVfModule(vfModule0UUID, vfModule0Name); + createVfModule(serviceData, serviceInstanceName, false, false); } - private void deployAndVerifyModuleInPendingTable(String serviceInstanceName) { - drawingBoardPage.clickDeployButton(); + private void deployAndVerifyModuleInPendingTableMacro(String serviceInstanceName, String requestId1, String requestId2) { + deploy(); boolean simulatorUpdated = false; - vidBasePage.goToIframe(); - GeneralUIUtils.ultimateWait(); - int[] ids = {1, 1, 2, 3}; - String[] statuses = {"IN_PROGRESS", "COMPLETED", "IN_PROGRESS", "PENDING"}; + int[] ids = {0, 0, 1, 2}; + String[] statuses = {IN_PROGRESS, COMPLETED, IN_PROGRESS, PENDING}; for (int i = 0; i < ids.length; i++) { String actualInstanceName = getActualInstanceName(serviceInstanceName, ids[i], statuses[i]); + verifyModuleInPendingTable(actualInstanceName, requestId1, requestId2, ImmutableSet.of(statuses[i]), true, simulatorUpdated); + simulatorUpdated = true; + } + vidBasePage.screenshotDeployDialog(serviceInstanceName); + } + + private void deploy() { + try { + logger.info("Redux state before deploy:"); + logger.info(getReduxState()); + } + catch (Exception e) { + //do nothing just logging + } + drawingBoardPage.clickDeployButton(); + + VidBasePage.goOutFromIframe(); + GeneralUIUtils.ultimateWait(); + vidBasePage.goToIframe(); + GeneralUIUtils.ultimateWait(); + } - final Set<String> expectedStatuses = ImmutableSet.of(statuses[i]); - ServiceStatusChecker serviceStatusChecker = new ServiceStatusChecker(actualInstanceName, expectedStatuses); - boolean statusIsShown = Wait.waitFor(serviceStatusChecker, null, 20, 2); - final String assertionMessage = String.format("service %s: none of rowClasses [%s] is in expectedStatuses: [%s] ", - actualInstanceName, - String.join(",", serviceStatusChecker.getColumnClassesSet()), - String.join(",", expectedStatuses)); + private void verifyModuleInPendingTable(String serviceInstanceName, String requestId1, String requestId2, Set<String> expectedStatuses, boolean isMacro, boolean simulatorUpdated) { + DrawingBoardPage.ServiceStatusChecker serviceStatusChecker = new DrawingBoardPage.ServiceStatusChecker(serviceInstanceName, expectedStatuses); + boolean statusIsShown = Wait.waitFor(serviceStatusChecker, null, 20, 2); + final String assertionMessage = String.format("service %s: none of rowClasses [%s] is in expectedStatuses: [%s] ", + serviceInstanceName, + String.join(",", serviceStatusChecker.getColumnClassesSet()), + String.join(",", expectedStatuses)); - assertTrue(assertionMessage, statusIsShown); + assertTrue(assertionMessage, statusIsShown); + if (isMacro) { InstantiationStatusPage.assertInstantiationStatusRow( - actualInstanceName, expectedRowFields(actualInstanceName)); - - if (!simulatorUpdated) { - simulatorUpdated = true; - final String request1 = PresetMSOBaseCreateServiceInstancePost.DEFAULT_REQUEST_ID; - final String request2 = "ce010256-3fdd-4cb5-aed7-37112a2c6e93"; - SimulatorApi.registerExpectationFromPreset(new PresetMSOCreateServiceInstanceGen2(request2), APPEND); - SimulatorApi.registerExpectationFromPreset(new PresetMSOOrchestrationRequestGet("IN_PROGRESS", request2), APPEND); - SimulatorApi.registerExpectationFromPreset(new PresetMSOOrchestrationRequestGet("COMPLETE", request1), APPEND); + serviceInstanceName, expectedRowFields(serviceInstanceName)); + } else { + InstantiationStatusPage.assertInstantiationStatusRow( + serviceInstanceName, expectedALaCarteRowFields(serviceInstanceName)); + } + + if (!simulatorUpdated) { + if (requestId2 != null) { + registerExpectationFromPreset(new PresetMSOOrchestrationRequestGet(IN_PROGRESS, requestId2), APPEND); } + registerExpectationFromPreset(new PresetMSOOrchestrationRequestGet("COMPLETE", requestId1), APPEND); } vidBasePage.screenshotDeployDialog(serviceInstanceName); } private String getActualInstanceName(String serviceInstanceName, Integer i, String status) { - return "PENDING".equals(status) ? serviceInstanceName : serviceInstanceName + "_00" + i; + return i==0 ? serviceInstanceName : serviceInstanceName + "_00" + i; } private void verifyOpenViewEdit(String serviceInstanceName) { boolean[] openEnabled = {true, false, false}; - String[] statuses = {"COMPLETED", "IN_PROGRESS", "PENDING"}; - ImmutableList.of(1, 2, 3).forEach(i -> { - String actualInstanceName = getActualInstanceName(serviceInstanceName, i, statuses[i - 1]); - checkMenuItem(actualInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_HEADER_OPEN_ITEM, openEnabled[i - 1], contextMenuOpen -> { - Click.byTestId(contextMenuOpen); - vidBasePage.goOutFromIframe(); - GeneralUIUtils.ultimateWait(); - - Wait.byText("View/Edit Service Instance"); - Wait.byText("Add node instance"); - Wait.byText("i'm a port"); - Wait.byText("f8791436-8d55-4fde-b4d5-72dd2cf13cfb"); - - vidBasePage.screenshotDeployDialog("view-edit-" + actualInstanceName); - SideMenu.navigateToMacroInstantiationStatus(); - }); + String[] statuses = {COMPLETED, IN_PROGRESS, PENDING}; + ImmutableList.of(0, 1, 2).forEach(i -> { + String actualInstanceName = getActualInstanceName(serviceInstanceName, i, statuses[i]); + if (Features.FLAG_1902_NEW_VIEW_EDIT.isActive()) { + InstantiationStatusPage.verifyOpenNewViewEdit(actualInstanceName, openEnabled[i], "EDIT"); + } + else { + vidBasePage.verifyOpenOldViewEdit(actualInstanceName, null, openEnabled[i], true, true); + } }); } - private void verifyOpenAuditInfo(String serviceInstanceName) { boolean auditInfoEnabled = true; - String[] statuses = {"COMPLETED", "IN_PROGRESS", "PENDING"}; - for (Integer i : ImmutableList.of(1, 2, 3)) { - String actualInstanceName = getActualInstanceName(serviceInstanceName, i, statuses[i - 1]); - checkMenuItem(actualInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_HEADER_AUDIT_INFO_ITEM, auditInfoEnabled, contextMenuOpen -> { + String[] statuses = {COMPLETED, IN_PROGRESS, PENDING}; + for (Integer i : ImmutableList.of(0, 1, 2)) { + String actualInstanceName = getActualInstanceName(serviceInstanceName, i, statuses[i]); + InstantiationStatusPage.checkMenuItem(actualInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_HEADER_AUDIT_INFO_ITEM, auditInfoEnabled, contextMenuOpen -> { Click.byTestId(contextMenuOpen); checkAuditInfoModal(actualInstanceName, i, statuses); }); final WebElement row = InstantiationStatusPage.getInstantiationStatusRow(actualInstanceName); - row.findElement(By.id(Constants.InstantiationStatus.TD_JOB_STATUS_ICON + "-" + (i - 1))).click(); + row.findElement(By.id(Constants.InstantiationStatus.TD_JOB_STATUS_ICON + "-" + (i))).click(); checkAuditInfoModal(actualInstanceName, i, statuses); } } @@ -294,16 +671,16 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { convertUITextCapitalizeAndFormatPipe(s.getText())) .collect(Collectors.toList()); - List<String> serviceStatus = Arrays.asList(Arrays.copyOfRange(statuses, i - 1, statuses.length)); + List<String> serviceStatus = Arrays.asList(Arrays.copyOfRange(statuses, i, statuses.length)); assertThat("statuses for " + actualInstanceName + " must be as expected", vidStatuses, is(Lists.reverse(serviceStatus))); String dateString = vidTableElement.findElements(By.id("vidStatusTime")).get(0).getText(); assertTrue("vid Status Time column must contains valid date in format : MMM dd, yyyy HH:mm", isDateValid(dateString, "MMM dd, yyyy HH:mm")); WebElement MSOTableElement = Get.byId("service-instantiation-audit-info-mso"); - assertEquals(4, MSOTableElement.findElement(By.tagName("thead")).findElements(By.tagName("th")).size(), "MSO table must contain 4 columns"); + assertEquals(3, MSOTableElement.findElement(By.tagName("thead")).findElements(By.tagName("th")).size(), "MSO table must contain 3 columns"); - if (statuses[i - 1].equals("PENDING")) { + if (statuses[i].equals(PENDING)) { assertEquals(0, MSOTableElement.findElement(By.tagName("tbody")).findElements(By.tagName("tr")).size(), "When status is PENDING MSO table is empty"); } @@ -335,20 +712,20 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { private void verifyDeleteJob(String serviceInstanceName) { boolean[] deleteEnabled = {false, false, true}; - String[] statuses = {"COMPLETED", "IN_PROGRESS", "PENDING"}; - verifyDeleteOrHideOperation(serviceInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_DELETE, statuses, deleteEnabled, "deleted"); + String[] statuses = {COMPLETED, IN_PROGRESS, PENDING}; + verifyDeleteOrHideOperation(serviceInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_REMOVE, statuses, deleteEnabled, "deleted"); } private void verifyHideJob(String serviceInstanceName) { boolean[] hideEnabled = {true, false}; - String[] statuses = {"COMPLETED", "IN_PROGRESS"}; + String[] statuses = {COMPLETED, IN_PROGRESS}; verifyDeleteOrHideOperation(serviceInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_HIDE, statuses, hideEnabled, "hidden"); } private void verifyDeleteOrHideOperation(String serviceInstanceName, String contextMenuItem, String[] statuses, boolean[] operationEnabled, String operationName) { - for (int i = 1; i <= statuses.length; i++) { - String actualInstanceName = getActualInstanceName(serviceInstanceName, i, statuses[i - 1]); - checkMenuItem(actualInstanceName, contextMenuItem, operationEnabled[i - 1], contextMenuDelete -> { + for (int i = 0; i < statuses.length; i++) { + String actualInstanceName = getActualInstanceName(serviceInstanceName, i, statuses[i]); + InstantiationStatusPage.checkMenuItem(actualInstanceName, contextMenuItem, operationEnabled[i], contextMenuDelete -> { Click.byTestId(contextMenuDelete); GeneralUIUtils.ultimateWait(); assertNull(actualInstanceName + " should be " + operationName, @@ -358,114 +735,117 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { vidBasePage.screenshotDeployDialog(serviceInstanceName); } - private void checkMenuItem(String actualInstanceName, String contextMenuItem, boolean shouldBeEnabled, Consumer<String> doIfEnabled) { - Wait.waitFor(name -> { - if (null == InstantiationStatusPage.getInstantiationStatusRow(name)) { - InstantiationStatusPage.clickRefreshButton(); - return false; - } else { - return true; - } - }, actualInstanceName, 8, 1); - final WebElement row = InstantiationStatusPage.getInstantiationStatusRow(actualInstanceName); - row.findElement(By.className("menu-div")).click(); - String clazz = Get.byXpath("//div[@data-tests-id='" + contextMenuItem + "']/ancestor::li").getAttribute("class"); - assertThat("item " + contextMenuItem + " of " + actualInstanceName + - " should be " + (shouldBeEnabled ? "enabled" : "disabled"), !clazz.equals("disabled"), is(shouldBeEnabled)); - if (shouldBeEnabled) { - doIfEnabled.accept(contextMenuItem); - } else { - // dismiss menu - Get.byClass("title").get(0).click(); - } - } - private ImmutableMap<String, String> expectedRowFields(String actualInstanceName) { return ImmutableMap.<String, String>builder() .put("userId", getUserCredentials().getUserId()) .put("serviceModelName", "action-data") .put("serviceInstanceName", actualInstanceName) .put("serviceModelVersion", "1.0") - .put("subscriberName", "USP VOICE") - .put("serviceType", "VIRTUAL USP") - .put("regionId", "mtn6") - .put("tenantName", "AIN Web Tool-15-D-testgamma") + .put("subscriberName", "SILVIA ROBBINS") + .put("serviceType", "TYLER SILVIA") + .put("regionId", "hvf6") + .put("tenantName", "AIN Web Tool-15-D-testalexandria") .put("aicZoneName", "NFTJSSSS-NFT1") - .put("project", "DFW") - .put("owningEntityName", "MetroPacketCore") + .put("project", "WATKINS") + .put("owningEntityName", "WayneHolland") + .put("pause", "false") + .build(); + } + + private ImmutableMap<String, String> expectedALaCarteRowFields(String actualInstanceName) { + return ImmutableMap.<String, String>builder() + .put("userId", getUserCredentials().getUserId()) + .put("serviceModelName", "Grouping Service for Test") + .put("serviceInstanceName", actualInstanceName) + .put("serviceModelVersion", "1.0") + .put("subscriberName", "SILVIA ROBBINS") + .put("serviceType", "TYLER SILVIA") + .put("project", "WATKINS") + .put("owningEntityName", "WayneHolland") .put("pause", "false") .build(); } - private String createSriovService(User user, List<String> serviceDynamicFields, - String csarName, String modelId, boolean modelWithGeneratedName, - boolean multiStageDesign, boolean tryCancelsAndReentries) { + private String createSriovService(ServiceData serviceData, boolean tryCancelsAndReentries) { + return createSriovService(serviceData, tryCancelsAndReentries, randomAlphabetic(5)); + } + + private String createSriovService(ServiceData serviceData, boolean tryCancelsAndReentries, String randomAlphabetic) { BrowseASDCPage browseASDCPage = new BrowseASDCPage(); + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); // simulate typing with spaces, but expected is without spaces - String serviceInstanceNameWithSpaces = RandomStringUtils.randomAlphabetic(5) + " instance name"; - String serviceInstanceName = serviceInstanceNameWithSpaces.replace(" ", ""); + String serviceInstanceNameWithSpaces = randomAlphabetic + " instance name"; + String serviceInstanceName = cleanSeparators(serviceInstanceNameWithSpaces); List<String> cycles = tryCancelsAndReentries ? ImmutableList.of("WILL_CANCEL", "AFTER_CANCEL") : ImmutableList.of("SINGLE_SHOT"); cycles.forEach(cycle -> { if ("AFTER_CANCEL".equals(cycle)) { - loadServicePopupOnBrowseASDCPage(modelId); + loadServicePopupOnBrowseASDCPage(serviceData.modelUuid); } else { - loadServicePopup(csarName, modelId); + loadServicePopup(serviceData.modelUuid); } - WebElement instanceName = Get.byId("instance-name"); - if (modelWithGeneratedName) { - Assert.assertNull(instanceName, "instance name input should be invisible when serviceEcompNaming == true."); + WebElement instanceName = Get.byId("instanceName"); + boolean isRequired = isElementByIdRequired("instanceName-label"); + if (serviceData.isGeneratedNaming) { + Assert.assertNotNull(instanceName, "instance name input should be visible when serviceEcompNaming == true."); + Assert.assertFalse(isRequired,"instance name input should be optional when ecompNaming == true."); + } else { - instanceName.sendKeys(serviceInstanceNameWithSpaces); + Assert.assertTrue(isRequired,"instance name input should be required when serviceEcompNaming == false."); + instanceName.sendKeys(serviceInstanceName); } //serviceType should be dependent on subscriber selection - assertElementDisabled("service-type-select"); - - GeneralUIUtils.ultimateWait(); - assertDropdownPermittedItemsByLabel(user.subscriberNames, Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS); - VidBasePage.selectSubscriberById("e433710f-9217-458d-a79d-1c7aff376d89"); + assertElementDisabled("serviceType-select"); + Wait.waitByClassAndText(Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS, "SILVIA ROBBINS", 30); GeneralUIUtils.ultimateWait(); + Click.byTestId(Constants.SUBSCRIBER_NAME_SELECT_TESTS_ID); + if (Features.FLAG_RESTRICTED_SELECT.isActive()) + assertElementExistAccordingTagNameAndTestId("select", Constants.SUBSCRIBER_SELECT_ID); + else{ + assertDropdownPermittedItemsByLabel(user.subscriberNames, Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS); + } + VidBasePage.selectSubscriberById("e433710f-9217-458d-a79d-1c7aff376d89"); //lcpRegion should be dependent on serviceType selection assertElementDisabled("lcpRegion-select"); - String serviceType = "VIRTUAL USP"; + String serviceType = "TYLER SILVIA"; Wait.waitByClassAndText(Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS, serviceType, 30); browseASDCPage.selectServiceTypeByName(serviceType); //tenant should be dependent on lcpRegion selection assertElementDisabled("tenant-select"); - String lcpRegion = "mtn6"; + String lcpRegion = "hvf6"; Wait.waitByClassAndText("lcpRegionOption", lcpRegion, 30); - browseASDCPage.selectLcpRegion(lcpRegion); + viewEditPage.selectLcpRegion(lcpRegion, AIC); + GeneralUIUtils.ultimateWait(); browseASDCPage.selectTenant("bae71557c5bb4d5aac6743a4e5f1d054"); - String setButtonTestId = "service-form-set"; + String setButtonTestId = "form-set"; assertSetButtonDisabled(setButtonTestId); - SelectOption.byTestIdAndVisibleText("MetroPacketCore", (Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID)); + SelectOption.byTestIdAndVisibleText("WayneHolland", (Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID)); assertSetButtonDisabled(setButtonTestId); - SelectOption.byTestIdAndVisibleText("DHV", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); + SelectOption.byTestIdAndVisibleText("ERICA", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); assertSetButtonEnabled(setButtonTestId); browseASDCPage.selectProductFamily("e433710f-9217-458d-a79d-1c7aff376d89"); - assertAllIsPermitted(Constants.BrowseASDC.AIC_OPTION_CLASS); browseASDCPage.selectAicZone("NFT1"); - SelectOption.byTestIdAndVisibleText("DFW", Constants.OwningEntity.PROJECT_SELECT_TEST_ID); + SelectOption.byTestIdAndVisibleText("WATKINS", Constants.OwningEntity.PROJECT_SELECT_TEST_ID); assertNotificationAreaVisibilityBehaviour(); - assertPauseOnPausePointsVisibility(multiStageDesign); + assertPauseOnPausePointsVisibility(serviceData.multiStageDesign); - validateDynamicFields(serviceDynamicFields); + validateDynamicFields(serviceData.dynamicFields); vidBasePage.screenshotDeployDialog("createSriovService-" + serviceInstanceName); @@ -475,7 +855,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { Click.byTestId(setButtonTestId); } - browseASDCPage.goOutFromIframe(); + VidBasePage.goOutFromIframe(); browseASDCPage.goToIframe(); @@ -483,112 +863,268 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { return serviceInstanceName; } - private void createVnf(boolean isInstanceNameGenerated, String vnfName, String serviceInstanceName, boolean tryCancelsAndReentries) { + private String createALaCarteService(ServiceData serviceData, String randomAlphabetic) { BrowseASDCPage browseASDCPage = new BrowseASDCPage(); - drawingBoardPage.clickAddButtonByNodeName(vnfName); + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); + + // simulate typing with spaces, but expected is without spaces + String serviceInstanceNameWithSpaces = randomAlphabetic + " instance name"; + String serviceInstanceName = cleanSeparators(serviceInstanceNameWithSpaces); + + loadServicePopup(serviceData.modelUuid); - if (isInstanceNameGenerated) { - WebElement instanceName = Get.byId("instance-name"); + WebElement instanceName = Get.byId("instanceName"); + if (serviceData.isGeneratedNaming) { Assert.assertNull(instanceName, "instance name input should be invisible when serviceEcompNaming == true."); } else { - Input.text("VNF instance name", "instanceName"); + instanceName.sendKeys(serviceInstanceName); + } + + //serviceType should be dependent on subscriber selection + assertElementDisabled("serviceType-select"); + Wait.waitByClassAndText(Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS, "SILVIA ROBBINS", 30); + GeneralUIUtils.ultimateWait(); + Click.byTestId(Constants.SUBSCRIBER_NAME_SELECT_TESTS_ID); + if (Features.FLAG_RESTRICTED_SELECT.isActive()) + assertElementExistAccordingTagNameAndTestId("select", Constants.SUBSCRIBER_SELECT_ID); + else{ + assertDropdownPermittedItemsByLabel(user.subscriberNames, Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS); + + } + VidBasePage.selectSubscriberById("e433710f-9217-458d-a79d-1c7aff376d89"); + + String serviceType = "TYLER SILVIA"; + Wait.waitByClassAndText(Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS, serviceType, 30); + browseASDCPage.selectServiceTypeByName(serviceType); + + String setButtonTestId = "form-set"; + assertSetButtonDisabled(setButtonTestId); + + SelectOption.byTestIdAndVisibleText("WayneHolland", (Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID)); + + SelectOption.byTestIdAndVisibleText("WATKINS", Constants.OwningEntity.PROJECT_SELECT_TEST_ID); + + validateDynamicFields(serviceData.dynamicFields); + + vidBasePage.screenshotDeployDialog("createALaCarteService-" + serviceInstanceName); + + Click.byTestId(setButtonTestId); + + VidBasePage.goOutFromIframe(); + + browseASDCPage.goToIframe(); + + return serviceInstanceName; + } + + private void assertElementExistAccordingTagNameAndTestId(String tag, String testId) { + WebElement webElement = Get.byId(testId); + Assert.assertEquals(webElement.getTagName(), tag); + } + + private void createVnf(ServiceData serviceData, boolean tryCancelsAndReentries, boolean addedByDefault, String serviceInstanceName) { + createVnf(serviceData.vnfData, tryCancelsAndReentries, addedByDefault, serviceInstanceName); + } + + private void createNetwork(VnfData vnfData, boolean tryCancelsAndReentries, boolean addedByDefault, String serviceInstanceName) { + createVnf(vnfData, tryCancelsAndReentries, addedByDefault, serviceInstanceName, true); + } + + private void createVnf(VnfData vnfData, boolean tryCancelsAndReentries, boolean addedByDefault, String serviceInstanceName) { + createVnf(vnfData, tryCancelsAndReentries, addedByDefault, serviceInstanceName, false); + } + + private void createVnf(VnfData vnfData, boolean tryCancelsAndReentries, boolean addedByDefault, String serviceInstanceName, boolean isNetwork) { + BrowseASDCPage browseASDCPage = new BrowseASDCPage(); + + String nodeToEdit = extractNodeToEdit(vnfData); + if (addedByDefault && Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) { + hoverAndClickEditButton(nodeToEdit); + } else { + drawingBoardPage.clickAddButtonByNodeName(vnfData.vnfName); + } + + GeneralUIUtils.ultimateWait(); + + if (vnfData.isGeneratedNaming) { + Assert.assertFalse(isElementByIdRequired("instanceName-label") ,"instance name input should be optional when EcompNaming == true, and required when false."); + } else { + Input.text(vnfData.vnfInstanceName, "instanceName"); } + //tenant should be dependent on lcpRegion selection assertElementDisabled("tenant-select"); WebElement legacyRegion = Get.byTestId("lcpRegionText"); - Assert.assertNull(legacyRegion, "legacy region shouldn't be visible when lcp region isn't AAIAIC25,rdm3 or rdm5a."); + Assert.assertNull(legacyRegion, "legacy region shouldn't be visible when lcp region isn't JANET25,olson3 or olson5a."); - browseASDCPage.selectLcpRegion("AAIAIC25"); + browseASDCPage.selectLcpRegion("JANET25"); legacyRegion = Get.byTestId("lcpRegionText"); - Assert.assertNotNull(legacyRegion, "legacy region should be visible when lcp region is AAIAIC25,rdm3 or rdm5a."); + Assert.assertNotNull(legacyRegion, "legacy region should be visible when lcp region is JANET25,olson3 or olson5a."); browseASDCPage.selectTenant("092eb9e8e4b7412e8787dd091bc58e86"); - String setButtonTestId = "vnf-form-set"; - assertSetButtonDisabled(setButtonTestId); + assertSetButtonDisabled(VNF_SET_BUTTON_TEST_ID); browseASDCPage.selectPlatform("platform"); - assertSetButtonEnabled(setButtonTestId); + assertSetButtonEnabled(VNF_SET_BUTTON_TEST_ID); browseASDCPage.setLegacyRegion("some legacy region"); - browseASDCPage.selectLineOfBusiness("ECOMP"); + browseASDCPage.selectLineOfBusiness("ONAP"); Wait.waitByTestId("model-item-value-subscriberName", 10); - Assert.assertEquals(Get.byTestId("model-item-value-subscriberName").getText(), "USP VOICE", "Subscriber name should be shown in vf module"); + Assert.assertEquals(Get.byTestId("model-item-value-subscriberName").getText(), "SILVIA ROBBINS", "Subscriber name should be shown in vf module"); Assert.assertEquals(Get.byTestId("model-item-value-min"), null, "Min value should not be shown in VNF popup"); Assert.assertEquals(Get.byTestId("model-item-value-max"), null, "Max value should not be show in VNF popup"); - if (!isInstanceNameGenerated) { + if (!vnfData.isGeneratedNaming) { Assert.assertEquals(Get.byTestId("model-item-value-serviceName").getText(), serviceInstanceName, "Subscriber name should be shown in vf module"); } vidBasePage.screenshotDeployDialog("createVnf-" + serviceInstanceName); - Click.byTestId(setButtonTestId); - - String nodeToEdit = "69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_ADIOD-vPE 0"; + Click.byTestId(VNF_SET_BUTTON_TEST_ID); + if (isNetwork) { + return; + } if (tryCancelsAndReentries) { hoverAndClickEditButton(nodeToEdit); - Wait.byText("VIRTUAL USP"); + Wait.byText("TYLER SILVIA"); GeneralUIUtils.ultimateWait(); - Assert.assertEquals(Get.selectedOptionText(Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID), "AAIAIC25"); + assertThat(Get.selectedOptionText(Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID), startsWith("JANET25")); Assert.assertEquals(Get.selectedOptionText(Constants.ViewEdit.TENANT_SELECT_TESTS_ID), "USP-SIP-IC-24335-T-01"); - Assert.assertEquals(Get.selectedOptionText(Constants.ViewEdit.LINE_OF_BUSINESS_SELECT_TESTS_ID), "ECOMP"); + Assert.assertEquals(Get.selectedOptionText(Constants.ViewEdit.LINE_OF_BUSINESS_SELECT_TESTS_ID), "ONAP"); Assert.assertEquals(Get.selectedOptionText(Constants.OwningEntity.PLATFORM_SELECT_TEST_ID), "platform"); Click.byTestId(Constants.CANCEL_BUTTON_TEST_ID); + GeneralUIUtils.ultimateWait(); } else { - toggleItemInTree(nodeToEdit); + toggleItemInTree(Constants.DrawingBoard.AVAILABLE_MODELS_TREE); } + Click.byTestId("node-" + nodeToEdit); + } + + private String extractNodeToEdit(VnfData vnfData) { + return vnfData.vnfUuid + "-" + vnfData.vnfName; } - private void toggleItemInTree(String nodeToEdit) { - Click.byXpath("//tree-root[@data-tests-id='" + Constants.DrawingBoard.AVAILABLE_MODELS_TREE + "']//span[@class='" + Constants.DrawingBoard.TOGGLE_CHILDREN + "']"); + + private void toggleItemInTree(String tree) { + Click.byXpath("//tree-root[@data-tests-id='" + tree + "']//span[@class='" + Constants.DrawingBoard.TOGGLE_CHILDREN + "']"); } private void hoverAndClickEditButton(String nodeToEdit) { - String buttonOfEdit = Constants.DrawingBoard.NODE_PREFIX + nodeToEdit + Constants.DrawingBoard.CONTEXT_MENU_BUTTON; + hoverAndClickButton(nodeToEdit, Constants.DrawingBoard.CONTEXT_MENU_EDIT); + } + + private void hoverAndClickDeleteButton(String nodeToEdit) { + hoverAndClickButton(nodeToEdit, Constants.InstantiationStatus.CONTEXT_MENU_REMOVE); + } + + private void hoverAndClickDuplicateButton(String nodeToEdit) { + hoverAndClickButton(nodeToEdit, Constants.InstantiationStatus.CONTEXT_MENU_DUPLICATE); + } + private void hoverAndClickButton(String nodeToEdit, String contextMenuItem) { + String nodeOfEdit = Constants.DrawingBoard.NODE_PREFIX + nodeToEdit; + String buttonOfEdit = nodeOfEdit + Constants.DrawingBoard.CONTEXT_MENU_BUTTON; GeneralUIUtils.hoverOnAreaByTestId(buttonOfEdit); Click.byTestId(buttonOfEdit); - Click.byTestId(Constants.DrawingBoard.CONTEXT_MENU_ITEM); + Click.byTestId(contextMenuItem); } - private void createVfModule(String vfModuleName, boolean isInstanceNameGenerated, boolean vgEnabled, int vgMin, - int vgMax, List<String> vfModuleDynamicFields, String serviceInstanceName) { - String setButtonTestId = "vnf-form-set"; + private void uploadSupplementaryFile(String inputFileName, boolean isValid, BrowseASDCPage browseASDCPage, String setButtonTestId) { + if (Features.FLAG_SUPPLEMENTARY_FILE.isActive()) { + GeneralUIUtils.ultimateWait(); + Input.file("supplementaryFiles/" + inputFileName, "supplementaryFile"); + GeneralUIUtils.ultimateWait(); + WebElement fileName = Get.byTestId("file-name"); + Assert.assertEquals(fileName.getText(),inputFileName); + browseASDCPage.assertButtonState(setButtonTestId, isValid); + } + } + + private void deleteSupplementaryFile() { + if (Features.FLAG_SUPPLEMENTARY_FILE.isActive()) { + Click.byTestId("remove-uploaded-file"); + GeneralUIUtils.ultimateWait(); + WebElement fileName = Get.byTestId("file-name"); + Assert.assertEquals(fileName.getText(),"Choose file"); + } + } + + private void createVfModule(ServiceData serviceData, String serviceInstanceName, boolean addedByDefault, boolean addOpensPopup) { + clickAddVfModule(serviceData, addedByDefault); + if (!addOpensPopup) { + clickEditVfModule(serviceData); + } + fillAndSetVfModulePopup(serviceData, serviceInstanceName); + } + + private void fillAndSetVfModulePopup(ServiceData serviceData, String serviceInstanceName) { + String setButtonTestId = "form-set"; BrowseASDCPage browseASDCPage = new BrowseASDCPage(); -// Click.byTestId(Constants.DrawingBoard.NODE_PREFIX + vnfName); - drawingBoardPage.clickAddButtonByNodeName(vfModuleName); - if (!isInstanceNameGenerated) { - Input.text("VF instance name", "instanceName"); - } else { - Assert.assertNull(Get.byTestId("instanceName")); - Assert.assertNull(Get.byTestId("volumeGroupName")); + Assert.assertEquals(isElementByIdRequired("instanceName-label"), !serviceData.vnfData.isGeneratedNaming,"instance name input should be optional when EcompNaming == true, and required when false."); + + if (!serviceData.vnfData.isGeneratedNaming) { + Input.text("VF instance name", "instanceName"); } - if (vgEnabled && !isInstanceNameGenerated) { - browseASDCPage.setInputText("volumeGroupName", "some group name name"); + + if (serviceData.vfData.vgEnabled) { + browseASDCPage.setInputText("volumeGroupName", "_abc"); + Assert.assertEquals(isElementByIdRequired("volumeGroupName-label"), false, "volume Group name input should be always optional"); } else { Assert.assertNull(Get.byTestId("volumeGroupName"), "volumeGroupName input should be invisible when vgEnabled == false"); } Wait.waitByTestId("model-item-value-subscriberName", 10); - Assert.assertEquals(Get.byTestId("model-item-value-subscriberName").getText(), "USP VOICE", "Subscriber name should be shown in vf module"); - Assert.assertEquals(Get.byTestId("model-item-value-min").getText(), Integer.toString(vgMin), "Min should be shown"); - Assert.assertEquals(Get.byTestId("model-item-value-max").getText(), Integer.toString(vgMax), "Max should be shown"); - if (!isInstanceNameGenerated) { + Assert.assertEquals(Get.byTestId("model-item-value-subscriberName").getText(), "SILVIA ROBBINS", "Subscriber name should be shown in vf module"); + Assert.assertEquals(Get.byTestId("model-item-value-min").getText(), Integer.toString(serviceData.vfData.vfMin), "Min should be shown"); + Assert.assertEquals(Get.byTestId("model-item-value-max").getText(), Integer.toString(serviceData.vfData.vfMax), "Max should be shown"); + if (!serviceData.vnfData.isGeneratedNaming) { Wait.byText(serviceInstanceName); Assert.assertEquals(Get.byTestId("model-item-value-serviceName").getText(), serviceInstanceName, "Service name should be shown in vf module"); } - validateDynamicFields(vfModuleDynamicFields); + validateDynamicFields(serviceData.vfData.dynamicFields); + + uploadSupplementaryFile("invalid-file.json", false, browseASDCPage, setButtonTestId); + deleteSupplementaryFile(); + uploadSupplementaryFile("sample.json", true, browseASDCPage, setButtonTestId); browseASDCPage.screenshotDeployDialog("createVfModule-" + serviceInstanceName); Click.byTestId(setButtonTestId); } + private void clickEditVfModule(ServiceData serviceData) { + if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) { + hoverAndClickEditButton(serviceData.vfData.uuid + "-" + serviceData.vfData.vfName); + } + } + + private void clickAddVfModule(ServiceData serviceData, boolean addedByDefault) { + if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive() && addedByDefault) { + return; + } + System.out.println("VFModule should be added 'manually'"); + + final WebElement vfModuleNode = Get.byTestId(Constants.DrawingBoard.NODE_PREFIX + serviceData.vfData.vfName); + + if (vfModuleNode == null || !vfModuleNode.isDisplayed()) { + // expand tree + drawingBoardPage.clickNode(serviceData.vnfData.vnfName); + } + drawingBoardPage.clickAddButtonByNodeName(serviceData.vfData.vfName); + } + + private void clickRemoveVfModule(String vfModuleId, String vfModuleName) { + if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) { + System.out.println("will remove " + vfModule0Name); + hoverAndClickDeleteButton(vfModuleId + "-" + vfModuleName); + } + } + private void assertPauseOnPausePointsVisibility(boolean visibility) { - WebElement pauseElem = Get.byId("pause"); + WebElement pauseElem = Get.byId("Pause"); final String assertionMessage = "pause on pause points visibility should be " + visibility; if (visibility) { Assert.assertNotNull(pauseElem, assertionMessage); @@ -607,121 +1143,71 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { Assert.assertNotNull(webElement, "notification area should be visible if more then 1 qty."); } - /** - * following are two popup service models that represent two opposite/extreme states of the popup. - * they should be enough to test all the possible popup states. - */ - private void loadMacroServicePopup_withDynamicFields_partialModelDetails_ecompNamingTrue() { - loadServicePopup("csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip", "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"); - } - - private void loadMacroServicePopup_noDynamicFields_fullModelDetails_ecompNamingFalse() { - loadServicePopup("csar-noDynamicFields-ecompNamingFalse-fullModelDetails-1a80c596.zip", "1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"); - } - - @DataProvider - private Object[][] createSriovService( - ) { - List<String> dynamicFields = Arrays.asList( - "2017488 adiodvpe0 VNF config template version:", - "Adiodvpe0 bandwidth units:", - "Adiodvpe0 bandwidth:", - "2017488 adiodvpe0 aic clli:", - "2017488 adiodvpe0 asn:", - "2017488 adiodvpe0 VNF instance name"); - ServiceData withEcompNaming = new ServiceData("csar-withDynamicFields-ecompNamingTrue-partialModelDetails.zip", - "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", - dynamicFields, - true, true, true, false, - "2017-488_ADIOD-vPE 0", - "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1", 0, 1, new ArrayList<>()); - return new Object[][]{{withEcompNaming}}; - } + private void prepareServicePreset(ModelInfo modelInfo, boolean deploy) { + String subscriberId = "e433710f-9217-458d-a79d-1c7aff376d89"; + if (deploy) { + registerExpectationForServiceDeployment( + ImmutableList.of( + modelInfo, + PASQUALEVmxVpeBvService488Annotations + ), + subscriberId, null); + } else { + registerExpectationForServiceBrowseAndDesign(ImmutableList.of(modelInfo), subscriberId); + } + } private class ServiceData { - - public ServiceData(String csarName, String modelUuid, List<String> dynamicFields, boolean isServiceGeneratedNaming, boolean isVnfGeneratedNaming, boolean isVgEnabled, boolean multiStageDesign, String vnfName, String vfName, int vfMin, int vfMax, List<String> vfModuleDynamicFields) { - this.csarName = csarName; + ServiceData(String modelUuid, List<String> dynamicFields, boolean isServiceGeneratedNaming, boolean isVnfGeneratedNaming, boolean isVgEnabled, boolean multiStageDesign, String vnfName, String vfName, int vfMin, int vfMax, List<String> vfModuleDynamicFields, String vfVersionId) { this.modelUuid = modelUuid; this.dynamicFields = dynamicFields; this.isGeneratedNaming = isServiceGeneratedNaming; this.multiStageDesign = multiStageDesign; - this.vnfData = new VnfData(vnfName, isVnfGeneratedNaming); - this.vfData = new VfData(vfName, isVgEnabled, vfMin, vfMax, vfModuleDynamicFields); + this.vnfData = new VnfData(vnfName, "69e09f68-8b63-4cc9-b9ff-860960b5db09", "VNF instance name", isVnfGeneratedNaming); + this.vfData = new VfData(vfName, isVgEnabled, vfMin, vfMax, vfModuleDynamicFields, vfVersionId); } - public String csarName; - public String modelUuid; - public List<String> dynamicFields; - public boolean isGeneratedNaming; - public boolean multiStageDesign; - public VnfData vnfData; - public VfData vfData; - + final String modelUuid; + final List<String> dynamicFields; + final boolean isGeneratedNaming; + final boolean multiStageDesign; + final VnfData vnfData; + final VfData vfData; } private class VnfData { - - public VnfData(String vnfName, boolean isGeneratedNaming) { + VnfData(String vnfName, String vnfUuid, String vnfInstanceName, boolean isGeneratedNaming) { this.vnfName = vnfName; + this.vnfUuid = vnfUuid; + this.vnfInstanceName = vnfInstanceName; this.isGeneratedNaming = isGeneratedNaming; } - public String vnfName; - public boolean isGeneratedNaming; + final String vnfName; + final String vnfUuid; + final String vnfInstanceName; + final boolean isGeneratedNaming; } private class VfData { - public VfData(String vfName, boolean vgEnabled, int vfMin, int vfMax, List<String> dynamicFields) { + VfData(String vfName, boolean vgEnabled, int vfMin, int vfMax, List<String> dynamicFields, String uuid) { this.vfName = vfName; this.vgEnabled = vgEnabled; this.vfMin = vfMin; this.vfMax = vfMax; this.dynamicFields = dynamicFields; + this.uuid = uuid; } - public int vfMin; - - public int vfMax; - - public String vfName; - - public boolean vgEnabled; - - public List<String> dynamicFields; - + final int vfMin; + final int vfMax; + final String uuid; + final String vfName; + final boolean vgEnabled; + final List<String> dynamicFields; } - private class ServiceStatusChecker implements Predicate<Boolean> { - private String actualInstanceName; - private Set<String> expectedStatuses; - private Set<String> columnClassesSet; - - public ServiceStatusChecker(String actualInstanceName, Set<String> expectedStatuses) { - this.actualInstanceName = actualInstanceName; - this.expectedStatuses = expectedStatuses; - } - - @Override - public boolean test(Boolean noMeaning) { - InstantiationStatusPage.clickRefreshButton(); - final WebElement row = InstantiationStatusPage.getInstantiationStatusRow(actualInstanceName); - if (row == null) { - System.err.println("**********************" + actualInstanceName + "************************************************"); - columnClassesSet = Collections.singleton(actualInstanceName + " NOT FOUND"); - return false; // treat missing row as if test condition not fulfilled - } else { - columnClassesSet = new HashSet<>(Arrays.asList( - row.findElements(By.xpath(".//*[@id='" + "jobStatus" + "']")).get(0).getAttribute("class").split(" "))); - return !(Sets.intersection(expectedStatuses, columnClassesSet).isEmpty()); - } - } - - public Set<String> getColumnClassesSet() { - return columnClassesSet; - } - } } diff --git a/vid-automation/src/main/java/vid/automation/test/test/PreviousVersionsPopupTest.java b/vid-automation/src/main/java/vid/automation/test/test/PreviousVersionsPopupTest.java index aefef20e2..c52dd6bac 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/PreviousVersionsPopupTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/PreviousVersionsPopupTest.java @@ -3,26 +3,27 @@ package vid.automation.test.test; import com.google.common.collect.ImmutableList; import org.junit.Assert; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetMultipleVersion; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkZones; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetOneVersion; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsGet; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.aai.*; import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstancePost; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.openqa.selenium.By; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import vid.automation.test.infra.Click; +import vid.automation.test.infra.Get; import vid.automation.test.sections.BrowseASDCPage; import vid.automation.test.sections.CreateNewInstancePage; import vid.automation.test.sections.PreviousVersionDialog; import vid.automation.test.sections.SideMenu; import vid.automation.test.services.SimulatorApi; +import static vid.automation.test.infra.ModelInfo.ModelInfoWithMultipleVersions.modelInfoWithMultipleVersions; +import static vid.automation.test.infra.ModelInfo.serviceWithOneVersion; + public class PreviousVersionsPopupTest extends CreateInstanceDialogBaseTest{ BrowseASDCPage browseASDCPage = new BrowseASDCPage(); @@ -30,11 +31,11 @@ public class PreviousVersionsPopupTest extends CreateInstanceDialogBaseTest{ private String versionNumber1 = "1.0"; private String versionNumber2 = "2.0"; private String versionNumber3 = "3.0"; - private String modelVersionId1 = "aeababbc-010b-4a60-8df7-e64c07389466"; - private String modelVersionId2 = "aa2f8e9c-9e47-4b15-a95c-4a9385599abc"; - private String modelVersionId3 = "d849c57d-b6fe-4843-8349-4ab8bbb08d71"; - private static final String modelInvariantId = "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba"; - private static final String serviceName = "action-data"; + private String modelVersionId1 = modelInfoWithMultipleVersions.modelVersionId1; + private String modelVersionId2 = modelInfoWithMultipleVersions.modelVersionId2; + private String modelVersionId3 = modelInfoWithMultipleVersions.modelVersionId3; + private static final String modelInvariantId = modelInfoWithMultipleVersions.modelInvariantId; + private static final String serviceName = modelInfoWithMultipleVersions.modelName; private String createModalTitleTestId = "create-modal-title"; @@ -58,8 +59,7 @@ public class PreviousVersionsPopupTest extends CreateInstanceDialogBaseTest{ @Test private void browseSDC_afterCancelOnPopup_browseSDCpageExists(){ prepareSimulatorWithThreeVersionsBeforeBrowseASDCService(); - SideMenu.navigateToBrowseASDCPage(); - browseASDCPage.clickPreviousVersionButton(); + navigateToBrowseAsdcAndClickPreviousButton(); browseASDCPage.clickCancelButton();// to change newVersionDialog.assertVersionRow(modelInvariantId,modelVersionId3,versionNumber3,"Browse_SDC_Service_Models-uuid-"); } @@ -67,14 +67,13 @@ public class PreviousVersionsPopupTest extends CreateInstanceDialogBaseTest{ private void browseSDC_previousVersionButton_notExists(){ prepareSimulatorWithOneVersionBeforeBrowseASDCService(); SideMenu.navigateToBrowseASDCPage(); - browseASDCPage.assertPreviousVersionButtonNotExists(modelInvariantId); + browseASDCPage.assertPreviousVersionButtonNotExists(serviceWithOneVersion.modelInvariantId); } @Test private void openPreviousVersionPopup_newestVersionButton_notExists(){ prepareSimulatorWithThreeVersionsBeforeBrowseASDCService(); - SideMenu.navigateToBrowseASDCPage(); - browseASDCPage.clickPreviousVersionButton(); + navigateToBrowseAsdcAndClickPreviousButton(); newVersionDialog.assertHighestVersionNotExists(modelVersionId3); newVersionDialog.clickCancelButton(); } @@ -84,8 +83,7 @@ public class PreviousVersionsPopupTest extends CreateInstanceDialogBaseTest{ prepareSimulatorWithThreeVersionsBeforeBrowseASDCService(); CreateNewInstancePage newInstance= new CreateNewInstancePage(); newVersionDialog = new PreviousVersionDialog(); - SideMenu.navigateToBrowseASDCPage(); - browseASDCPage.clickPreviousVersionButton(); + navigateToBrowseAsdcAndClickPreviousButton(); newVersionDialog.clickDeployServiceButtonByServiceUUID(modelVersionId2); assertNewInstanceFormOpened(createModalTitleTestId,expectedPopupIsALaCarteName); newInstance.clickCancelButtonByTestID(); @@ -94,6 +92,13 @@ public class PreviousVersionsPopupTest extends CreateInstanceDialogBaseTest{ } + private void navigateToBrowseAsdcAndClickPreviousButton() { + SideMenu.navigateToBrowseASDCPage(); + Click.byTestId("view-per-page-50"); + GeneralUIUtils.ultimateWait(); + Get.byTestId("PreviousVersion-"+modelInvariantId).findElement(By.tagName("button")).click(); + } + private void assertNewInstanceFormOpened(String createModalTitleTestId,String expectedInstanceFormName) { String newInstanceFormName = GeneralUIUtils.getWebElementByTestID(createModalTitleTestId).getText(); Assert.assertEquals(expectedInstanceFormName, newInstanceFormName); @@ -106,11 +111,12 @@ public class PreviousVersionsPopupTest extends CreateInstanceDialogBaseTest{ ImmutableList<BasePreset> presets = ImmutableList.of( new PresetGetSessionSlotCheckIntervalGet(), new PresetAAIGetSubscribersGet(), - new PresetAAIGetMultipleVersion(modelVersionId1,modelVersionId2,modelVersionId3, modelInvariantId), + new PresetAAIServiceDesignAndCreationPut(), new PresetAAIGetServicesGet(), new PresetSDCGetServiceMetadataGet(modelVersionId2, modelInvariantId, zipFileName), new PresetSDCGetServiceToscaModelGet(modelVersionId2, zipFileName), new PresetAAIGetSubDetailsGet(null), + new PresetAAIGetSubDetailsWithoutInstancesGet(null), new PresetAAIGetNetworkZones(), new PresetMSOCreateServiceInstancePost(), new PresetMSOOrchestrationRequestGet()); @@ -122,7 +128,7 @@ public class PreviousVersionsPopupTest extends CreateInstanceDialogBaseTest{ ImmutableList<BasePreset> presets = ImmutableList.of( new PresetGetSessionSlotCheckIntervalGet(), new PresetAAIGetSubscribersGet(), - new PresetAAIGetOneVersion(modelVersionId1, modelInvariantId), + new PresetAAIServiceDesignAndCreationPut(), new PresetAAIGetServicesGet()); SimulatorApi.registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); diff --git a/vid-automation/src/main/java/vid/automation/test/test/ReadOnlyTest.java b/vid-automation/src/main/java/vid/automation/test/test/ReadOnlyTest.java index c3ddd406b..8beb21982 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ReadOnlyTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ReadOnlyTest.java @@ -2,8 +2,9 @@ package vid.automation.test.test; import org.junit.Assert; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetails; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.testng.annotations.Test; @@ -18,6 +19,7 @@ import java.sql.*; import java.util.ArrayList; import java.util.List; +import static vid.automation.test.infra.ModelInfo.aLaCarteServiceCreationTest; import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; /** @@ -64,11 +66,8 @@ public class ReadOnlyTest extends VidBaseTestCase { @Test public void testBrowsASDCReadOnly() { - String zipFileName = "serviceCreationTest.zip"; - String modelVersionId = "aa2f8e9c-9e47-4b15-a95c-4a9385599abc"; - String modelInvariantId = "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba"; - - registerExpectationForLegacyServiceDeployment(modelVersionId, modelInvariantId, zipFileName, null); + resetGetServicesCache(); + registerExpectationForLegacyServiceDeployment(aLaCarteServiceCreationTest, null); SideMenu.navigateToBrowseASDCPage(); Assert.assertTrue(isDeployBtnDisabled()); @@ -91,8 +90,7 @@ public class ReadOnlyTest extends VidBaseTestCase { @Test private void testCreateNewInstanceReadOnly() { - SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.APPEND, - "search_for_service_instance/aai_get_full_subscribers.json"); + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(),SimulatorApi.RegistrationStrategy.APPEND); SideMenu.navigateToCreateNewServicePage(); assertDropdownPermittedItemsByValue(new ArrayList<String>(), Constants.CreateNewInstance.SUBSCRIBER_NAME_OPTION_CLASS); } diff --git a/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java b/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java index dfa79bf30..0741a4b38 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java @@ -1,83 +1,89 @@ package vid.automation.test.test; +import static org.hamcrest.Matchers.containsString; +import static vid.automation.test.infra.ModelInfo.macroForBrowseSdc; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; + +import com.google.common.collect.ImmutableList; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateMacroPre1806Post; import org.openqa.selenium.WebElement; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import vid.automation.test.Constants; -import vid.automation.test.infra.FeatureTogglingTest; import vid.automation.test.infra.SelectOption; import vid.automation.test.model.User; import vid.automation.test.sections.BrowseASDCPage; import vid.automation.test.sections.SideMenu; import vid.automation.test.services.SimulatorApi; -import static org.hamcrest.Matchers.containsString; -import static vid.automation.test.infra.Features.FLAG_ASYNC_INSTANTIATION; - public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest { static final String NEW_INSTANCE_NAME = "New Instance Name"; static final String SERVICE_NAME_PNF = "vidmacrofalsenaming"; - static final String SERVICE_UUID = "4d71990b-d8ad-4510-ac61-496288d9078e"; - static final String SUBSCRIBER = "FIREWALL/MISC"; + static final String SUBSCRIBER = "CRAIG/ROBERTS"; static final String PRODUCT = "Transport"; static final String SERVICE_TYPE = "AIM Transport"; - static final String LCP_REGION = "rdm3"; + static final String LCP_REGION = "olson3"; - static final String TENANT = "AIN Web Tool-15-D-testgamma"; + static final String TENANT = "AIN Web Tool-15-D-testalexandria"; static final String AIC_ZONE = "NFTJSSSS-NFT1"; static final String PROJECT = "yyy1"; static final String OWNING_ENTITY = "aaa1"; static final String RESOURCE_NAME = "MULTI_PROVIDER_PORT_GROUP 0"; static final String RESOURCE_DESCRIPTION = "Creates a neutron multi-provider VLAN network with dummy subnet"; - static final String SERVICE_INVARIANT_UUID = "d27e42cf-087e-4d31-88ac-6c4b7585f800"; static final String SERVICE_VERSION = "1.0"; static final String SERVICE_DESCRIPTION = "vidmacrofalsenaming"; static final String SERVICE_CATEGORY = "Network L1-3"; - public SanityMacroDeployTest() { - } - - @BeforeClass protected void registerToSimulator() { - SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.APPEND, - "sanity/browse_sdc_catalog_two_services.json", + resetGetServicesCache(); + invalidateSdcModelsCache(); + SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET, "sanity/aai_get_services.json", "sanity/aai_get_aic_zones.json", - "search_for_service_instance/aai_get_full_subscribers.json", - "search_for_service_instance/aai_get_subscribers_for_customer_FIREWALL-MISC.json", + "search_for_service_instance/aai_get_subscribers_for_customer_CRAIG-ROBERTS.json", "sanity/aai_get_tenants.json", "sanity/get_mso_get_orch_request.json", - "sanity/post_mso_create_service_instance.json", "sanity/get_sdc_catalog_services_4d71990b.json", "sanity/aai_named_query_for_view_edit.json" ); + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + new PresetAAIServiceDesignAndCreationPut(), + new PresetMSOCreateMacroPre1806Post(), + new PresetAAIGetSubscribersGet(), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_RDM3_TO_ATT_NC + ), + APPEND); } @Override protected UserCredentials getUserCredentials() { - String userName = Constants.Users.FIREWALL_MISC_AIM_TRANSPORT; + String userName = Constants.Users.CRAIG_ROBERTS_AIM_TRANSPORT; User user = usersService.getUser(userName); return new UserCredentials(user.credentials.userId, user.credentials.password, userName, "", ""); } - @FeatureTogglingTest(value = FLAG_ASYNC_INSTANTIATION, flagActive = false) @Test private void browseServiceModel_MacroService_CreatedSuccessfully() { + BrowseASDCPage browseASDCPage = new BrowseASDCPage(); SideMenu.navigateToBrowseASDCPage(); GeneralUIUtils.ultimateWait(); - browseASDCPage.clickDeployServiceButtonByServiceUUID(SERVICE_UUID); + browseASDCPage.clickDeployServiceButtonByServiceUUID(macroForBrowseSdc.modelVersionId); WebElement modalTitle = GeneralUIUtils.getWebElementByTestID(Constants.CREATE_MODAL_TITLE_ID, 30); Assert.assertThat(modalTitle.getText().toLowerCase(), containsString("macro")); + GeneralUIUtils.ultimateWait(); assertServiceDetails(); @@ -91,17 +97,29 @@ public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest { } private void fillCreateInstanceModal() { + + + waitForInstanceField(); + GeneralUIUtils.ultimateWait(); + GeneralUIUtils.sleep(10000); // stuff is getting weird + WebElement instance_name = GeneralUIUtils.getWebElementByTestID(Constants.INSTANCE_NAME_SELECT_TESTS_ID, 30); instance_name.sendKeys(NEW_INSTANCE_NAME); + waitForInstanceField(); + GeneralUIUtils.ultimateWait(); SelectOption.byTestIdAndVisibleText(SUBSCRIBER, Constants.SUBSCRIBER_NAME_SELECT_TESTS_ID); + waitForInstanceField(); GeneralUIUtils.ultimateWait(); SelectOption.byTestIdAndVisibleText(PRODUCT, Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); + + waitForInstanceField(); GeneralUIUtils.ultimateWait(); SelectOption.byTestIdAndVisibleText(SERVICE_TYPE, Constants.SERVICE_TYPE_SELECT_TESTS_ID); + GeneralUIUtils.ultimateWait(); - SelectOption.byTestIdAndVisibleText(LCP_REGION, Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID); + viewEditPage.selectLcpRegion(LCP_REGION, "AIC"); SelectOption.byTestIdAndVisibleText(TENANT, Constants.ViewEdit.TENANT_SELECT_TESTS_ID); SelectOption.byTestIdAndVisibleText(AIC_ZONE, Constants.ViewEdit.AIC_ZONE_TEST_ID); @@ -109,12 +127,22 @@ public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest { SelectOption.byTestIdAndVisibleText(OWNING_ENTITY, Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID); } + private void waitForInstanceField() { + GeneralUIUtils.sleep(200); // stuff is getting weird + SelectOption.waitForOptionInSelect(SUBSCRIBER, Constants.SUBSCRIBER_NAME_SELECT_TESTS_ID); + SelectOption.waitForOptionInSelect(TENANT, Constants.ViewEdit.TENANT_SELECT_TESTS_ID); + SelectOption.waitForOptionInSelect(AIC_ZONE, Constants.ViewEdit.AIC_ZONE_TEST_ID); + SelectOption.waitForOptionInSelect(PROJECT, Constants.OwningEntity.PROJECT_SELECT_TEST_ID); + SelectOption.waitForOptionInSelect(OWNING_ENTITY, Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID); + GeneralUIUtils.sleep(200); // stuff is getting weird + } + private void assertServiceDetails() { WebElement currElem = GeneralUIUtils.getWebElementByTestID(Constants.SERVICE_NAME, 30); Assert.assertEquals(currElem.getText(), SERVICE_NAME_PNF); currElem = GeneralUIUtils.getWebElementByTestID(Constants.SERVICE_UUID, 30); - Assert.assertEquals(currElem.getText(), SERVICE_UUID); + Assert.assertEquals(currElem.getText(), macroForBrowseSdc.modelVersionId); currElem = GeneralUIUtils.getWebElementByTestID(Constants.RESOURCE_NAME, 30); Assert.assertEquals(currElem.getText(), RESOURCE_NAME); @@ -123,7 +151,7 @@ public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest { Assert.assertEquals(currElem.getText(), RESOURCE_DESCRIPTION); currElem = GeneralUIUtils.getWebElementByTestID(Constants.SERVICE_INVARIANT_UUID, 30); - Assert.assertEquals(currElem.getText(), SERVICE_INVARIANT_UUID); + Assert.assertEquals(currElem.getText(), macroForBrowseSdc.modelInvariantId); currElem = GeneralUIUtils.getWebElementByTestID(Constants.SERVICE_VERSION, 30); Assert.assertEquals(currElem.getText(), SERVICE_VERSION); diff --git a/vid-automation/src/main/java/vid/automation/test/test/SanityTest.java b/vid-automation/src/main/java/vid/automation/test/test/SanityTest.java index 29d25f21f..4ec3d4958 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/SanityTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/SanityTest.java @@ -1,8 +1,10 @@ package vid.automation.test.test; +import java.io.IOException; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.openqa.selenium.WebElement; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -14,12 +16,10 @@ import vid.automation.test.sections.SearchExistingPage; import vid.automation.test.sections.SideMenu; import vid.automation.test.services.SimulatorApi; -import java.io.IOException; - public class SanityTest extends VidBaseTestCase { - static final String SUBSCRIBER = "Mobility"; - static final String SERVICE_NAME = "abc_mdns_2017_1011_IST_Service_CSI"; + static final String SUBSCRIBER = "Emanuel"; + static final String SERVICE_NAME = "abc_CHARLOTTE_2017_1011_IST_Service_CSI"; static final String SERVICE_ID = "ec884145-dbe8-4228-8165-f0c4d7123f8b"; public SanityTest() throws IOException { @@ -29,19 +29,19 @@ public class SanityTest extends VidBaseTestCase { @BeforeClass protected void registerToSimulator() { SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET, - "sanity/get_aai_get_subscribers.json" - , "sanity/aai_get_services.json" + "sanity/aai_get_services.json" , "sanity/get_aai_sub_details.json" , "sanity/get_aai_search_named_query.json" , "sanity/get_aai_search_instance_by_id.json" , "sanity/get_sdc_catalog_services_a1531622.json" , "sanity/get_aai_search_instance_by_name.json" ); + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), SimulatorApi.RegistrationStrategy.APPEND); } @Override protected UserCredentials getUserCredentials() { - String userName = Constants.Users.MOBILITY_VMMSC; + String userName = Constants.Users.EMANUEL_vWINIFRED; User user = usersService.getUser(userName); return new UserCredentials(user.credentials.userId, user.credentials.password, userName, "", ""); } @@ -90,13 +90,7 @@ public class SanityTest extends VidBaseTestCase { } private String confirmFilterById() { - WebElement filter = GeneralUIUtils.getWebElementByTestID(Constants.FILTER_SUBSCRIBER_DETAILS_ID, 30); - filter.sendKeys(SERVICE_ID); - - WebElement firstElement = GeneralUIUtils.getWebElementByTestID(Constants.INSTANCE_ID_FOR_NAME_TEST_ID_PREFIX + SERVICE_NAME, 30); - String filteredId = firstElement.getText(); - Assert.assertTrue(filteredId.equals(SERVICE_ID)); - return filteredId; + return confirmFilterById(SERVICE_NAME, SERVICE_ID); } private void confirmResultBySubscriber() { diff --git a/vid-automation/src/main/java/vid/automation/test/test/SearchExistingInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/SearchExistingInstanceTest.java index 7f18b2f83..c8370a571 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/SearchExistingInstanceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/SearchExistingInstanceTest.java @@ -1,20 +1,20 @@ package vid.automation.test.test; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; + +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import vid.automation.test.Constants; import vid.automation.test.infra.Click; -import vid.automation.test.infra.Wait; import vid.automation.test.model.User; import vid.automation.test.sections.SearchExistingPage; import vid.automation.test.sections.SideMenu; import vid.automation.test.services.BulkRegistration; import vid.automation.test.services.SimulatorApi; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.assertTrue; - public class SearchExistingInstanceTest extends VidBaseTestCase { public static final String serviceIdOeWirelineProjectX1 = "7e4f8130-5dee-47c4-8770-1abc5f5ded83"; @@ -22,25 +22,15 @@ public class SearchExistingInstanceTest extends VidBaseTestCase { @BeforeClass public void registerToSimulatorAndLogin() { - SimulatorApi.clearAll(); + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); BulkRegistration.searchExistingServiceInstanceByOEAndProject(); } - @Test(groups = { "shouldBeMigratedToWorkWithSimulator" }) - private void testSearchExistingInstanceById() throws Exception { - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); - relogin(user.credentials); - SideMenu.navigateToSearchExistingPage(); - goToExistingInstanceById("3f93c7cb-2fd0-4557-9514-e189b7b04f9d"); - - //a flow that updates an existing instance is tested in testCreateNewServiceInstance. - } - @Test private void testSearchExistingInstanceByOwningEntitySingleValue() { SearchExistingPage searchExistingPage = new SearchExistingPage(); SideMenu.navigateToSearchExistingPage(); - searchExistingPage.searchByOwningEntity("Wireline"); + searchExistingPage.searchByOwningEntity("Melissa"); searchExistingPage.clickSubmitButton(); GeneralUIUtils.ultimateWait(); assertTrue(searchExistingPage.checkEditOrViewExistsByInstanceId(serviceIdOeWirelineProjectX1)); @@ -49,7 +39,7 @@ public class SearchExistingInstanceTest extends VidBaseTestCase { @Test(groups = { "shouldBeMigratedToWorkWithSimulator" }) private void testSearchExistingInstanceByOwningEntityMultiValue() throws Exception { - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); relogin(user.credentials); SearchExistingPage searchExistingPage = new SearchExistingPage(); SideMenu.navigateToSearchExistingPage(); @@ -78,7 +68,7 @@ public class SearchExistingInstanceTest extends VidBaseTestCase { SearchExistingPage searchExistingPage = new SearchExistingPage(); SideMenu.navigateToSearchExistingPage(); searchExistingPage.searchByProject("yyy1"); - searchExistingPage.searchByOwningEntity("Wireline"); + searchExistingPage.searchByOwningEntity("Melissa"); searchExistingPage.clickSubmitButton(); GeneralUIUtils.ultimateWait(); assertTrue(searchExistingPage.checkEditOrViewExistsByInstanceId(serviceIdOeWirelineProjectYYY1)); @@ -88,7 +78,7 @@ public class SearchExistingInstanceTest extends VidBaseTestCase { @Test(groups = { "shouldBeMigratedToWorkWithSimulator" }) private void testSearchExistingInstanceByProjectWithSpecialCharacters() throws Exception { - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); relogin(user.credentials); SearchExistingPage searchExistingPage = new SearchExistingPage(); SideMenu.navigateToSearchExistingPage(); @@ -103,7 +93,7 @@ public class SearchExistingInstanceTest extends VidBaseTestCase { @Test(groups = { "shouldBeMigratedToWorkWithSimulator" }) private void testSearchExistingInstanceByProjectMultiValue() throws Exception { - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); relogin(user.credentials); SearchExistingPage searchExistingPage = new SearchExistingPage(); SideMenu.navigateToSearchExistingPage(); diff --git a/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java b/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java index e5a8b5786..c472793fc 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java +++ b/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestCase.java @@ -3,22 +3,35 @@ package vid.automation.test.test; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableList; import org.apache.commons.lang3.StringUtils; +import org.glassfish.jersey.uri.internal.JerseyUriBuilder; import org.junit.Assert; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsGet; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.onap.simulator.presetGenerator.presets.aai.*; -import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAICloudRegionAndSourceFromConfigurationPut; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkZones; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetPortMirroringSourcePorts; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsWithoutInstancesGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetTenants; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIPostNamedQueryForViewEdit; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.EcompPortalPresetsUtils; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstancePost; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest; -import org.openecomp.sdc.ci.tests.utilities.FileHandling; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.execute.setup.SetupCDTest; +import org.onap.sdc.ci.tests.utilities.FileHandling; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.WebElement; +import org.springframework.http.client.ClientHttpRequestInterceptor; +import org.springframework.web.client.RestTemplate; import org.testng.ITestContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeSuite; @@ -31,26 +44,71 @@ import vid.automation.test.sections.*; import vid.automation.test.services.CategoryParamsService; import vid.automation.test.services.SimulatorApi; import vid.automation.test.services.UsersService; +import vid.automation.test.utils.CookieAndJsonHttpHeadersInterceptor; import vid.automation.test.utils.DB_CONFIG; import vid.automation.test.utils.TestConfigurationHelper; +import vid.automation.test.utils.TestHelper; import java.io.File; import java.lang.reflect.Method; +import java.net.URI; +import java.net.URISyntaxException; import java.sql.*; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - +import java.util.*; +import java.util.concurrent.TimeUnit; + +import static java.util.Collections.emptySet; +import static java.util.Collections.singletonList; +import static java.util.stream.Collectors.*; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.Matchers.contains; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.collection.IsEmptyCollection.empty; import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; import static org.testng.Assert.assertEquals; import static org.testng.AssertJUnit.fail; +import static vid.automation.test.utils.TestHelper.GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS; +import static vid.automation.test.utils.TestHelper.GET_TENANTS; public class VidBaseTestCase extends SetupCDTest{ protected final UsersService usersService = new UsersService(); protected final CategoryParamsService categoryParamsService = new CategoryParamsService(); + protected final RestTemplate restTemplate = new RestTemplate(); + protected final URI uri; + protected final URI envUrI; + + public VidBaseTestCase() { + try { + this.envUrI = new URI(System.getProperty("ENV_URL")); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + this.uri = new JerseyUriBuilder().host(envUrI.getHost()).port(envUrI.getPort()).scheme("http").path("vid").build(); + } + + public void login() { + UserCredentials userCredentials = getUserCredentials(); + final List<ClientHttpRequestInterceptor> interceptors = singletonList(new CookieAndJsonHttpHeadersInterceptor(uri, userCredentials)); + restTemplate.setInterceptors(interceptors); + } + + public void invalidateSdcModelsCache() { + if (Features.FLAG_SERVICE_MODEL_CACHE.isActive()) { + restTemplate.postForObject(uri + "/rest/models/reset", "", Object.class); + } + } + + protected void resetGetServicesCache() { + login(); + TestHelper.resetAaiCache(GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS, restTemplate, uri); + } + + protected void resetGetTenantsCache() { + login(); + TestHelper.resetAaiCache(GET_TENANTS, restTemplate, uri); + } @Override protected UserCredentials getUserCredentials() { @@ -71,7 +129,7 @@ public class VidBaseTestCase extends SetupCDTest{ } @Override - protected org.openecomp.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { + protected org.onap.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { return TestConfigurationHelper.getEnvConfiguration(); } @@ -102,63 +160,86 @@ public class VidBaseTestCase extends SetupCDTest{ } } + @BeforeSuite(alwaysRun = true) + public void setSmallDefaultTimeout() throws Exception { + getDriver().manage().timeouts().implicitlyWait(250, TimeUnit.MILLISECONDS); + } + @Override protected void loginToLocalSimulator(UserCredentials userCredentials) { LoginExternalPage.performLoginExternal(userCredentials); } - static public class ModelInfo { - public final String modelVersionId; - public final String modelInvariantId; - public final String zipFileName; + protected String getReduxState() { + final JavascriptExecutor javascriptExecutor = (JavascriptExecutor) GeneralUIUtils.getDriver(); + String reduxState = (String)javascriptExecutor.executeScript("return window.sessionStorage.getItem('reduxState');"); + System.out.println(reduxState); + return reduxState; + } - public ModelInfo(String modelVersionId, String modelInvariantId, String zipFileName) { - this.modelVersionId = modelVersionId; - this.modelInvariantId = modelInvariantId; - this.zipFileName = zipFileName; + protected void setReduxState(String state) { + final JavascriptExecutor javascriptExecutor = (JavascriptExecutor) GeneralUIUtils.getDriver(); + String script = String.format("window.sessionStorage.setItem('reduxState', '%s');", state); + System.out.println("executing script:"); + System.out.println(script); + javascriptExecutor.executeScript(script); + } + + protected void registerExpectationForLegacyServiceDeployment(ModelInfo modelInfo, String subscriberId) { + List<BasePreset> presets = new ArrayList<>(Arrays.asList( + new PresetAAIPostNamedQueryForViewEdit(BaseMSOPreset.DEFAULT_INSTANCE_ID, true, false), + new PresetAAIGetPortMirroringSourcePorts("9533-config-LB1113", "myRandomInterfaceId", "i'm a port", true) + )); + + presets.add(new PresetMSOCreateServiceInstancePost()); + presets.add(new PresetMSOOrchestrationRequestGet()); + + presets.addAll(getPresetForServiceBrowseAndDesign(ImmutableList.of(modelInfo), subscriberId)); + + SimulatorApi.registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); + } + + protected void registerExpectationForServiceDeployment(List<ModelInfo> modelInfoList, String subscriberId, PresetMSOCreateServiceInstanceGen2 createServiceInstancePreset) { + List<BasePreset> presets = new ArrayList<>(Arrays.asList( + new PresetAAIPostNamedQueryForViewEdit(BaseMSOPreset.DEFAULT_INSTANCE_ID, true, false), + new PresetAAIGetPortMirroringSourcePorts("9533-config-LB1113", "myRandomInterfaceId", "i'm a port", true) + )); + + if (createServiceInstancePreset != null) { + presets.add(createServiceInstancePreset); } + presets.add(new PresetMSOOrchestrationRequestGet("IN_PROGRESS")); + + presets.addAll(getPresetForServiceBrowseAndDesign(modelInfoList, subscriberId)); + + SimulatorApi.registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); } - protected void registerExpectationForLegacyServiceDeployment(String modelVersionId, String modelInvariantId, String zipFileName, String subscriberId) { - registerExpectationForServiceDeployment(ServiceDeployment.LEGACY, ImmutableList.of(new ModelInfo(modelVersionId,modelInvariantId,zipFileName)), subscriberId); + protected void registerExpectationForServiceBrowseAndDesign(List<ModelInfo> modelInfoList, String subscriberId) { + SimulatorApi.registerExpectationFromPresets(getPresetForServiceBrowseAndDesign(modelInfoList, subscriberId), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); } - private enum ServiceDeployment {ASYNC, LEGACY} + protected List<BasePreset> getPresetForServiceBrowseAndDesign(List<ModelInfo> modelInfoList, String subscriberId) { - protected void registerExpectationForServiceDeployment(ServiceDeployment serviceDeploymentOnMsoExpectations, List<ModelInfo> modelInfoList, String subscriberId) { List<BasePreset> presets = new ArrayList<>(Arrays.asList( - new PresetGetSessionSlotCheckIntervalGet(), - new PresetAAIGetSubscribersGet(), - new PresetAAIGetServicesGet(), - new PresetAAIGetSubDetailsGet(subscriberId), - new PresetAAIPostNamedQueryForViewEdit("f8791436-8d55-4fde-b4d5-72dd2cf13cfb"), - new PresetAAICloudRegionAndSourceFromConfigurationPut("9533-config-LB1113", "myRandomCloudRegionId"), - new PresetAAIGetPortMirroringSourcePorts("9533-config-LB1113", "myRandomInterfaceId", "i'm a port", true), - new PresetAAIGetNetworkZones(), - new PresetAAIGetTenants(), - new PresetAAIServiceDesignAndCreationPut(modelInfoList.stream().map( - x-> new PresetAAIServiceDesignAndCreationPut.ServiceModelIdentifiers(x.modelVersionId, x.modelInvariantId)) - .collect(Collectors.toList())) - )); + new PresetAAIGetSubDetailsGet(subscriberId), + new PresetAAIGetSubDetailsWithoutInstancesGet(subscriberId), + new PresetAAIGetSubscribersGet(), + new PresetAAIGetServicesGet(), + new PresetAAICloudRegionAndSourceFromConfigurationPut("9533-config-LB1113", "myRandomCloudRegionId"), + new PresetAAIGetNetworkZones(), + new PresetAAIGetTenants(), + new PresetAAIServiceDesignAndCreationPut() + )); + + presets.addAll(EcompPortalPresetsUtils.getEcompPortalPresets()); modelInfoList.forEach(modelInfo -> { presets.add(new PresetSDCGetServiceMetadataGet(modelInfo.modelVersionId, modelInfo.modelInvariantId, modelInfo.zipFileName)); presets.add(new PresetSDCGetServiceToscaModelGet(modelInfo.modelVersionId, modelInfo.zipFileName)); }); - switch (serviceDeploymentOnMsoExpectations) { - case ASYNC: - presets.add(new PresetAAISearchNodeQueryEmptyResult()); - presets.add(new PresetMSOCreateServiceInstanceGen2()); - presets.add(new PresetMSOOrchestrationRequestGet("IN_PROGRESS")); - break; - case LEGACY: - presets.add(new PresetMSOCreateServiceInstancePost()); - presets.add(new PresetMSOOrchestrationRequestGet()); - break; - } - - SimulatorApi.registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); + return presets; } protected void relogin(Credentials credentials) throws Exception { @@ -200,13 +281,19 @@ public class VidBaseTestCase extends SetupCDTest{ GeneralUIUtils.ultimateWait(); List<WebElement> optionsList = GeneralUIUtils.getWebElementsListBy(By.className(dropdownOptionsClassName), 30); - for (WebElement option : - optionsList) { - String optionValue = option.getAttribute(attribute); - if ((option.isEnabled() && !permittedItems.contains(optionValue)) || - !option.isEnabled() && permittedItems.contains(optionValue)) { - fail(Constants.DROPDOWN_PERMITTED_ASSERT_FAIL_MESSAGE); - } + + final Map<Boolean, Set<String>> optionsMap = optionsList.stream() + .collect(groupingBy(WebElement::isEnabled, mapping(option -> option.getAttribute(attribute), toSet()))); + + assertGroupedPermissionsAreCorrect(permittedItems, optionsMap); + } + + private void assertGroupedPermissionsAreCorrect(ArrayList<String> permittedItems, Map<Boolean, Set<String>> optionsMap) { + if (permittedItems.isEmpty()) { + assertThat(Constants.DROPDOWN_PERMITTED_ASSERT_FAIL_MESSAGE, optionsMap.getOrDefault(Boolean.TRUE, emptySet()), is(empty())); + }else { + assertThat(Constants.DROPDOWN_PERMITTED_ASSERT_FAIL_MESSAGE, optionsMap.getOrDefault(Boolean.TRUE, emptySet()), containsInAnyOrder(permittedItems.toArray())); + assertThat(Constants.DROPDOWN_PERMITTED_ASSERT_FAIL_MESSAGE, optionsMap.getOrDefault(Boolean.FALSE, emptySet()), not(contains(permittedItems.toArray()))); } } @@ -216,7 +303,7 @@ public class VidBaseTestCase extends SetupCDTest{ GeneralUIUtils.getWebElementsListBy(By.className(dropdownOptionsClassName), 30); for (WebElement option : optionsList) { - String optionValue = option.getAttribute("value"); + //String optionValue = option.getAttribute("value"); if (!option.isEnabled()) { fail(Constants.DROPDOWN_PERMITTED_ASSERT_FAIL_MESSAGE); } @@ -227,14 +314,11 @@ public class VidBaseTestCase extends SetupCDTest{ GeneralUIUtils.ultimateWait(); List<WebElement> optionsList = GeneralUIUtils.getWebElementsListBy(By.className(dropdownOptionsClassName), 30); - for (WebElement option : - optionsList) { - String optionText = option.getText(); - if ((option.isEnabled() && !permittedItems.contains(optionText)) || - !option.isEnabled() && permittedItems.contains(optionText)) { - fail(Constants.DROPDOWN_PERMITTED_ASSERT_FAIL_MESSAGE); - } - } + + final Map<Boolean, Set<String>> optionsMap = optionsList.stream() + .collect(groupingBy(WebElement::isEnabled, mapping(WebElement::getText, toSet()))); + + assertGroupedPermissionsAreCorrect(permittedItems, optionsMap); } protected void assertViewEditButtonState(String expectedButtonText, String UUID) { @@ -244,14 +328,14 @@ public class VidBaseTestCase extends SetupCDTest{ } - protected void addNetwork(Map<String, String> metadata,String instanceName, String name, String lcpRegion, String productFamily,String platform, String lineOfBusiness, String tenant, String suppressRollback, + protected void addNetwork(Map<String, String> metadata,String instanceName, String name, String lcpRegion, String cloudOwner, String productFamily,String platform, String lineOfBusiness, String tenant, String suppressRollback, String legacyRegion, ArrayList<String> permittedTenants) { ViewEditPage viewEditPage = new ViewEditPage(); viewEditPage.selectNetworkToAdd(name); assertModelInfo(metadata, false); viewEditPage.setInstanceName(instanceName); - viewEditPage.selectLCPRegion(lcpRegion); + viewEditPage.selectLcpRegion(lcpRegion, cloudOwner); viewEditPage.selectProductFamily(productFamily); viewEditPage.selectLineOfBusiness(lineOfBusiness); assertDropdownPermittedItemsByValue(permittedTenants, Constants.ViewEdit.TENANT_OPTION_CLASS); @@ -313,10 +397,10 @@ public class VidBaseTestCase extends SetupCDTest{ searchExistingPage.clickEditViewByInstanceId(instanceUUID); } - void resumeVFModule(String vfModuleName, String lcpRegion, String tenant, String legacyRegion, ArrayList<String> permittedTenants){ + void resumeVFModule(String vfModuleName, String lcpRegion, String cloudOwner, String tenant, String legacyRegion, ArrayList<String> permittedTenants){ ViewEditPage viewEditPage = new ViewEditPage(); viewEditPage.clickResumeButton(vfModuleName); - viewEditPage.selectLCPRegion(lcpRegion); + viewEditPage.selectLcpRegion(lcpRegion, cloudOwner); assertDropdownPermittedItemsByValue(permittedTenants, Constants.ViewEdit.TENANT_OPTION_CLASS); viewEditPage.selectTenant(tenant); viewEditPage.setLegacyRegion(legacyRegion); @@ -384,7 +468,7 @@ public class VidBaseTestCase extends SetupCDTest{ } } - protected <T> void setNewInstance_leftPane_assertModelDataCorrect(Map<String, String> modelKeyToDataTestsIdMap, String prefix, T model) { + protected <T> void assertModelDataCorrect(Map<String, String> modelKeyToDataTestsIdMap, String prefix, T model) { modelKeyToDataTestsIdMap.forEach((fieldName, dataTestsId) -> { WebElement webElement = Get.byTestId(prefix + dataTestsId); assertEquals(webElement.getText(), getServiceFieldByName(fieldName, model)); @@ -410,7 +494,7 @@ public class VidBaseTestCase extends SetupCDTest{ private void assertMetadataItem(String keyTestId, String value, boolean withPrefix) { String elementTestId = (withPrefix ? Constants.ServiceModelInfo.INFO_TEST_ID_PREFIX:"") + keyTestId; String infoItemText = GeneralUIUtils.getWebElementByTestID(elementTestId, 60).getText(); - Assert.assertThat(String.format(Constants.ServiceModelInfo.METADETA_ERROR_MESSAGE, elementTestId), infoItemText, is(value)); + assertThat(String.format(Constants.ServiceModelInfo.METADETA_ERROR_MESSAGE, elementTestId), infoItemText, is(value)); } public DeployMacroDialogBase getMacroDialog(){ @@ -423,16 +507,12 @@ public class VidBaseTestCase extends SetupCDTest{ return new DeployMacroDialogOld(); } - protected void loadServicePopup(String zipFileName, String modelVersionId ) { - String modelInvariantId = "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0"; - String subscriberId = "e433710f-9217-458d-a79d-1c7aff376d89"; - registerExpectationForServiceDeployment( - ServiceDeployment.ASYNC, - ImmutableList.of( - new ModelInfo(modelVersionId, modelInvariantId, zipFileName), - new ModelInfo("f4d84bb4-a416-4b4e-997e-0059973630b9", "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9", "service-AdiodVmxVpeBvService488-csar-annotations.zip") - ), - subscriberId); + protected void loadServicePopup(ModelInfo modelInfo) { + loadServicePopup(modelInfo.modelVersionId); + } + + + protected void loadServicePopup(String modelVersionId) { SideMenu.navigateToBrowseASDCPage(); GeneralUIUtils.ultimateWait(); loadServicePopupOnBrowseASDCPage(modelVersionId); @@ -440,7 +520,7 @@ public class VidBaseTestCase extends SetupCDTest{ protected void loadServicePopupOnBrowseASDCPage(String modelVersionId ) { DeployMacroDialog deployMacroDialog = new DeployMacroDialog(); - deployMacroDialog.goOutFromIframe(); + VidBasePage.goOutFromIframe(); deployMacroDialog.clickDeployServiceButtonByServiceUUID(modelVersionId); deployMacroDialog.goToIframe(); GeneralUIUtils.ultimateWait(); @@ -464,6 +544,10 @@ public class VidBaseTestCase extends SetupCDTest{ org.testng.Assert.assertFalse(webElement.isEnabled(), "field should be disabled if the field it depends on was not selected yet."); } + public boolean isElementByIdRequired(String id) { + return Get.byId(id).getAttribute("class").contains("required"); + } + protected int getUserIdNumberFromDB(User user) { try (Connection connection = DriverManager.getConnection(DB_CONFIG.url, DB_CONFIG.username, DB_CONFIG.password)) { Statement stmt = connection.createStatement(); @@ -495,15 +579,38 @@ public class VidBaseTestCase extends SetupCDTest{ } protected void navigateToViewEditPageOfuspVoiceVidTest444(String aaiModelVersionId) { + navigateToViewEditPage("3f93c7cb-2fd0-4557-9514-e189b7b04f9d", aaiModelVersionId); + } + + protected void navigateToViewEditPageOf_test_sssdad() { + navigateToViewEditPage("c187e9fe-40c3-4862-b73e-84ff056205f6", "ee6d61be-4841-4f98-8f23-5de9da846ca7"); + } + + protected void navigateToViewEditPage(final String serviceInstanceId, String aaiModelVersionId) { VidBasePage vidBasePage = new VidBasePage(); SideMenu.navigateToWelcomePage(); vidBasePage.navigateTo("serviceModels.htm#/instantiate?" + "subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&" + "subscriberName=USP%20VOICE&" + "serviceType=VIRTUAL%20USP&" + - "serviceInstanceId=3f93c7cb-2fd0-4557-9514-e189b7b04f9d&" + + "serviceInstanceId=" + serviceInstanceId + "&" + "aaiModelVersionId=" + aaiModelVersionId + "&" + "isPermitted=true"); GeneralUIUtils.ultimateWait(); } + + + public void hoverAndClickMenuByName(String nodeName, String nodeToEdit, String contextMenuItem ) { + String buttonOfEdit = Constants.DrawingBoard.NODE_PREFIX + nodeToEdit + Constants.DrawingBoard.CONTEXT_MENU_BUTTON; + + WebElement rightTreeNode = getTreeNodeByName(nodeName); + WebElement menuButton = Get.byXpath(rightTreeNode, ".//span[@data-tests-id='" + buttonOfEdit + "']"); + + GeneralUIUtils.clickElementUsingActions(menuButton); + Click.byTestId(contextMenuItem); + } + + private WebElement getTreeNodeByName(String nodeName) { + return Get.byXpath("//tree-node-content[.//*[contains(text(), '" + nodeName + "')]]"); + } } diff --git a/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestWithoutLogin.java b/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestWithoutLogin.java index 9dab455cc..48f776406 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestWithoutLogin.java +++ b/vid-automation/src/main/java/vid/automation/test/test/VidBaseTestWithoutLogin.java @@ -1,7 +1,7 @@ package vid.automation.test.test; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; -import org.openecomp.sdc.ci.tests.execute.setup.DriverFactory; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.execute.setup.DriverFactory; import vid.automation.test.utils.TestConfigurationHelper; public abstract class VidBaseTestWithoutLogin extends DriverFactory { @@ -12,7 +12,7 @@ public abstract class VidBaseTestWithoutLogin extends DriverFactory { } @Override - protected org.openecomp.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { + protected org.onap.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { return TestConfigurationHelper.getEnvConfiguration(); } diff --git a/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java b/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java index 3b9546fdd..ed64bba0a 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ViewEditServiceInstanceTest.java @@ -1,54 +1,65 @@ package vid.automation.test.test; +import static org.apache.logging.log4j.core.util.Assert.isNonEmpty; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.collection.IsEmptyCollection.empty; +import static org.testng.AssertJUnit.assertEquals; +import static vid.automation.test.infra.Features.FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE; +import static vid.automation.test.infra.Features.FLAG_COLLECTION_RESOURCE_SUPPORT; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; + import com.google.common.collect.ImmutableMap; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import org.hamcrest.MatcherAssert; import org.junit.Assert; import org.junit.Before; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetails; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.WebElement; import org.testng.annotations.AfterMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import vid.automation.test.Constants; -import vid.automation.test.infra.*; +import vid.automation.test.infra.Click; +import vid.automation.test.infra.Exists; +import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Features; +import vid.automation.test.infra.Get; +import vid.automation.test.infra.Wait; import vid.automation.test.model.User; import vid.automation.test.sections.VidBasePage; import vid.automation.test.sections.ViewEditPage; import vid.automation.test.services.BulkRegistration; import vid.automation.test.services.SimulatorApi; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import static org.hamcrest.Matchers.equalTo; -import static org.testng.AssertJUnit.assertEquals; -import static vid.automation.test.infra.Features.FLAG_COLLECTION_RESOURCE_SUPPORT; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; - public class ViewEditServiceInstanceTest extends VidBaseTestCase { private ViewEditPage viewEditPage = new ViewEditPage(); VidBasePage vidBasePage =new VidBasePage(); private String serviceInstanceId = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; private String crServiceInstanceId = "3f93c7cb-2fd0-4557-9514-e189b7testCR"; + private String serviceFabricInstanceId = "c187e9fe-40c3-4862-b73e-84ff056205f61234"; private String serviceInstanceId2 ="c187e9fe-40c3-4862-b73e-84ff056205f6"; private final String DEACTIVATE_ACTION = "deactivate"; private final String ACTIVATE_ACTION = "activate"; private List<String> pnfs = Arrays.asList("SANITY6785cce9", "tesai371ve2"); private final String serviceInstanceIdeWithoutModelVerId ="9caf5581-40ab-47be-b1f1-909a87724add"; - private final String crNetworkText ="NETWORK INSTANCE GROUP: l3network-id-rs804s | ROLE: HngwProtectedOam.OAM | TYPE: Tenant_Layer_3 | # OF NETWORKS: 3"; + private final String crNetworkText ="NETWORK INSTANCE GROUP: l3network-id-rs804s | ROLE: RosemaProtectedOam.OAM | TYPE: Tenant_Layer_3 | # OF NETWORKS: 3"; private final String crCollectionText ="COLLECTION: collection-name | TYPE: L3-NETWORK"; private final String crInfoText = "\"requestState\": \"COMPLETE\""; SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss"); - static final String LCP_REGION = "mtn6"; + static final String LCP_REGION = "hvf6"; + static final String CLOUD_OWNER = "AIC"; static final String TENANT = "bae71557c5bb4d5aac6743a4e5f1d054"; @@ -80,13 +91,16 @@ public class ViewEditServiceInstanceTest extends VidBaseTestCase { webElement.click(); viewEditPage.clickDeleteButton(); } - private void deleteInstance(String deleteButtonId, String successMessage) { + deleteInstance(deleteButtonId, successMessage, Constants.CONFIRM_RESUME_DELETE_TESTS_ID); + } + + private void deleteInstance(String deleteButtonId, String successMessage, String confirmButtonId) { navigateToViewEditPageOfuspVoiceVidTest444("7a6ee536-f052-46fa-aa7e-2fca9d674c44"); Click.byTestId(deleteButtonId); - viewEditPage.selectLCPRegion(LCP_REGION); + viewEditPage.selectLcpRegion(LCP_REGION, CLOUD_OWNER); viewEditPage.selectTenant(TENANT); - vidBasePage.clickConfirmButtonInResumeDelete(); + vidBasePage.clickButtonByTestId(confirmButtonId); viewEditPage.assertMsoRequestModal(successMessage); viewEditPage.clickCommitCloseButton(); GeneralUIUtils.ultimateWait(); @@ -106,6 +120,28 @@ public class ViewEditServiceInstanceTest extends VidBaseTestCase { deleteInstance(Constants.ViewEdit.DELETE_VF_MODULE_BUTTON_TEST_ID + "aa", Constants.ViewEdit.VF_MODULE_DELETED_SUCCESSFULLY_TEXT); } + @FeatureTogglingTest(value = FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE) + @Test + public void softDeleteAndResumeVfModuleInstance_deleteDialogAppears_msoResponseIsOk() { + SimulatorApi.clearAll(); + String vfModuleName = "my_vfModule"; + BulkRegistration.deleteExistingVfModuleInstance("ACTIVE"); + deleteInstance(Constants.ViewEdit.DELETE_VF_MODULE_BUTTON_TEST_ID + vfModuleName, Constants.ViewEdit.VF_MODULE_DELETED_SUCCESSFULLY_TEXT, Constants.SOFT_DELETE_TESTS_ID); + BulkRegistration.resumeWithHomingDataVfModule("ACTIVE", "Assigned", vfModuleName); + navigateToViewEditPageOfuspVoiceVidTest444("7a6ee536-f052-46fa-aa7e-2fca9d674c44"); + viewEditPage.clickResumeButton(vfModuleName); + assertThat("Select lcp region shouldn't be display when homing data is presented", + GeneralUIUtils.getDriver().findElements(Get.getXpathForDataTestId(Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID)), + is(empty())); + assertThat("Select tenant shouldn't be display when homing data is presented", + GeneralUIUtils.getDriver().findElements(Get.getXpathForDataTestId(Constants.ViewEdit.TENANT_SELECT_TESTS_ID)), + is(empty())); + viewEditPage.clickConfirmButtonInResumeDelete(); + assertSuccessfulVFModuleCreation(); + viewEditPage.clickCommitCloseButton(); + GeneralUIUtils.ultimateWait(); + } + @Test public void deleteNetworkInstance_deleteDialogAppears_msoResponseIsOk() { SimulatorApi.clearAll(); @@ -147,12 +183,30 @@ public class ViewEditServiceInstanceTest extends VidBaseTestCase { viewEditPage.clickCloseButton(); } + @Test + public void testActivateServiceInstanceWithFabric() { + String orchStatus = "assiGNed"; + SimulatorApi.clearAll(); + BulkRegistration.searchExistingServiceInstanceWithFabric(orchStatus); + goToExistingInstanceById(serviceFabricInstanceId); + viewEditPage.assertButtonState(Constants.ViewEdit.DEACTIVATE_BUTTON_TEST_ID,false); + boolean flagIsActive = Features.FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS.isActive(); + if(flagIsActive) { + viewEditPage.assertButtonState(Constants.ViewEdit.ACTIVATE_FABRIC_CONFIGURATION_BUTTON_TEST_ID, true); + viewEditPage.clickActivateFabricConfigurationButton(); + viewEditPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT); + viewEditPage.clickCloseButton(); + } + } + private void assertAndCheckShowAssignmentsSdncUrl(String orchStatus, String serviceInstanceId) { boolean buttonIsEnable = Features.FLAG_SHOW_ASSIGNMENTS.isActive() && orchStatus.equals("assiGNed"); - viewEditPage.assertButtonState(Constants.ViewEdit.SHOW_ASSIGNMENTS_BUTTON_TEST_ID, buttonIsEnable); + boolean isNotDisplay = GeneralUIUtils.getDriver().findElements(Get.getXpathForDataTestId(Constants.ViewEdit.SHOW_ASSIGNMENTS_BUTTON_TEST_ID)).isEmpty(); + Assert.assertNotEquals(isNotDisplay, buttonIsEnable); + if (buttonIsEnable) { WebElement webElement = Get.byTestId(Constants.ViewEdit.SHOW_ASSIGNMENTS_BUTTON_TEST_ID); - String expectedUrl = "https://mtanjv9sdma51.aic.cip.att.com:8448/configAdapter/index#/resource_manager/"+serviceInstanceId; + String expectedUrl = "https://mtan.onap.org:8448/configAdapter/index#/resource_manager/"+serviceInstanceId; MatcherAssert.assertThat("Show assignments SDNC url is wrong", webElement.getAttribute("href"), equalTo(expectedUrl)); } @@ -358,13 +412,13 @@ public class ViewEditServiceInstanceTest extends VidBaseTestCase { "pending-delete", false); for(Map.Entry<String, Boolean> entry: vfModulesStatuses.entrySet()) { WebElement vfModule = GeneralUIUtils.getWebElementByClassName("vfModuleTreeNode-" + entry.getKey()); - Assert.assertEquals(!vfModule.findElements(By.className("resume")).isEmpty(), entry.getValue()); + Assert.assertEquals(isNonEmpty(vfModule.findElements(By.className("resume"))), entry.getValue()); } } @Before public void before() throws Exception { - User user = usersService.getUser(Constants.Users.USP_VOICE_VIRTUAL_USP); + User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); relogin(user.credentials); } diff --git a/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java b/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java new file mode 100644 index 000000000..724e68065 --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java @@ -0,0 +1,178 @@ +package vid.automation.test.test; + +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; +import static org.testng.AssertJUnit.assertTrue; +import static vid.automation.test.infra.ModelInfo.aLaCarteVnfGroupingService; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMultimap; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.UUID; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIFilterServiceInstanceById; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsGetSpecificService; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubDetailsWithoutInstancesGetSpecificService; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIModelsByInvariantIdGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOAddOrRemoveOneInstanceGroupMember; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteInstanceGroup; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.testng.annotations.Test; +import vid.automation.test.Constants; +import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Features; +import vid.automation.test.infra.Wait; +import vid.automation.test.sections.DrawingBoardPage; +import vid.automation.test.sections.VidBasePage; +import vid.automation.test.services.SimulatorApi; + +public class ViewEditWithDrawingBoardTest extends VidBaseTestCase { + private final String RELATED_VNF_UUID1 = "a9f1b136-11ed-471f-8d77-f123c7501a01"; + private final String RELATED_VNF_UUID2 = "963b67e1-079a-404e-abef-b745d770bd85"; + private final String RELATED_VNF_UUID3 = "5a34a4f4-81a4-4eed-871b-f0b1187160d4"; + private static final String MSO_COMPLETE_STATUS = "COMPLETE"; + private static final String COMPLETED = "COMPLETED"; + private String vnfGroupInstanceId; + private String vnfGroupInstanceName; + private String serviceInstanceName; + private String serviceInstanceId = "b9af7c1d-a2d7-4370-b747-1b266849ad32"; + String subscriberId = "e433710f-9217-458d-a79d-1c7aff376d89"; + String serviceType = "TYLER SILVIA"; + String serviceReqId = "3cf5ea96-6b34-4945-b5b1-4a7798b1caf2"; + + @FeatureTogglingTest(Features.FLAG_1902_VNF_GROUPING) + @Test + public void testDeleteVnfGroupWithMembers() { + + String vnf1Name = registerServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name(); + final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = ImmutableMap.of(SERVICE_NAME, serviceInstanceName); + + + List<BasePreset> presets = ImmutableList.of( + new PresetAAIGetSubscribersGet(), + new PresetAAIGetServicesGet(), + new PresetAAIFilterServiceInstanceById(subscriberId, serviceType, serviceInstanceId), + new PresetAAIGetSubDetailsGetSpecificService(subscriberId, serviceType, "Active", aLaCarteVnfGroupingService, serviceInstanceId), + new PresetAAIGetSubDetailsWithoutInstancesGetSpecificService(subscriberId, serviceType), + new PresetSDCGetServiceMetadataGet(aLaCarteVnfGroupingService), + new PresetSDCGetServiceToscaModelGet(aLaCarteVnfGroupingService), + new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService(names, 0, serviceReqId) + ); + + SimulatorApi.registerExpectationFromPresets(presets, APPEND); + registerMsoPreset(); + GeneralUIUtils.ultimateWait(); + goToExistingInstanceById(serviceInstanceId); + GeneralUIUtils.ultimateWait(); + + DrawingBoardPage drawingBoardPage = new DrawingBoardPage(); + drawingBoardPage.goToIframe(); + GeneralUIUtils.ultimateWait(); + hoverAndClickMenuByName(vnf1Name, "daeb6568-cef8-417f-9075-ed259ce59f48-groupingservicefortest..ResourceInstanceGroup..0", Constants.InstantiationStatus.CONTEXT_MENU_DELETE); + GeneralUIUtils.ultimateWait(); + drawingBoardPage.clickDeployButton(); + + + VidBasePage.goOutFromIframe(); + GeneralUIUtils.ultimateWait(); + drawingBoardPage.goToIframe(); + GeneralUIUtils.ultimateWait(); + + DrawingBoardPage.ServiceStatusChecker serviceStatusChecker = new DrawingBoardPage.ServiceStatusChecker(serviceInstanceName, Collections.singleton(COMPLETED)); + boolean statusIsShown = Wait.waitFor(serviceStatusChecker, null, 10, 1); + assertTrue("Service "+serviceInstanceName+" wasn't completed after in time", statusIsShown); + + } + + public void registerMsoPreset(){ + String vnfGroupRequestId = UUID.randomUUID().toString(); + String firstMemberRequestId = UUID.randomUUID().toString(); + String secondMemberRequestId = UUID.randomUUID().toString(); + String thirdMemberRequestId = UUID.randomUUID().toString(); + + List <PresetMSODeleteInstanceGroup> vnfGroupPreset = ImmutableList.of( + new PresetMSODeleteInstanceGroup(vnfGroupRequestId, vnfGroupInstanceId, getUserCredentials().getUserId())); + + List<PresetMSOAddOrRemoveOneInstanceGroupMember> instanceGroupMemberPreset = ImmutableList.of( + new PresetMSOAddOrRemoveOneInstanceGroupMember(vnfGroupInstanceId, "963b67e1-079a-404e-abef-b745d770bd85", getUserCredentials().getUserId(), firstMemberRequestId, PresetMSOAddOrRemoveOneInstanceGroupMember.InstanceGroupMemberAction.Remove), + new PresetMSOAddOrRemoveOneInstanceGroupMember(vnfGroupInstanceId, "a9f1b136-11ed-471f-8d77-f123c7501a01", getUserCredentials().getUserId(), secondMemberRequestId, PresetMSOAddOrRemoveOneInstanceGroupMember.InstanceGroupMemberAction.Remove), + new PresetMSOAddOrRemoveOneInstanceGroupMember(vnfGroupInstanceId, "5a34a4f4-81a4-4eed-871b-f0b1187160d4", getUserCredentials().getUserId(), thirdMemberRequestId, PresetMSOAddOrRemoveOneInstanceGroupMember.InstanceGroupMemberAction.Remove) + ); + + List<PresetMSOOrchestrationRequestGet> inProgressPresets = new ArrayList<>(); + inProgressPresets.add(new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, vnfGroupRequestId)); + inProgressPresets.add(new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, firstMemberRequestId)); + inProgressPresets.add(new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, secondMemberRequestId)); + inProgressPresets.add(new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, thirdMemberRequestId)); + + final ImmutableList.Builder<BasePreset> basePresetBuilder = new ImmutableList.Builder<>(); + basePresetBuilder + .addAll(instanceGroupMemberPreset) + .addAll(inProgressPresets) + .addAll(vnfGroupPreset); + List<BasePreset> presets = basePresetBuilder.build(); + registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.APPEND); + } + + + public String registerServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name() { + PresetAAIStandardQueryGet relatedVnf1 = + PresetAAIStandardQueryGet.ofVnf(RELATED_VNF_UUID1, "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "", ImmutableMultimap.of()); + + PresetAAIStandardQueryGet relatedVnf2 = + PresetAAIStandardQueryGet.ofVnf(RELATED_VNF_UUID2, "d6557200-ecf2-4641-8094-5393ae3aae60","d6557200-ecf2-4641-8094-5393ae3aae60", + "", ImmutableMultimap.of()); + + PresetAAIStandardQueryGet relatedVnf3 = + PresetAAIStandardQueryGet.ofVnf(RELATED_VNF_UUID3, "d6557200-ecf2-4641-8094-5393ae3aae60","d6557200-ecf2-4641-8094-5393ae3aae60", + "", ImmutableMultimap.of()); + + final PresetAAIStandardQueryGet vnfGroup1 = + PresetAAIStandardQueryGet.ofInstanceGroup("vnfGroup-type", "Teresa Bradley", + ImmutableMultimap.<String, String>builder() + .putAll("generic-vnf", relatedVnf1.getReqPath(), relatedVnf2.getReqPath(), relatedVnf3.getReqPath()) + .build() + ); + + final PresetAAIStandardQueryGet vnfGroup2 = + PresetAAIStandardQueryGet.ofInstanceGroup("vnfGroup-type", "Stanley Mccarthy", ImmutableMultimap.of()); + + final PresetAAIStandardQueryGet serviceInstance = + PresetAAIStandardQueryGet.ofServiceInstance(serviceInstanceId, aLaCarteVnfGroupingService.modelVersionId, aLaCarteVnfGroupingService.modelInvariantId, "e433710f-9217-458d-a79d-1c7aff376d89", "TYLER SILVIA", + ImmutableMultimap.<String, String>builder() + .putAll("instance-group", vnfGroup1.getReqPath(), vnfGroup2.getReqPath()) + .build() + ); + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + serviceInstance, + vnfGroup1,vnfGroup2, relatedVnf1, relatedVnf2, relatedVnf3, + new PresetAAIModelsByInvariantIdGet(ImmutableList.of(aLaCarteVnfGroupingService.modelInvariantId)), + new PresetGetSessionSlotCheckIntervalGet(), + new PresetAAIGetSubscribersGet(), + new PresetSDCGetServiceMetadataGet(aLaCarteVnfGroupingService), + new PresetSDCGetServiceToscaModelGet(aLaCarteVnfGroupingService) + ), CLEAR_THEN_SET); + + serviceInstanceName = serviceInstance.getInstanceName(); + vnfGroupInstanceName = vnfGroup1.getInstanceName(); + vnfGroupInstanceId = vnfGroup1.getInstanceId(); + return vnfGroupInstanceName; + } + + +} diff --git a/vid-automation/src/main/java/vid/automation/test/test/SubInterfaceTest.java b/vid-automation/src/main/java/vid/automation/test/test/VlanTagSubInterfaceTest.java index 59baaf776..3f8db2a94 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/SubInterfaceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/VlanTagSubInterfaceTest.java @@ -1,12 +1,27 @@ package vid.automation.test.test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AAIAIC25_TO_ATT_AIC; +import static org.testng.AssertJUnit.assertEquals; +import static vid.automation.test.infra.Features.FLAG_COLLECTION_RESOURCE_SUPPORT; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; +import static vid.automation.test.test.ALaCarteflowTest.AIC; + import com.google.common.collect.ImmutableList; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetRelatedInstanceGroupsByVnfId; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetTenants; -import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVNFInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfVlanTagging; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; -import org.openecomp.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.Select; import org.testng.Assert; @@ -19,49 +34,36 @@ import vid.automation.test.infra.FeatureTogglingTest; import vid.automation.test.infra.Get; import vid.automation.test.infra.SelectOption; import vid.automation.test.sections.SearchExistingPage; -import vid.automation.test.sections.ViewEditPage; +import vid.automation.test.sections.VidBasePage; import vid.automation.test.services.BulkRegistration; import vid.automation.test.services.SimulatorApi; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertNull; -import static vid.automation.test.infra.Features.FLAG_COLLECTION_RESOURCE_SUPPORT; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; - @FeatureTogglingTest(FLAG_COLLECTION_RESOURCE_SUPPORT) -public class SubInterfaceTest extends CreateInstanceDialogBaseTest { +public class VlanTagSubInterfaceTest extends CreateInstanceDialogBaseTest { - private final ViewEditPage viewEditPage = new ViewEditPage(); private final String ecompNamingFalseInstanceId = "dc3a893e-0104-4ef6-abfe-6c2932294a3e"; private final String ecompNamingTrueInstanceId = "dc3a893e-0104-4ef6-abfe-6c2932294a3f"; @BeforeClass protected void registerToSimulator() { SimulatorApi.clearAll(); - BulkRegistration.createNewServiceInstance("USP VOICE"); + BulkRegistration.createNewServiceInstance("SILVIA ROBBINS"); BulkRegistration.searchExistingVFServiceWithVFCInstanceGroupInstance("Created"); SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.APPEND , "add_subinterface/get_sdc_catalog_services_vid-test-333.json" - , "add_subinterface/aai_get_services.json" - , "add_subinterface/aai_get_subscribers.json" , "add_subinterface/aai_get_aic_zones.json" ); - final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion1 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("e433710f-9217-458d-a79d-1c7aff376d89", "mtn6", "untraaa"); - final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion2 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("e433710f-9217-458d-a79d-1c7aff376d89", "AAIAIC25", "untraaa"); + final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion1 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("irma-aic", "hvf6", "untraaa"); + final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion2 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("irma-aic", "JANET25", "untraaa"); SimulatorApi.registerExpectationFromPresets(ImmutableList.of( - new PresetMSOCreateVNFInstancePost(ecompNamingTrueInstanceId, "6bce7302-70bd-4057-b48e-8d5b99e686ca"), - new PresetMSOCreateVNFInstancePost(ecompNamingFalseInstanceId, "6bce7302-70bd-4057-b48e-8d5b99e686cb"), + new PresetAAIGetServicesGet(), + new PresetAAIGetSubscribersGet(), + new PresetMSOCreateVnfVlanTagging(ecompNamingTrueInstanceId, "6bce7302-70bd-4057-b48e-8d5b99e686ca", true), + new PresetMSOCreateVnfVlanTagging(ecompNamingFalseInstanceId, "6bce7302-70bd-4057-b48e-8d5b99e686cb", false), + PRESET_AAIAIC25_TO_ATT_AIC, new PresetAAIGetTenants(), presetAAIGetInstanceGroupsByCloudRegion1, presetAAIGetInstanceGroupsByCloudRegion2, @@ -77,17 +79,20 @@ public class SubInterfaceTest extends CreateInstanceDialogBaseTest { @DataProvider private Object[][] getServices() { - return new Object[][]{{ecompNamingTrueInstanceId, true}, {ecompNamingFalseInstanceId, false}}; + return new Object[][]{ + {ecompNamingTrueInstanceId}, + {ecompNamingFalseInstanceId} + }; } @Test(dataProvider = "getServices") - public void createSubInterface_validPopupDataAndUIEcompNamingTrue(String serviceUuid, boolean ecompNamingEnabled) { + public void createSubInterface_validPopupDataAndUI(String serviceUuid) { SearchExistingPage searchExistingPage = new SearchExistingPage(); - searchExistingPage.goOutFromIframe(); + VidBasePage.goOutFromIframe(); goToExistingInstanceById(serviceUuid); - String vnfName = "vDBE 0"; + String vnfName = "vDOROTHEA 0"; Assert.assertNotNull(Get.byClassAndText("instanceGroupTreeNode","instance group name")); GeneralUIUtils.clickOnElementByTestId(Constants.ViewEdit.ADD_VNF_BUTTON_TEST_ID, 60); GeneralUIUtils.clickOnElementByTestId(Constants.ViewEdit.VNF_OPTION_TEST_ID_PREFIX + vnfName, 60); @@ -97,17 +102,13 @@ public class SubInterfaceTest extends CreateInstanceDialogBaseTest { searchExistingPage.goToIframe(); WebElement instanceNameInput = GeneralUIUtils.getInputElement(Constants.INSTANCE_NAME_SELECT_TESTS_ID); - if (ecompNamingEnabled) { - assertNull(instanceNameInput); - } else { - instanceNameInput.sendKeys("New Name"); - } - SelectOption.byTestIdAndVisibleText("VIRTUAL USP", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); - SelectOption.byTestIdAndVisibleText("AAIAIC25", Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID); + instanceNameInput.sendKeys("NewName"); + SelectOption.byTestIdAndVisibleText("TYLER SILVIA", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); + viewEditPage.selectLcpRegion("JANET25", AIC); SelectOption.byTestIdAndVisibleText("USP-SIP-IC-24335-T-01", Constants.ViewEdit.TENANT_SELECT_TESTS_ID); SelectOption.byTestIdAndVisibleText("UUUAIAAI-YYY1", Constants.ViewEdit.AIC_ZONE_TEST_ID); - SelectOption.byTestIdAndVisibleText("plat1", Constants.OwningEntity.PLATFORM_SELECT_TEST_ID); - SelectOption.byTestIdAndVisibleText("ecomp", Constants.OwningEntity.LOB_SELECT_TEST_ID); + SelectOption.byTestIdAndVisibleText("xxx1", Constants.OwningEntity.PLATFORM_SELECT_TEST_ID); + SelectOption.byTestIdAndVisibleText("ONAP", Constants.OwningEntity.LOB_SELECT_TEST_ID); SelectOption.byTestIdAndVisibleText("Rollback", Constants.SUPPRESS_ROLLBACK_SELECT_TESTS_ID); @@ -177,7 +178,7 @@ public class SubInterfaceTest extends CreateInstanceDialogBaseTest { } Click.byTestId(Constants.ConfigurationCreation.NEXT_BUTTON_TEST_ID); - searchExistingPage.goOutFromIframe(); + VidBasePage.goOutFromIframe(); assertSuccessfulServiceInstanceCreation(); viewEditPage.clickCommitCloseButton(); } diff --git a/vid-automation/src/main/java/vid/automation/test/utils/CookieAndJsonHttpHeadersInterceptor.java b/vid-automation/src/main/java/vid/automation/test/utils/CookieAndJsonHttpHeadersInterceptor.java index 07fd3754e..c98b2428a 100644 --- a/vid-automation/src/main/java/vid/automation/test/utils/CookieAndJsonHttpHeadersInterceptor.java +++ b/vid-automation/src/main/java/vid/automation/test/utils/CookieAndJsonHttpHeadersInterceptor.java @@ -1,7 +1,7 @@ package vid.automation.test.utils; import org.junit.Assert; -import org.openecomp.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; import org.springframework.http.*; import org.springframework.http.client.ClientHttpRequestExecution; import org.springframework.http.client.ClientHttpRequestInterceptor; diff --git a/vid-automation/src/main/java/vid/automation/test/utils/DB_CONFIG.java b/vid-automation/src/main/java/vid/automation/test/utils/DB_CONFIG.java index ef5625232..717e2a746 100644 --- a/vid-automation/src/main/java/vid/automation/test/utils/DB_CONFIG.java +++ b/vid-automation/src/main/java/vid/automation/test/utils/DB_CONFIG.java @@ -1,8 +1,8 @@ package vid.automation.test.utils; public class DB_CONFIG { - public static String url = String.format("jdbc:mariadb://%s:%d/vid_openecomp_epsdk", - System.getProperty("DB_HOST", System.getProperty("VID_HOST", "127.0.0.1" )), + public static String url = String.format("jdbc:mariadb://%s:%d/vid_portal", + System.getProperty("DB_HOST", System.getProperty("VID_HOST", "10.0.0.10" )), Integer.valueOf(System.getProperty("DB_PORT", "3306")) ); public static String username = "euser"; diff --git a/vid-automation/src/main/java/vid/automation/test/utils/ExtendedHamcrestMatcher.java b/vid-automation/src/main/java/vid/automation/test/utils/ExtendedHamcrestMatcher.java new file mode 100644 index 000000000..b1c713f1e --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/utils/ExtendedHamcrestMatcher.java @@ -0,0 +1,24 @@ +package vid.automation.test.utils; + +import org.hamcrest.Matcher; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + +import static org.hamcrest.core.AllOf.allOf; +import static org.hamcrest.core.IsCollectionContaining.hasItem; + +public class ExtendedHamcrestMatcher { + + + //this method return matcher for has items that support collection as input (Instead of ...) + public static <T> Matcher<Iterable<T>> hasItemsFromCollection(Collection<T> items) { + List<Matcher<? super Iterable<T>>> all = new ArrayList<>(items.size()); + for (T element : items) { + all.add(hasItem(element)); + } + + return allOf(all); + } +} diff --git a/vid-automation/src/main/java/vid/automation/test/utils/ReadFile.java b/vid-automation/src/main/java/vid/automation/test/utils/ReadFile.java index 655cc20a6..1f6cd032b 100644 --- a/vid-automation/src/main/java/vid/automation/test/utils/ReadFile.java +++ b/vid-automation/src/main/java/vid/automation/test/utils/ReadFile.java @@ -3,7 +3,7 @@ package vid.automation.test.utils; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; -import org.openecomp.sdc.ci.tests.utilities.FileHandling; +import org.onap.sdc.ci.tests.utilities.FileHandling; import vid.automation.test.infra.Input; import java.io.IOException; diff --git a/vid-automation/src/main/java/vid/automation/test/utils/RegExMatcher.java b/vid-automation/src/main/java/vid/automation/test/utils/RegExMatcher.java new file mode 100644 index 000000000..c540cf5ea --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/utils/RegExMatcher.java @@ -0,0 +1,29 @@ +package vid.automation.test.utils; + +import org.hamcrest.Description; +import org.hamcrest.TypeSafeMatcher; + +public class RegExMatcher extends TypeSafeMatcher<String> { + + private final String regEx; + + public RegExMatcher(String regEx) { + this.regEx = regEx; + } + + + @Override + public void describeTo(Description description) { + description.appendText("matches regEx="+regEx); + } + + + @Override + protected boolean matchesSafely(String item) { + return item.matches(regEx); + } + + public static RegExMatcher matchesRegEx(final String regEx) { + return new RegExMatcher(regEx); + } +} diff --git a/vid-automation/src/main/java/vid/automation/test/utils/TestConfigurationHelper.java b/vid-automation/src/main/java/vid/automation/test/utils/TestConfigurationHelper.java index ae731dbc0..0b2978dda 100644 --- a/vid-automation/src/main/java/vid/automation/test/utils/TestConfigurationHelper.java +++ b/vid-automation/src/main/java/vid/automation/test/utils/TestConfigurationHelper.java @@ -6,13 +6,13 @@ public class TestConfigurationHelper { private TestConfigurationHelper(){} - public static org.openecomp.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { + public static org.onap.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { try { String envUrl = System.getProperty("ENV_URL"); boolean isCustomLogin = Boolean.parseBoolean(System.getProperty("CUSTOM_LOGIN")); - org.openecomp.sdc.ci.tests.datatypes.Configuration configuration = new org.openecomp.sdc.ci.tests.datatypes.Configuration(envUrl, isCustomLogin); + org.onap.sdc.ci.tests.datatypes.Configuration configuration = new org.onap.sdc.ci.tests.datatypes.Configuration(envUrl, isCustomLogin); String geckoDriverPath = System.getProperty("GECKO_PATH"); if(geckoDriverPath == null){ diff --git a/vid-automation/src/main/java/vid/automation/test/utils/TestHelper.java b/vid-automation/src/main/java/vid/automation/test/utils/TestHelper.java new file mode 100644 index 000000000..83876fa27 --- /dev/null +++ b/vid-automation/src/main/java/vid/automation/test/utils/TestHelper.java @@ -0,0 +1,15 @@ +package vid.automation.test.utils; + +import org.springframework.web.client.RestTemplate; + +import java.net.URI; + +public class TestHelper { + + public static String GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS = "getServiceModelsByDistributionStatus"; + public static String GET_TENANTS = "getTenants"; + + public static void resetAaiCache(String cacheName, RestTemplate restTemplate, URI vidUri) { + restTemplate.delete(vidUri + "/aai_reset_cache/"+cacheName); + } +} diff --git a/vid-automation/src/main/resources/META-INF/aop-ajc.xml b/vid-automation/src/main/resources/META-INF/aop-ajc.xml index 77505c753..7376e3291 100644 --- a/vid-automation/src/main/resources/META-INF/aop-ajc.xml +++ b/vid-automation/src/main/resources/META-INF/aop-ajc.xml @@ -1,2 +1,18 @@ <aspectj> + <aspects> + <aspect name="com.att.automation.common.report_portal_integration.aspects.StepAspects"/> + <aspect name="com.att.automation.common.report_portal_integration.aspects.WebDriverAspects"/> + <aspect name="com.att.automation.common.report_portal_integration.aspects.AssertAspects"/> + <aspect name="com.att.automation.common.report_portal_integration.aspects.WireMockAspects"/> + <aspect name="com.att.automation.common.report_portal_integration.aspects.RestAssuredAspects"/> + <aspect name="com.att.automation.common.report_portal_integration.aspects.ReportPortalAspects"/> + <aspect name="com.att.automation.common.report_portal_integration.aspects.LatticeAspects"/> + </aspects> + <weaver options="-Xset:weaveJavaxPackages=true -warn:none -Xlint:ignore"> + <include within="vid.automation..*"/> + <include within="org.onap..*"/> + <include within="com.att.automation..*"/> + <include within="com.epam..*"/> + <include within="org.testng.TestNG"/> + </weaver> </aspectj>
\ No newline at end of file diff --git a/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json b/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json new file mode 100644 index 000000000..b5b5aaefc --- /dev/null +++ b/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json @@ -0,0 +1 @@ +{"global":{"name":null,"flags":{"FLAG_NETWORK_TO_ASYNC_INSTANTIATION":false,"FLAG_SHOW_ASSIGNMENTS":true,"FLAG_DEFAULT_VNF":true,"FLAG_A_LA_CARTE_AUDIT_INFO":true,"FLAG_UNASSIGN_SERVICE":true,"FLAG_SHOW_VERIFY_SERVICE":true,"FLAG_ASYNC_ALACARTE_VFMODULE":false,"FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS":true,"FLAG_ASYNC_ALACARTE_VNF":true,"FLAG_COLLECTION_RESOURCE_SUPPORT":true,"FLAG_DUPLICATE_VNF":true,"FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF":true,"FLAG_SERVICE_MODEL_CACHE":true,"CREATE_INSTANCE_TEST":false,"FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD":true,"FLAG_ASYNC_INSTANTIATION":true,"FLAG_ASYNC_JOBS":true,"FLAG_SUPPLEMENTARY_FILE":true,"EMPTY_DRAWING_BOARD_TEST":false,"FLAG_ADD_MSO_TESTAPI_FIELD":true,"FLAG_5G_IN_NEW_INSTANTIATION_UI":true,"FLAG_RESTRICTED_SELECT":false,"FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS":true},"type":"[FLAGS] Update"},"service":{"serviceHierarchy":{"1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd":{"service":{"uuid":"1a80c596-27e5-4ca9-b5bb-e03a7fd4c0fd","invariantUuid":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0","name":"action-data","version":"1.0","toscaModelURL":null,"category":"Network L1-3","serviceType":"pnf","serviceRole":"Testing","description":"PASQUALE vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM","serviceEcompNaming":"false","instantiationType":"Macro","inputs":{},"vidNotions":{"instantiationUI":"legacy","modelCategory":"other"}},"vnfs":{"2017-388_PASQUALE-vPE 1":{"uuid":"0903e1c0-8e03-4936-b5c2-260653b96413","invariantUuid":"00beb8f9-6d39-452f-816d-c709b9cbb87d","description":"Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM","name":"2017-388_PASQUALE-vPE","version":"1.0","customizationUuid":"280dec31-f16d-488b-9668-4aae55d6648a","inputs":{},"commands":{},"properties":{"vmxvre_retype":"RE-VMX","vnf_config_template_version":"get_input:2017488_PASQUALEvpe0_vnf_config_template_version","sriov44_net_id":"48d399b3-11ee-48a8-94d2-f0ea94d6be8d","int_ctl_net_id":"2f323477-6936-4d01-ac53-d849430281d9","vmxvpfe_sriov41_0_port_mac":"00:11:22:EF:AC:DF","int_ctl_net_name":"VMX-INTXI","vmx_int_ctl_prefix":"10.0.0.10","sriov43_net_id":"da349ca1-6de9-4548-be88-2d88e99bfef5","sriov42_net_id":"760669ba-013d-4d9b-b0e7-4151fe2e6279","sriov41_net_id":"25ad52d5-c165-40f8-b3b0-ddfc2373280a","nf_type":"vPE","vmxvpfe_int_ctl_ip_1":"10.0.0.10","is_AVPN_service":"false","vmx_RSG_name":"vREXI-affinity","vmx_int_ctl_forwarding":"l2","vmxvre_oam_ip_0":"10.0.0.10","vmxvpfe_sriov44_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_sriov41_0_port_vlanstrip":"false","vmxvpfe_sriov42_0_port_vlanfilter":"4001","vmxvpfe_sriov44_0_port_unknownunicastallow":"true","vmxvre_image_name_0":"VRE-ENGINE_17.2-S2.1.qcow2","vmxvre_instance":"0","vmxvpfe_sriov43_0_port_mac":"00:11:22:EF:AC:DF","vmxvre_flavor_name":"ns.c1r16d32.v5","vmxvpfe_volume_size_0":"40.0","vmxvpfe_sriov43_0_port_vlanfilter":"4001","nf_naming":"{ecomp_generated_naming=true}","multi_stage_design":"true","nf_naming_code":"Navneet","vmxvre_name_0":"vREXI","vmxvpfe_sriov42_0_port_vlanstrip":"false","vmxvpfe_volume_name_0":"vPFEXI_FBVolume","vmx_RSG_id":"bd89a33c-13c3-4a04-8fde-1a57eb123141","vmxvpfe_image_name_0":"VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2","vmxvpfe_sriov43_0_port_unknownunicastallow":"true","vmxvpfe_sriov44_0_port_unknownmulticastallow":"true","vmxvre_console":"vidconsole","vmxvpfe_sriov44_0_port_vlanfilter":"4001","vmxvpfe_sriov42_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_volume_id_0":"47cede15-da2f-4397-a101-aa683220aff3","vmxvpfe_sriov42_0_port_unknownmulticastallow":"true","vmxvpfe_sriov44_0_port_vlanstrip":"false","vf_module_id":"123","nf_function":"JAI","vmxvpfe_sriov43_0_port_unknownmulticastallow":"true","vmxvre_int_ctl_ip_0":"10.0.0.10","ecomp_generated_naming":"true","AIC_CLLI":"get_input:2017488_PASQUALEvpe0_AIC_CLLI","vnf_name":"mtnj309me6vre","vmxvpfe_sriov41_0_port_unknownunicastallow":"true","vmxvre_volume_type_1":"HITACHI","vmxvpfe_sriov44_0_port_broadcastallow":"true","vmxvre_volume_type_0":"HITACHI","vmxvpfe_volume_type_0":"HITACHI","vmxvpfe_sriov43_0_port_broadcastallow":"true","bandwidth_units":"get_input:2017488_PASQUALEvpe0_bandwidth_units","vnf_id":"123","vmxvre_oam_prefix":"24","availability_zone_0":"mtpocfo-kvm-az01","ASN":"get_input:2017488_PASQUALEvpe0_ASN","vmxvre_chassis_i2cid":"161","vmxvpfe_name_0":"vPFEXI","bandwidth":"get_input:2017488_PASQUALEvpe0_bandwidth","availability_zone_max_count":"1","vmxvre_volume_size_0":"45.0","vmxvre_volume_size_1":"50.0","vmxvpfe_sriov42_0_port_broadcastallow":"true","vmxvre_oam_gateway":"10.0.0.10","vmxvre_volume_name_1":"vREXI_FAVolume","vmxvre_ore_present":"0","vmxvre_volume_name_0":"vREXI_FBVolume","vmxvre_type":"0","vnf_instance_name":"get_input:2017488_PASQUALEvpe0_vnf_instance_name","vmxvpfe_sriov41_0_port_unknownmulticastallow":"true","oam_net_id":"b95eeb1d-d55d-4827-abb4-8ebb94941429","vmx_int_ctl_len":"24","vmxvpfe_sriov43_0_port_vlanstrip":"false","vmxvpfe_sriov41_0_port_broadcastallow":"true","vmxvre_volume_id_1":"6e86797e-03cd-4fdc-ba72-2957119c746d","vmxvpfe_sriov41_0_port_vlanfilter":"4001","nf_role":"Testing","vmxvre_volume_id_0":"f4eacb79-f687-4e9d-b760-21847c8bb15a","vmxvpfe_sriov42_0_port_unknownunicastallow":"true","vmxvpfe_flavor_name":"ns.c20r16d25.v5"},"type":"VF","modelCustomizationName":"2017-388_PASQUALE-vPE 1","vfModules":{},"volumeGroups":{},"vfcInstanceGroups":{}},"2017-388_PASQUALE-vPE 0":{"uuid":"afacccf6-397d-45d6-b5ae-94c39734b168","invariantUuid":"72e465fe-71b1-4e7b-b5ed-9496118ff7a8","description":"Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM","name":"2017-388_PASQUALE-vPE","version":"4.0","customizationUuid":"b3c76f73-eeb5-4fb6-9d31-72a889f1811c","inputs":{},"commands":{},"properties":{"vmxvre_retype":"RE-VMX","vnf_config_template_version":"get_input:2017488_PASQUALEvpe0_vnf_config_template_version","sriov44_net_id":"48d399b3-11ee-48a8-94d2-f0ea94d6be8d","int_ctl_net_id":"2f323477-6936-4d01-ac53-d849430281d9","vmxvpfe_sriov41_0_port_mac":"00:11:22:EF:AC:DF","int_ctl_net_name":"VMX-INTXI","vmx_int_ctl_prefix":"10.0.0.10","sriov43_net_id":"da349ca1-6de9-4548-be88-2d88e99bfef5","sriov42_net_id":"760669ba-013d-4d9b-b0e7-4151fe2e6279","sriov41_net_id":"25ad52d5-c165-40f8-b3b0-ddfc2373280a","nf_type":"vPE","vmxvpfe_int_ctl_ip_1":"10.0.0.10","is_AVPN_service":"false","vmx_RSG_name":"vREXI-affinity","vmx_int_ctl_forwarding":"l2","vmxvre_oam_ip_0":"10.0.0.10","vmxvpfe_sriov44_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_sriov41_0_port_vlanstrip":"false","vmxvpfe_sriov42_0_port_vlanfilter":"4001","vmxvpfe_sriov44_0_port_unknownunicastallow":"true","vmxvre_image_name_0":"VRE-ENGINE_17.2-S2.1.qcow2","vmxvre_instance":"0","vmxvpfe_sriov43_0_port_mac":"00:11:22:EF:AC:DF","vmxvre_flavor_name":"ns.c1r16d32.v5","vmxvpfe_volume_size_0":"40.0","vmxvpfe_sriov43_0_port_vlanfilter":"4001","nf_naming":"{ecomp_generated_naming=true}","multi_stage_design":"true","nf_naming_code":"Navneet","vmxvre_name_0":"vREXI","vmxvpfe_sriov42_0_port_vlanstrip":"false","vmxvpfe_volume_name_0":"vPFEXI_FBVolume","vmx_RSG_id":"bd89a33c-13c3-4a04-8fde-1a57eb123141","vmxvpfe_image_name_0":"VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2","vmxvpfe_sriov43_0_port_unknownunicastallow":"true","vmxvpfe_sriov44_0_port_unknownmulticastallow":"true","vmxvre_console":"vidconsole","vmxvpfe_sriov44_0_port_vlanfilter":"4001","vmxvpfe_sriov42_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_volume_id_0":"47cede15-da2f-4397-a101-aa683220aff3","vmxvpfe_sriov42_0_port_unknownmulticastallow":"true","vmxvpfe_sriov44_0_port_vlanstrip":"false","vf_module_id":"123","nf_function":"JAI","vmxvpfe_sriov43_0_port_unknownmulticastallow":"true","vmxvre_int_ctl_ip_0":"10.0.0.10","ecomp_generated_naming":"true","AIC_CLLI":"get_input:2017488_PASQUALEvpe0_AIC_CLLI","vnf_name":"mtnj309me6vre","vmxvpfe_sriov41_0_port_unknownunicastallow":"true","vmxvre_volume_type_1":"HITACHI","vmxvpfe_sriov44_0_port_broadcastallow":"true","vmxvre_volume_type_0":"HITACHI","vmxvpfe_volume_type_0":"HITACHI","vmxvpfe_sriov43_0_port_broadcastallow":"true","bandwidth_units":"get_input:2017488_PASQUALEvpe0_bandwidth_units","vnf_id":"123","vmxvre_oam_prefix":"24","availability_zone_0":"mtpocfo-kvm-az01","ASN":"get_input:2017488_PASQUALEvpe0_ASN","vmxvre_chassis_i2cid":"161","vmxvpfe_name_0":"vPFEXI","bandwidth":"get_input:2017488_PASQUALEvpe0_bandwidth","availability_zone_max_count":"1","vmxvre_volume_size_0":"45.0","vmxvre_volume_size_1":"50.0","vmxvpfe_sriov42_0_port_broadcastallow":"true","vmxvre_oam_gateway":"10.0.0.10","vmxvre_volume_name_1":"vREXI_FAVolume","vmxvre_ore_present":"0","vmxvre_volume_name_0":"vREXI_FBVolume","vmxvre_type":"0","vnf_instance_name":"get_input:2017488_PASQUALEvpe0_vnf_instance_name","vmxvpfe_sriov41_0_port_unknownmulticastallow":"true","oam_net_id":"b95eeb1d-d55d-4827-abb4-8ebb94941429","vmx_int_ctl_len":"24","vmxvpfe_sriov43_0_port_vlanstrip":"false","vmxvpfe_sriov41_0_port_broadcastallow":"true","vmxvre_volume_id_1":"6e86797e-03cd-4fdc-ba72-2957119c746d","vmxvpfe_sriov41_0_port_vlanfilter":"4001","nf_role":"Testing","vmxvre_volume_id_0":"f4eacb79-f687-4e9d-b760-21847c8bb15a","vmxvpfe_sriov42_0_port_unknownunicastallow":"true","vmxvpfe_flavor_name":"ns.c20r16d25.v5"},"type":"VF","modelCustomizationName":"2017-388_PASQUALE-vPE 0","vfModules":{},"volumeGroups":{},"vfcInstanceGroups":{}},"2017-488_PASQUALE-vPE 0":{"uuid":"69e09f68-8b63-4cc9-b9ff-860960b5db09","invariantUuid":"72e465fe-71b1-4e7b-b5ed-9496118ff7a8","description":"Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM","name":"2017-488_PASQUALE-vPE","version":"5.0","customizationUuid":"1da7b585-5e61-4993-b95e-8e6606c81e45","inputs":{},"commands":{},"properties":{"vmxvre_retype":"RE-VMX","vnf_config_template_version":"get_input:2017488_PASQUALEvpe0_vnf_config_template_version","sriov44_net_id":"48d399b3-11ee-48a8-94d2-f0ea94d6be8d","int_ctl_net_id":"2f323477-6936-4d01-ac53-d849430281d9","vmxvpfe_sriov41_0_port_mac":"00:11:22:EF:AC:DF","int_ctl_net_name":"VMX-INTXI","vmx_int_ctl_prefix":"10.0.0.10","sriov43_net_id":"da349ca1-6de9-4548-be88-2d88e99bfef5","sriov42_net_id":"760669ba-013d-4d9b-b0e7-4151fe2e6279","sriov41_net_id":"25ad52d5-c165-40f8-b3b0-ddfc2373280a","nf_type":"vPE","vmxvpfe_int_ctl_ip_1":"10.0.0.10","is_AVPN_service":"false","vmx_RSG_name":"vREXI-affinity","vmx_int_ctl_forwarding":"l2","vmxvre_oam_ip_0":"10.0.0.10","vmxvpfe_sriov44_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_sriov41_0_port_vlanstrip":"false","vmxvpfe_sriov42_0_port_vlanfilter":"4001","vmxvpfe_sriov44_0_port_unknownunicastallow":"true","vmxvre_image_name_0":"VRE-ENGINE_17.2-S2.1.qcow2","vmxvre_instance":"0","vmxvpfe_sriov43_0_port_mac":"00:11:22:EF:AC:DF","vmxvre_flavor_name":"ns.c1r16d32.v5","vmxvpfe_volume_size_0":"40.0","vmxvpfe_sriov43_0_port_vlanfilter":"4001","nf_naming":"{ecomp_generated_naming=true}","multi_stage_design":"true","nf_naming_code":"Navneet","vmxvre_name_0":"vREXI","vmxvpfe_sriov42_0_port_vlanstrip":"false","vmxvpfe_volume_name_0":"vPFEXI_FBVolume","vmx_RSG_id":"bd89a33c-13c3-4a04-8fde-1a57eb123141","vmxvpfe_image_name_0":"VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2","vmxvpfe_sriov43_0_port_unknownunicastallow":"true","vmxvpfe_sriov44_0_port_unknownmulticastallow":"true","vmxvre_console":"vidconsole","vmxvpfe_sriov44_0_port_vlanfilter":"4001","vmxvpfe_sriov42_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_volume_id_0":"47cede15-da2f-4397-a101-aa683220aff3","vmxvpfe_sriov42_0_port_unknownmulticastallow":"true","vmxvpfe_sriov44_0_port_vlanstrip":"false","vf_module_id":"123","nf_function":"JAI","vmxvpfe_sriov43_0_port_unknownmulticastallow":"true","vmxvre_int_ctl_ip_0":"10.0.0.10","ecomp_generated_naming":"true","AIC_CLLI":"get_input:2017488_PASQUALEvpe0_AIC_CLLI","vnf_name":"mtnj309me6vre","vmxvpfe_sriov41_0_port_unknownunicastallow":"true","vmxvre_volume_type_1":"HITACHI","vmxvpfe_sriov44_0_port_broadcastallow":"true","vmxvre_volume_type_0":"HITACHI","vmxvpfe_volume_type_0":"HITACHI","vmxvpfe_sriov43_0_port_broadcastallow":"true","bandwidth_units":"get_input:2017488_PASQUALEvpe0_bandwidth_units","vnf_id":"123","vmxvre_oam_prefix":"24","availability_zone_0":"mtpocfo-kvm-az01","ASN":"get_input:2017488_PASQUALEvpe0_ASN","vmxvre_chassis_i2cid":"161","vmxvpfe_name_0":"vPFEXI","bandwidth":"get_input:2017488_PASQUALEvpe0_bandwidth","availability_zone_max_count":"1","vmxvre_volume_size_0":"45.0","vmxvre_volume_size_1":"50.0","vmxvpfe_sriov42_0_port_broadcastallow":"true","vmxvre_oam_gateway":"10.0.0.10","vmxvre_volume_name_1":"vREXI_FAVolume","vmxvre_ore_present":"0","vmxvre_volume_name_0":"vREXI_FBVolume","vmxvre_type":"0","vnf_instance_name":"get_input:2017488_PASQUALEvpe0_vnf_instance_name","vmxvpfe_sriov41_0_port_unknownmulticastallow":"true","oam_net_id":"b95eeb1d-d55d-4827-abb4-8ebb94941429","vmx_int_ctl_len":"24","vmxvpfe_sriov43_0_port_vlanstrip":"false","vmxvpfe_sriov41_0_port_broadcastallow":"true","vmxvre_volume_id_1":"6e86797e-03cd-4fdc-ba72-2957119c746d","vmxvpfe_sriov41_0_port_vlanfilter":"4001","nf_role":"Testing","vmxvre_volume_id_0":"f4eacb79-f687-4e9d-b760-21847c8bb15a","vmxvpfe_sriov42_0_port_unknownunicastallow":"true","vmxvpfe_flavor_name":"ns.c20r16d25.v5"},"type":"VF","modelCustomizationName":"2017-488_PASQUALE-vPE 0","vfModules":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","invariantUuid":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","customizationUuid":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vRE_BV","baseModule":false},"inputs":{},"volumeGroupAllowed":true},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0":{"uuid":"f8360508-3f17-4414-a2ed-6bc71161e8db","invariantUuid":"b34833bb-6aa9-4ad6-a831-70b06367a091","customizationUuid":"a55961b2-2065-4ab0-a5b7-2fcee1c227e3","description":null,"name":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","version":"5","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","properties":{"minCountInstances":1,"maxCountInstances":1,"initialCount":1,"vfModuleLabel":"PASQUALE_base_vPE_BV","baseModule":true},"inputs":{},"volumeGroupAllowed":false},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2":{"uuid":"0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a","invariantUuid":"eff8cc59-53a1-4101-aed7-8cf24ecf8339","customizationUuid":"3cd946bb-50e0-40d8-96d3-c9023520b557","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vPFE_BV","baseModule":false},"inputs":{},"volumeGroupAllowed":true}},"volumeGroups":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","invariantUuid":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","customizationUuid":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vRE_BV","baseModule":false},"inputs":{}},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2":{"uuid":"0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a","invariantUuid":"eff8cc59-53a1-4101-aed7-8cf24ecf8339","customizationUuid":"3cd946bb-50e0-40d8-96d3-c9023520b557","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vPFE_BV","baseModule":false},"inputs":{}}},"vfcInstanceGroups":{}}},"networks":{},"collectionResource":{},"configurations":{},"fabricConfigurations":{},"serviceProxies":{},"vfModules":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","invariantUuid":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","customizationUuid":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vRE_BV","baseModule":false},"inputs":{},"volumeGroupAllowed":true},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0":{"uuid":"f8360508-3f17-4414-a2ed-6bc71161e8db","invariantUuid":"b34833bb-6aa9-4ad6-a831-70b06367a091","customizationUuid":"a55961b2-2065-4ab0-a5b7-2fcee1c227e3","description":null,"name":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","version":"5","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","properties":{"minCountInstances":1,"maxCountInstances":1,"initialCount":1,"vfModuleLabel":"PASQUALE_base_vPE_BV","baseModule":true},"inputs":{},"volumeGroupAllowed":false},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2":{"uuid":"0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a","invariantUuid":"eff8cc59-53a1-4101-aed7-8cf24ecf8339","customizationUuid":"3cd946bb-50e0-40d8-96d3-c9023520b557","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vPFE_BV","baseModule":false},"inputs":{},"volumeGroupAllowed":true}},"volumeGroups":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","invariantUuid":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","customizationUuid":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vRE_BV","baseModule":false},"inputs":{}},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2":{"uuid":"0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a","invariantUuid":"eff8cc59-53a1-4101-aed7-8cf24ecf8339","customizationUuid":"3cd946bb-50e0-40d8-96d3-c9023520b557","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vPFE_BV","baseModule":false},"inputs":{}}},"pnfs":{}},"6b528779-44a3-4472-bdff-9cd15ec93450":{"service":{"uuid":"6b528779-44a3-4472-bdff-9cd15ec93450","invariantUuid":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0","name":"action-data","version":"1.0","toscaModelURL":null,"category":"","serviceType":"","serviceRole":"","description":"","serviceEcompNaming":"false","instantiationType":"Macro","inputs":{"2017488_PASQUALEvpe0_ASN":{"type":"string","description":"AV/PE","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"AV_vPE"}},"vidNotions":{"instantiationUI":"legacy","modelCategory":"other"}},"vnfs":{"2017-388_PASQUALE-vPE 1":{"uuid":"0903e1c0-8e03-4936-b5c2-260653b96413","invariantUuid":"00beb8f9-6d39-452f-816d-c709b9cbb87d","description":"Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM","name":"2017-388_PASQUALE-vPE","version":"1.0","customizationUuid":"280dec31-f16d-488b-9668-4aae55d6648a","inputs":{"vnf_config_template_version":{"type":"string","description":"VPE Software Version","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"17.2"},"bandwidth_units":{"type":"string","description":"Units of bandwidth","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"Gbps"},"bandwidth":{"type":"string","description":"Requested VPE bandwidth","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"10"},"AIC_CLLI":{"type":"string","description":"AIC Site CLLI","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"ATLMY8GA"},"ASN":{"type":"string","description":"AV/PE","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"AV_vPE"},"vnf_instance_name":{"type":"string","description":"The hostname assigned to the vpe.","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"mtnj309me6"}},"commands":{"vnf_config_template_version":{"displayName":"vnf_config_template_version","command":"get_input","inputName":"2017488_PASQUALEvpe0_vnf_config_template_version"},"bandwidth_units":{"displayName":"bandwidth_units","command":"get_input","inputName":"PASQUALEvpe0_bandwidth_units"},"bandwidth":{"displayName":"bandwidth","command":"get_input","inputName":"PASQUALEvpe0_bandwidth"},"AIC_CLLI":{"displayName":"AIC_CLLI","command":"get_input","inputName":"2017488_PASQUALEvpe0_AIC_CLLI"},"ASN":{"displayName":"ASN","command":"get_input","inputName":"2017488_PASQUALEvpe0_ASN"},"vnf_instance_name":{"displayName":"vnf_instance_name","command":"get_input","inputName":"2017488_PASQUALEvpe0_vnf_instance_name"}},"properties":{"vmxvre_retype":"RE-VMX","vnf_config_template_version":"get_input:2017488_PASQUALEvpe0_vnf_config_template_version","sriov44_net_id":"48d399b3-11ee-48a8-94d2-f0ea94d6be8d","int_ctl_net_id":"2f323477-6936-4d01-ac53-d849430281d9","vmxvpfe_sriov41_0_port_mac":"00:11:22:EF:AC:DF","int_ctl_net_name":"VMX-INTXI","vmx_int_ctl_prefix":"10.0.0.10","sriov43_net_id":"da349ca1-6de9-4548-be88-2d88e99bfef5","sriov42_net_id":"760669ba-013d-4d9b-b0e7-4151fe2e6279","sriov41_net_id":"25ad52d5-c165-40f8-b3b0-ddfc2373280a","nf_type":"vPE","vmxvpfe_int_ctl_ip_1":"10.0.0.10","is_AVPN_service":"false","vmx_RSG_name":"vREXI-affinity","vmx_int_ctl_forwarding":"l2","vmxvre_oam_ip_0":"10.0.0.10","vmxvpfe_sriov44_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_sriov41_0_port_vlanstrip":"false","vmxvpfe_sriov42_0_port_vlanfilter":"4001","vmxvpfe_sriov44_0_port_unknownunicastallow":"true","vmxvre_image_name_0":"VRE-ENGINE_17.2-S2.1.qcow2","vmxvre_instance":"0","vmxvpfe_sriov43_0_port_mac":"00:11:22:EF:AC:DF","vmxvre_flavor_name":"ns.c1r16d32.v5","vmxvpfe_volume_size_0":"40.0","vmxvpfe_sriov43_0_port_vlanfilter":"4001","nf_naming":"{ecomp_generated_naming=false}","nf_naming_code":"Navneet","vmxvre_name_0":"vREXI","vmxvpfe_sriov42_0_port_vlanstrip":"false","vmxvpfe_volume_name_0":"vPFEXI_FBVolume","vmx_RSG_id":"bd89a33c-13c3-4a04-8fde-1a57eb123141","vmxvpfe_image_name_0":"VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2","vmxvpfe_sriov43_0_port_unknownunicastallow":"true","vmxvpfe_sriov44_0_port_unknownmulticastallow":"true","vmxvre_console":"vidconsole","vmxvpfe_sriov44_0_port_vlanfilter":"4001","vmxvpfe_sriov42_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_volume_id_0":"47cede15-da2f-4397-a101-aa683220aff3","vmxvpfe_sriov42_0_port_unknownmulticastallow":"true","vmxvpfe_sriov44_0_port_vlanstrip":"false","vf_module_id":"123","nf_function":"JAI","vmxvpfe_sriov43_0_port_unknownmulticastallow":"true","vmxvre_int_ctl_ip_0":"10.0.0.10","ecomp_generated_naming":"false","AIC_CLLI":"get_input:2017488_PASQUALEvpe0_AIC_CLLI","vnf_name":"mtnj309me6vre","vmxvpfe_sriov41_0_port_unknownunicastallow":"true","vmxvre_volume_type_1":"HITACHI","vmxvpfe_sriov44_0_port_broadcastallow":"true","vmxvre_volume_type_0":"HITACHI","vmxvpfe_volume_type_0":"HITACHI","vmxvpfe_sriov43_0_port_broadcastallow":"true","bandwidth_units":"get_input:PASQUALEvpe0_bandwidth_units","vnf_id":"123","vmxvre_oam_prefix":"24","availability_zone_0":"mtpocfo-kvm-az01","ASN":"get_input:2017488_PASQUALEvpe0_ASN","vmxvre_chassis_i2cid":"161","vmxvpfe_name_0":"vPFEXI","bandwidth":"get_input:PASQUALEvpe0_bandwidth","availability_zone_max_count":"1","vmxvre_volume_size_0":"45.0","vmxvre_volume_size_1":"50.0","vmxvpfe_sriov42_0_port_broadcastallow":"true","vmxvre_oam_gateway":"10.0.0.10","vmxvre_volume_name_1":"vREXI_FAVolume","vmxvre_ore_present":"0","vmxvre_volume_name_0":"vREXI_FBVolume","vmxvre_type":"0","vnf_instance_name":"get_input:2017488_PASQUALEvpe0_vnf_instance_name","vmxvpfe_sriov41_0_port_unknownmulticastallow":"true","oam_net_id":"b95eeb1d-d55d-4827-abb4-8ebb94941429","vmx_int_ctl_len":"24","vmxvpfe_sriov43_0_port_vlanstrip":"false","vmxvpfe_sriov41_0_port_broadcastallow":"true","vmxvre_volume_id_1":"6e86797e-03cd-4fdc-ba72-2957119c746d","vmxvpfe_sriov41_0_port_vlanfilter":"4001","nf_role":"Testing","vmxvre_volume_id_0":"f4eacb79-f687-4e9d-b760-21847c8bb15a","vmxvpfe_sriov42_0_port_unknownunicastallow":"true","vmxvpfe_flavor_name":"ns.c20r16d25.v5"},"type":"VF","modelCustomizationName":"2017-388_PASQUALE-vPE 1","vfModules":{},"volumeGroups":{},"vfcInstanceGroups":{}},"2017-388_PASQUALE-vPE 0":{"uuid":"afacccf6-397d-45d6-b5ae-94c39734b168","invariantUuid":"72e465fe-71b1-4e7b-b5ed-9496118ff7a8","description":"Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM","name":"2017-388_PASQUALE-vPE","version":"4.0","customizationUuid":"b3c76f73-eeb5-4fb6-9d31-72a889f1811c","inputs":{"vnf_config_template_version":{"type":"string","description":"VPE Software Version","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"17.2"},"bandwidth_units":{"type":"string","description":"Units of bandwidth","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"Gbps"},"bandwidth":{"type":"string","description":"Requested VPE bandwidth","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"10"},"AIC_CLLI":{"type":"string","description":"AIC Site CLLI","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"ATLMY8GA"},"ASN":{"type":"string","description":"AV/PE","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"AV_vPE"},"vnf_instance_name":{"type":"string","description":"The hostname assigned to the vpe.","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"mtnj309me6"}},"commands":{"vnf_config_template_version":{"displayName":"vnf_config_template_version","command":"get_input","inputName":"2017488_PASQUALEvpe0_vnf_config_template_version"},"bandwidth_units":{"displayName":"bandwidth_units","command":"get_input","inputName":"PASQUALEvpe0_bandwidth_units"},"bandwidth":{"displayName":"bandwidth","command":"get_input","inputName":"PASQUALEvpe0_bandwidth"},"AIC_CLLI":{"displayName":"AIC_CLLI","command":"get_input","inputName":"2017488_PASQUALEvpe0_AIC_CLLI"},"ASN":{"displayName":"ASN","command":"get_input","inputName":"2017488_PASQUALEvpe0_ASN"},"vnf_instance_name":{"displayName":"vnf_instance_name","command":"get_input","inputName":"2017488_PASQUALEvpe0_vnf_instance_name"}},"properties":{"vmxvre_retype":"RE-VMX","vnf_config_template_version":"get_input:2017488_PASQUALEvpe0_vnf_config_template_version","sriov44_net_id":"48d399b3-11ee-48a8-94d2-f0ea94d6be8d","int_ctl_net_id":"2f323477-6936-4d01-ac53-d849430281d9","vmxvpfe_sriov41_0_port_mac":"00:11:22:EF:AC:DF","int_ctl_net_name":"VMX-INTXI","vmx_int_ctl_prefix":"10.0.0.10","sriov43_net_id":"da349ca1-6de9-4548-be88-2d88e99bfef5","sriov42_net_id":"760669ba-013d-4d9b-b0e7-4151fe2e6279","sriov41_net_id":"25ad52d5-c165-40f8-b3b0-ddfc2373280a","nf_type":"vPE","vmxvpfe_int_ctl_ip_1":"10.0.0.10","is_AVPN_service":"false","vmx_RSG_name":"vREXI-affinity","vmx_int_ctl_forwarding":"l2","vmxvre_oam_ip_0":"10.0.0.10","vmxvpfe_sriov44_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_sriov41_0_port_vlanstrip":"false","vmxvpfe_sriov42_0_port_vlanfilter":"4001","vmxvpfe_sriov44_0_port_unknownunicastallow":"true","vmxvre_image_name_0":"VRE-ENGINE_17.2-S2.1.qcow2","vmxvre_instance":"0","vmxvpfe_sriov43_0_port_mac":"00:11:22:EF:AC:DF","vmxvre_flavor_name":"ns.c1r16d32.v5","vmxvpfe_volume_size_0":"40.0","vmxvpfe_sriov43_0_port_vlanfilter":"4001","nf_naming":"{ecomp_generated_naming=false}","nf_naming_code":"Navneet","vmxvre_name_0":"vREXI","vmxvpfe_sriov42_0_port_vlanstrip":"false","vmxvpfe_volume_name_0":"vPFEXI_FBVolume","vmx_RSG_id":"bd89a33c-13c3-4a04-8fde-1a57eb123141","vmxvpfe_image_name_0":"VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2","vmxvpfe_sriov43_0_port_unknownunicastallow":"true","vmxvpfe_sriov44_0_port_unknownmulticastallow":"true","vmxvre_console":"vidconsole","vmxvpfe_sriov44_0_port_vlanfilter":"4001","vmxvpfe_sriov42_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_volume_id_0":"47cede15-da2f-4397-a101-aa683220aff3","vmxvpfe_sriov42_0_port_unknownmulticastallow":"true","min_instances":"1","vmxvpfe_sriov44_0_port_vlanstrip":"false","vf_module_id":"123","nf_function":"JAI","vmxvpfe_sriov43_0_port_unknownmulticastallow":"true","vmxvre_int_ctl_ip_0":"10.0.0.10","ecomp_generated_naming":"false","AIC_CLLI":"get_input:2017488_PASQUALEvpe0_AIC_CLLI","vnf_name":"mtnj309me6vre","vmxvpfe_sriov41_0_port_unknownunicastallow":"true","vmxvre_volume_type_1":"HITACHI","vmxvpfe_sriov44_0_port_broadcastallow":"true","vmxvre_volume_type_0":"HITACHI","vmxvpfe_volume_type_0":"HITACHI","vmxvpfe_sriov43_0_port_broadcastallow":"true","bandwidth_units":"get_input:PASQUALEvpe0_bandwidth_units","vnf_id":"123","vmxvre_oam_prefix":"24","availability_zone_0":"mtpocfo-kvm-az01","ASN":"get_input:2017488_PASQUALEvpe0_ASN","vmxvre_chassis_i2cid":"161","vmxvpfe_name_0":"vPFEXI","bandwidth":"get_input:PASQUALEvpe0_bandwidth","availability_zone_max_count":"1","vmxvre_volume_size_0":"45.0","vmxvre_volume_size_1":"50.0","vmxvpfe_sriov42_0_port_broadcastallow":"true","vmxvre_oam_gateway":"10.0.0.10","vmxvre_volume_name_1":"vREXI_FAVolume","vmxvre_ore_present":"0","vmxvre_volume_name_0":"vREXI_FBVolume","vmxvre_type":"0","vnf_instance_name":"get_input:2017488_PASQUALEvpe0_vnf_instance_name","vmxvpfe_sriov41_0_port_unknownmulticastallow":"true","oam_net_id":"b95eeb1d-d55d-4827-abb4-8ebb94941429","vmx_int_ctl_len":"24","vmxvpfe_sriov43_0_port_vlanstrip":"false","vmxvpfe_sriov41_0_port_broadcastallow":"true","vmxvre_volume_id_1":"6e86797e-03cd-4fdc-ba72-2957119c746d","vmxvpfe_sriov41_0_port_vlanfilter":"4001","nf_role":"Testing","vmxvre_volume_id_0":"f4eacb79-f687-4e9d-b760-21847c8bb15a","vmxvpfe_sriov42_0_port_unknownunicastallow":"true","vmxvpfe_flavor_name":"ns.c20r16d25.v5"},"type":"VF","modelCustomizationName":"2017-388_PASQUALE-vPE 0","vfModules":{},"volumeGroups":{},"vfcInstanceGroups":{}},"2017-488_PASQUALE-vPE 0":{"uuid":"69e09f68-8b63-4cc9-b9ff-860960b5db09","invariantUuid":"72e465fe-71b1-4e7b-b5ed-9496118ff7a8","description":"Name PASQUALE vPE Description The provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM","name":"2017-488_PASQUALE-vPE","version":"5.0","customizationUuid":"1da7b585-5e61-4993-b95e-8e6606c81e45","inputs":{"vnf_config_template_version":{"type":"string","description":"VPE Software Version","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"17.2"},"bandwidth_units":{"type":"string","description":"Units of bandwidth","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"Gbps"},"bandwidth":{"type":"string","description":"Requested VPE bandwidth","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"10"},"AIC_CLLI":{"type":"string","description":"AIC Site CLLI","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"ATLMY8GA"},"ASN":{"type":"string","description":"AV/PE","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"AV_vPE"},"vnf_instance_name":{"type":"string","description":"The hostname assigned to the vpe.","entry_schema":null,"inputProperties":null,"constraints":[],"required":true,"default":"mtnj309me6"}},"commands":{"vnf_config_template_version":{"displayName":"vnf_config_template_version","command":"get_input","inputName":"2017488_PASQUALEvpe0_vnf_config_template_version"},"bandwidth_units":{"displayName":"bandwidth_units","command":"get_input","inputName":"PASQUALEvpe0_bandwidth_units"},"bandwidth":{"displayName":"bandwidth","command":"get_input","inputName":"PASQUALEvpe0_bandwidth"},"AIC_CLLI":{"displayName":"AIC_CLLI","command":"get_input","inputName":"2017488_PASQUALEvpe0_AIC_CLLI"},"ASN":{"displayName":"ASN","command":"get_input","inputName":"2017488_PASQUALEvpe0_ASN"},"vnf_instance_name":{"displayName":"vnf_instance_name","command":"get_input","inputName":"2017488_PASQUALEvpe0_vnf_instance_name"}},"properties":{"vmxvre_retype":"RE-VMX","vnf_config_template_version":"get_input:2017488_PASQUALEvpe0_vnf_config_template_version","sriov44_net_id":"48d399b3-11ee-48a8-94d2-f0ea94d6be8d","int_ctl_net_id":"2f323477-6936-4d01-ac53-d849430281d9","vmxvpfe_sriov41_0_port_mac":"00:11:22:EF:AC:DF","int_ctl_net_name":"VMX-INTXI","vmx_int_ctl_prefix":"10.0.0.10","sriov43_net_id":"da349ca1-6de9-4548-be88-2d88e99bfef5","sriov42_net_id":"760669ba-013d-4d9b-b0e7-4151fe2e6279","sriov41_net_id":"25ad52d5-c165-40f8-b3b0-ddfc2373280a","nf_type":"vPE","vmxvpfe_int_ctl_ip_1":"10.0.0.10","is_AVPN_service":"false","vmx_RSG_name":"vREXI-affinity","vmx_int_ctl_forwarding":"l2","vmxvre_oam_ip_0":"10.0.0.10","vmxvpfe_sriov44_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_sriov41_0_port_vlanstrip":"false","vmxvpfe_sriov42_0_port_vlanfilter":"4001","vmxvpfe_sriov44_0_port_unknownunicastallow":"true","vmxvre_image_name_0":"VRE-ENGINE_17.2-S2.1.qcow2","vmxvre_instance":"0","vmxvpfe_sriov43_0_port_mac":"00:11:22:EF:AC:DF","vmxvre_flavor_name":"ns.c1r16d32.v5","vmxvpfe_volume_size_0":"40.0","vmxvpfe_sriov43_0_port_vlanfilter":"4001","nf_naming":"{ecomp_generated_naming=false}","nf_naming_code":"Navneet","vmxvre_name_0":"vREXI","vmxvpfe_sriov42_0_port_vlanstrip":"false","vmxvpfe_volume_name_0":"vPFEXI_FBVolume","max_instances":"3","vmx_RSG_id":"bd89a33c-13c3-4a04-8fde-1a57eb123141","vmxvpfe_image_name_0":"VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2","vmxvpfe_sriov43_0_port_unknownunicastallow":"true","vmxvpfe_sriov44_0_port_unknownmulticastallow":"true","vmxvre_console":"vidconsole","vmxvpfe_sriov44_0_port_vlanfilter":"4001","vmxvpfe_sriov42_0_port_mac":"00:11:22:EF:AC:DF","vmxvpfe_volume_id_0":"47cede15-da2f-4397-a101-aa683220aff3","vmxvpfe_sriov42_0_port_unknownmulticastallow":"true","min_instances":"1","vmxvpfe_sriov44_0_port_vlanstrip":"false","vf_module_id":"123","nf_function":"JAI","vmxvpfe_sriov43_0_port_unknownmulticastallow":"true","vmxvre_int_ctl_ip_0":"10.0.0.10","ecomp_generated_naming":"false","AIC_CLLI":"get_input:2017488_PASQUALEvpe0_AIC_CLLI","vnf_name":"mtnj309me6vre","vmxvpfe_sriov41_0_port_unknownunicastallow":"true","vmxvre_volume_type_1":"HITACHI","vmxvpfe_sriov44_0_port_broadcastallow":"true","vmxvre_volume_type_0":"HITACHI","vmxvpfe_volume_type_0":"HITACHI","vmxvpfe_sriov43_0_port_broadcastallow":"true","bandwidth_units":"get_input:PASQUALEvpe0_bandwidth_units","vnf_id":"123","vmxvre_oam_prefix":"24","availability_zone_0":"mtpocfo-kvm-az01","ASN":"get_input:2017488_PASQUALEvpe0_ASN","vmxvre_chassis_i2cid":"161","vmxvpfe_name_0":"vPFEXI","bandwidth":"get_input:PASQUALEvpe0_bandwidth","availability_zone_max_count":"1","vmxvre_volume_size_0":"45.0","vmxvre_volume_size_1":"50.0","vmxvpfe_sriov42_0_port_broadcastallow":"true","vmxvre_oam_gateway":"10.0.0.10","vmxvre_volume_name_1":"vREXI_FAVolume","vmxvre_ore_present":"0","vmxvre_volume_name_0":"vREXI_FBVolume","vmxvre_type":"0","vnf_instance_name":"get_input:2017488_PASQUALEvpe0_vnf_instance_name","vmxvpfe_sriov41_0_port_unknownmulticastallow":"true","oam_net_id":"b95eeb1d-d55d-4827-abb4-8ebb94941429","vmx_int_ctl_len":"24","vmxvpfe_sriov43_0_port_vlanstrip":"false","vmxvpfe_sriov41_0_port_broadcastallow":"true","vmxvre_volume_id_1":"6e86797e-03cd-4fdc-ba72-2957119c746d","vmxvpfe_sriov41_0_port_vlanfilter":"4001","nf_role":"Testing","vmxvre_volume_id_0":"f4eacb79-f687-4e9d-b760-21847c8bb15a","vmxvpfe_sriov42_0_port_unknownunicastallow":"true","vmxvpfe_flavor_name":"ns.c20r16d25.v5"},"type":"VF","modelCustomizationName":"2017-488_PASQUALE-vPE 0","vfModules":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","invariantUuid":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","customizationUuid":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vRE_BV","baseModule":false},"inputs":{"vnf_config_template_version":{"type":"string","description":"VPE Software Version","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"vnf_config_template_version"},"fromInputName":"2017488_PASQUALEvpe0_vnf_config_template_version","constraints":null,"required":true,"default":"17.2"},"bandwidth_units":{"type":"string","description":"Units of bandwidth","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"bandwidth_units"},"fromInputName":"PASQUALEvpe0_bandwidth_units","constraints":null,"required":true,"default":"Gbps"},"bandwidth":{"type":"string","description":"Requested VPE bandwidth","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"bandwidth"},"fromInputName":"PASQUALEvpe0_bandwidth","constraints":null,"required":true,"default":"10"},"AIC_CLLI":{"type":"string","description":"AIC Site CLLI","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"AIC_CLLI"},"fromInputName":"2017488_PASQUALEvpe0_AIC_CLLI","constraints":null,"required":true,"default":"ATLMY8GA"},"vnf_instance_name":{"type":"string","description":"The hostname assigned to the vpe.","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"vnf_instance_name"},"fromInputName":"2017488_PASQUALEvpe0_vnf_instance_name","constraints":null,"required":true,"default":"mtnj309me6"}},"volumeGroupAllowed":true},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0":{"uuid":"f8360508-3f17-4414-a2ed-6bc71161e8db","invariantUuid":"b34833bb-6aa9-4ad6-a831-70b06367a091","customizationUuid":"a55961b2-2065-4ab0-a5b7-2fcee1c227e3","description":null,"name":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","version":"5","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","properties":{"minCountInstances":1,"maxCountInstances":1,"initialCount":1,"vfModuleLabel":"PASQUALE_base_vPE_BV","baseModule":true},"inputs":{},"volumeGroupAllowed":false},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2":{"uuid":"0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a","invariantUuid":"eff8cc59-53a1-4101-aed7-8cf24ecf8339","customizationUuid":"3cd946bb-50e0-40d8-96d3-c9023520b557","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vPFE_BV","baseModule":false},"inputs":{},"volumeGroupAllowed":true}},"volumeGroups":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","invariantUuid":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","customizationUuid":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vRE_BV","baseModule":false},"inputs":{"vnf_config_template_version":{"type":"string","description":"VPE Software Version","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"vnf_config_template_version"},"fromInputName":"2017488_PASQUALEvpe0_vnf_config_template_version","constraints":null,"required":true,"default":"17.2"},"bandwidth_units":{"type":"string","description":"Units of bandwidth","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"bandwidth_units"},"fromInputName":"PASQUALEvpe0_bandwidth_units","constraints":null,"required":true,"default":"Gbps"},"bandwidth":{"type":"string","description":"Requested VPE bandwidth","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"bandwidth"},"fromInputName":"PASQUALEvpe0_bandwidth","constraints":null,"required":true,"default":"10"},"AIC_CLLI":{"type":"string","description":"AIC Site CLLI","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"AIC_CLLI"},"fromInputName":"2017488_PASQUALEvpe0_AIC_CLLI","constraints":null,"required":true,"default":"ATLMY8GA"},"vnf_instance_name":{"type":"string","description":"The hostname assigned to the vpe.","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"vnf_instance_name"},"fromInputName":"2017488_PASQUALEvpe0_vnf_instance_name","constraints":null,"required":true,"default":"mtnj309me6"}}},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2":{"uuid":"0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a","invariantUuid":"eff8cc59-53a1-4101-aed7-8cf24ecf8339","customizationUuid":"3cd946bb-50e0-40d8-96d3-c9023520b557","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vPFE_BV","baseModule":false},"inputs":{}}},"vfcInstanceGroups":{}}},"networks":{},"collectionResource":{},"configurations":{},"fabricConfigurations":{},"serviceProxies":{},"vfModules":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","invariantUuid":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","customizationUuid":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vRE_BV","baseModule":false},"inputs":{"vnf_config_template_version":{"type":"string","description":"VPE Software Version","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"vnf_config_template_version"},"fromInputName":"2017488_PASQUALEvpe0_vnf_config_template_version","constraints":null,"required":true,"default":"17.2"},"bandwidth_units":{"type":"string","description":"Units of bandwidth","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"bandwidth_units"},"fromInputName":"PASQUALEvpe0_bandwidth_units","constraints":null,"required":true,"default":"Gbps"},"bandwidth":{"type":"string","description":"Requested VPE bandwidth","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"bandwidth"},"fromInputName":"PASQUALEvpe0_bandwidth","constraints":null,"required":true,"default":"10"},"AIC_CLLI":{"type":"string","description":"AIC Site CLLI","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"AIC_CLLI"},"fromInputName":"2017488_PASQUALEvpe0_AIC_CLLI","constraints":null,"required":true,"default":"ATLMY8GA"},"vnf_instance_name":{"type":"string","description":"The hostname assigned to the vpe.","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"vnf_instance_name"},"fromInputName":"2017488_PASQUALEvpe0_vnf_instance_name","constraints":null,"required":true,"default":"mtnj309me6"}},"volumeGroupAllowed":true},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0":{"uuid":"f8360508-3f17-4414-a2ed-6bc71161e8db","invariantUuid":"b34833bb-6aa9-4ad6-a831-70b06367a091","customizationUuid":"a55961b2-2065-4ab0-a5b7-2fcee1c227e3","description":null,"name":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","version":"5","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","properties":{"minCountInstances":1,"maxCountInstances":1,"initialCount":1,"vfModuleLabel":"PASQUALE_base_vPE_BV","baseModule":true},"inputs":{},"volumeGroupAllowed":false},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2":{"uuid":"0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a","invariantUuid":"eff8cc59-53a1-4101-aed7-8cf24ecf8339","customizationUuid":"3cd946bb-50e0-40d8-96d3-c9023520b557","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vPFE_BV","baseModule":false},"inputs":{},"volumeGroupAllowed":true}},"volumeGroups":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","invariantUuid":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","customizationUuid":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vRE_BV","baseModule":false},"inputs":{"vnf_config_template_version":{"type":"string","description":"VPE Software Version","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"vnf_config_template_version"},"fromInputName":"2017488_PASQUALEvpe0_vnf_config_template_version","constraints":null,"required":true,"default":"17.2"},"bandwidth_units":{"type":"string","description":"Units of bandwidth","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"bandwidth_units"},"fromInputName":"PASQUALEvpe0_bandwidth_units","constraints":null,"required":true,"default":"Gbps"},"bandwidth":{"type":"string","description":"Requested VPE bandwidth","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"bandwidth"},"fromInputName":"PASQUALEvpe0_bandwidth","constraints":null,"required":true,"default":"10"},"AIC_CLLI":{"type":"string","description":"AIC Site CLLI","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"AIC_CLLI"},"fromInputName":"2017488_PASQUALEvpe0_AIC_CLLI","constraints":null,"required":true,"default":"ATLMY8GA"},"vnf_instance_name":{"type":"string","description":"The hostname assigned to the vpe.","entry_schema":null,"inputProperties":{"sourceType":"HEAT","vfModuleLabel":"PASQUALE_vRE_BV","paramName":"vnf_instance_name"},"fromInputName":"2017488_PASQUALEvpe0_vnf_instance_name","constraints":null,"required":true,"default":"mtnj309me6"}}},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2":{"uuid":"0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a","invariantUuid":"eff8cc59-53a1-4101-aed7-8cf24ecf8339","customizationUuid":"3cd946bb-50e0-40d8-96d3-c9023520b557","description":null,"name":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","version":"6","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2","properties":{"minCountInstances":0,"maxCountInstances":null,"initialCount":0,"vfModuleLabel":"PASQUALE_vPFE_BV","baseModule":false},"inputs":{}}},"pnfs":{}}},"serviceInstance":{"6b528779-44a3-4472-bdff-9cd15ec93450":{"vnfs":{"2017-388_PASQUALE-vPE 0":{"rollbackOnFailure":"true","vfModules":{},"isMissingData":false,"originalName":"2017-388_PASQUALE-vPE 0","vnfStoreKey":"2017-388_PASQUALE-vPE 0","trackById":"nbzg9yvj0bg","uuid":"afacccf6-397d-45d6-b5ae-94c39734b168","productFamilyId":"e433710f-9217-458d-a79d-1c7aff376d89","lcpCloudRegionId":"JANET25","tenantId":"092eb9e8e4b7412e8787dd091bc58e86","lineOfBusiness":"ONAP","platformName":"platform","modelInfo":{"modelInvariantId":"72e465fe-71b1-4e7b-b5ed-9496118ff7a8","modelVersionId":"afacccf6-397d-45d6-b5ae-94c39734b168","modelName":"2017-388_PASQUALE-vPE","modelVersion":"4.0","modelCustomizationId":"b3c76f73-eeb5-4fb6-9d31-72a889f1811c","modelCustomizationName":"2017-388_PASQUALE-vPE 0","uuid":"afacccf6-397d-45d6-b5ae-94c39734b168"},"instanceName":"2017388_PASQUALEvPEmCaNkinstanceName","legacyRegion":"some legacy region","instanceParams":[{"vnf_config_template_version":"17.2","bandwidth_units":"Gbps","bandwidth":"10","AIC_CLLI":"ATLMY8GA","ASN":"AV_vPE","vnf_instance_name":"mtnj309me6"}]},"2017-488_PASQUALE-vPE 0":{"rollbackOnFailure":"true","vfModules":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot":{"instanceName":"VFinstancenameZERO","supplementaryFile":null,"supplementaryFile_hidden":null,"supplementaryFile_hidden_content":null,"instanceParams":[{}],"modelInfo":{"modelInvariantId":"b34833bb-6aa9-4ad6-a831-70b06367a091","modelVersionId":"f8360508-3f17-4414-a2ed-6bc71161e8db","modelName":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","modelVersion":"5","modelCustomizationId":"a55961b2-2065-4ab0-a5b7-2fcee1c227e3","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","uuid":"f8360508-3f17-4414-a2ed-6bc71161e8db"},"uuid":"f8360508-3f17-4414-a2ed-6bc71161e8db","isMissingData":false}},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc":{"instanceName":"VFinstancename","volumeGroupName":"VFinstancename_vol_abc","supplementaryFile":"C:\\fakepath\\sample.json","supplementaryFile_hidden":null,"supplementaryFile_hidden_content":null,"instanceParams":[{"vnf_config_template_version":"17.2","bandwidth_units":"Gbps","bandwidth":"10","AIC_CLLI":"ATLMY8GA","vnf_instance_name":"mtnj309me6"}],"modelInfo":{"modelInvariantId":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","modelVersionId":"25284168-24bb-4698-8cb4-3f509146eca5","modelName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","modelVersion":"6","modelCustomizationId":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","uuid":"25284168-24bb-4698-8cb4-3f509146eca5"},"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","isMissingData":false}}},"isMissingData":false,"originalName":"2017-488_PASQUALE-vPE 0","vnfStoreKey":"2017-488_PASQUALE-vPE 0","trackById":"uaq4lvzfk1","uuid":"69e09f68-8b63-4cc9-b9ff-860960b5db09","productFamilyId":"e433710f-9217-458d-a79d-1c7aff376d89","lcpCloudRegionId":"JANET25","tenantId":"092eb9e8e4b7412e8787dd091bc58e86","lineOfBusiness":"ONAP","platformName":"platform","modelInfo":{"modelInvariantId":"72e465fe-71b1-4e7b-b5ed-9496118ff7a8","modelVersionId":"69e09f68-8b63-4cc9-b9ff-860960b5db09","modelName":"2017-488_PASQUALE-vPE","modelVersion":"5.0","modelCustomizationId":"1da7b585-5e61-4993-b95e-8e6606c81e45","modelCustomizationName":"2017-488_PASQUALE-vPE 0","uuid":"69e09f68-8b63-4cc9-b9ff-860960b5db09"},"instanceName":"2017488_PASQUALEvPEVNFinstancename","legacyRegion":"some legacy region","instanceParams":[{"vnf_config_template_version":"17.2","bandwidth_units":"Gbps","bandwidth":"10","AIC_CLLI":"ATLMY8GA","ASN":"AV_vPE","vnf_instance_name":"mtnj309me6"}]},"2017-488_PASQUALE-vPE 0:0001":{"rollbackOnFailure":"true","vfModules":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot":{"instanceName":"VFinstancenameZERO_001","supplementaryFile":null,"supplementaryFile_hidden":null,"supplementaryFile_hidden_content":null,"instanceParams":[{}],"modelInfo":{"modelInvariantId":"b34833bb-6aa9-4ad6-a831-70b06367a091","modelVersionId":"f8360508-3f17-4414-a2ed-6bc71161e8db","modelName":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","modelVersion":"5","modelCustomizationId":"a55961b2-2065-4ab0-a5b7-2fcee1c227e3","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","uuid":"f8360508-3f17-4414-a2ed-6bc71161e8db"},"uuid":"f8360508-3f17-4414-a2ed-6bc71161e8db","isMissingData":false,"trackById":"0wopaw560i"}},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc":{"instanceName":"VFinstancename_001","volumeGroupName":"VFinstancename_vol_abc_001","supplementaryFile":"C:\\fakepath\\sample.json","supplementaryFile_hidden":null,"supplementaryFile_hidden_content":null,"instanceParams":[{"vnf_config_template_version":"17.2","bandwidth_units":"Gbps","bandwidth":"10","AIC_CLLI":"ATLMY8GA","vnf_instance_name":"mtnj309me6"}],"modelInfo":{"modelInvariantId":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","modelVersionId":"25284168-24bb-4698-8cb4-3f509146eca5","modelName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","modelVersion":"6","modelCustomizationId":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","uuid":"25284168-24bb-4698-8cb4-3f509146eca5"},"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","isMissingData":false,"trackById":"kis67wg4sn"}}},"isMissingData":false,"originalName":"2017-488_PASQUALE-vPE 0","vnfStoreKey":"2017-488_PASQUALE-vPE 0","trackById":"4i4tuu8cjwm","uuid":"69e09f68-8b63-4cc9-b9ff-860960b5db09","productFamilyId":"e433710f-9217-458d-a79d-1c7aff376d89","lcpCloudRegionId":"JANET25","tenantId":"092eb9e8e4b7412e8787dd091bc58e86","lineOfBusiness":"ONAP","platformName":"platform","modelInfo":{"modelInvariantId":"72e465fe-71b1-4e7b-b5ed-9496118ff7a8","modelVersionId":"69e09f68-8b63-4cc9-b9ff-860960b5db09","modelName":"2017-488_PASQUALE-vPE","modelVersion":"5.0","modelCustomizationId":"1da7b585-5e61-4993-b95e-8e6606c81e45","modelCustomizationName":"2017-488_PASQUALE-vPE 0","uuid":"69e09f68-8b63-4cc9-b9ff-860960b5db09"},"instanceName":"2017488_PASQUALEvPEVNFinstancename_001","legacyRegion":"some legacy region","instanceParams":[{"vnf_config_template_version":"17.2","bandwidth_units":"Gbps","bandwidth":"10","AIC_CLLI":"ATLMY8GA","ASN":"AV_vPE","vnf_instance_name":"mtnj309me6"}]},"2017-488_PASQUALE-vPE 0:0002":{"rollbackOnFailure":"true","vfModules":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot":{"instanceName":"VFinstancenameZERO_002","supplementaryFile":null,"supplementaryFile_hidden":null,"supplementaryFile_hidden_content":null,"instanceParams":[{}],"modelInfo":{"modelInvariantId":"b34833bb-6aa9-4ad6-a831-70b06367a091","modelVersionId":"f8360508-3f17-4414-a2ed-6bc71161e8db","modelName":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","modelVersion":"5","modelCustomizationId":"a55961b2-2065-4ab0-a5b7-2fcee1c227e3","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0","uuid":"f8360508-3f17-4414-a2ed-6bc71161e8db"},"uuid":"f8360508-3f17-4414-a2ed-6bc71161e8db","isMissingData":false,"trackById":"wixmcvxsc3o"}},"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1":{"2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc":{"instanceName":"VFinstancename_002","volumeGroupName":"VFinstancename_vol_abc_002","supplementaryFile":"C:\\fakepath\\sample.json","supplementaryFile_hidden":null,"supplementaryFile_hidden_content":null,"instanceParams":[{"vnf_config_template_version":"17.2","bandwidth_units":"Gbps","bandwidth":"10","AIC_CLLI":"ATLMY8GA","vnf_instance_name":"mtnj309me6"}],"modelInfo":{"modelInvariantId":"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1","modelVersionId":"25284168-24bb-4698-8cb4-3f509146eca5","modelName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","modelVersion":"6","modelCustomizationId":"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401","modelCustomizationName":"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1","uuid":"25284168-24bb-4698-8cb4-3f509146eca5"},"uuid":"25284168-24bb-4698-8cb4-3f509146eca5","isMissingData":false,"trackById":"e8a6fm743p6"}}},"isMissingData":false,"originalName":"2017-488_PASQUALE-vPE 0","vnfStoreKey":"2017-488_PASQUALE-vPE 0","trackById":"y32mc2xht1","uuid":"69e09f68-8b63-4cc9-b9ff-860960b5db09","productFamilyId":"e433710f-9217-458d-a79d-1c7aff376d89","lcpCloudRegionId":"JANET25","tenantId":"092eb9e8e4b7412e8787dd091bc58e86","lineOfBusiness":"ONAP","platformName":"platform","modelInfo":{"modelInvariantId":"72e465fe-71b1-4e7b-b5ed-9496118ff7a8","modelVersionId":"69e09f68-8b63-4cc9-b9ff-860960b5db09","modelName":"2017-488_PASQUALE-vPE","modelVersion":"5.0","modelCustomizationId":"1da7b585-5e61-4993-b95e-8e6606c81e45","modelCustomizationName":"2017-488_PASQUALE-vPE 0","uuid":"69e09f68-8b63-4cc9-b9ff-860960b5db09"},"instanceName":"2017488_PASQUALEvPEVNFinstancename_002","legacyRegion":"some legacy region","instanceParams":[{"vnf_config_template_version":"17.2","bandwidth_units":"Gbps","bandwidth":"10","AIC_CLLI":"ATLMY8GA","ASN":"AV_vPE","vnf_instance_name":"mtnj309me6"}]}},"instanceParams":[{"2017488_PASQUALEvpe0_ASN":"AV_vPE"}],"validationCounter":0,"existingNames":{"mcankinstancename":"","2017488_PASQUALEvpevnfinstancename":"","2017388_PASQUALEvpemcankinstancename":"","vfinstancename":"","vfinstancename_vol_abc":"","vfinstancenamezero":"","2017488_PASQUALEvpevnfinstancename_001":"","vfinstancenamezero_001":"","vfinstancename_001":"","vfinstancename_vol_abc_001":"","2017488_PASQUALEvpevnfinstancename_002":"","vfinstancenamezero_002":"","vfinstancename_002":"","vfinstancename_vol_abc_002":""},"existingVNFCounterMap":{"afacccf6-397d-45d6-b5ae-94c39734b168":1,"69e09f68-8b63-4cc9-b9ff-860960b5db09":3},"existingNetworksCounterMap":{},"instanceName":"mCaNkinstancename","globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89","subscriptionServiceType":"TYLER SILVIA","owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc","productFamilyId":"e433710f-9217-458d-a79d-1c7aff376d89","lcpCloudRegionId":"hvf6","tenantId":"bae71557c5bb4d5aac6743a4e5f1d054","aicZoneId":"NFT1","projectName":"WATKINS","rollbackOnFailure":"true","bulkSize":"3","aicZoneName":"NFTJSSSS-NFT1","owningEntityName":"WayneHolland","testApi":"VNF_API","tenantName":"AIN Web Tool-15-D-testalexandria","modelInfo":{"modelInvariantId":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0","modelVersionId":"6b528779-44a3-4472-bdff-9cd15ec93450","modelName":"action-data","modelVersion":"1.0","uuid":"6b528779-44a3-4472-bdff-9cd15ec93450"},"isALaCarte":false,"name":"action-data","version":"1.0","description":"","category":"","uuid":"6b528779-44a3-4472-bdff-9cd15ec93450","invariantUuid":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0","serviceType":"","serviceRole":"","isMultiStepDesign":false}},"lcpRegionsAndTenants":{"lcpRegionList":[{"id":"JANET25","name":"JANET25","isPermitted":true},{"id":"hvf6","name":"hvf6","isPermitted":true}],"lcpRegionsTenantsMap":{"JANET25":[{"id":"092eb9e8e4b7412e8787dd091bc58e86","name":"USP-SIP-IC-24335-T-01","isPermitted":true,"cloudOwner":"irma-aic"}],"hvf6":[{"id":"bae71557c5bb4d5aac6743a4e5f1d054","name":"AIN Web Tool-15-D-testalexandria","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"229bcdc6eaeb4ca59d55221141d01f8e","name":"AIN Web Tool-15-D-STTest2","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"1178612d2b394be4834ad77f567c0af2","name":"AIN Web Tool-15-D-SSPtestcustome","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"19c5ade915eb461e8af52fb2fd8cd1f2","name":"AIN Web Tool-15-D-UncheckedEcopm","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"de007636e25249238447264a988a927b","name":"AIN Web Tool-15-D-dfsdf","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"62f29b3613634ca6a3065cbe0e020c44","name":"AIN/SMS-16-D-Multiservices1","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"649289e30d3244e0b48098114d63c2aa","name":"AIN Web Tool-15-D-SSPST66","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"3f21eeea6c2c486bba31dab816c05a32","name":"AIN Web Tool-15-D-ASSPST47","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"f60ce21d3ee6427586cff0d22b03b773","name":"CESAR-100-D-sspjg67246","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"8774659e425f479895ae091bb5d46560","name":"CESAR-100-D-sspjg68359","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"624eb554b0d147c19ff8885341760481","name":"AINWebTool-15-D-iftach","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"214f55f5fc414c678059c383b03e4962","name":"CESAR-100-D-sspjg612401","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"c90666c291664841bb98e4d981ff1db5","name":"CESAR-100-D-sspjg621340","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"ce5b6bc5c7b348e1bf4b91ac9a174278","name":"sspjg621351cloned","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"b386b768a3f24c8e953abbe0b3488c02","name":"AINWebTool-15-D-eteancomp","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"dc6c4dbfd225474e9deaadd34968646c","name":"AINWebTool-15-T-SPFET","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"02cb5030e9914aa4be120bd9ed1e19eb","name":"AINWebTool-15-X-eeweww","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"f2f3830e4c984d45bcd00e1a04158a79","name":"CESAR-100-D-spjg61909","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"05b91bd5137f4929878edd965755c06d","name":"CESAR-100-D-sspjg621512cloned","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"7002fbe8482d4a989ddf445b1ce336e0","name":"AINWebTool-15-X-vdr","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"4008522be43741dcb1f5422022a2aa0b","name":"AINWebTool-15-D-ssasa","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"f44e2e96a1b6476abfda2fa407b00169","name":"AINWebTool-15-D-PFNPT","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"b69a52bec8a84669a37a1e8b72708be7","name":"AINWebTool-15-X-vdre","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"fac7d9fd56154caeb9332202dcf2969f","name":"AINWebTool-15-X-NONPODECOMP","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"2d34d8396e194eb49969fd61ffbff961","name":"DN5242-Nov16-T5","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"cb42a77ff45b48a8b8deb83bb64acc74","name":"ro-T11","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"fa45ca53c80b492fa8be5477cd84fc2b","name":"ro-T112","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"4914ab0ab3a743e58f0eefdacc1dde77","name":"DN5242-Nov21-T1","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"d0a3e3f2964542259d155a81c41aadc3","name":"test-hvf6-09","isPermitted":true,"cloudOwner":"irma-aic"},{"id":"cbb99fe4ada84631b7baf046b6fd2044","name":"DN5242-Nov16-T3","isPermitted":true,"cloudOwner":"irma-aic"}]}},"subscribers":[{"id":"ERICA5779-Subscriber-2","name":"ERICA5779-Subscriber-2","isPermitted":false},{"id":"ERICA5779-Subscriber-3","name":"ERICA5779-Subscriber-3","isPermitted":false},{"id":"ERICA5779-Subscriber-4","name":"ERICA5779-Subscriber-5","isPermitted":false},{"id":"ERICA5779-TestSub-PWT-101","name":"ERICA5779-TestSub-PWT-101","isPermitted":false},{"id":"ERICA5779-TestSub-PWT-102","name":"ERICA5779-TestSub-PWT-102","isPermitted":false},{"id":"ERICA5779-TestSub-PWT-103","name":"ERICA5779-TestSub-PWT-103","isPermitted":false},{"id":"31739f3e-526b-11e6-beb8-9e71128cae77","name":"CRAIG/ROBERTS","isPermitted":false},{"id":"DHV1707-TestSubscriber-2","name":"DALE BRIDGES","isPermitted":false},{"id":"jimmy-example","name":"JimmyExampleCust-20161102","isPermitted":false},{"id":"jimmy-example2","name":"JimmyExampleCust-20161103","isPermitted":false},{"id":"CAR_2020_ER","name":"CAR_2020_ER","isPermitted":true},{"id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","name":"Emanuel","isPermitted":false},{"id":"21014aa2-526b-11e6-beb8-9e71128cae77","name":"JULIO ERICKSON","isPermitted":false},{"id":"DHV1707-TestSubscriber-1","name":"LLOYD BRIDGES","isPermitted":false},{"id":"e433710f-9217-458d-a79d-1c7aff376d89","name":"SILVIA ROBBINS","isPermitted":true}],"productFamilies":null,"serviceTypes":{"e433710f-9217-458d-a79d-1c7aff376d89":[{"id":"17","name":"JOHANNA_SANTOS","isPermitted":false},{"id":"16","name":"LINDSEY","isPermitted":false},{"id":"2","name":"Emanuel","isPermitted":false},{"id":"5","name":"Kennedy","isPermitted":false},{"id":"14","name":"SSD","isPermitted":false},{"id":"1","name":"TYLER SILVIA","isPermitted":true},{"id":"12","name":"VPMS","isPermitted":false},{"id":"3","name":"vJamie","isPermitted":false},{"id":"0","name":"vRichardson","isPermitted":false},{"id":"18","name":"vCarroll","isPermitted":false},{"id":"9","name":"vMME","isPermitted":false},{"id":"13","name":"vWINIFRED","isPermitted":false},{"id":"10","name":"vMNS","isPermitted":false},{"id":"15","name":"vMOG","isPermitted":false},{"id":"8","name":"vOTA","isPermitted":false},{"id":"11","name":"vEsmeralda","isPermitted":false},{"id":"6","name":"vPorfirio","isPermitted":false},{"id":"7","name":"vVM","isPermitted":false},{"id":"4","name":"vVoiceMail","isPermitted":false}]},"aicZones":[{"id":"NFT1","name":"NFTJSSSS-NFT1"},{"id":"JAG1","name":"YUDFJULP-JAG1"},{"id":"YYY1","name":"UUUAIAAI-YYY1"},{"id":"BAN1","name":"VSDKYUTP-BAN1"},{"id":"DKJ1","name":"DKJSJDKA-DKJ1"},{"id":"MCS1","name":"ASACMAMS-MCS1"},{"id":"UIO1","name":"uioclli1-UIO1"},{"id":"RAJ1","name":"YGBIJNLQ-RAJ1"},{"id":"OPA1","name":"opaclli1-OPA1"},{"id":"SDE1","name":"ZXCVBNMA-SDE1"},{"id":"VEN2","name":"FGHJUHIL-VEN2"},{"id":"ORL1","name":"ORLDFLMA-ORL1"},{"id":"JAD1","name":"JADECLLI-JAD1"},{"id":"ZXL1","name":"LWLWCANN-ZXL1"},{"id":"CKL1","name":"CLKSKCKK-CKL1"},{"id":"SDF1","name":"sdfclli1-SDF1"},{"id":"RAD1","name":"RADICAL1-RAD1"},{"id":"KIT1","name":"BHYJFGLN-KIT1"},{"id":"REL1","name":"INGERFGT-REL1"},{"id":"JNL1","name":"CJALSDAC-JNL1"},{"id":"OLK1","name":"OLKOLKLS-OLK1"},{"id":"CHI1","name":"CHILLIWE-CHI1"},{"id":"UUU4","name":"UUUAAAUU-UUU4"},{"id":"TUF1","name":"TUFCLLI1-TUF1"},{"id":"KJN1","name":"CKALDKSA-KJN1"},{"id":"SAM1","name":"SNDGCA64-SAN1"},{"id":"SCK1","name":"SCKSCKSK-SCK1"},{"id":"HJH1","name":"AOEEQQQD-HJH1"},{"id":"HGD1","name":"SDFQWHGD-HGD1"},{"id":"KOR1","name":"HYFLNBVT-KOR1"},{"id":"ATL43","name":"AICLOCID-ATL43"},{"id":"ATL54","name":"AICFTAAI-ATL54"},{"id":"ATL66","name":"CLLIAAII-ATL66"},{"id":"VEL1","name":"BNMLKUIK-VEL1"},{"id":"ICC1","name":"SANJITAT-ICC1"},{"id":"MNT11","name":"WSXEFBTH-MNT11"},{"id":"DEF2","name":"WSBHGTYL-DEF2"},{"id":"MAD11","name":"SDFQWGKL-MAD11"},{"id":"OLG1","name":"OLHOLHOL-OLG1"},{"id":"GAR1","name":"NGFVSJKO-GAR1"},{"id":"SAN22","name":"GNVLSCTL-SAN22"},{"id":"HRG1","name":"HRGHRGGS-HRG1"},{"id":"JCS1","name":"JCSJSCJS-JCS1"},{"id":"DHA12","name":"WSXEDECF-DHA12"},{"id":"HJE1","name":"AOEEWWWD-HJE1"},{"id":"NCA1","name":"NCANCANN-NCA1"},{"id":"IOP1","name":"iopclli1-IOP1"},{"id":"RTY1","name":"rtyclli1-RTY1"},{"id":"KAP1","name":"HIOUYTRQ-KAP1"},{"id":"ZEN1","name":"ZENCLLI1-ZEN1"},{"id":"HKA1","name":"JAKHLASS-HKA1"},{"id":"CQK1","name":"CQKSCAKK-CQK1"},{"id":"SAI1","name":"UBEKQLPD-SAI1"},{"id":"ERT1","name":"ertclli1-ERT1"},{"id":"IBB1","name":"PLMKOIJU-IBB1"},{"id":"TIR2","name":"PLKINHYI-TIR2"},{"id":"HSD1","name":"CHASKCDS-HSD1"},{"id":"SLF78","name":"SDCTLFN1-SLF78"},{"id":"SEE78","name":"SDCTEEE4-SEE78"},{"id":"SAN13","name":"TOKYJPFA-SAN13"},{"id":"SAA78","name":"SDCTAAA1-SAA78"},{"id":"LUC1","name":"ATLDFGYC-LUC1"},{"id":"AMD13","name":"MEMATLAN-AMD13"},{"id":"TOR1","name":"TOROONXN-TOR1"},{"id":"QWE1","name":"QWECLLI1-QWE1"},{"id":"ZOG1","name":"ZOGASTRO-ZOG1"},{"id":"CAL33","name":"CALIFORN-CAL33"},{"id":"SHH78","name":"SDIT1HHH-SHH78"},{"id":"DSA1","name":"LKJHGFDS-DSA1"},{"id":"CLG1","name":"CLGRABAD-CLG1"},{"id":"BNA1","name":"BNARAGBK-BNA1"},{"id":"ATL84","name":"CANTTCOC-ATL84"},{"id":"APP1","name":"WBHGTYUI-APP1"},{"id":"RJN1","name":"RJNRBZAW-RJN1"},{"id":"EHH78","name":"SDCSHHH5-EHH78"},{"id":"mac10","name":"PKGTESTF-mac10"},{"id":"SXB78","name":"SDCTGXB1-SXB78"},{"id":"SAX78","name":"SDCTAXG1-SAX78"},{"id":"SYD1","name":"SYDNAUBV-SYD1"},{"id":"TOK1","name":"TOKYJPFA-TOK1"},{"id":"KGM2","name":"KGMTNC20-KGM2"},{"id":"DCC1b","name":"POIUYTGH-DCC1b"},{"id":"SKK78","name":"SDCTKKK1-SKK78"},{"id":"SGG78","name":"SDCTGGG1-SGG78"},{"id":"SJJ78","name":"SDCTJJJ1-SJJ78"},{"id":"SBX78","name":"SDCTBXG1-SBX78"},{"id":"LAG1","name":"LARGIZON-LAG1"},{"id":"IAA1","name":"QAZXSWED-IAA1"},{"id":"POI1","name":"PLMNJKIU-POI1"},{"id":"LAG1a","name":"LARGIZON-LAG1a"},{"id":"PBL1","name":"PBLAPBAI-PBL1"},{"id":"LAG45","name":"LARGIZON-LAG1a"},{"id":"MAR1","name":"MNBVCXZM-MAR1"},{"id":"HST70","name":"HSTNTX70-HST70"},{"id":"DCC1a","name":"POIUYTGH-DCC1a"},{"id":"TOL1","name":"TOLDOH21-TOL1"},{"id":"LON1","name":"LONEENCO-LON1"},{"id":"SJU78","name":"SDIT1JUB-SJU78"},{"id":"STN27","name":"HSTNTX01-STN27"},{"id":"SSW56","name":"ss8126GT-SSW56"},{"id":"SBB78","name":"SDIT1BBB-SBB78"},{"id":"DCC3","name":"POIUYTGH-DCC3"},{"id":"GNV1","name":"GNVLSCTL-GNV1"},{"id":"WAS1","name":"WASHDCSW-WAS1"},{"id":"TOY1","name":"TORYONNZ-TOY1"},{"id":"STT1","name":"STTLWA02-STT1"},{"id":"STG1","name":"STTGGE62-STG1"},{"id":"SLL78","name":"SDCTLLL1-SLL78"},{"id":"SBU78","name":"SDIT1BUB-SBU78"},{"id":"ATL2","name":"ATLNGANW-ATL2"},{"id":"BOT1","name":"BOTHWAKY-BOT1"},{"id":"SNG1","name":"SNGPSIAU-SNG1"},{"id":"NYC1","name":"NYCMNY54-NYC1"},{"id":"LAG1b","name":"LARGIZON-LAG1b"},{"id":"AMD15","name":"AMDFAA01-AMD15"},{"id":"SNA1","name":"SNANTXCA-SNA1"},{"id":"PLT1","name":"PLTNCA60-PLT1"},{"id":"TLP1","name":"TLPNXM18-TLP1"},{"id":"SDD81","name":"SAIT1DD6-SDD81"},{"id":"DCC1","name":"POIUYTGH-DCC1"},{"id":"DCC2","name":"POIUYTGH-DCC2"},{"id":"OKC1","name":"OKCBOK55-OKC1"},{"id":"PAR1","name":"PARSFRCG-PAR1"},{"id":"TES36","name":"ABCEETES-TES36"},{"id":"COM1","name":"PLMKOPIU-COM1"},{"id":"ANI1","name":"ATLNGTRE-ANI1"},{"id":"SDG78","name":"SDIT1BDG-SDG78"},{"id":"mac20","name":"PKGTESTF-mac20"},{"id":"DSF45","name":"DSFBG123-DSF45"},{"id":"HST25","name":"HSTNTX01-HST25"},{"id":"AMD18","name":"AUDIMA01-AMD18"},{"id":"SAA80","name":"SAIT9AA3-SAA80"},{"id":"SSA56","name":"SSIT2AA7-SSA56"},{"id":"SDD82","name":"SAIT1DD9-SDD82"},{"id":"JCV1","name":"JCVLFLBW-JCV1"},{"id":"SUL2","name":"WERTYUJK-SUL2"},{"id":"PUR1","name":"purelyde-PUR1"},{"id":"FDE55","name":"FDERT555-FDE55"},{"id":"SITE","name":"LONEENCO-SITE"},{"id":"ATL1","name":"ATLNGAMA-ATL1"},{"id":"JUL1","name":"ZXCVBNMM-JUL1"},{"id":"TAT34","name":"TESAAISB-TAT34"},{"id":"XCP12","name":"CHKGH123-XCP12"},{"id":"RAI1","name":"poiuytre-RAI1"},{"id":"HPO1","name":"ATLNGAUP-HPO1"},{"id":"KJF12","name":"KJFDH123-KJF12"},{"id":"SCC80","name":"SAIT9CC3-SCC80"},{"id":"SAA12","name":"SAIT9AF8-SAA12"},{"id":"SAA14","name":"SAIT1AA9-SAA14"},{"id":"ATL35","name":"TTESSAAI-ATL35"},{"id":"CWY1","name":"CWYMOWBS-CWY1"},{"id":"ATL76","name":"TELEPAAI-ATL76"},{"id":"DSL12","name":"DSLFK242-DSL12"},{"id":"ATL53","name":"AAIATLTE-ATL53"},{"id":"SAA11","name":"SAIT9AA2-SAA11"},{"id":"ATL62","name":"TESSASCH-ATL62"},{"id":"AUG1","name":"ASDFGHJK-AUG1"},{"id":"POI22","name":"POIUY123-POI22"},{"id":"SAA13","name":"SAIT1AA9-SAA13"},{"id":"BHY17","name":"BHYTFRF3-BHY17"},{"id":"LIS1","name":"HOSTPROF-LIS1"},{"id":"SIP1","name":"ZXCVBNMK-SIP1"},{"id":"ATL99","name":"TEESTAAI-ATL43"},{"id":"ATL64","name":"FORLOAAJ-ATL64"},{"id":"TAT33","name":"TESAAISA-TAT33"},{"id":"RAD10","name":"INDIPUNE-RAD10"},{"id":"RTW5","name":"BHYTFRY4-RTW5"},{"id":"JGS1","name":"KSJKKKKK-JGS1"},{"id":"ATL98","name":"TEESTAAI-ATL43"},{"id":"WAN1","name":"LEIWANGW-WAN1"},{"id":"ATL44","name":"ATLSANAB-ATL44"},{"id":"RTD2","name":"BHYTFRk4-RTD2"},{"id":"NIR1","name":"ORFLMANA-NIR1"},{"id":"ATL75","name":"SANAAIRE-ATL75"},{"id":"NUM1","name":"QWERTYUI-NUM1"},{"id":"hvf32","name":"MDTWNJ21-hvf32"},{"id":"RTZ4","name":"BHYTFRZ6-RTZ4"},{"id":"ATL56","name":"ATLSANAC-ATL56"},{"id":"AMS1","name":"AMSTNLBW-AMS1"},{"id":"RCT1","name":"AMSTERNL-RCT1"},{"id":"JAN1","name":"ORFLMATT-JAN1"},{"id":"ABC14","name":"TESAAISA-ABC14"},{"id":"TAT37","name":"TESAAISD-TAT37"},{"id":"MIC54","name":"MICHIGAN-MIC54"},{"id":"ABC11","name":"ATLSANAI-ABC11"},{"id":"AMF11","name":"AMDOCS01-AMF11"},{"id":"ATL63","name":"ATLSANEW-ATL63"},{"id":"ABC12","name":"ATLSECIA-ABC12"},{"id":"hvf20","name":"MDTWNJ21-hvf20"},{"id":"ABC15","name":"AAITESAN-ABC15"},{"id":"AVT1","name":"AVTRFLHD-AVT1"},{"id":"ATL34","name":"ATLSANAI-ATL34"}],"categoryParameters":{"owningEntityList":[{"id":"54555bcb-0c27-47f8-a4b8-ede04fda86f2","name":"148a3ffe-89b3-4085-b4d7-d8c5962c4f00"},{"id":"47d173d2-711a-4717-9c38-e26db23255eb","name":"26a1f61e-d941-4ad9-b3ca-6f6360c18139"},{"id":"9e6d016a-1802-471a-9ad4-000e4bfed132","name":"42bbda95-c406-49fc-8762-28f16c28582c"},{"id":"4be71f0f-afc3-439f-93fa-210683d3f256","name":"5762b62a-d81c-4fb0-baff-d8994d5cde62"},{"id":"53762b10-8c21-4bf8-bdf2-978dcb651195","name":"578b986b-0ac9-4e82-9792-ba781daa2280"},{"id":"e9f7ae74-0ce0-400d-9361-86056835dc6b","name":"68b3ab76-fbf2-4e76-976c-500aad1b881c"},{"id":"6195067f-e59d-4fe7-bf94-3541d30ad5d1","name":"9addaeb7-2db3-48e0-903a-0aa50a44106f"},{"id":"bcfb1c1e-ae97-4539-8f6d-c4b7595aa817","name":"a675de44-378a-4df4-80f1-06de713bd027"},{"id":"aaa1","name":"aaa1"},{"id":"efc656d8-e8ea-4784-ba0d-a62759f70abd","name":"b0de48fd-109a-4e43-9a1e-1e4a1e766ddd"},{"id":"c77954f5-2224-44d1-8559-72ec9d99c91b","name":"d18cf06d-d7fc-4f3d-bce7-1f11ba76223f"},{"id":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc","name":"WayneHolland"},{"id":"1f0e9fd0-71b2-4569-a42f-c3aeac18b9b9","name":"oren"},{"id":"Melissa","name":"Melissa"}],"projectList":[{"id":"WATKINS","name":"WATKINS"},{"id":"p1","name":"p1"},{"id":"p2","name":"p2"},{"id":"p3","name":"p3"},{"id":"p4","name":"p4"},{"id":"p5","name":"p5"},{"id":"p6","name":"p6"},{"id":"p7","name":"p7"},{"id":"p8","name":"p8"},{"id":"x1","name":"x1"},{"id":"yyy1","name":"yyy1"}],"lineOfBusinessList":[{"id":"ONAP","name":"ONAP"},{"id":"zzz1","name":"zzz1"}],"platformList":[{"id":"platform","name":"platform"},{"id":"xxx1","name":"xxx1"}]},"type":"[LCP_REGIONS_AND_TENANTS] Update"}}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarte.json b/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarte.json new file mode 100644 index 000000000..71ba53661 --- /dev/null +++ b/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarte.json @@ -0,0 +1,26 @@ +{ + "modelInfo": { + "modelInvariantId": "0367689e-d41e-483f-b200-eab17e4a7f8d", + "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705", + "modelName": "gayawabawe", + "modelVersion": "5.1" + }, + "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "Lucine Sarika", + "projectName" : "zasaki", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriberName": "SILVIA ROBBINS", + "productFamilyId" : "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3", + "instanceName" : "SERVICE_NAME", + "subscriptionServiceType" : "TYLER SILVIA", + "aicZoneId" : "de738e5f-3704-4a14-b98f-3bf86ac0c0a0", + "aicZoneName" : "voloyakane-senamo", + "lcpCloudRegionId" : "a93f8383-707e-43fa-8191-a6e69a1aab17", + "lcpCloudRegionName" : "Cyrus Graciano", + "tenantId" : "c85f0e80-0636-44a4-8cb2-4ec00d056e79", + "tenantName" : "Hedvika Wendelin", + "bulkSize": "1", + "testApi": "VNF_API", + "isALaCarte": true +} + diff --git a/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnf.json b/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnf.json new file mode 100644 index 000000000..c6529c86e --- /dev/null +++ b/vid-automation/src/main/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnf.json @@ -0,0 +1,47 @@ +{ + "modelInfo": { + "modelInvariantId": "0367689e-d41e-483f-b200-eab17e4a7f8d", + "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705", + "modelName": "gayawabawe", + "modelVersion": "5.1" + }, + "vnfs": + { + "vSAMP12 1":{ + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe042c22-ba82-43c6-b2f6-8f1fc4164091", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP12 1", + "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceName": "VNF_NAME", + "platformName": "vnf_platformName", + "lcpCloudRegionId" : "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e", + "lineOfBusinessName": "vnf_lineOfBusinessName", + "rollbackOnFailure": false + } + }, + "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "Lucine Sarika", + "projectName" : "zasaki", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriberName": "SILVIA ROBBINS", + "productFamilyId" : "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3", + "instanceName" : "SERVICE_NAME", + "subscriptionServiceType" : "TYLER SILVIA", + "aicZoneId" : "de738e5f-3704-4a14-b98f-3bf86ac0c0a0", + "aicZoneName" : "voloyakane-senamo", + "lcpCloudRegionId" : "a93f8383-707e-43fa-8191-a6e69a1aab17", + "lcpCloudRegionName" : "Cyrus Graciano", + "tenantId" : "c85f0e80-0636-44a4-8cb2-4ec00d056e79", + "tenantName" : "Hedvika Wendelin", + "bulkSize": "BULK_SIZE", + "testApi": "VNF_API", + "isALaCarte": true +} + diff --git a/vid-automation/src/main/resources/changeManagement/withoutConfigurationParameters.csv b/vid-automation/src/main/resources/changeManagement/withoutConfigurationParameters.csv index f8f4e86c0..8c9aa401f 100644 --- a/vid-automation/src/main/resources/changeManagement/withoutConfigurationParameters.csv +++ b/vid-automation/src/main/resources/changeManagement/withoutConfigurationParameters.csv @@ -6,7 +6,7 @@ payload,request-parameters,[vm],[vnfc],vnfc-name,ibcx0001vm001dbg001 payload,request-parameters,[vm],[vnfc],vnfc-function-code,dbg payload,request-parameters,[vm],[vnfc],vnfc-type,DBE-VM #1 payload,request-parameters,[vm],[vnfc],group-notation,ibcx0001vm001dbg001pair -payload,request-parameters,[vm],[vnfc],ipaddress-v4-oam-vip,135.21.166.39 +payload,request-parameters,[vm],[vnfc],ipaddress-v4-oam-vip,10.2.3.4 payload,request-parameters,[vm],,vm-name,ibcx0001vm002 payload,request-parameters,[vm],[vnfc],vnfc-name,ibcx0001vm002dbg001 payload,request-parameters,[vm],[vnfc],vnfc-function-code,dbg diff --git a/vid-automation/src/main/resources/changeManagement/withoutPayload.csv b/vid-automation/src/main/resources/changeManagement/withoutPayload.csv index 25ac17397..7045a3130 100644 --- a/vid-automation/src/main/resources/changeManagement/withoutPayload.csv +++ b/vid-automation/src/main/resources/changeManagement/withoutPayload.csv @@ -2,7 +2,7 @@ request-parameters,[vm],[vnfc],vnfc-function-code,dbg request-parameters,[vm],[vnfc],vnfc-type,DBE-VM #1 request-parameters,[vm],[vnfc],group-notation,ibcx0001vm001dbg001pair -request-parameters,[vm],[vnfc],ipaddress-v4-oam-vip,135.21.166.39 +request-parameters,[vm],[vnfc],ipaddress-v4-oam-vip,10.2.3.4 request-parameters,[vm],,vm-name,ibcx0001vm002 request-parameters,[vm],[vnfc],vnfc-name,ibcx0001vm002dbg001 request-parameters,[vm],[vnfc],vnfc-function-code,dbg diff --git a/vid-automation/src/main/resources/ci/conf/log4j.properties b/vid-automation/src/main/resources/ci/conf/log4j.properties index 3e159ec8d..bef72a99f 100644 --- a/vid-automation/src/main/resources/ci/conf/log4j.properties +++ b/vid-automation/src/main/resources/ci/conf/log4j.properties @@ -28,7 +28,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c: log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout -log4j.logger.org.openecomp.sdc.ci.tests.utils=TRACE, FILE, stdout -log4j.additivity.org.openecomp.sdc.ci.tests.utils=false +log4j.logger.org.onap.sdc.ci.tests.utils=TRACE, FILE, stdout +log4j.additivity.org.onap.sdc.ci.tests.utils=false diff --git a/vid-automation/src/main/resources/ci/scripts/copyToStorage.sh b/vid-automation/src/main/resources/ci/scripts/copyToStorage.sh new file mode 100644 index 000000000..86fcadfef --- /dev/null +++ b/vid-automation/src/main/resources/ci/scripts/copyToStorage.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +REPORT_NAME=$1 +VERSION=$2 +ENV=$3 + +if [ -z "$REPORT_NAME" ] + then + source ExtentReport/versions.info + now=$(date +'%Y-%m-%d_%H_%M') + REPORT_NAME="${now}" + VERSION="${osVersion}" + if [[ $env == *"DEV20"* ]] + then + ENV="Nightly" + else + ENV="" + fi + + fi + +/usr/bin/expect << EOF +spawn ssh admin@135.76.210.45 mkdir -p -m 775 /home/admin/reports/${ENV}/${VERSION}/UI/ + +expect { + -re ".*es.*o.*" { + exp_send "yes\r" + exp_continue + } + -re ".*sword.*" { + exp_send "Aa123456\r" + } +} + +expect eof + +spawn scp -pr ExtentReport admin@135.76.210.45:/home/admin/reports/${ENV}/${VERSION}/UI/${REPORT_NAME}/ + +expect { + -re ".*es.*o.*" { + exp_send "yes\r" + exp_continue + } + -re ".*sword.*" { + exp_send "Aa123456\r" + } +} + +expect eof +EOF diff --git a/vid-automation/src/main/resources/ci/scripts/sendMail.sh b/vid-automation/src/main/resources/ci/scripts/sendMail.sh new file mode 100644 index 000000000..794534fc8 --- /dev/null +++ b/vid-automation/src/main/resources/ci/scripts/sendMail.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +now=$(date +'%Y%-m%d%H%M') + +REPORT_NAME=$1 +VERSION=$2 +ENV=$3 + +RECIPIENTS1="dl-sdcqa@intl.att.com,ml636r@intl.att.com,bl5783intl.att.com,ak314p@intl.att.com,el489u@intl.att.com,hk096q@intl.att.com,bs5719@intl.att.com" +RECIPIENTS2="dl-asdcqa@intl.att.com" + +source ExtentReport/versions.info +if [ -z "$REPORT_NAME" ] + then + source ExtentReport/versions.info + now=$(date +'%Y-%m-%d_%H_%M') + REPORT_NAME="${now}" + VERSION="${osVersion}" + + +fi + +if [[ $env == *"DEV20"* ]] + then + ENV="Nightly" + RECIPIENTS=$RECIPIENTS1 + else + ENV="" + RECIPIENTS=$RECIPIENTS2 +fi + +#REPORT_ZIP_FILE=ExtentReport_${now}.zip +REPORT_FOLDER='ExtentReport' +REPORT_HTML_FILE=${REPORT_FOLDER}/*Report.html +BODY_MESSAGE='Hello, \n\n Please find automation results on following link: \n\n http://asdc-srv-210-45.tlv.intl.att.com/'${ENV}'/'${VERSION}'/UI/'${REPORT_NAME}'/SDC_UI_Extent_Report.html \n\nThanks, \nASDC QA Team\n\n ' + +#OLD_FILE=$(find ./ -type f -name ${REPORT_ZIP_FILE} -print) +#if [ ! -z ${OLD_FILE} ] +#then +# rm -f ${REPORT_ZIP_FILE} +# echo "Removing old zip file............" +#fi + +#echo "Creating new zip file" +#zip -r ${REPORT_ZIP_FILE} ./${REPORT_FOLDER} + + + +echo -e ${BODY_MESSAGE} | mail -s 'E2E Automation '$ENV' results - SDC '$VERSION -r 'ASDC@Automation.team' $RECIPIENTS diff --git a/vid-automation/src/main/resources/ci/scripts/startTest.sh b/vid-automation/src/main/resources/ci/scripts/startTest.sh new file mode 100644 index 000000000..e4c1a0995 --- /dev/null +++ b/vid-automation/src/main/resources/ci/scripts/startTest.sh @@ -0,0 +1,141 @@ +#!/bin/bash +REMOTE_DEBUG=false +RERUN=true +JAVA_OPTION="" +debug_port=8000 +TEST_SUITES=testSuites +fileName=testng-failed.xml + +function help_usage () +{ + echo + echo "$0 (<jar_file_name> <suite file name>) [-r/rerun <true/false> -d/debug <true/false>]" + echo "nohup ./startTest.sh ui-ci-1707.0.5-SNAPSHOT-jar-with-dependencies.jar extendedSanity.xml -r false -d true &" + echo "by default rerun is true and remote debug is false." + echo + exit 2 +} + +function isBoolean () +{ + PARAM_NAME=$1 + VALUE=$2 + if [[ ${VALUE} != "true" ]] && [[ ${VALUE} != "false" ]]; then + echo "Valid parameter" ${PARAM_NAME} "values are: true/false" + help_usage + fi +} + +function prepareFailedXmlFile () +{ + echo "1="$1 "2="$2 "fileName="${fileName} + PATTERN=`grep -w "test name=" ${FULL_PATH}/${TEST_SUITES}/$2 | awk -F'"' '{print $2}'` + sed '/<test name="'${PATTERN}'"/,/<!-- '${PATTERN}' --/d' $1 > ${FULL_PATH}/${TEST_SUITES}/${fileName} + sed -i 's/thread-count="[0-9]\+"/thread-count="1"/g' ${FULL_PATH}/${TEST_SUITES}/${fileName} +} + +#main +[ $# -lt 2 ] && help_usage + +JAR_FILE=$1 +SUITE_FILE=$2 + +while [ $# -ne 0 ]; do + case $1 in + -r|rerun) + RERUN=$2 + isBoolean $1 ${RERUN} + shift 1 + shift 1 + ;; + -d|debug) + REMOTE_DEBUG=$2 + isBoolean $1 ${REMOTE_DEBUG} + shift 1 + shift 1 + ;; + *) + shift 1 + ;; + esac +done + +CURRENT_DIR=`pwd` +BASEDIR=$(dirname $0) + +if [ ${BASEDIR:0:1} = "/" ] +then + FULL_PATH=$BASEDIR +else + FULL_PATH=$CURRENT_DIR/$BASEDIR +fi +LOGS_PROP_FILE=file:${FULL_PATH}/conf/log4j.properties +############################################# +TARGET_DIR=${FULL_PATH}/target +CONF_FILE=${FULL_PATH}/conf/attsdc.yaml + +DEBUG=true +MainClass=org.onap.sdc.ci.tests.run.StartTest + +TESTS_DIR=/opt/app/sdc/ci/resources/tests +COMPONENTS_DIR=/opt/app/sdc/ci/resources/components + + +TARGET_LOG_DIR="${TARGET_DIR}/" + +if [ ${REMOTE_DEBUG} == "true" ]; then + echo "Debug mode, Listen on port $debug_port"; + JAVA_OPTION="-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${debug_port}" ; +fi + +cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" + + +if [ $DEBUG == "true" ] +then + $cmd +else + $cmd >> /dev/null +fi + +if [ ${RERUN} == "true" ]; then + if [ -f ${TARGET_DIR}/${fileName} ]; then + echo "Prepare" ${TARGET_DIR}/${fileName} "file to rerun all failed tests ..."; + prepareFailedXmlFile ${TARGET_DIR}/${fileName} $SUITE_FILE; + SUITE_FILE=${fileName}; + cmd="java -Xmx2048m -Xms1024m $JAVA_OPTION -DdisplayException=true -Dtargetlog=${TARGET_LOG_DIR} -Dfilepath=${FILES_TEST} -Dconfig.resource=${CONF_FILE} -Ddebug=${DEBUG} -Dlog4j.configuration=${LOGS_PROP_FILE} -cp $JAR_FILE ${MainClass} $SUITE_FILE &" + $cmd; + fi +fi + +status=`echo $?` + +source ExtentReport/versions.info +now=$(date +'%Y-%m-%d_%H_%M') +REPORT_NAME=${now} +VERSION=${osVersion} + +if [[ $env == *"DEV20"* ]] +then + MYENV="Nightly" +else + MYENV="" +fi + +COPY_REPORT_SCRIPT="copyToStorage.sh" +chmod +x ${COPY_REPORT_SCRIPT} +echo "copy report to storage..." +sh ./${COPY_REPORT_SCRIPT} ${REPORT_NAME} ${VERSION} ${MYENV} + + +MAILING_SCRIPT_NAME="sendMail.sh" +chmod +x ${MAILING_SCRIPT_NAME} +echo "Sending report via mail..." +`./${MAILING_SCRIPT_NAME} ${REPORT_NAME} ${VERSION} ${MYENV}` + + +echo "##################################################" +echo "################# status is ${status} #################" +echo "##################################################" + +exit $status diff --git a/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json b/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json index ee95c9ff0..ac62bb1e7 100644 --- a/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json +++ b/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json @@ -1,12 +1,12 @@ { "global-customer-id":"GLOBAL_CUSTOMER_ID", - "subscriber-name":"Mobility", + "subscriber-name":"Emanuel", "subscriber-type":"INFRA", "resource-version":"1494255056308", "service-subscriptions":{ "service-subscription":[ { - "service-type":"vFlowLogic", + "service-type":"vRichardson", "resource-version":"1501700976809", "service-instances":{ "service-instance":[ @@ -35,13 +35,21 @@ "is-permitted":false }, { - "service-type":"VIRTUAL USP", + "service-type":"TYLER SILVIA", "resource-version":"1501700976809", "service-instances":{ "service-instance":[ { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f61234", + "service-instance-name": "test_fabric_config", + "model-invariant-id": "c15fe228-7d40-4f99-afa7-10abeedf9aac", + "model-version-id": "253f1467-fe68-4e80-ba71-308000caec31", + "resource-version": "1500789244674", + "orchestration-status": "<ORCH_STATUS>" + }, + { "service-instance-id":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb", - "service-instance-name":"mdns_2017_1011_CreateSerInstance", + "service-instance-name":"CHARLOTTE_2017_1011_CreateSerInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"896489236489", @@ -50,6 +58,16 @@ "model-version-id":"f4d84bb4-a416-4b4e-997e-0059973630b9" }, { + "service-instance-id":"d2391436-8d55-4fde-b4d5-72dd2cf13cgh", + "service-instance-name":"ALaCarte_CreateSerInstance", + "persona-model-id":null, + "persona-model-version":null, + "resource-version":"896489236489", + "orchestration-status":"Active", + "model-invariant-id":"7ee41ce4-4827-44b0-a48e-2707a59905d2", + "model-version-id":"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc" + }, + { "service-instance-id":"414db2d4-18d0-415e-aac2-f255b586cfbx", "service-instance-name":"usp_voice_inst", "persona-model-id":null, @@ -64,7 +82,7 @@ "is-permitted":true }, { - "service-type":"Mobility", + "service-type":"Emanuel", "resource-version":"1505402148533", "service-instances":{ "service-instance":[ @@ -100,7 +118,7 @@ }, { "service-instance-id":"be3f0f35-0cd6-4b64-a9a1-ef66ebf2df38", - "service-instance-name":"mdns_2017_1011_sb063v_1024", + "service-instance-name":"CHARLOTTE_2017_1011_sb063v_1024", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508858365648", @@ -110,7 +128,7 @@ }, { "service-instance-id":"9fb6d4cd-6d8e-41d6-afcf-37d151df1976", - "service-instance-name":"zrdm_Mobility_Service_297772_kk364s_1010_1400", + "service-instance-name":"zrdm_Emanuel_Service_297772_kk364s_1010_1400", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507658384805", @@ -120,7 +138,7 @@ }, { "service-instance-id":"bbbcbe28-850f-42a5-8f46-8bd2a30c3014", - "service-instance-name":"mdns_2017_1011_kk364s", + "service-instance-name":"CHARLOTTE_2017_1011_kk364s", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508962475505", @@ -130,7 +148,7 @@ }, { "service-instance-id":"fd533b88-9e23-4636-8a32-3d2bf24db80b", - "service-instance-name":"Mobility_Service_297772", + "service-instance-name":"Emanuel_Service_297772", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505500142924", @@ -140,7 +158,7 @@ }, { "service-instance-id":"14cfc148-ff07-49a3-a4e2-0aa5ce237624", - "service-instance-name":"rdm5b_mdns_2017_1011_IST_Service_kk364s", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_IST_Service_kk364s", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509122521715", @@ -180,7 +198,7 @@ }, { "service-instance-id":"3afa7504-be8c-4fb1-b6c2-071f78faee18", - "service-instance-name":"mDNS_preload_1710_0914_01", + "service-instance-name":"CHARLOTTE_preload_1710_0914_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506538704860", @@ -210,7 +228,7 @@ }, { "service-instance-id":"18094982-779d-48b7-ab75-93da74944583", - "service-instance-name":"rdm5_mdns_2017_1011", + "service-instance-name":"olson5_CHARLOTTE_2017_1011", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509045878842", @@ -260,7 +278,7 @@ }, { "service-instance-id":"f032606a-5add-4a12-87f7-4df1f0734594", - "service-instance-name":"Zmtn6_Mobility_Service_297772_kk364s_1010_1130", + "service-instance-name":"Zmtn6_Emanuel_Service_297772_kk364s_1010_1130", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507649564599", @@ -300,7 +318,7 @@ }, { "service-instance-id":"0d9d1292-f2bb-4a43-95fc-c9e1e4e9c510", - "service-instance-name":"CR_SVC_Mobility_Service_297772_ss616y_09_28", + "service-instance-name":"CR_SVC_Emanuel_Service_297772_ss616y_09_28", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506539863926", @@ -320,7 +338,7 @@ }, { "service-instance-id":"076bf40a-7eca-4412-ab6e-5de4cf598256", - "service-instance-name":"CService_mDNS_preload_1710_0914_1110", + "service-instance-name":"CService_CHARLOTTE_preload_1710_0914_1110", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507752734878", @@ -343,7 +361,7 @@ "is-permitted":false }, { - "service-type":"vBNG", + "service-type":"vJamie", "resource-version":"1498068165053", "service-instances":{ "service-instance":[ @@ -429,7 +447,7 @@ }, { "service-instance-id":"7492cc2b-facb-4b81-abbe-a35cd4188fd7", - "service-instance-name":"crSVC_Mobility_Service_297772_ss616y_09_26", + "service-instance-name":"crSVC_Emanuel_Service_297772_ss616y_09_26", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506440095410", @@ -498,7 +516,7 @@ }, { "service-instance-id":"e98d2d5d-ffec-4eee-b32a-229e94ec8b24", - "service-instance-name":"mDNS_1710_preload_test_Svc_01_PB", + "service-instance-name":"CHARLOTTE_1710_preload_test_Svc_01_PB", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505233873380", @@ -508,7 +526,7 @@ }, { "service-instance-id":"258a043f-d8bd-46e8-a5f1-1118da623347", - "service-instance-name":"HnportalSriovProviderNet3_4", + "service-instance-name":"WILKINSSriovProviderNet3_4", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506021716378", @@ -528,7 +546,7 @@ }, { "service-instance-id":"a8ab2c37-db0c-4dca-99f5-8d7a99dc6bf5", - "service-instance-name":"mDNS_1710_preload_test_Svc_PB_02", + "service-instance-name":"CHARLOTTE_1710_preload_test_Svc_PB_02", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506367121901", @@ -541,7 +559,7 @@ "is-permitted":false }, { - "service-type":"Nimbus", + "service-type":"Kennedy", "resource-version":"1509369877126", "service-instances":{ "service-instance":[ @@ -557,7 +575,7 @@ }, { "service-instance-id":"d93fa084-80f4-4900-ba57-8b736db3271b", - "service-instance-name":"mDNS_preload_1710_0914_1024", + "service-instance-name":"CHARLOTTE_preload_1710_0914_1024", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508876558729", @@ -567,7 +585,7 @@ }, { "service-instance-id":"123466fa-e678-439e-a89f-29bdb2747d13", - "service-instance-name":"MDNS_NETWORK_OAM_ISTinE2E", + "service-instance-name":"CHARLOTTE_NETWORK_OAM_ISTinE2E", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509557184342", @@ -577,7 +595,7 @@ }, { "service-instance-id":"8a4674e2-fbca-4857-af78-e611b1574f5a", - "service-instance-name":"mdns_pa2396_1027", + "service-instance-name":"CHARLOTTE_pa2396_1027", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509045174529", @@ -587,7 +605,7 @@ }, { "service-instance-id":"75442b9d-e3de-4311-bfd8-b8bed4541742", - "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_2910", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_2910", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509215537269", @@ -597,7 +615,7 @@ }, { "service-instance-id":"f022b8c0-9796-4389-90ae-5c46df9e8574", - "service-instance-name":"PCRF_1610_2.4_SVC", + "service-instance-name":"RODERICK_1610_2.4_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148885", @@ -617,7 +635,7 @@ }, { "service-instance-id":"25158088-c7b1-4898-b511-de0c78e093c9", - "service-instance-name":"MOBT-Nimbus-3-Sprint-1-Svc", + "service-instance-name":"MOBT-Kennedy-3-Sprint-1-Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506094357348", @@ -627,7 +645,7 @@ }, { "service-instance-id":"b84af18a-c01a-4408-8e3c-74517a94af6f", - "service-instance-name":"Nimbus-IXLA-0705-Svc", + "service-instance-name":"Kennedy-IXLA-0705-Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506715142169", @@ -647,7 +665,7 @@ }, { "service-instance-id":"fff0b350-ffaa-46ed-b927-8e82b3497af8", - "service-instance-name":"mDNS-1710-AF-SVC", + "service-instance-name":"CHARLOTTE-1710-AF-SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506435654274", @@ -657,7 +675,7 @@ }, { "service-instance-id":"77d79cda-f8f4-4a9e-80d2-3199fefe6eb4", - "service-instance-name":"Nimbus_LDSA_0705_Svc", + "service-instance-name":"Kennedy_LDSA_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499869842847", @@ -667,7 +685,7 @@ }, { "service-instance-id":"cedac8e7-43ef-47a9-ace6-90aadafdc01a", - "service-instance-name":"Mobility-Ntwking-Svc-Model", + "service-instance-name":"Emanuel-Ntwking-Svc-Model", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505507866717", @@ -677,7 +695,7 @@ }, { "service-instance-id":"b287a10e-6dcb-402e-87bf-fe78fdcc54cf", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1410_1205", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1410_1205", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507997085749", @@ -687,7 +705,7 @@ }, { "service-instance-id":"2ef18b98-b026-4a77-b0e9-71d4e9a1a0ac", - "service-instance-name":"mdns_createServiceInstance", + "service-instance-name":"CHARLOTTE_createServiceInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508165923307", @@ -697,7 +715,7 @@ }, { "service-instance-id":"ab8bcc6c-3bc8-4f0e-8100-5d3bbdf5d8de", - "service-instance-name":"mdns_2017_1011_Create_SerInstance", + "service-instance-name":"CHARLOTTE_2017_1011_Create_SerInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508082674808", @@ -707,7 +725,7 @@ }, { "service-instance-id":"b41a499d-a2e1-4e9e-8717-ee1167bd43e9", - "service-instance-name":"Service_Nimbus_Demo_01", + "service-instance-name":"Service_Kennedy_Demo_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135772", @@ -717,7 +735,7 @@ }, { "service-instance-id":"af913107-ddea-425d-ab84-886b1a754bd1", - "service-instance-name":"Nimbus_IXLT_0705_Svc", + "service-instance-name":"Kennedy_IXLT_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500051698402", @@ -727,7 +745,7 @@ }, { "service-instance-id":"ec1eb896-f519-4e71-bec9-ead21fd5d633", - "service-instance-name":"mobility_Service_1011", + "service-instance-name":"emanuel_Service_1011", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507736303848", @@ -747,7 +765,7 @@ }, { "service-instance-id":"66b13cb4-b575-449f-aa45-ffbfe005c7b1", - "service-instance-name":"mDNS_preload_1710_0914", + "service-instance-name":"CHARLOTTE_preload_1710_0914", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505856078810", @@ -757,7 +775,7 @@ }, { "service-instance-id":"870f55a9-692d-45af-970b-7630317b46ea", - "service-instance-name":"Mobisupport_PCRF_Network_Service", + "service-instance-name":"Mobisupport_RODERICK_Network_Service", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152926", @@ -767,7 +785,7 @@ }, { "service-instance-id":"abc17093-fad2-41fc-ad30-65985b34bdfc", - "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_2010_1006", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_2010_1006", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508517379024", @@ -777,7 +795,7 @@ }, { "service-instance-id":"b3372b34-2085-40b3-b293-df1e546dddee", - "service-instance-name":"zrdm5bpxmc02_092017_Svc", + "service-instance-name":"zolson5bpxmc02_092017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505937237447", @@ -797,7 +815,7 @@ }, { "service-instance-id":"9b24c4e2-6e63-4de5-8a20-741ec8289ae1", - "service-instance-name":"Mobility_Service_297772_pb_1", + "service-instance-name":"Emanuel_Service_297772_pb_1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507665028261", @@ -807,7 +825,7 @@ }, { "service-instance-id":"ea5650f4-9d80-431e-a177-b6c43fd4ade0", - "service-instance-name":"zrdm_Mobility_Service_297772_kk364s_1110_1045", + "service-instance-name":"zrdm_Emanuel_Service_297772_kk364s_1110_1045", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507733035901", @@ -817,7 +835,7 @@ }, { "service-instance-id":"cd9aa07d-e670-498a-adef-82250a1428a0", - "service-instance-name":"mdns_2017_pa2396_1013", + "service-instance-name":"CHARLOTTE_2017_pa2396_1013", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507833492086", @@ -837,7 +855,7 @@ }, { "service-instance-id":"a15b35f0-81eb-43a7-ad51-a05331e629ca", - "service-instance-name":"Nimbus_FN_Int_Network_Svc", + "service-instance-name":"Kennedy_FN_Int_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148152", @@ -847,7 +865,7 @@ }, { "service-instance-id":"9ad4ac55-a5e0-4b49-95c0-b2d846abf700", - "service-instance-name":"mDNS_preload_1710_0914_100417", + "service-instance-name":"CHARLOTTE_preload_1710_0914_100417", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507144734087", @@ -867,7 +885,7 @@ }, { "service-instance-id":"4183a1b5-6bf0-4446-9c50-01851e8b4f50", - "service-instance-name":"PXMC_Svc", + "service-instance-name":"CORNELIUS_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148483", @@ -887,7 +905,7 @@ }, { "service-instance-id":"e4a7a120-9a19-4757-9d91-41f1dc89a708", - "service-instance-name":"Nimbus_FN_SGI_Network_Svc", + "service-instance-name":"Kennedy_FN_SGI_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148283", @@ -917,7 +935,7 @@ }, { "service-instance-id":"85bfb318-d203-42bd-a13f-e8c7508105df", - "service-instance-name":"mDNS_02-06-2017_Svc", + "service-instance-name":"CHARLOTTE_02-06-2017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147914", @@ -937,7 +955,7 @@ }, { "service-instance-id":"17901377-cd73-4d92-abc8-b4905e720ae8", - "service-instance-name":"Nimbus_3.0spr1_PCRF_v2.7_Svc", + "service-instance-name":"Kennedy_3.0spr1_RODERICK_v2.7_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504819759422", @@ -947,7 +965,7 @@ }, { "service-instance-id":"4a55321e-6707-497d-8b06-c4fb1ff065d5", - "service-instance-name":"PXTC_v7_svc_082817", + "service-instance-name":"GRANVILLE_v7_svc_082817", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504292485665", @@ -977,7 +995,7 @@ }, { "service-instance-id":"614e9b44-5388-4a60-a566-35c83ace67b3", - "service-instance-name":"mdns_2017_1011_PB", + "service-instance-name":"CHARLOTTE_2017_1011_PB", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509739169686", @@ -997,7 +1015,7 @@ }, { "service-instance-id":"08cdfd4b-9d25-40c8-a8c3-a15a3025d021", - "service-instance-name":"Nimbus_3.1_PCRF_0717_Svc", + "service-instance-name":"Kennedy_3.1_RODERICK_0717_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504061752729", @@ -1007,7 +1025,7 @@ }, { "service-instance-id":"0c916c04-d2ca-43f3-90f8-e0266b3e97c8", - "service-instance-name":"mdns_pa23961111", + "service-instance-name":"CHARLOTTE_pa23961111", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508338875497", @@ -1017,7 +1035,7 @@ }, { "service-instance-id":"ead68f27-e78f-417a-9d74-d7af3871c406", - "service-instance-name":"mdns_2017_1011_oh22u_1103", + "service-instance-name":"CHARLOTTE_2017_1011_oh22u_1103", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509728889955", @@ -1027,7 +1045,7 @@ }, { "service-instance-id":"54ba3628-9ee5-4b32-8a2a-3abf001bed4e", - "service-instance-name":"mdns_2017_1011_oh22u_20171103", + "service-instance-name":"CHARLOTTE_2017_1011_oh22u_20171103", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509730482946", @@ -1037,7 +1055,7 @@ }, { "service-instance-id":"9ecab3e4-c4f4-4c46-a46e-9be98f89a664", - "service-instance-name":"mdns_createservice_pa23961026", + "service-instance-name":"CHARLOTTE_createservice_pa23961026", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509032288508", @@ -1047,7 +1065,7 @@ }, { "service-instance-id":"11d25472-cbfb-4e10-a1f2-bea25d7c0823", - "service-instance-name":"mdns_2017_1011_v4", + "service-instance-name":"CHARLOTTE_2017_1011_v4", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508054069141", @@ -1057,7 +1075,7 @@ }, { "service-instance-id":"8c88375a-fe46-4f03-9729-cb2850d8e122", - "service-instance-name":"mdns_2017_1011_ServiceInstance", + "service-instance-name":"CHARLOTTE_2017_1011_ServiceInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508097853649", @@ -1067,7 +1085,7 @@ }, { "service-instance-id":"f054ce69-a3d0-4061-b6a6-cdb4ea8b4968", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1014_1700", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1014_1700", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507929319130", @@ -1087,7 +1105,7 @@ }, { "service-instance-id":"1abdbf2b-d08d-4f64-b123-7ecca7b8c9aa", - "service-instance-name":"mdns_2017_1011_pa2396", + "service-instance-name":"CHARLOTTE_2017_1011_pa2396", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507749134293", @@ -1097,7 +1115,7 @@ }, { "service-instance-id":"4a7882f6-128f-4303-8a47-9ee44a885965", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1210", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1210", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507752287291", @@ -1107,7 +1125,7 @@ }, { "service-instance-id":"7cdd3596-a11f-4508-87ff-f0a9be0796c9", - "service-instance-name":"Cservice_mdns_2017_1011_sg", + "service-instance-name":"Cservice_CHARLOTTE_2017_1011_sg", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507755029185", @@ -1117,7 +1135,7 @@ }, { "service-instance-id":"a43da41c-1510-4f2c-aef5-435534accf9f", - "service-instance-name":"mdns_2017_1011", + "service-instance-name":"CHARLOTTE_2017_1011", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507748135880", @@ -1137,7 +1155,7 @@ }, { "service-instance-id":"7eef7c51-70fe-4723-b762-bf8de2d4ea52", - "service-instance-name":"Nimbus_LU2_CGWY_Svc", + "service-instance-name":"Kennedy_LU2_CGWY_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135961", @@ -1147,7 +1165,7 @@ }, { "service-instance-id":"745fd172-4a08-4f14-a2d0-a9a0e2a3f725", - "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_1028", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_1028", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509129321340", @@ -1177,7 +1195,7 @@ }, { "service-instance-id":"77b4ba1c-c4df-4e3c-a73a-6c89967086a8", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507812622773", @@ -1187,7 +1205,7 @@ }, { "service-instance-id":"f7f8b3d0-bff3-4e10-b973-18ab33a40cb7", - "service-instance-name":"PXMC_v7_Service_062317", + "service-instance-name":"CORNELIUS_v7_Service_062317", "persona-model-id":null, "persona-model-version":null, "resource-version":"1503434415225", @@ -1207,7 +1225,7 @@ }, { "service-instance-id":"a8372edb-c2ff-4008-a5d1-1e790873d92f", - "service-instance-name":"mDNS_Service_New_HEAT", + "service-instance-name":"CHARLOTTE_Service_New_HEAT", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501704876346", @@ -1217,7 +1235,7 @@ }, { "service-instance-id":"7a9e9d7a-820a-46df-8cc9-79ba677fbf70", - "service-instance-name":"mDNS_1710_preload_test_Svc", + "service-instance-name":"CHARLOTTE_1710_preload_test_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505319453315", @@ -1227,7 +1245,7 @@ }, { "service-instance-id":"f195837b-ef28-42c3-8dea-47ad37eaed95", - "service-instance-name":"mDNS_preload_1710_0914_0920", + "service-instance-name":"CHARLOTTE_preload_1710_0914_0920", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505964829466", @@ -1257,7 +1275,7 @@ }, { "service-instance-id":"f2f54623-94b0-4dcb-a381-c58b82229d12", - "service-instance-name":"mdns_2017_1011_CreateSerInstance", + "service-instance-name":"CHARLOTTE_2017_1011_CreateSerInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508186235886", @@ -1287,7 +1305,7 @@ }, { "service-instance-id":"41de54a4-c2d7-41e6-b7e4-0125231e1a75", - "service-instance-name":"mdns_20171014_298940", + "service-instance-name":"CHARLOTTE_20171014_298940", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507921979277", @@ -1297,7 +1315,7 @@ }, { "service-instance-id":"9b3f5b80-7aaf-4c71-9066-79ba0beea6ae", - "service-instance-name":"mdns_298109_serviceinstance_pa2396", + "service-instance-name":"CHARLOTTE_298109_serviceinstance_pa2396", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507921462300", @@ -1307,7 +1325,7 @@ }, { "service-instance-id":"55dabffc-0f6c-424b-afd1-d3a3c515a8b3", - "service-instance-name":"mDNS_20170705_SVC", + "service-instance-name":"CHARLOTTE_20170705_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499710772965", @@ -1317,7 +1335,7 @@ }, { "service-instance-id":"b49aadf0-1435-468c-b338-1be1f86a1291", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1310", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1310", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507906471665", @@ -1327,7 +1345,7 @@ }, { "service-instance-id":"f9b00b35-3cb7-4b6f-9e21-922b4c291e70", - "service-instance-name":"mdns_298109", + "service-instance-name":"CHARLOTTE_298109", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507907071149", @@ -1337,7 +1355,7 @@ }, { "service-instance-id":"203d5521-85e9-46f1-9aa2-df593be5f464", - "service-instance-name":"Nimbus_FN_Cor_Network_Svc", + "service-instance-name":"Kennedy_FN_Cor_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149671", @@ -1347,7 +1365,7 @@ }, { "service-instance-id":"5164424e-5cc0-4050-9cd2-3598d0ed23a3", - "service-instance-name":"Nimbus_FN_HSL_Network_Svc", + "service-instance-name":"Kennedy_FN_HSL_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149745", @@ -1357,7 +1375,7 @@ }, { "service-instance-id":"d750f7d0-8543-4c71-8949-12b1cbbb623f", - "service-instance-name":"Nimbus_FN_Internet_Network_Svc", + "service-instance-name":"Kennedy_FN_Internet_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255150967", @@ -1377,7 +1395,7 @@ }, { "service-instance-id":"0d867a3c-66c2-49bb-89b3-a934209f04c9", - "service-instance-name":"RDM5b_mdns_2017_1011_oh222u_10312017", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_oh222u_10312017", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509393490120", @@ -1397,7 +1415,7 @@ }, { "service-instance-id":"0d94c422-73bf-4973-b561-2c9083b7c14c", - "service-instance-name":"mdns_2017_1011_IST_Service", + "service-instance-name":"CHARLOTTE_2017_1011_IST_Service", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509374793651", @@ -1407,7 +1425,7 @@ }, { "service-instance-id":"97d698da-4e7b-44b8-8596-f0fed1cb992e", - "service-instance-name":"MDNS_NETWORK_OAM", + "service-instance-name":"CHARLOTTE_NETWORK_OAM", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509478420584", @@ -1417,7 +1435,7 @@ }, { "service-instance-id":"8bafeb61-f9cd-4afb-b7a5-cd786df0c751", - "service-instance-name":"mdns_2017_1011_ServiceCreation_pa23061030", + "service-instance-name":"CHARLOTTE_2017_1011_ServiceCreation_pa23061030", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509379856680", @@ -1437,7 +1455,7 @@ }, { "service-instance-id":"16cd6439-ebd6-46f2-aa14-fcaa9b8c5ce7", - "service-instance-name":"PXTC_02_23_2017_Svc", + "service-instance-name":"GRANVILLE_02_23_2017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255150076", @@ -1447,7 +1465,7 @@ }, { "service-instance-id":"4767ab93-da7b-492c-833f-d063c7452caa", - "service-instance-name":"Nimbus_LDST_0705_Svc", + "service-instance-name":"Kennedy_LDST_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501261983060", @@ -1457,7 +1475,7 @@ }, { "service-instance-id":"c6fc80c1-de71-4484-86e5-b15ccc7e3432", - "service-instance-name":"mDNS_02-06-2017_Svc_DS_0814", + "service-instance-name":"CHARLOTTE_02-06-2017_Svc_DS_0814", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502734680482", @@ -1537,7 +1555,7 @@ }, { "service-instance-id":"8de54913-279f-406d-8585-e2152222373f", - "service-instance-name":"Nimbus_IXLA_0705_Svc", + "service-instance-name":"Kennedy_IXLA_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499963829384", @@ -1547,7 +1565,7 @@ }, { "service-instance-id":"f9dcb4e4-a47a-4f6a-b224-5fd3b30a83a0", - "service-instance-name":"Nimbus_SGI_Network_Svc", + "service-instance-name":"Kennedy_SGI_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148003", @@ -1557,7 +1575,7 @@ }, { "service-instance-id":"d5c83af3-4b48-4778-b2c3-07fba2362c79", - "service-instance-name":"Nimbus_FN_OAM_Network_Svc", + "service-instance-name":"Kennedy_FN_OAM_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148499", @@ -1567,7 +1585,7 @@ }, { "service-instance-id":"dce199f8-bb6a-4e99-a861-19b544c5438f", - "service-instance-name":"Mobility_Service_297772_pb", + "service-instance-name":"Emanuel_Service_297772_pb", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507663693747", @@ -1587,7 +1605,7 @@ }, { "service-instance-id":"38811ee9-901a-46e9-8dbd-4a7faceaebd4", - "service-instance-name":"mdns_createinstance", + "service-instance-name":"CHARLOTTE_createinstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508269726756", @@ -1597,7 +1615,7 @@ }, { "service-instance-id":"6fcd3f57-51d0-41b2-8825-ad2820253e5c", - "service-instance-name":"Nimbus_Int_Network_Svc", + "service-instance-name":"Kennedy_Int_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147871", @@ -1607,7 +1625,7 @@ }, { "service-instance-id":"5aaebe92-b062-473b-9a0c-017568386d8b", - "service-instance-name":"mdns_createService", + "service-instance-name":"CHARLOTTE_createService", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508265751686", @@ -1617,7 +1635,7 @@ }, { "service-instance-id":"a146b14c-6b06-435e-9c9a-f78cbcad626e", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508266016689", @@ -1630,13 +1648,13 @@ "is-permitted":true }, { - "service-type":"vSEGW", + "service-type":"vPorfirio", "resource-version":"1494254851983", "service-instances":{ "service-instance":[ { "service-instance-id":"5dfa2fc6-5dfe-4db6-ad73-a66e0cb878f4", - "service-instance-name":"SeGW_012417_Svc", + "service-instance-name":"Porfirio_012417_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147946", @@ -1646,7 +1664,7 @@ }, { "service-instance-id":"8e296fb3-0308-4634-9d8e-d715c8365ae7", - "service-instance-name":"vSeGW_07_05_2017_Svc", + "service-instance-name":"vPorfirio_07_05_2017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499698647185", @@ -1714,7 +1732,7 @@ "service-instance":[ { "service-instance-id":"70ea5910-b338-417e-a3a5-b63e7780bc13", - "service-instance-name":"RDM3_vOTA3_072717_Svc", + "service-instance-name":"olson3_vOTA3_072717_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501863709431", @@ -1773,7 +1791,7 @@ }, { "service-instance-id":"05427532-2f81-4d56-921f-52645e40dd9a", - "service-instance-name":"Vive2evmme1020", + "service-instance-name":"Vive2evflorence1020", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148467", @@ -2002,7 +2020,7 @@ }, { "service-instance-id":"52bdd6f0-3cf4-4607-a0ee-345e5c1ee370", - "service-instance-name":"MNS_Mobility_Network_RDM6B", + "service-instance-name":"MNS_Emanuel_Network_RDM6B", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509390672331", @@ -2042,7 +2060,7 @@ }, { "service-instance-id":"140b40e4-57a2-4b32-82b9-2f8475368f96", - "service-instance-name":"Mobility_Ntwking_vMNS_Svc", + "service-instance-name":"Emanuel_Ntwking_vMNS_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507653879814", @@ -2072,7 +2090,7 @@ }, { "service-instance-id":"f2ac821f-d0de-44d2-a635-d3c2768f6e32", - "service-instance-name":"Mobility+Proted+Network+Svc", + "service-instance-name":"Emanuel+Proted+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135548", @@ -2092,7 +2110,7 @@ }, { "service-instance-id":"18c26081-ced9-4295-8363-2f5dec967175", - "service-instance-name":"Mobility+HSL+Network+Svc", + "service-instance-name":"Emanuel+HSL+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135993", @@ -2102,7 +2120,7 @@ }, { "service-instance-id":"100c48e7-ff0e-40b3-b34e-fc7789c361ce", - "service-instance-name":"Mobility+Mgmt+Network+Svc", + "service-instance-name":"Emanuel+Mgmt+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136003", @@ -2122,7 +2140,7 @@ }, { "service-instance-id":"dae4013c-8907-4c40-83e2-e4f28227a2cb", - "service-instance-name":"Mobility+Direct+Network+Svc", + "service-instance-name":"Emanuel+Direct+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136019", @@ -2175,13 +2193,13 @@ "is-permitted":false }, { - "service-type":"vSCP", + "service-type":"vEsmeralda", "resource-version":"1501532104695", "service-instances":{ "service-instance":[ { "service-instance-id":"b3614fb3-9430-4e21-824a-69b7838a6afa", - "service-instance-name":"vSCP_FW_INT2_20170727_SVC", + "service-instance-name":"vEsmeralda_FW_INT2_20170727_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501864174017", @@ -2201,7 +2219,7 @@ }, { "service-instance-id":"116dda7f-1728-4276-b976-e750d3e360d6", - "service-instance-name":"vSCP_FW+INT1+Sept+22+Svc", + "service-instance-name":"vEsmeralda_FW+INT1+Sept+22+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135497", @@ -2231,7 +2249,7 @@ }, { "service-instance-id":"ee52ca93-8309-4b66-b935-ffc1a3a5d2b0", - "service-instance-name":"vSCP_INT1_Sept_20_Svc", + "service-instance-name":"vEsmeralda_INT1_Sept_20_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500661099821", @@ -2251,7 +2269,7 @@ }, { "service-instance-id":"f64cf888-12d7-4d98-900b-d3bb2f2a096c", - "service-instance-name":"vSCP_SVC_INT2_0722", + "service-instance-name":"vEsmeralda_SVC_INT2_0722", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135475", @@ -2281,7 +2299,7 @@ }, { "service-instance-id":"6eac6301-8583-4ac0-b1bf-c79eb528c95d", - "service-instance-name":"vSCP_FW_INT2_20170727_SVC_VL", + "service-instance-name":"vEsmeralda_FW_INT2_20170727_SVC_VL", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505230561129", @@ -2311,7 +2329,7 @@ }, { "service-instance-id":"b229a960-06ab-4994-91d1-5ac6a7dac01c", - "service-instance-name":"vSCP_RDM3_Lab_INT2_0712_SVC", + "service-instance-name":"vEsmeralda_RDM3_Lab_INT2_0712_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502889690377", @@ -2370,7 +2388,7 @@ }, { "service-instance-id":"cd3a9458-12d7-4e08-91cc-3cb1855625ce", - "service-instance-name":"Vive2evscp_vprobe1025", + "service-instance-name":"Vive2evEsmeralda_vprobe1025", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148167", @@ -2380,7 +2398,7 @@ }, { "service-instance-id":"9150328a-922b-46e6-81c0-586d31cdf07a", - "service-instance-name":"Vive2evscp_vprobe1025", + "service-instance-name":"Vive2evEsmeralda_vprobe1025", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152546", @@ -2390,7 +2408,7 @@ }, { "service-instance-id":"1bc1002b-d12a-4cbb-a977-f21bf9b4a7a9", - "service-instance-name":"viv2vscpe2e1025", + "service-instance-name":"viv2vEsmeraldae2e1025", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152553", @@ -2480,7 +2498,7 @@ }, { "service-instance-id":"b06e9f78-398a-466d-af4e-deb66c19bd7d", - "service-instance-name":"Mobility-vprobe-FE-11-2-1-7-Service", + "service-instance-name":"Emanuel-vprobe-FE-11-2-1-7-Service", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507062871959", @@ -2493,13 +2511,13 @@ "is-permitted":false }, { - "service-type":"vMMSC", + "service-type":"vWINIFRED", "resource-version":"1498752217386", "service-instances":{ "service-instance":[ { "service-instance-id":"3364befd-0802-4861-99af-47c5c047239b", - "service-instance-name":"HnportalSriovProviderNet_50", + "service-instance-name":"WILKINSSriovProviderNet_50", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148521", @@ -2519,7 +2537,7 @@ }, { "service-instance-id":"240f80d8-4b6e-4882-a069-67512dc66888", - "service-instance-name":"HnportalSriovProviderNet_88", + "service-instance-name":"WILKINSSriovProviderNet_88", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148043", @@ -2529,7 +2547,7 @@ }, { "service-instance-id":"48e6f4d3-8335-4669-9708-2e972fd2473f", - "service-instance-name":"HnportalSriovProviderNet_77", + "service-instance-name":"WILKINSSriovProviderNet_77", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149448", @@ -2589,7 +2607,7 @@ }, { "service-instance-id":"526fe500-b06d-49e9-ac9c-9e305468f7d9", - "service-instance-name":"HnportalSriovProviderNet_89", + "service-instance-name":"WILKINSSriovProviderNet_89", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151379", @@ -2629,7 +2647,7 @@ }, { "service-instance-id":"d12538b2-d2f3-4879-87ac-f0b45fc6f84d", - "service-instance-name":"CRSVC_Mobility_Service_297772_ss616y_09_26_17_1", + "service-instance-name":"CRSVC_Emanuel_Service_297772_ss616y_09_26_17_1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506440871179", @@ -2689,7 +2707,7 @@ }, { "service-instance-id":"804c924a-00fe-40a9-af10-fbaa4ad99390", - "service-instance-name":"vMMSC_Lab2_020217_Svc_Service_0617", + "service-instance-name":"vWINIFRED_Lab2_020217_Svc_Service_0617", "persona-model-id":null, "persona-model-version":null, "resource-version":"1497721637609", @@ -2729,7 +2747,7 @@ }, { "service-instance-id":"1b9e0bf1-13d9-4122-8364-6d94187a6e76", - "service-instance-name":"vMMSC_Lab2_010517_Svc_DS_0714_01", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_DS_0714_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500063304219", @@ -2749,7 +2767,7 @@ }, { "service-instance-id":"97ed0e33-3031-42c7-a4ce-519f3af21132", - "service-instance-name":"HnportalSriovProviderNet_29", + "service-instance-name":"WILKINSSriovProviderNet_29", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148377", @@ -2759,7 +2777,7 @@ }, { "service-instance-id":"022b44be-2fe1-465a-b9ad-e9d6c3c89778", - "service-instance-name":"VMMSC_AIC_3.0_Svc", + "service-instance-name":"vWINIFRED_AIC_3.0_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1495556113481", @@ -2769,7 +2787,7 @@ }, { "service-instance-id":"72117a7f-e304-4f59-9ba5-d2b6419caa6b", - "service-instance-name":"HnportalSriovProviderNet_100", + "service-instance-name":"WILKINSSriovProviderNet_100", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148058", @@ -2789,7 +2807,7 @@ }, { "service-instance-id":"26031c62-ca38-4427-a773-ee43a172ed3a", - "service-instance-name":"vMMSC_Test_06292017_Svc_0629_ud6361", + "service-instance-name":"vWINIFRED_Test_06292017_Svc_0629_ud6361", "persona-model-id":null, "persona-model-version":null, "resource-version":"1498782124079", @@ -2799,7 +2817,7 @@ }, { "service-instance-id":"d3055874-7e1c-4a3d-b4d1-8ac3e91fcc28", - "service-instance-name":"vMMSC_Test_08182017_Svc_sb063v", + "service-instance-name":"vWINIFRED_Test_08182017_Svc_sb063v", "persona-model-id":null, "persona-model-version":null, "resource-version":"1503070451727", @@ -2849,7 +2867,7 @@ }, { "service-instance-id":"facedbb9-9703-4b61-a04b-d0f23e6a0188", - "service-instance-name":"crSVC_Mobility_Service_297772_ss616y_1", + "service-instance-name":"crSVC_Emanuel_Service_297772_ss616y_1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506374487982", @@ -2899,7 +2917,7 @@ }, { "service-instance-id":"fd202522-5f89-4ce9-b892-5f75956f93b3", - "service-instance-name":"HnportalSriovProviderNet_112", + "service-instance-name":"WILKINSSriovProviderNet_112", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149987", @@ -2909,7 +2927,7 @@ }, { "service-instance-id":"a83695df-061f-4871-80fe-0be5f7113ad0", - "service-instance-name":"HnportalSriovProviderNet_53", + "service-instance-name":"WILKINSSriovProviderNet_53", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148198", @@ -2919,7 +2937,7 @@ }, { "service-instance-id":"3d443a66-504d-49d3-967d-5f6523ec2e7b", - "service-instance-name":"HnportalSriovProviderNet_55", + "service-instance-name":"WILKINSSriovProviderNet_55", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148205", @@ -2929,7 +2947,7 @@ }, { "service-instance-id":"9365e5c7-bdd6-4f50-a8d2-96d5b3293842", - "service-instance-name":"HnportalSriovProviderNet_123", + "service-instance-name":"WILKINSSriovProviderNet_123", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149295", @@ -2979,7 +2997,7 @@ }, { "service-instance-id":"537b6fdd-1753-4be6-8b12-d325eebc3e32", - "service-instance-name":"createService_Mobility_Service_297772_09_28_ss616y", + "service-instance-name":"createService_Emanuel_Service_297772_09_28_ss616y", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506543405211", @@ -2989,7 +3007,7 @@ }, { "service-instance-id":"7f8b4e13-fc46-4b67-b2b7-d6d8226476fe", - "service-instance-name":"x_mdns_2017_1011_CSI", + "service-instance-name":"x_CHARLOTTE_2017_1011_CSI", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509729899645", @@ -2999,7 +3017,7 @@ }, { "service-instance-id":"4ec4f2c8-6f55-4244-aa36-aac847ac048f", - "service-instance-name":"vMMSC+Sept+22+Svc", + "service-instance-name":"vWINIFRED+Sept+22+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136029", @@ -3039,7 +3057,7 @@ }, { "service-instance-id":"3191493c-46cd-40d0-b659-c7d1e5f14bda", - "service-instance-name":"vMMSC_MMS_Lab_3_121416_Svc", + "service-instance-name":"vWINIFRED_MMS_Lab_3_121416_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152771", @@ -3059,7 +3077,7 @@ }, { "service-instance-id":"ee612d09-aa6d-455d-97ad-3259d2098d75", - "service-instance-name":"HnportalSriovProviderNet_58", + "service-instance-name":"WILKINSSriovProviderNet_58", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151334", @@ -3069,7 +3087,7 @@ }, { "service-instance-id":"6301180d-d4d8-447d-88f9-37fa585b1502", - "service-instance-name":"vMMSC_AIC_3.0_0622_Svc", + "service-instance-name":"vWINIFRED_AIC_3.0_0622_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500335097279", @@ -3079,7 +3097,7 @@ }, { "service-instance-id":"a5c57309-c13c-4d93-b849-78857cbc1620", - "service-instance-name":"Mobility_Service_297772_nb5443", + "service-instance-name":"Emanuel_Service_297772_nb5443", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505761426908", @@ -3149,7 +3167,7 @@ }, { "service-instance-id":"faac5e72-5fa0-4a3c-84f9-7f582cb6dac7", - "service-instance-name":"HNPortal_OAM_NET_VTO_2", + "service-instance-name":"WILKINS_OAM_NET_VTO_2", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151970", @@ -3189,7 +3207,7 @@ }, { "service-instance-id":"96ebc75f-fb74-4e90-a907-f8e95e12b2f7", - "service-instance-name":"Mobility_Service_297772_DS_0918_01", + "service-instance-name":"Emanuel_Service_297772_DS_0918_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505761575910", @@ -3219,7 +3237,7 @@ }, { "service-instance-id":"ec6b2b5b-b3cc-428d-951a-246b5c520f2d", - "service-instance-name":"VMMSC_AIC_3.0_MVM_0612", + "service-instance-name":"vWINIFRED_AIC_3.0_MVM_0612", "persona-model-id":null, "persona-model-version":null, "resource-version":"1497298262657", @@ -3229,7 +3247,7 @@ }, { "service-instance-id":"8eabacfe-c914-4891-9d1c-68f0ecff1944", - "service-instance-name":"VMMSC_AIC_30_Svc", + "service-instance-name":"vWINIFRED_AIC_30_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505484796812", @@ -3249,7 +3267,7 @@ }, { "service-instance-id":"7d05c5df-e627-43f2-8684-bac0762dacbd", - "service-instance-name":"HnportalSriovProviderNet_98", + "service-instance-name":"WILKINSSriovProviderNet_98", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149640", @@ -3299,7 +3317,7 @@ }, { "service-instance-id":"33c37a25-76a7-40fe-b08e-d88384e5654e", - "service-instance-name":"HnportalSriovProviderNet_96", + "service-instance-name":"WILKINSSriovProviderNet_96", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149632", @@ -3319,7 +3337,7 @@ }, { "service-instance-id":"d0dd8197-b506-4118-97c9-29fa49af77fd", - "service-instance-name":"vMMSC_Lab2_010517_Svc_DS_0615_01", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_DS_0615_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1497539173826", @@ -3359,7 +3377,7 @@ }, { "service-instance-id":"e0aa3f05-1c5d-4205-be72-b4f53c5caf26", - "service-instance-name":"lll_051817_vmme_svc", + "service-instance-name":"lll_051817_vflorence_svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1495131287067", @@ -3369,7 +3387,7 @@ }, { "service-instance-id":"8514ebd9-b681-47e7-86bc-6c803b672dc4", - "service-instance-name":"vMMSC_Lab2_020217_Svc", + "service-instance-name":"vWINIFRED_Lab2_020217_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147818", @@ -3379,7 +3397,7 @@ }, { "service-instance-id":"d11b6e9b-0c72-4e65-a93e-a94d9c673d05", - "service-instance-name":"vMMSC_Test_06292017_Svc_ds_0720_01", + "service-instance-name":"vWINIFRED_Test_06292017_Svc_ds_0720_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500490381801", @@ -3389,7 +3407,7 @@ }, { "service-instance-id":"78f93382-b473-47c9-b921-3beb1e73477e", - "service-instance-name":"vMMSC_Lab2_010707_Svc_SA", + "service-instance-name":"vWINIFRED_Lab2_010707_Svc_SA", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499368751374", @@ -3399,7 +3417,7 @@ }, { "service-instance-id":"512cea94-0ae9-4df5-a670-75fdeb709574", - "service-instance-name":"vMMSC_Lab2_010517_Svc_710", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_710", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499701812485", @@ -3439,7 +3457,7 @@ }, { "service-instance-id":"8752cea8-ffee-4dcc-8f80-71641ce7017b", - "service-instance-name":"Service_vMMSC_298109_Svc_DS_0913_01", + "service-instance-name":"Service_vWINIFRED_298109_Svc_DS_0913_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505336746682", @@ -3449,7 +3467,7 @@ }, { "service-instance-id":"5cd4b31f-17e3-4bc2-8a53-fd1aebfc40c8", - "service-instance-name":"HnportalSriovProviderNet_97", + "service-instance-name":"WILKINSSriovProviderNet_97", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149102", @@ -3469,7 +3487,7 @@ }, { "service-instance-id":"5a2cb0c0-e32d-42a9-9a8c-e47ad9dd7978", - "service-instance-name":"HnportalSriovProviderNet_73", + "service-instance-name":"WILKINSSriovProviderNet_73", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149603", @@ -3479,7 +3497,7 @@ }, { "service-instance-id":"1664e68e-5323-4d0a-be16-fbf7a973aede", - "service-instance-name":"HnportalSriovProviderNet_82", + "service-instance-name":"WILKINSSriovProviderNet_82", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149782", @@ -3499,7 +3517,7 @@ }, { "service-instance-id":"370073cf-89e9-4526-9fc0-dfff468571a8", - "service-instance-name":"SI_vVIGaas_Test_01", + "service-instance-name":"SI_vSalvatore_Test_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148452", @@ -3687,7 +3705,7 @@ }, { "service-instance-id":"37aa1cd2-decf-41a8-9edb-ed4407898201", - "service-instance-name":"vMMSC_Lab2_010517_Svc_Rollback", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_Rollback", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499697119107", @@ -3730,13 +3748,13 @@ "is-permitted":false }, { - "service-type":"FIRSTNET", + "service-type":"LINDSEY", "resource-version":"1509387060781", "service-instances":{ "service-instance":[ { "service-instance-id":"72745ee0-4236-43a4-a2a7-5156f7d5db4d", - "service-instance-name":"RDM5a_TFNET_CORE_NTWK_Svc", + "service-instance-name":"olson5a_TFNET_CORE_NTWK_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151745", @@ -3746,7 +3764,7 @@ }, { "service-instance-id":"21343700-a9d3-401c-a9cb-d46dacecac8a", - "service-instance-name":"vSAEGW-FN-0630-Svc-RDM5B1", + "service-instance-name":"vSAEGW-FN-0630-Svc-olson5B1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508454188209", @@ -3816,7 +3834,7 @@ }, { "service-instance-id":"7bb7ea08-d091-433d-b3e5-1e32617b19d7", - "service-instance-name":"APNDNS-1710-SVC-FN-RDM5a", + "service-instance-name":"APNDNS-1710-SVC-FN-olson5a", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509999807693", @@ -3859,7 +3877,7 @@ "is-permitted":false }, { - "service-type":"ACTIVE_CHARGE", + "service-type":"JOHANNA_SANTOS", "resource-version":"1494255101364", "service-instances":{ "service-instance":[ @@ -3878,13 +3896,13 @@ "is-permitted":false }, { - "service-type":"vHSS", + "service-type":"vCarroll", "resource-version":"1494254877333", "service-instances":{ "service-instance":[ { "service-instance-id":"cebf5d96-09d7-4bee-9b5b-c5e116366c5b", - "service-instance-name":"vHSS-EPC-RDM3-Lab-SVC-0921", + "service-instance-name":"vHSS-EPC-olson3-Lab-SVC-0921", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507211398987", @@ -3904,7 +3922,7 @@ }, { "service-instance-id":"99ec97fc-d9c6-47df-b619-b8d51e693b00", - "service-instance-name":"vHSS-RDM3-Lab1-SVC-0803", + "service-instance-name":"vHSS-olson3-Lab1-SVC-0803", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502120091585", @@ -3914,7 +3932,7 @@ }, { "service-instance-id":"86bad36c-e58a-4681-8d6e-9a72caed750e", - "service-instance-name":"vHSS-EPC-RDM3-Lab-SVC-0830", + "service-instance-name":"vHSS-EPC-olson3-Lab-SVC-0830", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505856441762", diff --git a/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json b/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json index 0417f18b6..0653899bf 100644 --- a/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json +++ b/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json @@ -1,19 +1,19 @@ { - "service-type": "VIRTUAL USP", + "service-type": "TYLER SILVIA", "resource-version": "1494001841964", "relationship-list": { "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "AAIAIC25" + "relationship-value": "JANET25" }, { "relationship-key": "tenant.tenant-id", @@ -29,15 +29,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -47,21 +47,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-testgamma" + "property-value": "AIN Web Tool-15-D-testalexandria" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -77,15 +77,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -101,15 +101,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -125,15 +125,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/de007636e25249238447264a988a927b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/de007636e25249238447264a988a927b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -149,15 +149,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -173,15 +173,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -197,15 +197,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -221,15 +221,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -245,15 +245,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8774659e425f479895ae091bb5d46560", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8774659e425f479895ae091bb5d46560", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -269,15 +269,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/624eb554b0d147c19ff8885341760481", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/624eb554b0d147c19ff8885341760481", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -293,15 +293,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/214f55f5fc414c678059c383b03e4962", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/214f55f5fc414c678059c383b03e4962", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -317,15 +317,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -341,15 +341,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -365,15 +365,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -389,15 +389,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -413,15 +413,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -437,15 +437,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -461,15 +461,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/05b91bd5137f4929878edd965755c06d", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/05b91bd5137f4929878edd965755c06d", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -485,15 +485,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -509,15 +509,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -533,15 +533,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -557,15 +557,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -581,15 +581,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -605,15 +605,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -629,15 +629,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -653,15 +653,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -677,15 +677,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -701,15 +701,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -719,21 +719,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "test-mtn6-09" + "property-value": "test-hvf6-09" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", diff --git a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_aai_search_named_query.json b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_aai_search_named_query.json index ac6fed851..4167b68cd 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_aai_search_named_query.json +++ b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_aai_search_named_query.json @@ -6,7 +6,7 @@ "simulatorResponse": { "responseCode": 200, "body": { - "inventory-response-item":[{"model-name":"ServicevMMSCPID298109","service-instance":{"service-instance-id":"537d3eb0-b7ab-4fe8-a438-6166ab6af49b","service-instance-name":"ggghhh"},"extra-properties":{},"inventory-response-items":{"inventory-response-item":[{"model-name":"VSP1710PID298109_vMMSC","generic-vnf":{"vnf-id":"0eb38f69-d96b-4d5e-b8c9-3736c292f0f7","vnf-name":"ssgsg","vnf-type":"ServicevMMSCPID298109/VSP1710PID298109_vMMSC 0","service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","prov-status":"PREPROV","orchestration-status":"Created","in-maint":false,"is-closed-loop-disabled":false,"resource-version":"1506517656216","model-invariant-id":"e7961100-cde6-4b5a-bcda-b8945086950a","model-version-id":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e","model-customization-id":"6b8fc7dc-2db1-4283-a222-b07d10595495","nf-type":"MOBILITY MESSAGING ","nf-function":"Multimedia Message Service Center ","nf-role":"VMMSC","nf-naming-code":"null"},"extra-properties":{}}]}}] + "inventory-response-item":[{"model-name":"ServicevWINIFREDPID298109","service-instance":{"service-instance-id":"537d3eb0-b7ab-4fe8-a438-6166ab6af49b","service-instance-name":"ggghhh"},"extra-properties":{},"inventory-response-items":{"inventory-response-item":[{"model-name":"VSP1710PID298109_vWINIFRED","generic-vnf":{"vnf-id":"0eb38f69-d96b-4d5e-b8c9-3736c292f0f7","vnf-name":"ssgsg","vnf-type":"ServicevWINIFREDPID298109/VSP1710PID298109_vWINIFRED 0","service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","prov-status":"PREPROV","orchestration-status":"Created","in-maint":false,"is-closed-loop-disabled":false,"resource-version":"1506517656216","model-invariant-id":"e7961100-cde6-4b5a-bcda-b8945086950a","model-version-id":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e","model-customization-id":"6b8fc7dc-2db1-4283-a222-b07d10595495","nf-type":"EMANUEL MESSAGING ","nf-function":"Multimedia Message Service Center ","nf-role":"vWINIFRED","nf-naming-code":"null"},"extra-properties":{}}]}}] } } }
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_sdc_catalog_services_ggghhh.json b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_sdc_catalog_services_ggghhh.json index 4520b0d3a..5641b9550 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_sdc_catalog_services_ggghhh.json +++ b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/get_sdc_catalog_services_ggghhh.json @@ -22,10 +22,10 @@ "body": { "uuid": "aa2f8e9c-9e47-4b15-a95c-4a93855ac61b", "invariantUUID": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", - "name": "ServicevMMSCPID298109", + "name": "ServicevWINIFREDPID298109", "version": "1.0", "toscaModelURL": "./ggghhh.zip", - "category": "Mobility", + "category": "Emanuel", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vf_module.json b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vf_module.json deleted file mode 100644 index afba0683e..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vf_module.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/vfModules", - "body": { - "requestDetails": { - "requestParameters": { - "testApi": "GR_API" - } - } - } - } , - "simulatorResponse": { - "responseCode": 202, - "responseHeaders": { - "Content-Type": "application/json" - }, - "body": { - "requestReferences": { - "instanceId": "SERVICE_INSTANCE_ID", - "requestId": "REQUEST_ID" - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vnf.json b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vnf.json deleted file mode 100644 index 71677143c..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_vnf.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs", - "body": { - "requestDetails": { - "requestInfo": { - "instanceName": "INSTANCE_NAME", - "source": "VID", - "suppressRollback": false, - "requestorId": "mo37915000", - "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034" - }, - "modelInfo": { - "modelType": "vnf", - "modelInvariantId": "e7961100-cde6-4b5a-bcda-b8945086950a", - "modelVersionId": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e", - "modelName": "VSP1710PID298109_vMMSC", - "modelVersion": "1.0", - "modelCustomizationId": "6b8fc7dc-2db1-4283-a222-b07d10595495", - "modelCustomizationName": "VSP1710PID298109_vMMSC 0" - }, - "requestParameters": { - "userParams": [], - "testApi": "GR_API" - }, - "cloudConfiguration": { - "lcpCloudRegionId": "some legacy region", - "tenantId": "092eb9e8e4b7412e8787dd091bc58e86" - }, - <LOB>"lineOfBusiness": {"lineOfBusinessName": "ECOMP"},</LOB> - "platform": { - "platformName": "platform" - }, - "relatedInstanceList": [{ - "relatedInstance": { - "instanceId": "SERVICE_INSTANCE_ID", - "modelInfo": { - "modelType": "service", - "modelName": "ServicevMMSCPID298109", - "modelInvariantId": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", - "modelVersion": "1.0", - "modelVersionId": "aa2f8e9c-9e47-4b15-a95c-4a93855ac61b" - } - } - } - ] - } - } - } , - "simulatorResponse": { - "responseCode": 202, - "responseHeaders": { - "Content-Type": "application/json" - }, - "body": { - "requestReferences": { - "instanceId": "SERVICE_INSTANCE_ID", - "requestId": "dbe54591-c8ed-46d3-abc7-d3a24873dfbd" - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_volume_group.json b/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_volume_group.json deleted file mode 100644 index c9d06e9e2..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/aLacarteFlow/mso_create_volume_group.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/volumeGroups", - "body": { - "requestDetails": { - "requestParameters": { - "testApi": "GR_API" - } - } - } - } , - "simulatorResponse": { - "responseCode": 202, - "responseHeaders": { - "Content-Type": "application/json" - }, - "body": { - "requestReferences": { - "instanceId": "SERVICE_INSTANCE_ID", - "requestId": "REQUEST_ID" - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_filter_service_instance_by_id_network-vl.json b/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_filter_service_instance_by_id_network-vl.json index 0a0f8e52f..db46301ae 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_filter_service_instance_by_id_network-vl.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_filter_service_instance_by_id_network-vl.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/d198cc45-158b-480e-8d2c-03943c51268e" + "resource-link": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/d198cc45-158b-480e-8d2c-03943c51268e" } ] } diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_filter_service_instance_by_name_network-vl.json b/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_filter_service_instance_by_name_network-vl.json index 60013726a..c73280999 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_filter_service_instance_by_name_network-vl.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_filter_service_instance_by_name_network-vl.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/d198cc45-158b-480e-8d2c-03943c51268e" + "resource-link": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/d198cc45-158b-480e-8d2c-03943c51268e" } ] } diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_get_tenants.json b/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_get_tenants.json index d9acb6be9..f0925981a 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_get_tenants.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_get_tenants.json @@ -1,27 +1,27 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility" + "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel" }, "simulatorResponse": { "responseCode": 200, "body": { - "service-type": "Mobility", + "service-type": "Emanuel", "resource-version": "1494001853297", "relationship-list": { "relationship": [ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -38,15 +38,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -63,15 +63,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn16" + "relationship-value": "hvf16" }, { "relationship-key": "tenant.tenant-id", @@ -138,15 +138,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -188,15 +188,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -213,15 +213,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3ae175bf8f574740b1f41588500d7d29", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23b/tenants/tenant/3ae175bf8f574740b1f41588500d7d29", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23b" + "relationship-value": "hvf23b" }, { "relationship-key": "tenant.tenant-id", @@ -238,15 +238,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -263,15 +263,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/72a26aabf7424ad3acd5145224f122d8", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23b/tenants/tenant/72a26aabf7424ad3acd5145224f122d8", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23b" + "relationship-value": "hvf23b" }, { "relationship-key": "tenant.tenant-id", @@ -288,15 +288,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/d0a030fc9fd942c88d8bbb3165c96456", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23a/tenants/tenant/d0a030fc9fd942c88d8bbb3165c96456", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23a" + "relationship-value": "hvf23a" }, { "relationship-key": "tenant.tenant-id", @@ -313,15 +313,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/87dbe25f3a6149dab53a742c25c90bb6", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23b/tenants/tenant/87dbe25f3a6149dab53a742c25c90bb6", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23b" + "relationship-value": "hvf23b" }, { "relationship-key": "tenant.tenant-id", @@ -338,15 +338,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -363,15 +363,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/2889dda86a19400097284de529cd950e", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23a/tenants/tenant/2889dda86a19400097284de529cd950e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23a" + "relationship-value": "hvf23a" }, { "relationship-key": "tenant.tenant-id", @@ -388,15 +388,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23b" + "relationship-value": "hvf23b" }, { "relationship-key": "tenant.tenant-id", @@ -413,15 +413,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/de1096c250564451a5e48370a78a7b1f", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23a/tenants/tenant/de1096c250564451a5e48370a78a7b1f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23a" + "relationship-value": "hvf23a" }, { "relationship-key": "tenant.tenant-id", @@ -438,15 +438,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/e6beab145f6b49098277ac163ac1b4f3", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf23a/tenants/tenant/e6beab145f6b49098277ac163ac1b4f3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23a" + "relationship-value": "hvf23a" }, { "relationship-key": "tenant.tenant-id", diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_named_query_for_view_edit_test_network-vl.json b/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_named_query_for_view_edit_test_network-vl.json index 973ffcbce..388a94e64 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_named_query_for_view_edit_test_network-vl.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_network/aai_named_query_for_view_edit_test_network-vl.json @@ -13,7 +13,7 @@ "service-instance-id": "d198cc45-158b-480e-8d2c-03943c51268e" }, "service-subscription": { - "service-type": "Mobility" + "service-type": "Emanuel" } } ] diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network.json b/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network.json deleted file mode 100644 index 68faf4e29..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/serviceInstances/v./d198cc45-158b-480e-8d2c-03943c51268e/networks", - "body": - { - "requestDetails": { - "requestInfo": { - "instanceName": "<SERVICE_INSTANCE_NAME>", - "source": "VID", - "suppressRollback": false, - "requestorId": "mo57174000", - "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" - }, - "modelInfo": { - "modelType": "network", - "modelInvariantId": "de01afb5-532b-451d-aac4-ff9ff0644060", - "modelVersionId": "ac815c68-35b7-4ea4-9d04-92d2f844b27c", - "modelName": "AIC30_CONTRAIL_BASIC", - "modelVersion": "3.0", - "modelCustomizationId": "e94d61f7-b4b2-489a-a4a7-30b1a1a80daf", - "modelCustomizationName": "AIC30_CONTRAIL_BASIC 0" - }, - "requestParameters": { - "testApi": "GR_API", - "userParams": [] - }, - "cloudConfiguration": { - "lcpCloudRegionId": "One", - "tenantId": "c630e297a3ae486497d63eacec1d7c14" - }, - "relatedInstanceList": [ - { - "relatedInstance": { - "instanceId": "d198cc45-158b-480e-8d2c-03943c51268e", - "modelInfo": { - "modelType": "service", - "modelName": "Using VID for VoIP Network Instantiations Shani", - "modelInvariantId": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "modelVersion": "1.0", - "modelVersionId": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - } - } - } - ] - } - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "requestReferences": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "requestId": "314cc766-b673-4a50-b9c5-471f68914533" - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json b/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json index d5afa1706..9c6552b32 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json @@ -22,7 +22,7 @@ "modelCustomizationName": "AIC30_CONTRAIL_BASIC 0" }, "requestParameters": { - "testApi": "GR_API", + "testApi": "VNF_API", "userParams": [] }, "cloudConfiguration": { diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_orch_req.json b/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_orch_req.json deleted file mode 100644 index efa0f436f..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_orch_req.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/mso/orchestrationRequests/v./314cc766-b673-4a50-b9c5-471f68914533" - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "request": { - "requestId": "314cc766-b673-4a50-b9c5-471f68914533", - "startTime": "Mon, 23 Oct 2017 23:28:39 GMT", - "requestScope": "service", - "requestType": "networks", - "instanceReferences": { - "serviceInstanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "requestorId": "mo57174000" - }, - "requestStatus": { - "requestState": "COMPLETE", - "statusMessage": "Success", - "percentProgress": 100, - "finishTime": "Mon, 23 Oct 2017 23:28:39 GMT" - } - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_services.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_services.json index c0237906d..50f6707da 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_services.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_services.json @@ -9,17 +9,17 @@ "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" }, { @@ -28,18 +28,18 @@ "resource-version":"1494001980153" }, { - "service-id":"vRRaaS", - "service-description":"vRRaaS", + "service-id":"vTerrance", + "service-description":"vTerrance", "resource-version":"1484865266" }, { "service-id":"323d69d9-2efe-4r45-ay0a-89ea7ard4e6f", - "service-description":"vSCP", + "service-description":"vEsmeralda", "resource-version":"1494001903012" }, { "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "service-description":"VIRTUAL USP", + "service-description":"TYLER SILVIA", "resource-version":"1503954056794" }, { @@ -49,7 +49,7 @@ }, { "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0", - "service-description":"FIRSTNET", + "service-description":"LINDSEY", "resource-version":"1490910095155" }, { @@ -58,18 +58,18 @@ "resource-version":"1494001863930" }, { - "service-id":"vHNGWaas", + "service-id":"vRosemarie", "service-description":"HNGATEWAY", "resource-version":"1501192849249" }, { "service-id":"vHNPaas", - "service-description":"HNPORTAL", + "service-description":"WILKINS", "resource-version":"1501192982895" }, { "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "service-description":"VIRTUAL USP", + "service-description":"TYLER SILVIA", "resource-version":"1494001802638" }, { @@ -78,18 +78,18 @@ "resource-version":"1492533254036" }, { - "service-id":"VIPRaaS", - "service-description":"vIPRaaS", + "service-id":"vMuriel", + "service-description":"vMuriel", "resource-version":"1490910058887" }, { "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" }, { @@ -98,23 +98,23 @@ "resource-version":"1506361785997" }, { - "service-id":"vVIGaaS", - "service-description":"vVIGaaS", + "service-id":"vSalvatore", + "service-description":"vSalvatore", "resource-version":"1494001900545" }, { "service-id":"d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4", - "service-description":"uCPE-VMS", + "service-description":"JOSEFINA", "resource-version":"1494001941772" }, { - "service-id":"vPEaaS", - "service-description":"vPEaaS", + "service-id":"vHubbard", + "service-description":"vHubbard", "resource-version":"1494001988229" }, { "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/resources/registration_to_simulator/add_subinterface/aai_get_subscribers.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers.json deleted file mode 100644 index 365e58d78..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers", - "queryParams" : { - "subscriber-type": [ "INFRA" ], - "depth": [ "0" ] - } - } , - "simulatorResponse": { - "responseCode": 200, - "body": { - "customer":[ - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"FIREWALL/MISC", - "subscriber-type":"INFRA", - "resource-version":"1494254802147" - }, - { - "global-customer-id":"VidE2ETest", - "subscriber-name":"VidTest20161020", - "subscriber-type":"INFRA", - "resource-version":"1494254856862" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", - "subscriber-type":"INFRA", - "resource-version":"1494255056308" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"PACKET CORE", - "subscriber-type":"INFRA", - "resource-version":"1506548476111" - }, - { - "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name":"USP VOICE", - "subscriber-type":"INFRA", - "resource-version":"1494254832007" - } - ] - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_USP-VOICE_vfc_ig.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA-ROBBINS_vfc_ig.json index a6e388c02..4d3ee7226 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_USP-VOICE_vfc_ig.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA-ROBBINS_vfc_ig.json @@ -1,4 +1,4 @@ -{ +[{ "simulatorRequest": { "method": "GET", "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", @@ -10,13 +10,13 @@ "responseCode": 200, "body": { "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name": "USP VOICE", + "subscriber-name": "SILVIA ROBBINS", "subscriber-type": "INFRA", "resource-version": "1494001938080", "service-subscriptions": { "service-subscription": [ { - "service-type": "HOSTED COMMUNICATIONS", + "service-type": "DARREN MCGEE", "resource-version": "1494001920845", "service-instances": { "service-instance": [ @@ -706,15 +706,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -730,15 +730,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -754,15 +754,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -780,7 +780,7 @@ } }, { - "service-type": "VIRTUAL USP", + "service-type": "TYLER SILVIA", "resource-version": "1494001841964", "service-instances": { "service-instance": [ @@ -1865,7 +1865,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -1901,7 +1901,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -2498,7 +2498,7 @@ }, { "service-instance-id": "0f2624ba-94cf-4ac5-b903-652d49002c97", - "service-instance-name": "vmee1", + "service-instance-name": "vgeraldine1", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -4939,7 +4939,7 @@ }, { "service-instance-id": "e089b589-5227-4a7c-aa19-92c99507f147", - "service-instance-name": "VIRTUAL USP_VSP_Service_DS_0906_01", + "service-instance-name": "TYLER SILVIA_VSP_Service_DS_0906_01", "service-type": "", "service-role": "", "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -6602,7 +6602,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -6916,11 +6916,11 @@ "relationship": [ { "related-to": "project", - "related-link": "/aai/v11/business/projects/project/Nimbus", + "related-link": "/aai/v11/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -7327,15 +7327,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "AAIAIC25" + "relationship-value": "JANET25" }, { "relationship-key": "tenant.tenant-id", @@ -7351,15 +7351,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7369,21 +7369,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-testgamma" + "property-value": "AIN Web Tool-15-D-testalexandria" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7399,15 +7399,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7423,15 +7423,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7447,15 +7447,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/de007636e25249238447264a988a927b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/de007636e25249238447264a988a927b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7471,15 +7471,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7495,15 +7495,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7519,15 +7519,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7543,15 +7543,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7567,15 +7567,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8774659e425f479895ae091bb5d46560", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8774659e425f479895ae091bb5d46560", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7591,15 +7591,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/624eb554b0d147c19ff8885341760481", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/624eb554b0d147c19ff8885341760481", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7615,15 +7615,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/214f55f5fc414c678059c383b03e4962", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/214f55f5fc414c678059c383b03e4962", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7639,15 +7639,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7663,15 +7663,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7687,15 +7687,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7711,15 +7711,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7735,15 +7735,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7759,15 +7759,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7783,15 +7783,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/05b91bd5137f4929878edd965755c06d", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/05b91bd5137f4929878edd965755c06d", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7807,15 +7807,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7831,15 +7831,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7855,15 +7855,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7879,15 +7879,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7903,15 +7903,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7927,15 +7927,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7951,15 +7951,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8121,15 +8121,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ece35e4a79d547d193451ac38d700046", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8145,15 +8145,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8169,15 +8169,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ded2432abb5a4100801331d07787afc2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8193,15 +8193,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8217,15 +8217,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8071dc66981c4294b05483a1cddac801", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8241,15 +8241,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8265,15 +8265,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8294,4 +8294,939 @@ } } } -}
\ No newline at end of file +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", + "queryParams": { + "depth": 1 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriber-name": "SILVIA ROBBINS", + "subscriber-type": "INFRA", + "resource-version": "1494001938080", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "DARREN MCGEE", + "resource-version": "1494001920845", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "5a8dba3e75e7433185b8004e2f2c546e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-CheckEcomp" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "0ee101c4b53542f49cfc5e1e49d28f88" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-US608multising" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d0b6d63ca975464b9fc2c759a8b21270" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-noPOD41581Cloned" + } + ] + } + ] + } + }, + { + "service-type": "TYLER SILVIA", + "resource-version": "1494001841964", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "JANET25" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "092eb9e8e4b7412e8787dd091bc58e86" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "USP-SIP-IC-24335-T-01" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "bae71557c5bb4d5aac6743a4e5f1d054" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-testalexandria" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "229bcdc6eaeb4ca59d55221141d01f8e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-STTest2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "1178612d2b394be4834ad77f567c0af2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-SSPtestcustome" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "19c5ade915eb461e8af52fb2fd8cd1f2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-UncheckedEcopm" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/de007636e25249238447264a988a927b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "de007636e25249238447264a988a927b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-dfsdf" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "62f29b3613634ca6a3065cbe0e020c44" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-Multiservices1" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "649289e30d3244e0b48098114d63c2aa" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-SSPST66" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "3f21eeea6c2c486bba31dab816c05a32" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-ASSPST47" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f60ce21d3ee6427586cff0d22b03b773" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg67246" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8774659e425f479895ae091bb5d46560", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "8774659e425f479895ae091bb5d46560" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg68359" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/624eb554b0d147c19ff8885341760481", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "624eb554b0d147c19ff8885341760481" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-iftach" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/214f55f5fc414c678059c383b03e4962", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "214f55f5fc414c678059c383b03e4962" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg612401" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c90666c291664841bb98e4d981ff1db5" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg621340" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ce5b6bc5c7b348e1bf4b91ac9a174278" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "sspjg621351cloned" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b386b768a3f24c8e953abbe0b3488c02" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-eteancomp" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "dc6c4dbfd225474e9deaadd34968646c" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-T-SPFET" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "02cb5030e9914aa4be120bd9ed1e19eb" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-eeweww" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f2f3830e4c984d45bcd00e1a04158a79" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-spjg61909" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/05b91bd5137f4929878edd965755c06d", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "05b91bd5137f4929878edd965755c06d" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg621512cloned" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "7002fbe8482d4a989ddf445b1ce336e0" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-vdr" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "4008522be43741dcb1f5422022a2aa0b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-ssasa" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f44e2e96a1b6476abfda2fa407b00169" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-PFNPT" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b69a52bec8a84669a37a1e8b72708be7" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-vdre" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fac7d9fd56154caeb9332202dcf2969f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-NONPODECOMP" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cb42a77ff45b48a8b8deb83bb64acc74" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T11" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fa45ca53c80b492fa8be5477cd84fc2b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T112" + } + ] + } + ] + } + }, + { + "service-type": "TSBC", + "resource-version": "1494001891362", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ece35e4a79d547d193451ac38d700046" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-sspstMAIL" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "23cbbd1872864ea08aa53ade25d34172" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-rtertet" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ded2432abb5a4100801331d07787afc2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-SSPecompFlvr2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ad5aab08f5f7435e9983311af543f311" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMP" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "8071dc66981c4294b05483a1cddac801" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-ecompPODprivate" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "036f769581904ca08ead1415c22b9ec0" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMPCLONE" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2475a36c5e04f12a21593849ae83420" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-X-hope" + } + ] + } + ] + } + } + ] + } + } + } + } + ]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_USP_VOICE.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json index f0c9330c5..42ab78f84 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_USP_VOICE.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json @@ -1,4 +1,4 @@ -{ +[{ "simulatorRequest": { "method": "GET", "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", @@ -10,13 +10,13 @@ "responseCode": 200, "body": { "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name": "USP VOICE", + "subscriber-name": "SILVIA ROBBINS", "subscriber-type": "INFRA", "resource-version": "1494001938080", "service-subscriptions": { "service-subscription": [ { - "service-type": "VIRTUAL USP", + "service-type": "TYLER SILVIA", "resource-version": "1494001841964", "service-instances": { "service-instance": [ @@ -1769,7 +1769,7 @@ }, { "service-instance-id": "0f2624ba-94cf-4ac5-b903-652d49002c97", - "service-instance-name": "vmee1", + "service-instance-name": "vgeraldine1", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -2219,7 +2219,7 @@ }, { "service-instance-id": "e089b589-5227-4a7c-aa19-92c99507f147", - "service-instance-name": "Mobility_VSP_Service_DS_0906_01", + "service-instance-name": "TYLER SILVIA_VSP_Service_DS_0906_01", "service-type": "", "service-role": "", "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -2662,7 +2662,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -2698,7 +2698,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -6103,11 +6103,11 @@ "relationship": [ { "related-to": "project", - "related-link": "/aai/v11/business/projects/project/Nimbus", + "related-link": "/aai/v11/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -6421,7 +6421,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -6739,15 +6739,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "AAIAIC25" + "relationship-value": "JANET25" }, { "relationship-key": "tenant.tenant-id", @@ -6763,15 +6763,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6781,21 +6781,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-testgamma" + "property-value": "AIN Web Tool-15-D-testalexandria" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6811,15 +6811,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6835,15 +6835,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6859,15 +6859,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/de007636e25249238447264a988a927b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/de007636e25249238447264a988a927b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6883,15 +6883,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6907,15 +6907,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6931,15 +6931,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6955,15 +6955,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6979,15 +6979,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8774659e425f479895ae091bb5d46560", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8774659e425f479895ae091bb5d46560", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7003,15 +7003,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/624eb554b0d147c19ff8885341760481", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/624eb554b0d147c19ff8885341760481", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7027,15 +7027,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/214f55f5fc414c678059c383b03e4962", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/214f55f5fc414c678059c383b03e4962", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7051,15 +7051,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7075,15 +7075,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7099,15 +7099,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7123,15 +7123,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7147,15 +7147,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7171,15 +7171,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7195,15 +7195,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/05b91bd5137f4929878edd965755c06d", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/05b91bd5137f4929878edd965755c06d", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7219,15 +7219,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7243,15 +7243,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7267,15 +7267,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7291,15 +7291,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7315,15 +7315,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7339,15 +7339,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7363,15 +7363,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7387,15 +7387,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7411,15 +7411,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ee633f87f1f04a19ab6cbc1ea5a587cb", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ee633f87f1f04a19ab6cbc1ea5a587cb", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7435,15 +7435,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f13c8d9b610543ea84f0a899baf73b8f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f13c8d9b610543ea84f0a899baf73b8f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7459,15 +7459,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7483,15 +7483,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4e9093be45ce4726ada0e37e9e08afba", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4e9093be45ce4726ada0e37e9e08afba", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7507,15 +7507,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f8f6102ace934888a8de767781abb1cc", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f8f6102ace934888a8de767781abb1cc", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7531,15 +7531,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/46cb27d3fd094299bfbc23b4d9c076e4", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/46cb27d3fd094299bfbc23b4d9c076e4", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7555,15 +7555,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f1b3db4ae6d44b4babaee96d3a834359", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f1b3db4ae6d44b4babaee96d3a834359", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7579,15 +7579,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7093a5b869ff4c4497647d4ed7b174eb", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7093a5b869ff4c4497647d4ed7b174eb", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7603,15 +7603,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/a0b9c25bc67a43f88de35b1a73b52c85", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a0b9c25bc67a43f88de35b1a73b52c85", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7627,15 +7627,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/783c60ec140642fab93be64a3b3da7bf", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/783c60ec140642fab93be64a3b3da7bf", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7651,15 +7651,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7675,15 +7675,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2562962934ef4bd0be04b4bc360c9fe9", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2562962934ef4bd0be04b4bc360c9fe9", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7699,15 +7699,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2950bb8e1d694bd18b33885e4f2a3be2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2950bb8e1d694bd18b33885e4f2a3be2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7723,15 +7723,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fe35e5251a0b4fad86a0dff188cf8ba1", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe35e5251a0b4fad86a0dff188cf8ba1", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7747,15 +7747,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/48a013ce6c21446ebd005a778407c636", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/48a013ce6c21446ebd005a778407c636", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7771,15 +7771,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1b63514d5fdc4ab5b78fc57dcbc24c5f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1b63514d5fdc4ab5b78fc57dcbc24c5f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7795,15 +7795,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4e6817f491e84ac3970f23ae6c68a2f5", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4e6817f491e84ac3970f23ae6c68a2f5", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7819,15 +7819,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7837,21 +7837,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "test-mtn6-09" + "property-value": "test-hvf6-09" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b58c4006dd4d493bba16084ee2d6d85a", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b58c4006dd4d493bba16084ee2d6d85a", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7867,15 +7867,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/baae77dcb56e4e71b0b885ee37c0f9ed", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/baae77dcb56e4e71b0b885ee37c0f9ed", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7891,15 +7891,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/10e135cf54aa40d0819e9807a05be9fd", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/10e135cf54aa40d0819e9807a05be9fd", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7915,15 +7915,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/09bcfa01149a416b9dbef57fe9ff4f38", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/09bcfa01149a416b9dbef57fe9ff4f38", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7939,15 +7939,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c9ef0e42793f473ca49e2a882415de63", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c9ef0e42793f473ca49e2a882415de63", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7963,15 +7963,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/985430bc6e444fd6a24ed307e16ee80f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/985430bc6e444fd6a24ed307e16ee80f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7987,15 +7987,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/936f200c8a6344a1af038d05e37f6788", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/936f200c8a6344a1af038d05e37f6788", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8011,15 +8011,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2d66ce1949c64e64a892bf2a5e385a0d", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d66ce1949c64e64a892bf2a5e385a0d", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8035,15 +8035,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2175e8824a624b8fabb297b35b453147", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2175e8824a624b8fabb297b35b453147", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8059,15 +8059,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ccbe1427a5434619a7132bd7dd68e97b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ccbe1427a5434619a7132bd7dd68e97b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8083,15 +8083,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/45619c38a9ec4ce6836ec1cc54a2800b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/45619c38a9ec4ce6836ec1cc54a2800b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8107,15 +8107,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c1a1a7717bc142efa6573c2f12b1200c", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c1a1a7717bc142efa6573c2f12b1200c", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8131,15 +8131,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8155,15 +8155,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f3a68c2e5cf348af89411ca91bcf509e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f3a68c2e5cf348af89411ca91bcf509e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8179,15 +8179,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/661b60e06bf34a29a0474e1a8abcabb2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/661b60e06bf34a29a0474e1a8abcabb2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8203,15 +8203,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/afa69a3d2ae04ed5afea0c75a082ba10", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/afa69a3d2ae04ed5afea0c75a082ba10", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8227,15 +8227,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ad6bba93fa264b55be522600d6e3e47f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad6bba93fa264b55be522600d6e3e47f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8251,15 +8251,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb1c11460f0d47ebbf61343c351bd1d8", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb1c11460f0d47ebbf61343c351bd1d8", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8275,15 +8275,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/427f0797ee244a0baf04bd5699e78dbf", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/427f0797ee244a0baf04bd5699e78dbf", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8299,15 +8299,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/6e8aa8b2f8494cb09f62c4df56a1d68f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/6e8aa8b2f8494cb09f62c4df56a1d68f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8323,15 +8323,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ea3021aa27fd4838a95979a4538a25ff", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ea3021aa27fd4838a95979a4538a25ff", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8347,15 +8347,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d7b7097e78414423b9bedd8bdb7d1180", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d7b7097e78414423b9bedd8bdb7d1180", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8371,15 +8371,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7e6d83cc6dbc45e9b2d813e6d9951a0a", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7e6d83cc6dbc45e9b2d813e6d9951a0a", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8395,15 +8395,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/e3b312307aac45e5b67bf52225381486", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/e3b312307aac45e5b67bf52225381486", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8421,7 +8421,7 @@ } }, { - "service-type": "HOSTED COMMUNICATIONS", + "service-type": "DARREN MCGEE", "resource-version": "1494001920845", "service-instances": { "service-instance": [ @@ -9111,15 +9111,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9135,15 +9135,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9159,15 +9159,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9183,15 +9183,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/16f1ec0207134560a8099bb46055943f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/16f1ec0207134560a8099bb46055943f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9207,15 +9207,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/9519f3c0d0654309bd0b2165be6b9bd5", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/9519f3c0d0654309bd0b2165be6b9bd5", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9413,15 +9413,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ece35e4a79d547d193451ac38d700046", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9437,15 +9437,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9461,15 +9461,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ded2432abb5a4100801331d07787afc2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9485,15 +9485,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9509,15 +9509,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8071dc66981c4294b05483a1cddac801", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9533,15 +9533,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9557,15 +9557,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9586,4 +9586,2019 @@ } } } -}
\ No newline at end of file +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", + "queryParams": { + "depth": 1 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriber-name": "SILVIA ROBBINS", + "subscriber-type": "INFRA", + "resource-version": "1494001938080", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "TYLER SILVIA", + "resource-version": "1494001841964", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "JANET25" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "092eb9e8e4b7412e8787dd091bc58e86" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "USP-SIP-IC-24335-T-01" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "bae71557c5bb4d5aac6743a4e5f1d054" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-testalexandria" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "229bcdc6eaeb4ca59d55221141d01f8e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-STTest2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "1178612d2b394be4834ad77f567c0af2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-SSPtestcustome" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "19c5ade915eb461e8af52fb2fd8cd1f2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-UncheckedEcopm" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/de007636e25249238447264a988a927b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "de007636e25249238447264a988a927b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-dfsdf" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "62f29b3613634ca6a3065cbe0e020c44" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-Multiservices1" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "649289e30d3244e0b48098114d63c2aa" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-SSPST66" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "3f21eeea6c2c486bba31dab816c05a32" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-ASSPST47" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f60ce21d3ee6427586cff0d22b03b773" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg67246" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8774659e425f479895ae091bb5d46560", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "8774659e425f479895ae091bb5d46560" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg68359" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/624eb554b0d147c19ff8885341760481", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "624eb554b0d147c19ff8885341760481" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-iftach" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/214f55f5fc414c678059c383b03e4962", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "214f55f5fc414c678059c383b03e4962" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg612401" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c90666c291664841bb98e4d981ff1db5" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg621340" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ce5b6bc5c7b348e1bf4b91ac9a174278" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "sspjg621351cloned" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b386b768a3f24c8e953abbe0b3488c02" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-eteancomp" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "dc6c4dbfd225474e9deaadd34968646c" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-T-SPFET" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "02cb5030e9914aa4be120bd9ed1e19eb" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-eeweww" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f2f3830e4c984d45bcd00e1a04158a79" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-spjg61909" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/05b91bd5137f4929878edd965755c06d", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "05b91bd5137f4929878edd965755c06d" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg621512cloned" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "7002fbe8482d4a989ddf445b1ce336e0" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-vdr" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "4008522be43741dcb1f5422022a2aa0b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-ssasa" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f44e2e96a1b6476abfda2fa407b00169" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-PFNPT" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b69a52bec8a84669a37a1e8b72708be7" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-vdre" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fac7d9fd56154caeb9332202dcf2969f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-NONPODECOMP" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "1eddb590b7f04e9890bceeef9e591333" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "APP-C-DND" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2d34d8396e194eb49969fd61ffbff961" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "DN5242-Nov16-T5" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cb42a77ff45b48a8b8deb83bb64acc74" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T11" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ee633f87f1f04a19ab6cbc1ea5a587cb", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ee633f87f1f04a19ab6cbc1ea5a587cb" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-681419455" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f13c8d9b610543ea84f0a899baf73b8f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f13c8d9b610543ea84f0a899baf73b8f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-19" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fa45ca53c80b492fa8be5477cd84fc2b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T112" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4e9093be45ce4726ada0e37e9e08afba", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "4e9093be45ce4726ada0e37e9e08afba" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-40" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f8f6102ace934888a8de767781abb1cc", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f8f6102ace934888a8de767781abb1cc" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-43" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/46cb27d3fd094299bfbc23b4d9c076e4", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "46cb27d3fd094299bfbc23b4d9c076e4" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-50" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f1b3db4ae6d44b4babaee96d3a834359", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f1b3db4ae6d44b4babaee96d3a834359" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-delete2112017" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7093a5b869ff4c4497647d4ed7b174eb", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "7093a5b869ff4c4497647d4ed7b174eb" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1120249305" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a0b9c25bc67a43f88de35b1a73b52c85", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "a0b9c25bc67a43f88de35b1a73b52c85" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-51" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/783c60ec140642fab93be64a3b3da7bf", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "783c60ec140642fab93be64a3b3da7bf" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-34" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "4914ab0ab3a743e58f0eefdacc1dde77" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "DN5242-Nov21-T1" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2562962934ef4bd0be04b4bc360c9fe9", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2562962934ef4bd0be04b4bc360c9fe9" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1199103880" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2950bb8e1d694bd18b33885e4f2a3be2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2950bb8e1d694bd18b33885e4f2a3be2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-39722178" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe35e5251a0b4fad86a0dff188cf8ba1", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fe35e5251a0b4fad86a0dff188cf8ba1" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-574343681" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/48a013ce6c21446ebd005a778407c636", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "48a013ce6c21446ebd005a778407c636" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "DN5242-Nov23-Test1" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1b63514d5fdc4ab5b78fc57dcbc24c5f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "1b63514d5fdc4ab5b78fc57dcbc24c5f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-45" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4e6817f491e84ac3970f23ae6c68a2f5", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "4e6817f491e84ac3970f23ae6c68a2f5" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-47" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d0a3e3f2964542259d155a81c41aadc3" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "test-hvf6-09" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b58c4006dd4d493bba16084ee2d6d85a", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b58c4006dd4d493bba16084ee2d6d85a" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1091981337" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/baae77dcb56e4e71b0b885ee37c0f9ed", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "baae77dcb56e4e71b0b885ee37c0f9ed" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1316723862" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/10e135cf54aa40d0819e9807a05be9fd", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "10e135cf54aa40d0819e9807a05be9fd" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-42" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/09bcfa01149a416b9dbef57fe9ff4f38", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "09bcfa01149a416b9dbef57fe9ff4f38" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-48" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c9ef0e42793f473ca49e2a882415de63", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c9ef0e42793f473ca49e2a882415de63" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-22" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/985430bc6e444fd6a24ed307e16ee80f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "985430bc6e444fd6a24ed307e16ee80f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1868857163" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/936f200c8a6344a1af038d05e37f6788", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "936f200c8a6344a1af038d05e37f6788" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-49" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d66ce1949c64e64a892bf2a5e385a0d", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2d66ce1949c64e64a892bf2a5e385a0d" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-830984248" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2175e8824a624b8fabb297b35b453147", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2175e8824a624b8fabb297b35b453147" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-37" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ccbe1427a5434619a7132bd7dd68e97b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ccbe1427a5434619a7132bd7dd68e97b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-36" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/45619c38a9ec4ce6836ec1cc54a2800b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "45619c38a9ec4ce6836ec1cc54a2800b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-15" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c1a1a7717bc142efa6573c2f12b1200c", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c1a1a7717bc142efa6573c2f12b1200c" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1314828730" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cbb99fe4ada84631b7baf046b6fd2044" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "DN5242-Nov16-T3" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f3a68c2e5cf348af89411ca91bcf509e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f3a68c2e5cf348af89411ca91bcf509e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1114155455" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/661b60e06bf34a29a0474e1a8abcabb2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "661b60e06bf34a29a0474e1a8abcabb2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-594348189" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/afa69a3d2ae04ed5afea0c75a082ba10", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "afa69a3d2ae04ed5afea0c75a082ba10" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1055470287" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad6bba93fa264b55be522600d6e3e47f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ad6bba93fa264b55be522600d6e3e47f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-16" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb1c11460f0d47ebbf61343c351bd1d8", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cb1c11460f0d47ebbf61343c351bd1d8" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-21" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/427f0797ee244a0baf04bd5699e78dbf", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "427f0797ee244a0baf04bd5699e78dbf" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-23" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/6e8aa8b2f8494cb09f62c4df56a1d68f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "6e8aa8b2f8494cb09f62c4df56a1d68f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-495087135" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ea3021aa27fd4838a95979a4538a25ff", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ea3021aa27fd4838a95979a4538a25ff" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1427517907" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d7b7097e78414423b9bedd8bdb7d1180", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d7b7097e78414423b9bedd8bdb7d1180" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-398794798" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7e6d83cc6dbc45e9b2d813e6d9951a0a", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "7e6d83cc6dbc45e9b2d813e6d9951a0a" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-getestdsds" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/e3b312307aac45e5b67bf52225381486", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "e3b312307aac45e5b67bf52225381486" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-Ecomptenant" + } + ] + } + ] + } + }, + { + "service-type": "DARREN MCGEE", + "resource-version": "1494001920845", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "5a8dba3e75e7433185b8004e2f2c546e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-CheckEcomp" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "0ee101c4b53542f49cfc5e1e49d28f88" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-US608multising" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d0b6d63ca975464b9fc2c759a8b21270" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-noPOD41581Cloned" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/16f1ec0207134560a8099bb46055943f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "16f1ec0207134560a8099bb46055943f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-check11161022" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/9519f3c0d0654309bd0b2165be6b9bd5", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "9519f3c0d0654309bd0b2165be6b9bd5" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-CheckEcompMulti" + } + ] + } + ] + } + }, + { + "service-type": "TSBC", + "resource-version": "1494001891362", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ece35e4a79d547d193451ac38d700046" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-sspstMAIL" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "23cbbd1872864ea08aa53ade25d34172" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-rtertet" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ded2432abb5a4100801331d07787afc2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-SSPecompFlvr2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ad5aab08f5f7435e9983311af543f311" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMP" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "8071dc66981c4294b05483a1cddac801" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-ecompPODprivate" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "036f769581904ca08ead1415c22b9ec0" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMPCLONE" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2475a36c5e04f12a21593849ae83420" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-X-hope" + } + ] + } + ] + } + } + ] + } + } + } + } +]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_tenants.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_tenants.json deleted file mode 100644 index 2fdc0699a..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_tenants.json +++ /dev/null @@ -1,468 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL USP" - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "service-type": "VIRTUAL USP", - "resource-version": "1494001853297", - "relationship-list": { - "relationship": [ - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "fe4400a8e96e4caa85ccdca8a850255b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "IST_Automation_AAI_updated" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "a259ae7b7c3f493cb3d91f95a7c18149" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "IST_VID_DND" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn16" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "a259ae7b7c3f493cb3d91f95a7c18149" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "IST_VID_DND" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/fusion/Two/tenants/tenant/d3b49834f7164cbe831bfbfa35ef649b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "fusion" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "Two" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "d3b49834f7164cbe831bfbfa35ef649b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "fusion-admin-mitaka" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/fusion/One/tenants/tenant/c630e297a3ae486497d63eacec1d7c14", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "fusion" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "One" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "c630e297a3ae486497d63eacec1d7c14" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "fusion-admin-icehouse" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "c2609b7252b6484d89432611cfb2491b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "ECOM_Tenant_DND" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/fusion/One/tenants/tenant/d3b49834f7164cbe831bfbfa35ef649b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "fusion" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "One" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "d3b49834f7164cbe831bfbfa35ef649b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "fusion-admin-mitaka" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "1eddb590b7f04e9890bceeef9e591333" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "APP-C-DND" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3ae175bf8f574740b1f41588500d7d29", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23b" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "3ae175bf8f574740b1f41588500d7d29" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "APPC-24595-T-IST-02D" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "579d80c0cf754d1e9f1ddc2cdc1701e3" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "ECOM_FirstNet1_DND" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/72a26aabf7424ad3acd5145224f122d8", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23b" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "72a26aabf7424ad3acd5145224f122d8" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "APPC-24595-T-IST-02B" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/d0a030fc9fd942c88d8bbb3165c96456", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23a" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "d0a030fc9fd942c88d8bbb3165c96456" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "APPC-24595-T-IST-01B" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/87dbe25f3a6149dab53a742c25c90bb6", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23b" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "87dbe25f3a6149dab53a742c25c90bb6" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "APPC-24595-T-IST-02A" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "2cd3ca9abd25492eb0c6a44bc95fe714" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "ECOM_FirstNet2_DND" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/2889dda86a19400097284de529cd950e", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23a" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "2889dda86a19400097284de529cd950e" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "APPC-24595-T-IST-01C" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23b/tenants/tenant/3e9a20a3e89e45f884e09df0cc2d2d2a", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23b" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "3e9a20a3e89e45f884e09df0cc2d2d2a" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "APPC-24595-T-IST-02C" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/de1096c250564451a5e48370a78a7b1f", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23a" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "de1096c250564451a5e48370a78a7b1f" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "APPC-24595-T-IST-01D" - } - ] - }, - { - "related-to": "tenant", - "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn23a/tenants/tenant/e6beab145f6b49098277ac163ac1b4f3", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn23a" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "e6beab145f6b49098277ac163ac1b4f3" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "APPC-24595-T-IST-01A" - } - ] - } - ] - } - } - } -} - diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_named_query_for_vfc_ig_view_edit.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_named_query_for_vfc_ig_view_edit.json index beb73880a..c8f4ebfa8 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_named_query_for_vfc_ig_view_edit.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_named_query_for_vfc_ig_view_edit.json @@ -13,7 +13,7 @@ "service-instance-id":"dc3a893e-0104-4ef6-abfe-6c2932294a3f" }, "service-subscription":{ - "service-type":"VIRTUAL USP" + "service-type":"TYLER SILVIA" } } ] @@ -41,11 +41,11 @@ "inventory-response-items":{ "inventory-response-item":[ { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"c015cc0f-0f37-4488-aabf-53795fd93cd3", "vnf-name":"fsd", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -134,11 +134,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"0846287b-65bf-45a6-88f6-6a1af4149fac", "vnf-name":"kjkjk", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -207,12 +207,12 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"9908b762-136f-4b1f-8eb4-ef670ef58bb4", "vnf-name":"uiui", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", - "service-id":"vHNGWaas", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", + "service-id":"vRosemarie", "prov-status":"PREPROV", "orchestration-status":"Created", "in-maint":false, @@ -231,11 +231,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"543931f5-e50e-45a2-a69f-ab727e4c7f2f", "vnf-name":"sdfsdfdsf", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"LRSI-OSPF", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -255,12 +255,12 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"25e84884-22d5-44c9-8212-cb459f63e0ba", "vnf-name":"sdada", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", - "service-id":"VIPRaaS", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", + "service-id":"vMuriel", "prov-status":"PREPROV", "orchestration-status":"Created", "in-maint":false, @@ -279,11 +279,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"013fb0ba-977b-496c-9faa-7f8e5f083eec", "vnf-name":"gvb", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -303,11 +303,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"06914296-cb46-4b62-9453-329a706a6cbb", "vnf-name":"lkllll", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -327,11 +327,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"c55da606-cf38-42c7-bc3c-be8e23b19299", "vnf-name":"ss", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -351,11 +351,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"27cc0914-70be-453e-b552-3df6b1d6cda9", "vnf-name":"yh", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -396,7 +396,7 @@ "service-instance-id":"dc3a893e-0104-4ef6-abfe-6c2932294a3e" }, "service-subscription":{ - "service-type":"VIRTUAL USP" + "service-type":"TYLER SILVIA" } } ] @@ -424,11 +424,11 @@ "inventory-response-items":{ "inventory-response-item":[ { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"c015cc0f-0f37-4488-aabf-53795fd93cd3", "vnf-name":"fsd", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -517,11 +517,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"0846287b-65bf-45a6-88f6-6a1af4149fac", "vnf-name":"kjkjk", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -590,12 +590,12 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"9908b762-136f-4b1f-8eb4-ef670ef58bb4", "vnf-name":"uiui", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", - "service-id":"vHNGWaas", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", + "service-id":"vRosemarie", "prov-status":"PREPROV", "orchestration-status":"Created", "in-maint":false, @@ -614,11 +614,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"543931f5-e50e-45a2-a69f-ab727e4c7f2f", "vnf-name":"sdfsdfdsf", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"LRSI-OSPF", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -638,12 +638,12 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"25e84884-22d5-44c9-8212-cb459f63e0ba", "vnf-name":"sdada", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", - "service-id":"VIPRaaS", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", + "service-id":"vMuriel", "prov-status":"PREPROV", "orchestration-status":"Created", "in-maint":false, @@ -662,11 +662,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"013fb0ba-977b-496c-9faa-7f8e5f083eec", "vnf-name":"gvb", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -686,11 +686,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"06914296-cb46-4b62-9453-329a706a6cbb", "vnf-name":"lkllll", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -710,11 +710,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"c55da606-cf38-42c7-bc3c-be8e23b19299", "vnf-name":"ss", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -734,11 +734,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"27cc0914-70be-453e-b552-3df6b1d6cda9", "vnf-name":"yh", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0", "prov-status":"PREPROV", "orchestration-status":"Created", diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json index 41531eb3d..d55471fde 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json @@ -6,7 +6,7 @@ }, "simulatorResponse": { "responseCode": 200, - "file": "service-VdbeSrv-csar.zip" + "file": "service-vDOROTHEASrv-csar.zip" } }, { @@ -16,7 +16,7 @@ }, "simulatorResponse": { "responseCode": 200, - "file": "service-VdbeSrv-csar_ecomp_false6.zip" + "file": "service-vDOROTHEASrv-csar_ecomp_false6.zip" } }, { @@ -34,8 +34,8 @@ "invariantUUID": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", "name": "Demo Service", "version": "1.0", - "toscaModelURL": "./service-VdbeSrv-csar.zip", - "category": "VIRTUAL USP", + "toscaModelURL": "./service-vDOROTHEASrv-csar.zip", + "category": "TYLER SILVIA", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, @@ -60,8 +60,8 @@ "invariantUUID": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", "name": "Demo Service", "version": "1.0", - "toscaModelURL": "./service-VdbeSrv-csar_ecomp_false6.zip", - "category": "VIRTUAL USP", + "toscaModelURL": "./service-vDOROTHEASrv-csar_ecomp_false6.zip", + "category": "TYLER SILVIA", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-444.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-444.json index 40fdc09b6..3c85f240f 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-444.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-444.json @@ -6,7 +6,7 @@ }, "simulatorResponse": { "responseCode": 200, - "file": "service-VdbeSrv-csar.zip" + "file": "service-vDOROTHEASrv-csar.zip" } }, { @@ -24,8 +24,8 @@ "invariantUUID": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", "name": "Demo Service", "version": "1.0", - "toscaModelURL": "./service-VdbeSrv-csar.zip", - "category": "VIRTUAL USP", + "toscaModelURL": "./service-vDOROTHEASrv-csar.zip", + "category": "TYLER SILVIA", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/mso_vfc_ig_instance_orch_status_req.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/mso_vfc_ig_instance_orch_status_req.json index da2b0a82b..a26b48be2 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/mso_vfc_ig_instance_orch_status_req.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/mso_vfc_ig_instance_orch_status_req.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/mso/orchestrationRequests/v5", + "path": "/mso/orchestrationRequests/v.", "queryParams": { "filter": "serviceInstanceId:EQUALS:dc3a893e-0104-4ef6-abfe-6c2932294a3f" } diff --git a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/aai_get_services.json b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/aai_get_services.json index ef9725e40..7df5aaab4 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/aai_get_services.json +++ b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/aai_get_services.json @@ -9,17 +9,17 @@ "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" }, { @@ -28,18 +28,18 @@ "resource-version":"1494001980153" }, { - "service-id":"vRRaaS", - "service-description":"vRRaaS", + "service-id":"vTerrance", + "service-description":"vTerrance", "resource-version":"1484865266" }, { "service-id":"323d69d9-2efe-4r45-ay0a-89ea7ard4e6f", - "service-description":"vSCP", + "service-description":"vEsmeralda", "resource-version":"1494001903012" }, { "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "service-description":"Mobility", + "service-description":"Emanuel", "resource-version":"1503954056794" }, { @@ -49,7 +49,7 @@ }, { "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0", - "service-description":"FIRSTNET", + "service-description":"LINDSEY", "resource-version":"1490910095155" }, { @@ -58,18 +58,18 @@ "resource-version":"1494001863930" }, { - "service-id":"vHNGWaas", + "service-id":"vRosemarie", "service-description":"HNGATEWAY", "resource-version":"1501192849249" }, { "service-id":"vHNPaas", - "service-description":"HNPORTAL", + "service-description":"WILKINS", "resource-version":"1501192982895" }, { "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "service-description":"VIRTUAL USP", + "service-description":"TYLER SILVIA", "resource-version":"1494001802638" }, { @@ -78,18 +78,18 @@ "resource-version":"1492533254036" }, { - "service-id":"VIPRaaS", - "service-description":"vIPRaaS", + "service-id":"vMuriel", + "service-description":"vMuriel", "resource-version":"1490910058887" }, { "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" }, { @@ -98,23 +98,23 @@ "resource-version":"1506361785997" }, { - "service-id":"vVIGaaS", - "service-description":"vVIGaaS", + "service-id":"vSalvatore", + "service-description":"vSalvatore", "resource-version":"1494001900545" }, { "service-id":"d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4", - "service-description":"uCPE-VMS", + "service-description":"JOSEFINA", "resource-version":"1494001941772" }, { - "service-id":"vPEaaS", - "service-description":"vPEaaS", + "service-id":"vHubbard", + "service-description":"vHubbard", "resource-version":"1494001988229" }, { "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/resources/registration_to_simulator/browseASDC/get_aai_get_subscribers.json b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_aai_get_subscribers.json deleted file mode 100644 index a6011cfee..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_aai_get_subscribers.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers", - "queryParams" : { - "subscriber-type": [ "INFRA" ], - "depth": [ "0" ] - } - } , - "simulatorResponse": { - "responseCode": 200, - "body": { - "customer":[ - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", - "subscriber-type":"INFRA", - "resource-version":"1494255056308" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fc", - "subscriber-name":"PACKET CORE", - "subscriber-type":"INFRA", - "resource-version":"1506548476111" - }, - { - "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name":"USP VOICE", - "subscriber-type":"INFRA", - "resource-version":"1494254832007" - } - ] - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_aai_sub_details.json b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_aai_sub_details.json index 567a0f5c0..defbb58e2 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_aai_sub_details.json +++ b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_aai_sub_details.json @@ -1,4 +1,4 @@ -{ +[{ "simulatorRequest": { "method": "GET", "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -10,13 +10,13 @@ "responseCode": 200, "body": { "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", + "subscriber-name":"Emanuel", "subscriber-type":"INFRA", "resource-version":"1494255056308", "service-subscriptions":{ "service-subscription":[ { - "service-type":"vFlowLogic", + "service-type":"vRichardson", "resource-version":"1501700976809", "service-instances":{ "service-instance":[ @@ -45,7 +45,7 @@ "is-permitted":false }, { - "service-type":"Mobility", + "service-type":"Emanuel", "resource-version":"1505402148533", "service-instances":{ "service-instance":[ @@ -81,7 +81,7 @@ }, { "service-instance-id":"be3f0f35-0cd6-4b64-a9a1-ef66ebf2df38", - "service-instance-name":"mdns_2017_1011_sb063v_1024", + "service-instance-name":"CHARLOTTE_2017_1011_sb063v_1024", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508858365648", @@ -91,7 +91,7 @@ }, { "service-instance-id":"9fb6d4cd-6d8e-41d6-afcf-37d151df1976", - "service-instance-name":"zrdm_Mobility_Service_297772_kk364s_1010_1400", + "service-instance-name":"zrdm_Emanuel_Service_297772_kk364s_1010_1400", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507658384805", @@ -101,7 +101,7 @@ }, { "service-instance-id":"bbbcbe28-850f-42a5-8f46-8bd2a30c3014", - "service-instance-name":"mdns_2017_1011_kk364s", + "service-instance-name":"CHARLOTTE_2017_1011_kk364s", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508962475505", @@ -111,7 +111,7 @@ }, { "service-instance-id":"fd533b88-9e23-4636-8a32-3d2bf24db80b", - "service-instance-name":"Mobility_Service_297772", + "service-instance-name":"Emanuel_Service_297772", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505500142924", @@ -121,7 +121,7 @@ }, { "service-instance-id":"14cfc148-ff07-49a3-a4e2-0aa5ce237624", - "service-instance-name":"rdm5b_mdns_2017_1011_IST_Service_kk364s", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_IST_Service_kk364s", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509122521715", @@ -161,7 +161,7 @@ }, { "service-instance-id":"3afa7504-be8c-4fb1-b6c2-071f78faee18", - "service-instance-name":"mDNS_preload_1710_0914_01", + "service-instance-name":"CHARLOTTE_preload_1710_0914_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506538704860", @@ -191,7 +191,7 @@ }, { "service-instance-id":"18094982-779d-48b7-ab75-93da74944583", - "service-instance-name":"rdm5_mdns_2017_1011", + "service-instance-name":"olson5_CHARLOTTE_2017_1011", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509045878842", @@ -241,7 +241,7 @@ }, { "service-instance-id":"f032606a-5add-4a12-87f7-4df1f0734594", - "service-instance-name":"Zmtn6_Mobility_Service_297772_kk364s_1010_1130", + "service-instance-name":"Zmtn6_Emanuel_Service_297772_kk364s_1010_1130", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507649564599", @@ -281,7 +281,7 @@ }, { "service-instance-id":"0d9d1292-f2bb-4a43-95fc-c9e1e4e9c510", - "service-instance-name":"CR_SVC_Mobility_Service_297772_ss616y_09_28", + "service-instance-name":"CR_SVC_Emanuel_Service_297772_ss616y_09_28", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506539863926", @@ -301,7 +301,7 @@ }, { "service-instance-id":"076bf40a-7eca-4412-ab6e-5de4cf598256", - "service-instance-name":"CService_mDNS_preload_1710_0914_1110", + "service-instance-name":"CService_CHARLOTTE_preload_1710_0914_1110", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507752734878", @@ -324,7 +324,7 @@ "is-permitted":false }, { - "service-type":"vBNG", + "service-type":"vJamie", "resource-version":"1498068165053", "service-instances":{ "service-instance":[ @@ -410,7 +410,7 @@ }, { "service-instance-id":"7492cc2b-facb-4b81-abbe-a35cd4188fd7", - "service-instance-name":"crSVC_Mobility_Service_297772_ss616y_09_26", + "service-instance-name":"crSVC_Emanuel_Service_297772_ss616y_09_26", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506440095410", @@ -479,7 +479,7 @@ }, { "service-instance-id":"e98d2d5d-ffec-4eee-b32a-229e94ec8b24", - "service-instance-name":"mDNS_1710_preload_test_Svc_01_PB", + "service-instance-name":"CHARLOTTE_1710_preload_test_Svc_01_PB", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505233873380", @@ -489,7 +489,7 @@ }, { "service-instance-id":"258a043f-d8bd-46e8-a5f1-1118da623347", - "service-instance-name":"HnportalSriovProviderNet3_4", + "service-instance-name":"WILKINSSriovProviderNet3_4", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506021716378", @@ -509,7 +509,7 @@ }, { "service-instance-id":"a8ab2c37-db0c-4dca-99f5-8d7a99dc6bf5", - "service-instance-name":"mDNS_1710_preload_test_Svc_PB_02", + "service-instance-name":"CHARLOTTE_1710_preload_test_Svc_PB_02", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506367121901", @@ -522,7 +522,7 @@ "is-permitted":false }, { - "service-type":"Nimbus", + "service-type":"Kennedy", "resource-version":"1509369877126", "service-instances":{ "service-instance":[ @@ -538,7 +538,7 @@ }, { "service-instance-id":"d93fa084-80f4-4900-ba57-8b736db3271b", - "service-instance-name":"mDNS_preload_1710_0914_1024", + "service-instance-name":"CHARLOTTE_preload_1710_0914_1024", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508876558729", @@ -548,7 +548,7 @@ }, { "service-instance-id":"123466fa-e678-439e-a89f-29bdb2747d13", - "service-instance-name":"MDNS_NETWORK_OAM_ISTinE2E", + "service-instance-name":"CHARLOTTE_NETWORK_OAM_ISTinE2E", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509557184342", @@ -558,7 +558,7 @@ }, { "service-instance-id":"8a4674e2-fbca-4857-af78-e611b1574f5a", - "service-instance-name":"mdns_pa2396_1027", + "service-instance-name":"CHARLOTTE_pa2396_1027", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509045174529", @@ -568,7 +568,7 @@ }, { "service-instance-id":"75442b9d-e3de-4311-bfd8-b8bed4541742", - "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_2910", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_2910", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509215537269", @@ -578,7 +578,7 @@ }, { "service-instance-id":"f022b8c0-9796-4389-90ae-5c46df9e8574", - "service-instance-name":"PCRF_1610_2.4_SVC", + "service-instance-name":"RODERICK_1610_2.4_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148885", @@ -598,7 +598,7 @@ }, { "service-instance-id":"25158088-c7b1-4898-b511-de0c78e093c9", - "service-instance-name":"MOBT-Nimbus-3-Sprint-1-Svc", + "service-instance-name":"MOBT-Kennedy-3-Sprint-1-Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506094357348", @@ -608,7 +608,7 @@ }, { "service-instance-id":"b84af18a-c01a-4408-8e3c-74517a94af6f", - "service-instance-name":"Nimbus-IXLA-0705-Svc", + "service-instance-name":"Kennedy-IXLA-0705-Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506715142169", @@ -628,7 +628,7 @@ }, { "service-instance-id":"fff0b350-ffaa-46ed-b927-8e82b3497af8", - "service-instance-name":"mDNS-1710-AF-SVC", + "service-instance-name":"CHARLOTTE-1710-AF-SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506435654274", @@ -638,7 +638,7 @@ }, { "service-instance-id":"77d79cda-f8f4-4a9e-80d2-3199fefe6eb4", - "service-instance-name":"Nimbus_LDSA_0705_Svc", + "service-instance-name":"Kennedy_LDSA_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499869842847", @@ -648,7 +648,7 @@ }, { "service-instance-id":"cedac8e7-43ef-47a9-ace6-90aadafdc01a", - "service-instance-name":"Mobility-Ntwking-Svc-Model", + "service-instance-name":"Emanuel-Ntwking-Svc-Model", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505507866717", @@ -658,7 +658,7 @@ }, { "service-instance-id":"b287a10e-6dcb-402e-87bf-fe78fdcc54cf", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1410_1205", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1410_1205", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507997085749", @@ -668,7 +668,7 @@ }, { "service-instance-id":"2ef18b98-b026-4a77-b0e9-71d4e9a1a0ac", - "service-instance-name":"mdns_createServiceInstance", + "service-instance-name":"CHARLOTTE_createServiceInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508165923307", @@ -678,7 +678,7 @@ }, { "service-instance-id":"ab8bcc6c-3bc8-4f0e-8100-5d3bbdf5d8de", - "service-instance-name":"mdns_2017_1011_Create_SerInstance", + "service-instance-name":"CHARLOTTE_2017_1011_Create_SerInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508082674808", @@ -688,7 +688,7 @@ }, { "service-instance-id":"b41a499d-a2e1-4e9e-8717-ee1167bd43e9", - "service-instance-name":"Service_Nimbus_Demo_01", + "service-instance-name":"Service_Kennedy_Demo_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135772", @@ -698,7 +698,7 @@ }, { "service-instance-id":"af913107-ddea-425d-ab84-886b1a754bd1", - "service-instance-name":"Nimbus_IXLT_0705_Svc", + "service-instance-name":"Kennedy_IXLT_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500051698402", @@ -708,7 +708,7 @@ }, { "service-instance-id":"ec1eb896-f519-4e71-bec9-ead21fd5d633", - "service-instance-name":"mobility_Service_1011", + "service-instance-name":"emanuel_Service_1011", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507736303848", @@ -728,7 +728,7 @@ }, { "service-instance-id":"66b13cb4-b575-449f-aa45-ffbfe005c7b1", - "service-instance-name":"mDNS_preload_1710_0914", + "service-instance-name":"CHARLOTTE_preload_1710_0914", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505856078810", @@ -738,7 +738,7 @@ }, { "service-instance-id":"870f55a9-692d-45af-970b-7630317b46ea", - "service-instance-name":"Mobisupport_PCRF_Network_Service", + "service-instance-name":"Mobisupport_RODERICK_Network_Service", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152926", @@ -748,7 +748,7 @@ }, { "service-instance-id":"abc17093-fad2-41fc-ad30-65985b34bdfc", - "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_2010_1006", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_2010_1006", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508517379024", @@ -758,7 +758,7 @@ }, { "service-instance-id":"b3372b34-2085-40b3-b293-df1e546dddee", - "service-instance-name":"zrdm5bpxmc02_092017_Svc", + "service-instance-name":"zolson5bpxmc02_092017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505937237447", @@ -778,7 +778,7 @@ }, { "service-instance-id":"9b24c4e2-6e63-4de5-8a20-741ec8289ae1", - "service-instance-name":"Mobility_Service_297772_pb_1", + "service-instance-name":"Emanuel_Service_297772_pb_1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507665028261", @@ -788,7 +788,7 @@ }, { "service-instance-id":"ea5650f4-9d80-431e-a177-b6c43fd4ade0", - "service-instance-name":"zrdm_Mobility_Service_297772_kk364s_1110_1045", + "service-instance-name":"zrdm_Emanuel_Service_297772_kk364s_1110_1045", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507733035901", @@ -798,7 +798,7 @@ }, { "service-instance-id":"cd9aa07d-e670-498a-adef-82250a1428a0", - "service-instance-name":"mdns_2017_pa2396_1013", + "service-instance-name":"CHARLOTTE_2017_pa2396_1013", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507833492086", @@ -818,7 +818,7 @@ }, { "service-instance-id":"a15b35f0-81eb-43a7-ad51-a05331e629ca", - "service-instance-name":"Nimbus_FN_Int_Network_Svc", + "service-instance-name":"Kennedy_FN_Int_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148152", @@ -828,7 +828,7 @@ }, { "service-instance-id":"9ad4ac55-a5e0-4b49-95c0-b2d846abf700", - "service-instance-name":"mDNS_preload_1710_0914_100417", + "service-instance-name":"CHARLOTTE_preload_1710_0914_100417", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507144734087", @@ -848,7 +848,7 @@ }, { "service-instance-id":"4183a1b5-6bf0-4446-9c50-01851e8b4f50", - "service-instance-name":"PXMC_Svc", + "service-instance-name":"CORNELIUS_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148483", @@ -868,7 +868,7 @@ }, { "service-instance-id":"e4a7a120-9a19-4757-9d91-41f1dc89a708", - "service-instance-name":"Nimbus_FN_SGI_Network_Svc", + "service-instance-name":"Kennedy_FN_SGI_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148283", @@ -898,7 +898,7 @@ }, { "service-instance-id":"85bfb318-d203-42bd-a13f-e8c7508105df", - "service-instance-name":"mDNS_02-06-2017_Svc", + "service-instance-name":"CHARLOTTE_02-06-2017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147914", @@ -918,7 +918,7 @@ }, { "service-instance-id":"17901377-cd73-4d92-abc8-b4905e720ae8", - "service-instance-name":"Nimbus_3.0spr1_PCRF_v2.7_Svc", + "service-instance-name":"Kennedy_3.0spr1_RODERICK_v2.7_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504819759422", @@ -928,7 +928,7 @@ }, { "service-instance-id":"4a55321e-6707-497d-8b06-c4fb1ff065d5", - "service-instance-name":"PXTC_v7_svc_082817", + "service-instance-name":"GRANVILLE_v7_svc_082817", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504292485665", @@ -958,7 +958,7 @@ }, { "service-instance-id":"614e9b44-5388-4a60-a566-35c83ace67b3", - "service-instance-name":"mdns_2017_1011_PB", + "service-instance-name":"CHARLOTTE_2017_1011_PB", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509739169686", @@ -978,7 +978,7 @@ }, { "service-instance-id":"08cdfd4b-9d25-40c8-a8c3-a15a3025d021", - "service-instance-name":"Nimbus_3.1_PCRF_0717_Svc", + "service-instance-name":"Kennedy_3.1_RODERICK_0717_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504061752729", @@ -988,7 +988,7 @@ }, { "service-instance-id":"0c916c04-d2ca-43f3-90f8-e0266b3e97c8", - "service-instance-name":"mdns_pa23961111", + "service-instance-name":"CHARLOTTE_pa23961111", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508338875497", @@ -998,7 +998,7 @@ }, { "service-instance-id":"ead68f27-e78f-417a-9d74-d7af3871c406", - "service-instance-name":"mdns_2017_1011_oh22u_1103", + "service-instance-name":"CHARLOTTE_2017_1011_oh22u_1103", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509728889955", @@ -1008,7 +1008,7 @@ }, { "service-instance-id":"54ba3628-9ee5-4b32-8a2a-3abf001bed4e", - "service-instance-name":"mdns_2017_1011_oh22u_20171103", + "service-instance-name":"CHARLOTTE_2017_1011_oh22u_20171103", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509730482946", @@ -1018,7 +1018,7 @@ }, { "service-instance-id":"9ecab3e4-c4f4-4c46-a46e-9be98f89a664", - "service-instance-name":"mdns_createservice_pa23961026", + "service-instance-name":"CHARLOTTE_createservice_pa23961026", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509032288508", @@ -1028,7 +1028,7 @@ }, { "service-instance-id":"11d25472-cbfb-4e10-a1f2-bea25d7c0823", - "service-instance-name":"mdns_2017_1011_v4", + "service-instance-name":"CHARLOTTE_2017_1011_v4", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508054069141", @@ -1038,7 +1038,7 @@ }, { "service-instance-id":"8c88375a-fe46-4f03-9729-cb2850d8e122", - "service-instance-name":"mdns_2017_1011_ServiceInstance", + "service-instance-name":"CHARLOTTE_2017_1011_ServiceInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508097853649", @@ -1048,7 +1048,7 @@ }, { "service-instance-id":"f054ce69-a3d0-4061-b6a6-cdb4ea8b4968", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1014_1700", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1014_1700", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507929319130", @@ -1068,7 +1068,7 @@ }, { "service-instance-id":"1abdbf2b-d08d-4f64-b123-7ecca7b8c9aa", - "service-instance-name":"mdns_2017_1011_pa2396", + "service-instance-name":"CHARLOTTE_2017_1011_pa2396", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507749134293", @@ -1078,7 +1078,7 @@ }, { "service-instance-id":"4a7882f6-128f-4303-8a47-9ee44a885965", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1210", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1210", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507752287291", @@ -1088,7 +1088,7 @@ }, { "service-instance-id":"7cdd3596-a11f-4508-87ff-f0a9be0796c9", - "service-instance-name":"Cservice_mdns_2017_1011_sg", + "service-instance-name":"Cservice_CHARLOTTE_2017_1011_sg", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507755029185", @@ -1098,7 +1098,7 @@ }, { "service-instance-id":"a43da41c-1510-4f2c-aef5-435534accf9f", - "service-instance-name":"mdns_2017_1011", + "service-instance-name":"CHARLOTTE_2017_1011", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507748135880", @@ -1118,7 +1118,7 @@ }, { "service-instance-id":"7eef7c51-70fe-4723-b762-bf8de2d4ea52", - "service-instance-name":"Nimbus_LU2_CGWY_Svc", + "service-instance-name":"Kennedy_LU2_CGWY_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135961", @@ -1128,7 +1128,7 @@ }, { "service-instance-id":"745fd172-4a08-4f14-a2d0-a9a0e2a3f725", - "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_1028", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_1028", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509129321340", @@ -1158,7 +1158,7 @@ }, { "service-instance-id":"77b4ba1c-c4df-4e3c-a73a-6c89967086a8", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507812622773", @@ -1168,7 +1168,7 @@ }, { "service-instance-id":"f7f8b3d0-bff3-4e10-b973-18ab33a40cb7", - "service-instance-name":"PXMC_v7_Service_062317", + "service-instance-name":"CORNELIUS_v7_Service_062317", "persona-model-id":null, "persona-model-version":null, "resource-version":"1503434415225", @@ -1188,7 +1188,7 @@ }, { "service-instance-id":"a8372edb-c2ff-4008-a5d1-1e790873d92f", - "service-instance-name":"mDNS_Service_New_HEAT", + "service-instance-name":"CHARLOTTE_Service_New_HEAT", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501704876346", @@ -1198,7 +1198,7 @@ }, { "service-instance-id":"7a9e9d7a-820a-46df-8cc9-79ba677fbf70", - "service-instance-name":"mDNS_1710_preload_test_Svc", + "service-instance-name":"CHARLOTTE_1710_preload_test_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505319453315", @@ -1208,7 +1208,7 @@ }, { "service-instance-id":"f195837b-ef28-42c3-8dea-47ad37eaed95", - "service-instance-name":"mDNS_preload_1710_0914_0920", + "service-instance-name":"CHARLOTTE_preload_1710_0914_0920", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505964829466", @@ -1238,7 +1238,7 @@ }, { "service-instance-id":"f2f54623-94b0-4dcb-a381-c58b82229d12", - "service-instance-name":"mdns_2017_1011_CreateSerInstance", + "service-instance-name":"CHARLOTTE_2017_1011_CreateSerInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508186235886", @@ -1268,7 +1268,7 @@ }, { "service-instance-id":"41de54a4-c2d7-41e6-b7e4-0125231e1a75", - "service-instance-name":"mdns_20171014_298940", + "service-instance-name":"CHARLOTTE_20171014_298940", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507921979277", @@ -1278,7 +1278,7 @@ }, { "service-instance-id":"9b3f5b80-7aaf-4c71-9066-79ba0beea6ae", - "service-instance-name":"mdns_298109_serviceinstance_pa2396", + "service-instance-name":"CHARLOTTE_298109_serviceinstance_pa2396", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507921462300", @@ -1288,7 +1288,7 @@ }, { "service-instance-id":"55dabffc-0f6c-424b-afd1-d3a3c515a8b3", - "service-instance-name":"mDNS_20170705_SVC", + "service-instance-name":"CHARLOTTE_20170705_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499710772965", @@ -1298,7 +1298,7 @@ }, { "service-instance-id":"b49aadf0-1435-468c-b338-1be1f86a1291", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1310", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1310", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507906471665", @@ -1308,7 +1308,7 @@ }, { "service-instance-id":"f9b00b35-3cb7-4b6f-9e21-922b4c291e70", - "service-instance-name":"mdns_298109", + "service-instance-name":"CHARLOTTE_298109", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507907071149", @@ -1318,7 +1318,7 @@ }, { "service-instance-id":"203d5521-85e9-46f1-9aa2-df593be5f464", - "service-instance-name":"Nimbus_FN_Cor_Network_Svc", + "service-instance-name":"Kennedy_FN_Cor_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149671", @@ -1328,7 +1328,7 @@ }, { "service-instance-id":"5164424e-5cc0-4050-9cd2-3598d0ed23a3", - "service-instance-name":"Nimbus_FN_HSL_Network_Svc", + "service-instance-name":"Kennedy_FN_HSL_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149745", @@ -1338,7 +1338,7 @@ }, { "service-instance-id":"d750f7d0-8543-4c71-8949-12b1cbbb623f", - "service-instance-name":"Nimbus_FN_Internet_Network_Svc", + "service-instance-name":"Kennedy_FN_Internet_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255150967", @@ -1358,7 +1358,7 @@ }, { "service-instance-id":"0d867a3c-66c2-49bb-89b3-a934209f04c9", - "service-instance-name":"RDM5b_mdns_2017_1011_oh222u_10312017", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_oh222u_10312017", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509393490120", @@ -1378,7 +1378,7 @@ }, { "service-instance-id":"0d94c422-73bf-4973-b561-2c9083b7c14c", - "service-instance-name":"mdns_2017_1011_IST_Service", + "service-instance-name":"CHARLOTTE_2017_1011_IST_Service", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509374793651", @@ -1388,7 +1388,7 @@ }, { "service-instance-id":"97d698da-4e7b-44b8-8596-f0fed1cb992e", - "service-instance-name":"MDNS_NETWORK_OAM", + "service-instance-name":"CHARLOTTE_NETWORK_OAM", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509478420584", @@ -1398,7 +1398,7 @@ }, { "service-instance-id":"8bafeb61-f9cd-4afb-b7a5-cd786df0c751", - "service-instance-name":"mdns_2017_1011_ServiceCreation_pa23061030", + "service-instance-name":"CHARLOTTE_2017_1011_ServiceCreation_pa23061030", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509379856680", @@ -1418,7 +1418,7 @@ }, { "service-instance-id":"16cd6439-ebd6-46f2-aa14-fcaa9b8c5ce7", - "service-instance-name":"PXTC_02_23_2017_Svc", + "service-instance-name":"GRANVILLE_02_23_2017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255150076", @@ -1428,7 +1428,7 @@ }, { "service-instance-id":"4767ab93-da7b-492c-833f-d063c7452caa", - "service-instance-name":"Nimbus_LDST_0705_Svc", + "service-instance-name":"Kennedy_LDST_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501261983060", @@ -1438,7 +1438,7 @@ }, { "service-instance-id":"c6fc80c1-de71-4484-86e5-b15ccc7e3432", - "service-instance-name":"mDNS_02-06-2017_Svc_DS_0814", + "service-instance-name":"CHARLOTTE_02-06-2017_Svc_DS_0814", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502734680482", @@ -1518,7 +1518,7 @@ }, { "service-instance-id":"8de54913-279f-406d-8585-e2152222373f", - "service-instance-name":"Nimbus_IXLA_0705_Svc", + "service-instance-name":"Kennedy_IXLA_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499963829384", @@ -1528,7 +1528,7 @@ }, { "service-instance-id":"f9dcb4e4-a47a-4f6a-b224-5fd3b30a83a0", - "service-instance-name":"Nimbus_SGI_Network_Svc", + "service-instance-name":"Kennedy_SGI_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148003", @@ -1538,7 +1538,7 @@ }, { "service-instance-id":"d5c83af3-4b48-4778-b2c3-07fba2362c79", - "service-instance-name":"Nimbus_FN_OAM_Network_Svc", + "service-instance-name":"Kennedy_FN_OAM_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148499", @@ -1548,7 +1548,7 @@ }, { "service-instance-id":"dce199f8-bb6a-4e99-a861-19b544c5438f", - "service-instance-name":"Mobility_Service_297772_pb", + "service-instance-name":"Emanuel_Service_297772_pb", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507663693747", @@ -1568,7 +1568,7 @@ }, { "service-instance-id":"38811ee9-901a-46e9-8dbd-4a7faceaebd4", - "service-instance-name":"mdns_createinstance", + "service-instance-name":"CHARLOTTE_createinstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508269726756", @@ -1578,7 +1578,7 @@ }, { "service-instance-id":"6fcd3f57-51d0-41b2-8825-ad2820253e5c", - "service-instance-name":"Nimbus_Int_Network_Svc", + "service-instance-name":"Kennedy_Int_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147871", @@ -1588,7 +1588,7 @@ }, { "service-instance-id":"5aaebe92-b062-473b-9a0c-017568386d8b", - "service-instance-name":"mdns_createService", + "service-instance-name":"CHARLOTTE_createService", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508265751686", @@ -1598,7 +1598,7 @@ }, { "service-instance-id":"a146b14c-6b06-435e-9c9a-f78cbcad626e", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508266016689", @@ -1611,13 +1611,13 @@ "is-permitted":true }, { - "service-type":"vSEGW", + "service-type":"vPorfirio", "resource-version":"1494254851983", "service-instances":{ "service-instance":[ { "service-instance-id":"5dfa2fc6-5dfe-4db6-ad73-a66e0cb878f4", - "service-instance-name":"SeGW_012417_Svc", + "service-instance-name":"Porfirio_012417_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147946", @@ -1627,7 +1627,7 @@ }, { "service-instance-id":"8e296fb3-0308-4634-9d8e-d715c8365ae7", - "service-instance-name":"vSeGW_07_05_2017_Svc", + "service-instance-name":"vPorfirio_07_05_2017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499698647185", @@ -1695,7 +1695,7 @@ "service-instance":[ { "service-instance-id":"70ea5910-b338-417e-a3a5-b63e7780bc13", - "service-instance-name":"RDM3_vOTA3_072717_Svc", + "service-instance-name":"olson3_vOTA3_072717_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501863709431", @@ -1754,7 +1754,7 @@ }, { "service-instance-id":"05427532-2f81-4d56-921f-52645e40dd9a", - "service-instance-name":"Vive2evmme1020", + "service-instance-name":"Vive2evflorence1020", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148467", @@ -1983,7 +1983,7 @@ }, { "service-instance-id":"52bdd6f0-3cf4-4607-a0ee-345e5c1ee370", - "service-instance-name":"MNS_Mobility_Network_RDM6B", + "service-instance-name":"MNS_Emanuel_Network_RDM6B", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509390672331", @@ -2023,7 +2023,7 @@ }, { "service-instance-id":"140b40e4-57a2-4b32-82b9-2f8475368f96", - "service-instance-name":"Mobility_Ntwking_vMNS_Svc", + "service-instance-name":"Emanuel_Ntwking_vMNS_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507653879814", @@ -2053,7 +2053,7 @@ }, { "service-instance-id":"f2ac821f-d0de-44d2-a635-d3c2768f6e32", - "service-instance-name":"Mobility+Proted+Network+Svc", + "service-instance-name":"Emanuel+Proted+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135548", @@ -2073,7 +2073,7 @@ }, { "service-instance-id":"18c26081-ced9-4295-8363-2f5dec967175", - "service-instance-name":"Mobility+HSL+Network+Svc", + "service-instance-name":"Emanuel+HSL+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135993", @@ -2083,7 +2083,7 @@ }, { "service-instance-id":"100c48e7-ff0e-40b3-b34e-fc7789c361ce", - "service-instance-name":"Mobility+Mgmt+Network+Svc", + "service-instance-name":"Emanuel+Mgmt+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136003", @@ -2103,7 +2103,7 @@ }, { "service-instance-id":"dae4013c-8907-4c40-83e2-e4f28227a2cb", - "service-instance-name":"Mobility+Direct+Network+Svc", + "service-instance-name":"Emanuel+Direct+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136019", @@ -2156,13 +2156,13 @@ "is-permitted":false }, { - "service-type":"vSCP", + "service-type":"vEsmeralda", "resource-version":"1501532104695", "service-instances":{ "service-instance":[ { "service-instance-id":"b3614fb3-9430-4e21-824a-69b7838a6afa", - "service-instance-name":"vSCP_FW_INT2_20170727_SVC", + "service-instance-name":"vEsmeralda_FW_INT2_20170727_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501864174017", @@ -2182,7 +2182,7 @@ }, { "service-instance-id":"116dda7f-1728-4276-b976-e750d3e360d6", - "service-instance-name":"vSCP_FW+INT1+Sept+22+Svc", + "service-instance-name":"vEsmeralda_FW+INT1+Sept+22+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135497", @@ -2212,7 +2212,7 @@ }, { "service-instance-id":"ee52ca93-8309-4b66-b935-ffc1a3a5d2b0", - "service-instance-name":"vSCP_INT1_Sept_20_Svc", + "service-instance-name":"vEsmeralda_INT1_Sept_20_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500661099821", @@ -2232,7 +2232,7 @@ }, { "service-instance-id":"f64cf888-12d7-4d98-900b-d3bb2f2a096c", - "service-instance-name":"vSCP_SVC_INT2_0722", + "service-instance-name":"vEsmeralda_SVC_INT2_0722", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135475", @@ -2262,7 +2262,7 @@ }, { "service-instance-id":"6eac6301-8583-4ac0-b1bf-c79eb528c95d", - "service-instance-name":"vSCP_FW_INT2_20170727_SVC_VL", + "service-instance-name":"vEsmeralda_FW_INT2_20170727_SVC_VL", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505230561129", @@ -2292,7 +2292,7 @@ }, { "service-instance-id":"b229a960-06ab-4994-91d1-5ac6a7dac01c", - "service-instance-name":"vSCP_RDM3_Lab_INT2_0712_SVC", + "service-instance-name":"vEsmeralda_RDM3_Lab_INT2_0712_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502889690377", @@ -2351,7 +2351,7 @@ }, { "service-instance-id":"cd3a9458-12d7-4e08-91cc-3cb1855625ce", - "service-instance-name":"Vive2evscp_vprobe1025", + "service-instance-name":"Vive2evEsmeralda_vprobe1025", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148167", @@ -2361,7 +2361,7 @@ }, { "service-instance-id":"9150328a-922b-46e6-81c0-586d31cdf07a", - "service-instance-name":"Vive2evscp_vprobe1025", + "service-instance-name":"Vive2evEsmeralda_vprobe1025", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152546", @@ -2371,7 +2371,7 @@ }, { "service-instance-id":"1bc1002b-d12a-4cbb-a977-f21bf9b4a7a9", - "service-instance-name":"viv2vscpe2e1025", + "service-instance-name":"viv2vEsmeraldae2e1025", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152553", @@ -2461,7 +2461,7 @@ }, { "service-instance-id":"b06e9f78-398a-466d-af4e-deb66c19bd7d", - "service-instance-name":"Mobility-vprobe-FE-11-2-1-7-Service", + "service-instance-name":"Emanuel-vprobe-FE-11-2-1-7-Service", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507062871959", @@ -2474,13 +2474,13 @@ "is-permitted":false }, { - "service-type":"vMMSC", + "service-type":"vWINIFRED", "resource-version":"1498752217386", "service-instances":{ "service-instance":[ { "service-instance-id":"3364befd-0802-4861-99af-47c5c047239b", - "service-instance-name":"HnportalSriovProviderNet_50", + "service-instance-name":"WILKINSSriovProviderNet_50", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148521", @@ -2500,7 +2500,7 @@ }, { "service-instance-id":"240f80d8-4b6e-4882-a069-67512dc66888", - "service-instance-name":"HnportalSriovProviderNet_88", + "service-instance-name":"WILKINSSriovProviderNet_88", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148043", @@ -2510,7 +2510,7 @@ }, { "service-instance-id":"48e6f4d3-8335-4669-9708-2e972fd2473f", - "service-instance-name":"HnportalSriovProviderNet_77", + "service-instance-name":"WILKINSSriovProviderNet_77", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149448", @@ -2570,7 +2570,7 @@ }, { "service-instance-id":"526fe500-b06d-49e9-ac9c-9e305468f7d9", - "service-instance-name":"HnportalSriovProviderNet_89", + "service-instance-name":"WILKINSSriovProviderNet_89", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151379", @@ -2610,7 +2610,7 @@ }, { "service-instance-id":"d12538b2-d2f3-4879-87ac-f0b45fc6f84d", - "service-instance-name":"CRSVC_Mobility_Service_297772_ss616y_09_26_17_1", + "service-instance-name":"CRSVC_Emanuel_Service_297772_ss616y_09_26_17_1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506440871179", @@ -2670,7 +2670,7 @@ }, { "service-instance-id":"804c924a-00fe-40a9-af10-fbaa4ad99390", - "service-instance-name":"vMMSC_Lab2_020217_Svc_Service_0617", + "service-instance-name":"vWINIFRED_Lab2_020217_Svc_Service_0617", "persona-model-id":null, "persona-model-version":null, "resource-version":"1497721637609", @@ -2710,7 +2710,7 @@ }, { "service-instance-id":"1b9e0bf1-13d9-4122-8364-6d94187a6e76", - "service-instance-name":"vMMSC_Lab2_010517_Svc_DS_0714_01", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_DS_0714_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500063304219", @@ -2730,7 +2730,7 @@ }, { "service-instance-id":"97ed0e33-3031-42c7-a4ce-519f3af21132", - "service-instance-name":"HnportalSriovProviderNet_29", + "service-instance-name":"WILKINSSriovProviderNet_29", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148377", @@ -2740,7 +2740,7 @@ }, { "service-instance-id":"022b44be-2fe1-465a-b9ad-e9d6c3c89778", - "service-instance-name":"VMMSC_AIC_3.0_Svc", + "service-instance-name":"vWINIFRED_AIC_3.0_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1495556113481", @@ -2750,7 +2750,7 @@ }, { "service-instance-id":"72117a7f-e304-4f59-9ba5-d2b6419caa6b", - "service-instance-name":"HnportalSriovProviderNet_100", + "service-instance-name":"WILKINSSriovProviderNet_100", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148058", @@ -2770,7 +2770,7 @@ }, { "service-instance-id":"26031c62-ca38-4427-a773-ee43a172ed3a", - "service-instance-name":"vMMSC_Test_06292017_Svc_0629_ud6361", + "service-instance-name":"vWINIFRED_Test_06292017_Svc_0629_ud6361", "persona-model-id":null, "persona-model-version":null, "resource-version":"1498782124079", @@ -2780,7 +2780,7 @@ }, { "service-instance-id":"d3055874-7e1c-4a3d-b4d1-8ac3e91fcc28", - "service-instance-name":"vMMSC_Test_08182017_Svc_sb063v", + "service-instance-name":"vWINIFRED_Test_08182017_Svc_sb063v", "persona-model-id":null, "persona-model-version":null, "resource-version":"1503070451727", @@ -2830,7 +2830,7 @@ }, { "service-instance-id":"facedbb9-9703-4b61-a04b-d0f23e6a0188", - "service-instance-name":"crSVC_Mobility_Service_297772_ss616y_1", + "service-instance-name":"crSVC_Emanuel_Service_297772_ss616y_1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506374487982", @@ -2880,7 +2880,7 @@ }, { "service-instance-id":"fd202522-5f89-4ce9-b892-5f75956f93b3", - "service-instance-name":"HnportalSriovProviderNet_112", + "service-instance-name":"WILKINSSriovProviderNet_112", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149987", @@ -2890,7 +2890,7 @@ }, { "service-instance-id":"a83695df-061f-4871-80fe-0be5f7113ad0", - "service-instance-name":"HnportalSriovProviderNet_53", + "service-instance-name":"WILKINSSriovProviderNet_53", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148198", @@ -2900,7 +2900,7 @@ }, { "service-instance-id":"3d443a66-504d-49d3-967d-5f6523ec2e7b", - "service-instance-name":"HnportalSriovProviderNet_55", + "service-instance-name":"WILKINSSriovProviderNet_55", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148205", @@ -2910,7 +2910,7 @@ }, { "service-instance-id":"9365e5c7-bdd6-4f50-a8d2-96d5b3293842", - "service-instance-name":"HnportalSriovProviderNet_123", + "service-instance-name":"WILKINSSriovProviderNet_123", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149295", @@ -2960,7 +2960,7 @@ }, { "service-instance-id":"537b6fdd-1753-4be6-8b12-d325eebc3e32", - "service-instance-name":"createService_Mobility_Service_297772_09_28_ss616y", + "service-instance-name":"createService_Emanuel_Service_297772_09_28_ss616y", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506543405211", @@ -2970,7 +2970,7 @@ }, { "service-instance-id":"7f8b4e13-fc46-4b67-b2b7-d6d8226476fe", - "service-instance-name":"x_mdns_2017_1011_CSI", + "service-instance-name":"x_CHARLOTTE_2017_1011_CSI", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509729899645", @@ -2980,7 +2980,7 @@ }, { "service-instance-id":"4ec4f2c8-6f55-4244-aa36-aac847ac048f", - "service-instance-name":"vMMSC+Sept+22+Svc", + "service-instance-name":"vWINIFRED+Sept+22+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136029", @@ -3020,7 +3020,7 @@ }, { "service-instance-id":"3191493c-46cd-40d0-b659-c7d1e5f14bda", - "service-instance-name":"vMMSC_MMS_Lab_3_121416_Svc", + "service-instance-name":"vWINIFRED_MMS_Lab_3_121416_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152771", @@ -3040,7 +3040,7 @@ }, { "service-instance-id":"ee612d09-aa6d-455d-97ad-3259d2098d75", - "service-instance-name":"HnportalSriovProviderNet_58", + "service-instance-name":"WILKINSSriovProviderNet_58", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151334", @@ -3050,7 +3050,7 @@ }, { "service-instance-id":"6301180d-d4d8-447d-88f9-37fa585b1502", - "service-instance-name":"vMMSC_AIC_3.0_0622_Svc", + "service-instance-name":"vWINIFRED_AIC_3.0_0622_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500335097279", @@ -3060,7 +3060,7 @@ }, { "service-instance-id":"a5c57309-c13c-4d93-b849-78857cbc1620", - "service-instance-name":"Mobility_Service_297772_nb5443", + "service-instance-name":"Emanuel_Service_297772_nb5443", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505761426908", @@ -3130,7 +3130,7 @@ }, { "service-instance-id":"faac5e72-5fa0-4a3c-84f9-7f582cb6dac7", - "service-instance-name":"HNPortal_OAM_NET_VTO_2", + "service-instance-name":"WILKINS_OAM_NET_VTO_2", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151970", @@ -3170,7 +3170,7 @@ }, { "service-instance-id":"96ebc75f-fb74-4e90-a907-f8e95e12b2f7", - "service-instance-name":"Mobility_Service_297772_DS_0918_01", + "service-instance-name":"Emanuel_Service_297772_DS_0918_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505761575910", @@ -3200,7 +3200,7 @@ }, { "service-instance-id":"ec6b2b5b-b3cc-428d-951a-246b5c520f2d", - "service-instance-name":"VMMSC_AIC_3.0_MVM_0612", + "service-instance-name":"vWINIFRED_AIC_3.0_MVM_0612", "persona-model-id":null, "persona-model-version":null, "resource-version":"1497298262657", @@ -3210,7 +3210,7 @@ }, { "service-instance-id":"8eabacfe-c914-4891-9d1c-68f0ecff1944", - "service-instance-name":"VMMSC_AIC_30_Svc", + "service-instance-name":"vWINIFRED_AIC_30_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505484796812", @@ -3230,7 +3230,7 @@ }, { "service-instance-id":"7d05c5df-e627-43f2-8684-bac0762dacbd", - "service-instance-name":"HnportalSriovProviderNet_98", + "service-instance-name":"WILKINSSriovProviderNet_98", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149640", @@ -3280,7 +3280,7 @@ }, { "service-instance-id":"33c37a25-76a7-40fe-b08e-d88384e5654e", - "service-instance-name":"HnportalSriovProviderNet_96", + "service-instance-name":"WILKINSSriovProviderNet_96", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149632", @@ -3300,7 +3300,7 @@ }, { "service-instance-id":"d0dd8197-b506-4118-97c9-29fa49af77fd", - "service-instance-name":"vMMSC_Lab2_010517_Svc_DS_0615_01", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_DS_0615_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1497539173826", @@ -3340,7 +3340,7 @@ }, { "service-instance-id":"e0aa3f05-1c5d-4205-be72-b4f53c5caf26", - "service-instance-name":"lll_051817_vmme_svc", + "service-instance-name":"lll_051817_vflorence_svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1495131287067", @@ -3350,7 +3350,7 @@ }, { "service-instance-id":"8514ebd9-b681-47e7-86bc-6c803b672dc4", - "service-instance-name":"vMMSC_Lab2_020217_Svc", + "service-instance-name":"vWINIFRED_Lab2_020217_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147818", @@ -3360,7 +3360,7 @@ }, { "service-instance-id":"d11b6e9b-0c72-4e65-a93e-a94d9c673d05", - "service-instance-name":"vMMSC_Test_06292017_Svc_ds_0720_01", + "service-instance-name":"vWINIFRED_Test_06292017_Svc_ds_0720_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500490381801", @@ -3370,7 +3370,7 @@ }, { "service-instance-id":"78f93382-b473-47c9-b921-3beb1e73477e", - "service-instance-name":"vMMSC_Lab2_010707_Svc_SA", + "service-instance-name":"vWINIFRED_Lab2_010707_Svc_SA", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499368751374", @@ -3380,7 +3380,7 @@ }, { "service-instance-id":"512cea94-0ae9-4df5-a670-75fdeb709574", - "service-instance-name":"vMMSC_Lab2_010517_Svc_710", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_710", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499701812485", @@ -3420,7 +3420,7 @@ }, { "service-instance-id":"8752cea8-ffee-4dcc-8f80-71641ce7017b", - "service-instance-name":"Service_vMMSC_298109_Svc_DS_0913_01", + "service-instance-name":"Service_vWINIFRED_298109_Svc_DS_0913_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505336746682", @@ -3430,7 +3430,7 @@ }, { "service-instance-id":"5cd4b31f-17e3-4bc2-8a53-fd1aebfc40c8", - "service-instance-name":"HnportalSriovProviderNet_97", + "service-instance-name":"WILKINSSriovProviderNet_97", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149102", @@ -3450,7 +3450,7 @@ }, { "service-instance-id":"5a2cb0c0-e32d-42a9-9a8c-e47ad9dd7978", - "service-instance-name":"HnportalSriovProviderNet_73", + "service-instance-name":"WILKINSSriovProviderNet_73", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149603", @@ -3460,7 +3460,7 @@ }, { "service-instance-id":"1664e68e-5323-4d0a-be16-fbf7a973aede", - "service-instance-name":"HnportalSriovProviderNet_82", + "service-instance-name":"WILKINSSriovProviderNet_82", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149782", @@ -3480,7 +3480,7 @@ }, { "service-instance-id":"370073cf-89e9-4526-9fc0-dfff468571a8", - "service-instance-name":"SI_vVIGaas_Test_01", + "service-instance-name":"SI_vSalvatore_Test_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148452", @@ -3668,7 +3668,7 @@ }, { "service-instance-id":"37aa1cd2-decf-41a8-9edb-ed4407898201", - "service-instance-name":"vMMSC_Lab2_010517_Svc_Rollback", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_Rollback", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499697119107", @@ -3711,13 +3711,13 @@ "is-permitted":false }, { - "service-type":"FIRSTNET", + "service-type":"LINDSEY", "resource-version":"1509387060781", "service-instances":{ "service-instance":[ { "service-instance-id":"72745ee0-4236-43a4-a2a7-5156f7d5db4d", - "service-instance-name":"RDM5a_TFNET_CORE_NTWK_Svc", + "service-instance-name":"olson5a_TFNET_CORE_NTWK_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151745", @@ -3727,7 +3727,7 @@ }, { "service-instance-id":"21343700-a9d3-401c-a9cb-d46dacecac8a", - "service-instance-name":"vSAEGW-FN-0630-Svc-RDM5B1", + "service-instance-name":"vSAEGW-FN-0630-Svc-olson5B1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508454188209", @@ -3797,7 +3797,7 @@ }, { "service-instance-id":"7bb7ea08-d091-433d-b3e5-1e32617b19d7", - "service-instance-name":"APNDNS-1710-SVC-FN-RDM5a", + "service-instance-name":"APNDNS-1710-SVC-FN-olson5a", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509999807693", @@ -3840,7 +3840,7 @@ "is-permitted":false }, { - "service-type":"ACTIVE_CHARGE", + "service-type":"JOHANNA_SANTOS", "resource-version":"1494255101364", "service-instances":{ "service-instance":[ @@ -3859,13 +3859,13 @@ "is-permitted":false }, { - "service-type":"vHSS", + "service-type":"vCarroll", "resource-version":"1494254877333", "service-instances":{ "service-instance":[ { "service-instance-id":"cebf5d96-09d7-4bee-9b5b-c5e116366c5b", - "service-instance-name":"vHSS-EPC-RDM3-Lab-SVC-0921", + "service-instance-name":"vHSS-EPC-olson3-Lab-SVC-0921", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507211398987", @@ -3885,7 +3885,7 @@ }, { "service-instance-id":"99ec97fc-d9c6-47df-b619-b8d51e693b00", - "service-instance-name":"vHSS-RDM3-Lab1-SVC-0803", + "service-instance-name":"vHSS-olson3-Lab1-SVC-0803", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502120091585", @@ -3895,7 +3895,7 @@ }, { "service-instance-id":"86bad36c-e58a-4681-8d6e-9a72caed750e", - "service-instance-name":"vHSS-EPC-RDM3-Lab-SVC-0830", + "service-instance-name":"vHSS-EPC-olson3-Lab-SVC-0830", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505856441762", @@ -3911,4 +3911,117 @@ } } } -}
\ No newline at end of file +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "queryParams" : { + "depth": [ "1" ] + } + } , + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "subscriber-name":"Emanuel", + "subscriber-type":"INFRA", + "resource-version":"1494255056308", + "service-subscriptions":{ + "service-subscription":[ + { + "service-type":"vRichardson", + "resource-version":"1501700976809", + "is-permitted":false + }, + { + "service-type":"Emanuel", + "resource-version":"1505402148533", + "is-permitted":false + }, + { + "service-type":"vJamie", + "resource-version":"1498068165053", + "is-permitted":false + }, + { + "service-type":"vVoiceMail", + "resource-version":"1494254889686", + "is-permitted":false + }, + { + "service-type":"Kennedy", + "resource-version":"1509369877126", + "is-permitted":true + }, + { + "service-type":"vPorfirio", + "resource-version":"1494254851983", + "is-permitted":false + }, + { + "service-type":"vVM", + "resource-version":"1494255049530", + "is-permitted":false + }, + { + "service-type":"vOTA", + "resource-version":"1501692006937", + "is-permitted":false + }, + { + "service-type":"vMME", + "resource-version":"1497729820723", + "is-permitted":false + }, + { + "service-type":"vMNS", + "resource-version":"1509391084129", + "is-permitted":false + }, + { + "service-type":"vEsmeralda", + "resource-version":"1501532104695", + "is-permitted":false + }, + { + "service-type":"VPMS", + "resource-version":"1509738154248", + "is-permitted":false + }, + { + "service-type":"vWINIFRED", + "resource-version":"1498752217386", + "is-permitted":false + }, + { + "service-type":"SSD", + "resource-version":"1494254866295", + "is-permitted":false + }, + { + "service-type":"vMOG", + "resource-version":"1500675745252", + "is-permitted":false + }, + { + "service-type":"LINDSEY", + "resource-version":"1509387060781", + "is-permitted":false + }, + { + "service-type":"JOHANNA_SANTOS", + "resource-version":"1494255101364", + "is-permitted":false + }, + { + "service-type":"vCarroll", + "resource-version":"1494254877333", + "is-permitted":false + } + ] + } + } + } + } +]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_mso_get_orch_request.json b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_mso_get_orch_request.json index 3ffa5e48b..43f2019ec 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_mso_get_orch_request.json +++ b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_mso_get_orch_request.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/mso/orchestrationRequests/v5/c0011670-0e1a-4b74-945d-8bf5aede1d9c" + "path": "/mso/orchestrationRequests/v./c0011670-0e1a-4b74-945d-8bf5aede1d9c" }, "simulatorResponse": { "responseCode": 200, diff --git a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_sdc_catalog_services_2f80c596.json b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_sdc_catalog_services_2f80c596.json index 3da8874b2..8ac141c46 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_sdc_catalog_services_2f80c596.json +++ b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_sdc_catalog_services_2f80c596.json @@ -25,7 +25,7 @@ "name": "action-data", "version": "1.0", "toscaModelURL": "./2f80c596.zip", - "category": "Mobility", + "category": "Emanuel", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/service_design_and_creation.json b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/service_design_and_creation.json deleted file mode 100644 index e0eca117f..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/service_design_and_creation.json +++ /dev/null @@ -1,367 +0,0 @@ -{ - "simulatorRequest": { - "method": "PUT", - "path": "/aai/v../query", - "body": "{\"start\" : \"service-design-and-creation\/models\/\", \"query\" : \"query\/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK\"}", - "queryParams": { - "format": [ - "resource" - ] - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "results": [ - { - "model": { - "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "model-type": "resource", - "resource-version": "1500138206526", - "model-vers": { - "model-ver": [ - { - "model-version-id": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", - "model-name": "action-data", - "model-version": "1.0", - "model-description": "lustre settler sideways volcanic eight cellular", - "resource-version": "1500137463984", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/l2-bridge-for-wan-connector-model-id-ps-02/model-vers/model-ver/l2-bridge-for-wan-connector-resource-id-ps-02/model-elements/model-element/e874da22-729d-47bd-8c08-d596fd9c213d/model-elements/model-element/ccbb65b8-2faf-4f5f-80d9-804bb50f1455", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "l2-bridge-for-wan-connector-model-id-ps-02" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "l2-bridge-for-wan-connector-resource-id-ps-02" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "e874da22-729d-47bd-8c08-d596fd9c213d" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "ccbb65b8-2faf-4f5f-80d9-804bb50f1455" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "00beb8f9-6d39-452f-816d-c709b9cbb87d", - "model-type": "resource", - "resource-version": "4076846985447", - "model-vers": { - "model-ver": [ - { - "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413", - "model-name": "action-data", - "model-version": "1.0", - "model-description": "honor immunity exile prong below misshapen", - "resource-version": "4076846985447" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "ea78c9e3-514d-4a0a-9162-13837fa54c35", - "model-type": "resource", - "resource-version": "1500137034452", - "model-vers": { - "model-ver": [ - { - "model-version-id": "666a06ee-4b57-46df-bacf-908da8f10c3f", - "model-name": "multicast-configuration", - "model-version": "1.0", - "model-description": "python bullwhip appointment computation ambidextrous heaving", - "resource-version": "1500136282691" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "78ca26d0-246d-11e7-93ae-92361f002671", - "model-type": "resource", - "resource-version": "1492627634298", - "model-vers": { - "model-ver": [ - { - "model-version-id": "20c4431c-246d-11e7-93ae-92361f002671", - "model-name": "vSAMP10aDEV::base::module-0", - "model-version": "2", - "model-description": "MSO aLaCarte VF vSAMP10aDEV Base", - "resource-version": "1492627634300" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "5b607929-6088-4614-97ef-cac817508e0e", - "model-type": "resource", - "resource-version": "1492814035001", - "model-vers": { - "model-ver": [ - { - "model-version-id": "797a6c41-0f80-4d35-a288-3920c4e06baa", - "model-name": "CONTRAIL30_L2NODHCP", - "model-version": "1.0", - "model-description": "contrail 3.0.x L2 network for AIC 3.x sites (and No DHCP).", - "resource-version": "1492814035003", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f/model-vers/model-ver/aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e/model-elements/model-element/2f622421-1c67-4142-be6e-cecad5242af6/model-elements/model-element/2add7556-a23b-46b8-b6b4-ad300b47ceab", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "2f622421-1c67-4142-be6e-cecad5242af6" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "2add7556-a23b-46b8-b6b4-ad300b47ceab" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "0143d57b-a517-4de9-a0a1-eb76db51f402", - "model-type": "resource", - "resource-version": "1497897268768", - "model-vers": { - "model-ver": [ - { - "model-version-id": "f1bde010-cc5f-4765-941f-75f15b24f9fc", - "model-name": "BkVmxAv061917..base_vPE_AV..module-0", - "model-version": "2", - "resource-version": "1497897268769", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/267ef491-3c1a-4c32-8e69-0e557bfb61e7/model-vers/model-ver/18655c7f-c846-4934-9e25-34378dfd33d6/model-elements/model-element/578492b2-36a4-47da-83dc-91b58c699ad1/model-elements/model-element/6b1fc7a5-fc01-4a9d-a87f-0ad0d8caa13f", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "267ef491-3c1a-4c32-8e69-0e557bfb61e7" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "18655c7f-c846-4934-9e25-34378dfd33d6" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "578492b2-36a4-47da-83dc-91b58c699ad1" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "6b1fc7a5-fc01-4a9d-a87f-0ad0d8caa13f" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "ipe-resource-id-ps-02", - "model-type": "resource", - "resource-version": "1493389430122", - "model-vers": { - "model-ver": [ - { - "model-version-id": "ipe-resource-id-ps-02", - "model-name": "abc", - "model-version": "v1.0", - "resource-version": "1493389520357", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/l2-bridge-for-wan-connector-model-id-ps-02/model-vers/model-ver/l2-bridge-for-wan-connector-resource-id-ps-02/model-elements/model-element/e874da22-729d-47bd-8c08-d596fd9c213d/model-elements/model-element/ccbb65b8-2faf-4f5f-80d9-804bb50f1455", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "l2-bridge-for-wan-connector-model-id-ps-02" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "l2-bridge-for-wan-connector-resource-id-ps-02" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "e874da22-729d-47bd-8c08-d596fd9c213d" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "ccbb65b8-2faf-4f5f-80d9-804bb50f1455" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "lmoser410-connector-model-id", - "model-type": "widget", - "resource-version": "1493389512180", - "model-vers": { - "model-ver": [ - { - "model-version-id": "lmoser410-connector-model-version-id", - "model-name": "connector", - "model-version": "v1.0", - "resource-version": "1493389444766" - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "named-query-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/named-queries/named-query/lmoser410-named-query-uuid/named-query-elements/named-query-element/48278a7d-2b1e-454f-89e6-5c0ba145f486", - "relationship-data": [ - { - "relationship-key": "named-query.named-query-uuid", - "relationship-value": "lmoser410-named-query-uuid" - }, - { - "relationship-key": "named-query-element.named-query-element-uuid", - "relationship-value": "48278a7d-2b1e-454f-89e6-5c0ba145f486" - } - ] - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "3a97db99-c4bb-498a-a13a-38f65f1ced3d", - "model-type": "resource", - "resource-version": "1492630209768", - "model-vers": { - "model-ver": [ - { - "model-version-id": "ff2ae348-214a-11e7-93ae-92361f002673", - "model-name": "vSAMP10aDEV::base::module-0", - "model-version": "1.0", - "model-description": "MACRO_vSAMP_module", - "resource-version": "1492630209769" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "3c504d40-b847-424c-9d25-4fb7e0a3e994", - "model-type": "widget", - "resource-version": "1493389430124", - "model-vers": { - "model-ver": [ - { - "model-version-id": "204c641a-3494-48c8-979a-86856f5fd32a", - "model-name": "named-query-element", - "model-version": "1.0", - "resource-version": "1493389423212" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "93e56950-cb19-44e6-ace4-8b50f2d02e45", - "model-type": "resource", - "resource-version": "1497898974232", - "model-vers": { - "model-ver": [ - { - "model-version-id": "acba1f72-c6e0-477f-9426-ad190151e100", - "model-name": "RG_6-19_Test", - "model-version": "1.0", - "model-description": "RG_6-19_Test", - "resource-version": "1497898974233", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/a07220ba-954e-422f-86b5-e8b95fe6b116/model-vers/model-ver/bf6dbd68-2c7d-4ba2-ade1-dfd4476aa505/model-elements/model-element/6e10fe2e-6d04-4198-9124-dd051a5ae65f/model-elements/model-element/cb3c22e1-9dc6-467f-9636-0a7aef10d5d0", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "a07220ba-954e-422f-86b5-e8b95fe6b116" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "bf6dbd68-2c7d-4ba2-ade1-dfd4476aa505" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "6e10fe2e-6d04-4198-9124-dd051a5ae65f" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "cb3c22e1-9dc6-467f-9636-0a7aef10d5d0" - } - ] - } - ] - } - } - ] - } - } - } - ] - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/ecompportal_getSessionSlotCheckInterval.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/ecompportal_getSessionSlotCheckInterval.json index a43092ef9..a71270e72 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/ecompportal_getSessionSlotCheckInterval.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/ecompportal_getSessionSlotCheckInterval.json @@ -2,7 +2,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ecompportal_att/auxapi//getSessionSlotCheckInterval" + "path": "/ecompportal_att/auxapi//v3/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, @@ -22,6 +22,26 @@ { "simulatorRequest": { "method": "GET", + "path": "/ecompportal_att/auxapi/v3/getSessionSlotCheckInterval" + }, + "simulatorResponse": { + "responseCode": 200, + "body": "300000" + } + }, + { + "simulatorRequest": { + "method": "POST", + "path": "/ecompportal_att/auxapi/extendSessionTimeOuts" + }, + "simulatorResponse": { + "responseCode": 200, + "body": "300000" + } + }, + { + "simulatorRequest": { + "method": "GET", "path": "/ecompportal_att/auxapi/context/get_user" }, "simulatorResponse": { diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_aai_get_subscribers.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_aai_get_subscribers.json deleted file mode 100644 index fa19f6636..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_aai_get_subscribers.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers", - "queryParams" : { - "subscriber-type": [ "INFRA" ], - "depth": [ "0" ] - } - } , - "simulatorResponse": { - "responseCode": 200, - "body": { - "customer":[ - { - "global-customer-id":"MSO_1610_ST", - "subscriber-name":"MSO_1610_ST", - "subscriber-type":"INFRA", - "resource-version":"1494001902987" - }, - { - "global-customer-id":"21014aa2-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"PACKET CORE", - "subscriber-type":"INFRA", - "resource-version":"1494001776295" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-2", - "subscriber-name":"ICORE CORE", - "subscriber-type":"INFRA", - "resource-version":"1498751754450" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-1", - "subscriber-name":"PACKET1 CORE", - "subscriber-type":"INFRA", - "resource-version":"1498595633607" - }, - { - "global-customer-id":"jimmy-example", - "subscriber-name":"JimmyExampleCust-20161102", - "subscriber-type":"INFRA", - "resource-version":"1494001970063" - }, - { - "global-customer-id":"jimmy-example2", - "subscriber-name":"JimmyExampleCust-20161103", - "subscriber-type":"INFRA", - "resource-version":"1494001970225" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-102", - "subscriber-name":"DHV1802-TestSub-PWT-102", - "subscriber-type":"INFRA", - "resource-version":"1508852495058" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-101", - "subscriber-name":"DHV1802-TestSub-PWT-101", - "subscriber-type":"INFRA", - "resource-version":"1508179953733" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", - "subscriber-type":"INFRA", - "resource-version":"1494001894192" - }, - { - "global-customer-id":"DHV1802-Subscriber-4", - "subscriber-name":"DHV1802-Subscriber-5", - "subscriber-type":"INFRA", - "resource-version":"1509134064531" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-103", - "subscriber-name":"DHV1802-TestSub-PWT-103", - "subscriber-type":"INFRA", - "resource-version":"1509045503736" - }, - { - "global-customer-id":"DHV1802-Subscriber-2", - "subscriber-name":"DHV1802-Subscriber-2", - "subscriber-type":"INFRA", - "resource-version":"1509122065439" - }, - { - "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name":"USP VOICE", - "subscriber-type":"INFRA", - "resource-version":"1494001938080" - }, - { - "global-customer-id":"DHV1802-Subscriber-3", - "subscriber-name":"DHV1802-Subscriber-3", - "subscriber-type":"INFRA", - "resource-version":"1509122759407" - }, - { - "global-customer-id":"31739f3e-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"FIREWALL/MISC", - "subscriber-type":"INFRA", - "resource-version":"1494001772223" - } - ] - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_aai_sub_details.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_aai_sub_details.json index 567a0f5c0..defbb58e2 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_aai_sub_details.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_aai_sub_details.json @@ -1,4 +1,4 @@ -{ +[{ "simulatorRequest": { "method": "GET", "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -10,13 +10,13 @@ "responseCode": 200, "body": { "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", + "subscriber-name":"Emanuel", "subscriber-type":"INFRA", "resource-version":"1494255056308", "service-subscriptions":{ "service-subscription":[ { - "service-type":"vFlowLogic", + "service-type":"vRichardson", "resource-version":"1501700976809", "service-instances":{ "service-instance":[ @@ -45,7 +45,7 @@ "is-permitted":false }, { - "service-type":"Mobility", + "service-type":"Emanuel", "resource-version":"1505402148533", "service-instances":{ "service-instance":[ @@ -81,7 +81,7 @@ }, { "service-instance-id":"be3f0f35-0cd6-4b64-a9a1-ef66ebf2df38", - "service-instance-name":"mdns_2017_1011_sb063v_1024", + "service-instance-name":"CHARLOTTE_2017_1011_sb063v_1024", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508858365648", @@ -91,7 +91,7 @@ }, { "service-instance-id":"9fb6d4cd-6d8e-41d6-afcf-37d151df1976", - "service-instance-name":"zrdm_Mobility_Service_297772_kk364s_1010_1400", + "service-instance-name":"zrdm_Emanuel_Service_297772_kk364s_1010_1400", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507658384805", @@ -101,7 +101,7 @@ }, { "service-instance-id":"bbbcbe28-850f-42a5-8f46-8bd2a30c3014", - "service-instance-name":"mdns_2017_1011_kk364s", + "service-instance-name":"CHARLOTTE_2017_1011_kk364s", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508962475505", @@ -111,7 +111,7 @@ }, { "service-instance-id":"fd533b88-9e23-4636-8a32-3d2bf24db80b", - "service-instance-name":"Mobility_Service_297772", + "service-instance-name":"Emanuel_Service_297772", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505500142924", @@ -121,7 +121,7 @@ }, { "service-instance-id":"14cfc148-ff07-49a3-a4e2-0aa5ce237624", - "service-instance-name":"rdm5b_mdns_2017_1011_IST_Service_kk364s", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_IST_Service_kk364s", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509122521715", @@ -161,7 +161,7 @@ }, { "service-instance-id":"3afa7504-be8c-4fb1-b6c2-071f78faee18", - "service-instance-name":"mDNS_preload_1710_0914_01", + "service-instance-name":"CHARLOTTE_preload_1710_0914_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506538704860", @@ -191,7 +191,7 @@ }, { "service-instance-id":"18094982-779d-48b7-ab75-93da74944583", - "service-instance-name":"rdm5_mdns_2017_1011", + "service-instance-name":"olson5_CHARLOTTE_2017_1011", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509045878842", @@ -241,7 +241,7 @@ }, { "service-instance-id":"f032606a-5add-4a12-87f7-4df1f0734594", - "service-instance-name":"Zmtn6_Mobility_Service_297772_kk364s_1010_1130", + "service-instance-name":"Zmtn6_Emanuel_Service_297772_kk364s_1010_1130", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507649564599", @@ -281,7 +281,7 @@ }, { "service-instance-id":"0d9d1292-f2bb-4a43-95fc-c9e1e4e9c510", - "service-instance-name":"CR_SVC_Mobility_Service_297772_ss616y_09_28", + "service-instance-name":"CR_SVC_Emanuel_Service_297772_ss616y_09_28", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506539863926", @@ -301,7 +301,7 @@ }, { "service-instance-id":"076bf40a-7eca-4412-ab6e-5de4cf598256", - "service-instance-name":"CService_mDNS_preload_1710_0914_1110", + "service-instance-name":"CService_CHARLOTTE_preload_1710_0914_1110", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507752734878", @@ -324,7 +324,7 @@ "is-permitted":false }, { - "service-type":"vBNG", + "service-type":"vJamie", "resource-version":"1498068165053", "service-instances":{ "service-instance":[ @@ -410,7 +410,7 @@ }, { "service-instance-id":"7492cc2b-facb-4b81-abbe-a35cd4188fd7", - "service-instance-name":"crSVC_Mobility_Service_297772_ss616y_09_26", + "service-instance-name":"crSVC_Emanuel_Service_297772_ss616y_09_26", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506440095410", @@ -479,7 +479,7 @@ }, { "service-instance-id":"e98d2d5d-ffec-4eee-b32a-229e94ec8b24", - "service-instance-name":"mDNS_1710_preload_test_Svc_01_PB", + "service-instance-name":"CHARLOTTE_1710_preload_test_Svc_01_PB", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505233873380", @@ -489,7 +489,7 @@ }, { "service-instance-id":"258a043f-d8bd-46e8-a5f1-1118da623347", - "service-instance-name":"HnportalSriovProviderNet3_4", + "service-instance-name":"WILKINSSriovProviderNet3_4", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506021716378", @@ -509,7 +509,7 @@ }, { "service-instance-id":"a8ab2c37-db0c-4dca-99f5-8d7a99dc6bf5", - "service-instance-name":"mDNS_1710_preload_test_Svc_PB_02", + "service-instance-name":"CHARLOTTE_1710_preload_test_Svc_PB_02", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506367121901", @@ -522,7 +522,7 @@ "is-permitted":false }, { - "service-type":"Nimbus", + "service-type":"Kennedy", "resource-version":"1509369877126", "service-instances":{ "service-instance":[ @@ -538,7 +538,7 @@ }, { "service-instance-id":"d93fa084-80f4-4900-ba57-8b736db3271b", - "service-instance-name":"mDNS_preload_1710_0914_1024", + "service-instance-name":"CHARLOTTE_preload_1710_0914_1024", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508876558729", @@ -548,7 +548,7 @@ }, { "service-instance-id":"123466fa-e678-439e-a89f-29bdb2747d13", - "service-instance-name":"MDNS_NETWORK_OAM_ISTinE2E", + "service-instance-name":"CHARLOTTE_NETWORK_OAM_ISTinE2E", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509557184342", @@ -558,7 +558,7 @@ }, { "service-instance-id":"8a4674e2-fbca-4857-af78-e611b1574f5a", - "service-instance-name":"mdns_pa2396_1027", + "service-instance-name":"CHARLOTTE_pa2396_1027", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509045174529", @@ -568,7 +568,7 @@ }, { "service-instance-id":"75442b9d-e3de-4311-bfd8-b8bed4541742", - "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_2910", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_2910", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509215537269", @@ -578,7 +578,7 @@ }, { "service-instance-id":"f022b8c0-9796-4389-90ae-5c46df9e8574", - "service-instance-name":"PCRF_1610_2.4_SVC", + "service-instance-name":"RODERICK_1610_2.4_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148885", @@ -598,7 +598,7 @@ }, { "service-instance-id":"25158088-c7b1-4898-b511-de0c78e093c9", - "service-instance-name":"MOBT-Nimbus-3-Sprint-1-Svc", + "service-instance-name":"MOBT-Kennedy-3-Sprint-1-Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506094357348", @@ -608,7 +608,7 @@ }, { "service-instance-id":"b84af18a-c01a-4408-8e3c-74517a94af6f", - "service-instance-name":"Nimbus-IXLA-0705-Svc", + "service-instance-name":"Kennedy-IXLA-0705-Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506715142169", @@ -628,7 +628,7 @@ }, { "service-instance-id":"fff0b350-ffaa-46ed-b927-8e82b3497af8", - "service-instance-name":"mDNS-1710-AF-SVC", + "service-instance-name":"CHARLOTTE-1710-AF-SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506435654274", @@ -638,7 +638,7 @@ }, { "service-instance-id":"77d79cda-f8f4-4a9e-80d2-3199fefe6eb4", - "service-instance-name":"Nimbus_LDSA_0705_Svc", + "service-instance-name":"Kennedy_LDSA_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499869842847", @@ -648,7 +648,7 @@ }, { "service-instance-id":"cedac8e7-43ef-47a9-ace6-90aadafdc01a", - "service-instance-name":"Mobility-Ntwking-Svc-Model", + "service-instance-name":"Emanuel-Ntwking-Svc-Model", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505507866717", @@ -658,7 +658,7 @@ }, { "service-instance-id":"b287a10e-6dcb-402e-87bf-fe78fdcc54cf", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1410_1205", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1410_1205", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507997085749", @@ -668,7 +668,7 @@ }, { "service-instance-id":"2ef18b98-b026-4a77-b0e9-71d4e9a1a0ac", - "service-instance-name":"mdns_createServiceInstance", + "service-instance-name":"CHARLOTTE_createServiceInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508165923307", @@ -678,7 +678,7 @@ }, { "service-instance-id":"ab8bcc6c-3bc8-4f0e-8100-5d3bbdf5d8de", - "service-instance-name":"mdns_2017_1011_Create_SerInstance", + "service-instance-name":"CHARLOTTE_2017_1011_Create_SerInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508082674808", @@ -688,7 +688,7 @@ }, { "service-instance-id":"b41a499d-a2e1-4e9e-8717-ee1167bd43e9", - "service-instance-name":"Service_Nimbus_Demo_01", + "service-instance-name":"Service_Kennedy_Demo_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135772", @@ -698,7 +698,7 @@ }, { "service-instance-id":"af913107-ddea-425d-ab84-886b1a754bd1", - "service-instance-name":"Nimbus_IXLT_0705_Svc", + "service-instance-name":"Kennedy_IXLT_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500051698402", @@ -708,7 +708,7 @@ }, { "service-instance-id":"ec1eb896-f519-4e71-bec9-ead21fd5d633", - "service-instance-name":"mobility_Service_1011", + "service-instance-name":"emanuel_Service_1011", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507736303848", @@ -728,7 +728,7 @@ }, { "service-instance-id":"66b13cb4-b575-449f-aa45-ffbfe005c7b1", - "service-instance-name":"mDNS_preload_1710_0914", + "service-instance-name":"CHARLOTTE_preload_1710_0914", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505856078810", @@ -738,7 +738,7 @@ }, { "service-instance-id":"870f55a9-692d-45af-970b-7630317b46ea", - "service-instance-name":"Mobisupport_PCRF_Network_Service", + "service-instance-name":"Mobisupport_RODERICK_Network_Service", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152926", @@ -748,7 +748,7 @@ }, { "service-instance-id":"abc17093-fad2-41fc-ad30-65985b34bdfc", - "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_2010_1006", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_2010_1006", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508517379024", @@ -758,7 +758,7 @@ }, { "service-instance-id":"b3372b34-2085-40b3-b293-df1e546dddee", - "service-instance-name":"zrdm5bpxmc02_092017_Svc", + "service-instance-name":"zolson5bpxmc02_092017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505937237447", @@ -778,7 +778,7 @@ }, { "service-instance-id":"9b24c4e2-6e63-4de5-8a20-741ec8289ae1", - "service-instance-name":"Mobility_Service_297772_pb_1", + "service-instance-name":"Emanuel_Service_297772_pb_1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507665028261", @@ -788,7 +788,7 @@ }, { "service-instance-id":"ea5650f4-9d80-431e-a177-b6c43fd4ade0", - "service-instance-name":"zrdm_Mobility_Service_297772_kk364s_1110_1045", + "service-instance-name":"zrdm_Emanuel_Service_297772_kk364s_1110_1045", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507733035901", @@ -798,7 +798,7 @@ }, { "service-instance-id":"cd9aa07d-e670-498a-adef-82250a1428a0", - "service-instance-name":"mdns_2017_pa2396_1013", + "service-instance-name":"CHARLOTTE_2017_pa2396_1013", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507833492086", @@ -818,7 +818,7 @@ }, { "service-instance-id":"a15b35f0-81eb-43a7-ad51-a05331e629ca", - "service-instance-name":"Nimbus_FN_Int_Network_Svc", + "service-instance-name":"Kennedy_FN_Int_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148152", @@ -828,7 +828,7 @@ }, { "service-instance-id":"9ad4ac55-a5e0-4b49-95c0-b2d846abf700", - "service-instance-name":"mDNS_preload_1710_0914_100417", + "service-instance-name":"CHARLOTTE_preload_1710_0914_100417", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507144734087", @@ -848,7 +848,7 @@ }, { "service-instance-id":"4183a1b5-6bf0-4446-9c50-01851e8b4f50", - "service-instance-name":"PXMC_Svc", + "service-instance-name":"CORNELIUS_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148483", @@ -868,7 +868,7 @@ }, { "service-instance-id":"e4a7a120-9a19-4757-9d91-41f1dc89a708", - "service-instance-name":"Nimbus_FN_SGI_Network_Svc", + "service-instance-name":"Kennedy_FN_SGI_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148283", @@ -898,7 +898,7 @@ }, { "service-instance-id":"85bfb318-d203-42bd-a13f-e8c7508105df", - "service-instance-name":"mDNS_02-06-2017_Svc", + "service-instance-name":"CHARLOTTE_02-06-2017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147914", @@ -918,7 +918,7 @@ }, { "service-instance-id":"17901377-cd73-4d92-abc8-b4905e720ae8", - "service-instance-name":"Nimbus_3.0spr1_PCRF_v2.7_Svc", + "service-instance-name":"Kennedy_3.0spr1_RODERICK_v2.7_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504819759422", @@ -928,7 +928,7 @@ }, { "service-instance-id":"4a55321e-6707-497d-8b06-c4fb1ff065d5", - "service-instance-name":"PXTC_v7_svc_082817", + "service-instance-name":"GRANVILLE_v7_svc_082817", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504292485665", @@ -958,7 +958,7 @@ }, { "service-instance-id":"614e9b44-5388-4a60-a566-35c83ace67b3", - "service-instance-name":"mdns_2017_1011_PB", + "service-instance-name":"CHARLOTTE_2017_1011_PB", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509739169686", @@ -978,7 +978,7 @@ }, { "service-instance-id":"08cdfd4b-9d25-40c8-a8c3-a15a3025d021", - "service-instance-name":"Nimbus_3.1_PCRF_0717_Svc", + "service-instance-name":"Kennedy_3.1_RODERICK_0717_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504061752729", @@ -988,7 +988,7 @@ }, { "service-instance-id":"0c916c04-d2ca-43f3-90f8-e0266b3e97c8", - "service-instance-name":"mdns_pa23961111", + "service-instance-name":"CHARLOTTE_pa23961111", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508338875497", @@ -998,7 +998,7 @@ }, { "service-instance-id":"ead68f27-e78f-417a-9d74-d7af3871c406", - "service-instance-name":"mdns_2017_1011_oh22u_1103", + "service-instance-name":"CHARLOTTE_2017_1011_oh22u_1103", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509728889955", @@ -1008,7 +1008,7 @@ }, { "service-instance-id":"54ba3628-9ee5-4b32-8a2a-3abf001bed4e", - "service-instance-name":"mdns_2017_1011_oh22u_20171103", + "service-instance-name":"CHARLOTTE_2017_1011_oh22u_20171103", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509730482946", @@ -1018,7 +1018,7 @@ }, { "service-instance-id":"9ecab3e4-c4f4-4c46-a46e-9be98f89a664", - "service-instance-name":"mdns_createservice_pa23961026", + "service-instance-name":"CHARLOTTE_createservice_pa23961026", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509032288508", @@ -1028,7 +1028,7 @@ }, { "service-instance-id":"11d25472-cbfb-4e10-a1f2-bea25d7c0823", - "service-instance-name":"mdns_2017_1011_v4", + "service-instance-name":"CHARLOTTE_2017_1011_v4", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508054069141", @@ -1038,7 +1038,7 @@ }, { "service-instance-id":"8c88375a-fe46-4f03-9729-cb2850d8e122", - "service-instance-name":"mdns_2017_1011_ServiceInstance", + "service-instance-name":"CHARLOTTE_2017_1011_ServiceInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508097853649", @@ -1048,7 +1048,7 @@ }, { "service-instance-id":"f054ce69-a3d0-4061-b6a6-cdb4ea8b4968", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1014_1700", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1014_1700", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507929319130", @@ -1068,7 +1068,7 @@ }, { "service-instance-id":"1abdbf2b-d08d-4f64-b123-7ecca7b8c9aa", - "service-instance-name":"mdns_2017_1011_pa2396", + "service-instance-name":"CHARLOTTE_2017_1011_pa2396", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507749134293", @@ -1078,7 +1078,7 @@ }, { "service-instance-id":"4a7882f6-128f-4303-8a47-9ee44a885965", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1210", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1210", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507752287291", @@ -1088,7 +1088,7 @@ }, { "service-instance-id":"7cdd3596-a11f-4508-87ff-f0a9be0796c9", - "service-instance-name":"Cservice_mdns_2017_1011_sg", + "service-instance-name":"Cservice_CHARLOTTE_2017_1011_sg", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507755029185", @@ -1098,7 +1098,7 @@ }, { "service-instance-id":"a43da41c-1510-4f2c-aef5-435534accf9f", - "service-instance-name":"mdns_2017_1011", + "service-instance-name":"CHARLOTTE_2017_1011", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507748135880", @@ -1118,7 +1118,7 @@ }, { "service-instance-id":"7eef7c51-70fe-4723-b762-bf8de2d4ea52", - "service-instance-name":"Nimbus_LU2_CGWY_Svc", + "service-instance-name":"Kennedy_LU2_CGWY_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135961", @@ -1128,7 +1128,7 @@ }, { "service-instance-id":"745fd172-4a08-4f14-a2d0-a9a0e2a3f725", - "service-instance-name":"rdm5b_mdns_2017_1011_kk364s_1028", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_kk364s_1028", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509129321340", @@ -1158,7 +1158,7 @@ }, { "service-instance-id":"77b4ba1c-c4df-4e3c-a73a-6c89967086a8", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507812622773", @@ -1168,7 +1168,7 @@ }, { "service-instance-id":"f7f8b3d0-bff3-4e10-b973-18ab33a40cb7", - "service-instance-name":"PXMC_v7_Service_062317", + "service-instance-name":"CORNELIUS_v7_Service_062317", "persona-model-id":null, "persona-model-version":null, "resource-version":"1503434415225", @@ -1188,7 +1188,7 @@ }, { "service-instance-id":"a8372edb-c2ff-4008-a5d1-1e790873d92f", - "service-instance-name":"mDNS_Service_New_HEAT", + "service-instance-name":"CHARLOTTE_Service_New_HEAT", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501704876346", @@ -1198,7 +1198,7 @@ }, { "service-instance-id":"7a9e9d7a-820a-46df-8cc9-79ba677fbf70", - "service-instance-name":"mDNS_1710_preload_test_Svc", + "service-instance-name":"CHARLOTTE_1710_preload_test_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505319453315", @@ -1208,7 +1208,7 @@ }, { "service-instance-id":"f195837b-ef28-42c3-8dea-47ad37eaed95", - "service-instance-name":"mDNS_preload_1710_0914_0920", + "service-instance-name":"CHARLOTTE_preload_1710_0914_0920", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505964829466", @@ -1238,7 +1238,7 @@ }, { "service-instance-id":"f2f54623-94b0-4dcb-a381-c58b82229d12", - "service-instance-name":"mdns_2017_1011_CreateSerInstance", + "service-instance-name":"CHARLOTTE_2017_1011_CreateSerInstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508186235886", @@ -1268,7 +1268,7 @@ }, { "service-instance-id":"41de54a4-c2d7-41e6-b7e4-0125231e1a75", - "service-instance-name":"mdns_20171014_298940", + "service-instance-name":"CHARLOTTE_20171014_298940", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507921979277", @@ -1278,7 +1278,7 @@ }, { "service-instance-id":"9b3f5b80-7aaf-4c71-9066-79ba0beea6ae", - "service-instance-name":"mdns_298109_serviceinstance_pa2396", + "service-instance-name":"CHARLOTTE_298109_serviceinstance_pa2396", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507921462300", @@ -1288,7 +1288,7 @@ }, { "service-instance-id":"55dabffc-0f6c-424b-afd1-d3a3c515a8b3", - "service-instance-name":"mDNS_20170705_SVC", + "service-instance-name":"CHARLOTTE_20170705_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499710772965", @@ -1298,7 +1298,7 @@ }, { "service-instance-id":"b49aadf0-1435-468c-b338-1be1f86a1291", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_1310", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_1310", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507906471665", @@ -1308,7 +1308,7 @@ }, { "service-instance-id":"f9b00b35-3cb7-4b6f-9e21-922b4c291e70", - "service-instance-name":"mdns_298109", + "service-instance-name":"CHARLOTTE_298109", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507907071149", @@ -1318,7 +1318,7 @@ }, { "service-instance-id":"203d5521-85e9-46f1-9aa2-df593be5f464", - "service-instance-name":"Nimbus_FN_Cor_Network_Svc", + "service-instance-name":"Kennedy_FN_Cor_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149671", @@ -1328,7 +1328,7 @@ }, { "service-instance-id":"5164424e-5cc0-4050-9cd2-3598d0ed23a3", - "service-instance-name":"Nimbus_FN_HSL_Network_Svc", + "service-instance-name":"Kennedy_FN_HSL_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149745", @@ -1338,7 +1338,7 @@ }, { "service-instance-id":"d750f7d0-8543-4c71-8949-12b1cbbb623f", - "service-instance-name":"Nimbus_FN_Internet_Network_Svc", + "service-instance-name":"Kennedy_FN_Internet_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255150967", @@ -1358,7 +1358,7 @@ }, { "service-instance-id":"0d867a3c-66c2-49bb-89b3-a934209f04c9", - "service-instance-name":"RDM5b_mdns_2017_1011_oh222u_10312017", + "service-instance-name":"olson5b_CHARLOTTE_2017_1011_oh222u_10312017", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509393490120", @@ -1378,7 +1378,7 @@ }, { "service-instance-id":"0d94c422-73bf-4973-b561-2c9083b7c14c", - "service-instance-name":"mdns_2017_1011_IST_Service", + "service-instance-name":"CHARLOTTE_2017_1011_IST_Service", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509374793651", @@ -1388,7 +1388,7 @@ }, { "service-instance-id":"97d698da-4e7b-44b8-8596-f0fed1cb992e", - "service-instance-name":"MDNS_NETWORK_OAM", + "service-instance-name":"CHARLOTTE_NETWORK_OAM", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509478420584", @@ -1398,7 +1398,7 @@ }, { "service-instance-id":"8bafeb61-f9cd-4afb-b7a5-cd786df0c751", - "service-instance-name":"mdns_2017_1011_ServiceCreation_pa23061030", + "service-instance-name":"CHARLOTTE_2017_1011_ServiceCreation_pa23061030", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509379856680", @@ -1418,7 +1418,7 @@ }, { "service-instance-id":"16cd6439-ebd6-46f2-aa14-fcaa9b8c5ce7", - "service-instance-name":"PXTC_02_23_2017_Svc", + "service-instance-name":"GRANVILLE_02_23_2017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255150076", @@ -1428,7 +1428,7 @@ }, { "service-instance-id":"4767ab93-da7b-492c-833f-d063c7452caa", - "service-instance-name":"Nimbus_LDST_0705_Svc", + "service-instance-name":"Kennedy_LDST_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501261983060", @@ -1438,7 +1438,7 @@ }, { "service-instance-id":"c6fc80c1-de71-4484-86e5-b15ccc7e3432", - "service-instance-name":"mDNS_02-06-2017_Svc_DS_0814", + "service-instance-name":"CHARLOTTE_02-06-2017_Svc_DS_0814", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502734680482", @@ -1518,7 +1518,7 @@ }, { "service-instance-id":"8de54913-279f-406d-8585-e2152222373f", - "service-instance-name":"Nimbus_IXLA_0705_Svc", + "service-instance-name":"Kennedy_IXLA_0705_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499963829384", @@ -1528,7 +1528,7 @@ }, { "service-instance-id":"f9dcb4e4-a47a-4f6a-b224-5fd3b30a83a0", - "service-instance-name":"Nimbus_SGI_Network_Svc", + "service-instance-name":"Kennedy_SGI_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148003", @@ -1538,7 +1538,7 @@ }, { "service-instance-id":"d5c83af3-4b48-4778-b2c3-07fba2362c79", - "service-instance-name":"Nimbus_FN_OAM_Network_Svc", + "service-instance-name":"Kennedy_FN_OAM_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148499", @@ -1548,7 +1548,7 @@ }, { "service-instance-id":"dce199f8-bb6a-4e99-a861-19b544c5438f", - "service-instance-name":"Mobility_Service_297772_pb", + "service-instance-name":"Emanuel_Service_297772_pb", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507663693747", @@ -1568,7 +1568,7 @@ }, { "service-instance-id":"38811ee9-901a-46e9-8dbd-4a7faceaebd4", - "service-instance-name":"mdns_createinstance", + "service-instance-name":"CHARLOTTE_createinstance", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508269726756", @@ -1578,7 +1578,7 @@ }, { "service-instance-id":"6fcd3f57-51d0-41b2-8825-ad2820253e5c", - "service-instance-name":"Nimbus_Int_Network_Svc", + "service-instance-name":"Kennedy_Int_Network_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147871", @@ -1588,7 +1588,7 @@ }, { "service-instance-id":"5aaebe92-b062-473b-9a0c-017568386d8b", - "service-instance-name":"mdns_createService", + "service-instance-name":"CHARLOTTE_createService", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508265751686", @@ -1598,7 +1598,7 @@ }, { "service-instance-id":"a146b14c-6b06-435e-9c9a-f78cbcad626e", - "service-instance-name":"zrdm5b_mdns_2017_1011_kk364s_", + "service-instance-name":"zolson5b_CHARLOTTE_2017_1011_kk364s_", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508266016689", @@ -1611,13 +1611,13 @@ "is-permitted":true }, { - "service-type":"vSEGW", + "service-type":"vPorfirio", "resource-version":"1494254851983", "service-instances":{ "service-instance":[ { "service-instance-id":"5dfa2fc6-5dfe-4db6-ad73-a66e0cb878f4", - "service-instance-name":"SeGW_012417_Svc", + "service-instance-name":"Porfirio_012417_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147946", @@ -1627,7 +1627,7 @@ }, { "service-instance-id":"8e296fb3-0308-4634-9d8e-d715c8365ae7", - "service-instance-name":"vSeGW_07_05_2017_Svc", + "service-instance-name":"vPorfirio_07_05_2017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499698647185", @@ -1695,7 +1695,7 @@ "service-instance":[ { "service-instance-id":"70ea5910-b338-417e-a3a5-b63e7780bc13", - "service-instance-name":"RDM3_vOTA3_072717_Svc", + "service-instance-name":"olson3_vOTA3_072717_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501863709431", @@ -1754,7 +1754,7 @@ }, { "service-instance-id":"05427532-2f81-4d56-921f-52645e40dd9a", - "service-instance-name":"Vive2evmme1020", + "service-instance-name":"Vive2evflorence1020", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148467", @@ -1983,7 +1983,7 @@ }, { "service-instance-id":"52bdd6f0-3cf4-4607-a0ee-345e5c1ee370", - "service-instance-name":"MNS_Mobility_Network_RDM6B", + "service-instance-name":"MNS_Emanuel_Network_RDM6B", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509390672331", @@ -2023,7 +2023,7 @@ }, { "service-instance-id":"140b40e4-57a2-4b32-82b9-2f8475368f96", - "service-instance-name":"Mobility_Ntwking_vMNS_Svc", + "service-instance-name":"Emanuel_Ntwking_vMNS_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507653879814", @@ -2053,7 +2053,7 @@ }, { "service-instance-id":"f2ac821f-d0de-44d2-a635-d3c2768f6e32", - "service-instance-name":"Mobility+Proted+Network+Svc", + "service-instance-name":"Emanuel+Proted+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135548", @@ -2073,7 +2073,7 @@ }, { "service-instance-id":"18c26081-ced9-4295-8363-2f5dec967175", - "service-instance-name":"Mobility+HSL+Network+Svc", + "service-instance-name":"Emanuel+HSL+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135993", @@ -2083,7 +2083,7 @@ }, { "service-instance-id":"100c48e7-ff0e-40b3-b34e-fc7789c361ce", - "service-instance-name":"Mobility+Mgmt+Network+Svc", + "service-instance-name":"Emanuel+Mgmt+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136003", @@ -2103,7 +2103,7 @@ }, { "service-instance-id":"dae4013c-8907-4c40-83e2-e4f28227a2cb", - "service-instance-name":"Mobility+Direct+Network+Svc", + "service-instance-name":"Emanuel+Direct+Network+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136019", @@ -2156,13 +2156,13 @@ "is-permitted":false }, { - "service-type":"vSCP", + "service-type":"vEsmeralda", "resource-version":"1501532104695", "service-instances":{ "service-instance":[ { "service-instance-id":"b3614fb3-9430-4e21-824a-69b7838a6afa", - "service-instance-name":"vSCP_FW_INT2_20170727_SVC", + "service-instance-name":"vEsmeralda_FW_INT2_20170727_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501864174017", @@ -2182,7 +2182,7 @@ }, { "service-instance-id":"116dda7f-1728-4276-b976-e750d3e360d6", - "service-instance-name":"vSCP_FW+INT1+Sept+22+Svc", + "service-instance-name":"vEsmeralda_FW+INT1+Sept+22+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135497", @@ -2212,7 +2212,7 @@ }, { "service-instance-id":"ee52ca93-8309-4b66-b935-ffc1a3a5d2b0", - "service-instance-name":"vSCP_INT1_Sept_20_Svc", + "service-instance-name":"vEsmeralda_INT1_Sept_20_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500661099821", @@ -2232,7 +2232,7 @@ }, { "service-instance-id":"f64cf888-12d7-4d98-900b-d3bb2f2a096c", - "service-instance-name":"vSCP_SVC_INT2_0722", + "service-instance-name":"vEsmeralda_SVC_INT2_0722", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135475", @@ -2262,7 +2262,7 @@ }, { "service-instance-id":"6eac6301-8583-4ac0-b1bf-c79eb528c95d", - "service-instance-name":"vSCP_FW_INT2_20170727_SVC_VL", + "service-instance-name":"vEsmeralda_FW_INT2_20170727_SVC_VL", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505230561129", @@ -2292,7 +2292,7 @@ }, { "service-instance-id":"b229a960-06ab-4994-91d1-5ac6a7dac01c", - "service-instance-name":"vSCP_RDM3_Lab_INT2_0712_SVC", + "service-instance-name":"vEsmeralda_RDM3_Lab_INT2_0712_SVC", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502889690377", @@ -2351,7 +2351,7 @@ }, { "service-instance-id":"cd3a9458-12d7-4e08-91cc-3cb1855625ce", - "service-instance-name":"Vive2evscp_vprobe1025", + "service-instance-name":"Vive2evEsmeralda_vprobe1025", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148167", @@ -2361,7 +2361,7 @@ }, { "service-instance-id":"9150328a-922b-46e6-81c0-586d31cdf07a", - "service-instance-name":"Vive2evscp_vprobe1025", + "service-instance-name":"Vive2evEsmeralda_vprobe1025", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152546", @@ -2371,7 +2371,7 @@ }, { "service-instance-id":"1bc1002b-d12a-4cbb-a977-f21bf9b4a7a9", - "service-instance-name":"viv2vscpe2e1025", + "service-instance-name":"viv2vEsmeraldae2e1025", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152553", @@ -2461,7 +2461,7 @@ }, { "service-instance-id":"b06e9f78-398a-466d-af4e-deb66c19bd7d", - "service-instance-name":"Mobility-vprobe-FE-11-2-1-7-Service", + "service-instance-name":"Emanuel-vprobe-FE-11-2-1-7-Service", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507062871959", @@ -2474,13 +2474,13 @@ "is-permitted":false }, { - "service-type":"vMMSC", + "service-type":"vWINIFRED", "resource-version":"1498752217386", "service-instances":{ "service-instance":[ { "service-instance-id":"3364befd-0802-4861-99af-47c5c047239b", - "service-instance-name":"HnportalSriovProviderNet_50", + "service-instance-name":"WILKINSSriovProviderNet_50", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148521", @@ -2500,7 +2500,7 @@ }, { "service-instance-id":"240f80d8-4b6e-4882-a069-67512dc66888", - "service-instance-name":"HnportalSriovProviderNet_88", + "service-instance-name":"WILKINSSriovProviderNet_88", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148043", @@ -2510,7 +2510,7 @@ }, { "service-instance-id":"48e6f4d3-8335-4669-9708-2e972fd2473f", - "service-instance-name":"HnportalSriovProviderNet_77", + "service-instance-name":"WILKINSSriovProviderNet_77", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149448", @@ -2570,7 +2570,7 @@ }, { "service-instance-id":"526fe500-b06d-49e9-ac9c-9e305468f7d9", - "service-instance-name":"HnportalSriovProviderNet_89", + "service-instance-name":"WILKINSSriovProviderNet_89", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151379", @@ -2610,7 +2610,7 @@ }, { "service-instance-id":"d12538b2-d2f3-4879-87ac-f0b45fc6f84d", - "service-instance-name":"CRSVC_Mobility_Service_297772_ss616y_09_26_17_1", + "service-instance-name":"CRSVC_Emanuel_Service_297772_ss616y_09_26_17_1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506440871179", @@ -2670,7 +2670,7 @@ }, { "service-instance-id":"804c924a-00fe-40a9-af10-fbaa4ad99390", - "service-instance-name":"vMMSC_Lab2_020217_Svc_Service_0617", + "service-instance-name":"vWINIFRED_Lab2_020217_Svc_Service_0617", "persona-model-id":null, "persona-model-version":null, "resource-version":"1497721637609", @@ -2710,7 +2710,7 @@ }, { "service-instance-id":"1b9e0bf1-13d9-4122-8364-6d94187a6e76", - "service-instance-name":"vMMSC_Lab2_010517_Svc_DS_0714_01", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_DS_0714_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500063304219", @@ -2730,7 +2730,7 @@ }, { "service-instance-id":"97ed0e33-3031-42c7-a4ce-519f3af21132", - "service-instance-name":"HnportalSriovProviderNet_29", + "service-instance-name":"WILKINSSriovProviderNet_29", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148377", @@ -2740,7 +2740,7 @@ }, { "service-instance-id":"022b44be-2fe1-465a-b9ad-e9d6c3c89778", - "service-instance-name":"VMMSC_AIC_3.0_Svc", + "service-instance-name":"vWINIFRED_AIC_3.0_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1495556113481", @@ -2750,7 +2750,7 @@ }, { "service-instance-id":"72117a7f-e304-4f59-9ba5-d2b6419caa6b", - "service-instance-name":"HnportalSriovProviderNet_100", + "service-instance-name":"WILKINSSriovProviderNet_100", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148058", @@ -2770,7 +2770,7 @@ }, { "service-instance-id":"26031c62-ca38-4427-a773-ee43a172ed3a", - "service-instance-name":"vMMSC_Test_06292017_Svc_0629_ud6361", + "service-instance-name":"vWINIFRED_Test_06292017_Svc_0629_ud6361", "persona-model-id":null, "persona-model-version":null, "resource-version":"1498782124079", @@ -2780,7 +2780,7 @@ }, { "service-instance-id":"d3055874-7e1c-4a3d-b4d1-8ac3e91fcc28", - "service-instance-name":"vMMSC_Test_08182017_Svc_sb063v", + "service-instance-name":"vWINIFRED_Test_08182017_Svc_sb063v", "persona-model-id":null, "persona-model-version":null, "resource-version":"1503070451727", @@ -2830,7 +2830,7 @@ }, { "service-instance-id":"facedbb9-9703-4b61-a04b-d0f23e6a0188", - "service-instance-name":"crSVC_Mobility_Service_297772_ss616y_1", + "service-instance-name":"crSVC_Emanuel_Service_297772_ss616y_1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506374487982", @@ -2880,7 +2880,7 @@ }, { "service-instance-id":"fd202522-5f89-4ce9-b892-5f75956f93b3", - "service-instance-name":"HnportalSriovProviderNet_112", + "service-instance-name":"WILKINSSriovProviderNet_112", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149987", @@ -2890,7 +2890,7 @@ }, { "service-instance-id":"a83695df-061f-4871-80fe-0be5f7113ad0", - "service-instance-name":"HnportalSriovProviderNet_53", + "service-instance-name":"WILKINSSriovProviderNet_53", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148198", @@ -2900,7 +2900,7 @@ }, { "service-instance-id":"3d443a66-504d-49d3-967d-5f6523ec2e7b", - "service-instance-name":"HnportalSriovProviderNet_55", + "service-instance-name":"WILKINSSriovProviderNet_55", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148205", @@ -2910,7 +2910,7 @@ }, { "service-instance-id":"9365e5c7-bdd6-4f50-a8d2-96d5b3293842", - "service-instance-name":"HnportalSriovProviderNet_123", + "service-instance-name":"WILKINSSriovProviderNet_123", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149295", @@ -2960,7 +2960,7 @@ }, { "service-instance-id":"537b6fdd-1753-4be6-8b12-d325eebc3e32", - "service-instance-name":"createService_Mobility_Service_297772_09_28_ss616y", + "service-instance-name":"createService_Emanuel_Service_297772_09_28_ss616y", "persona-model-id":null, "persona-model-version":null, "resource-version":"1506543405211", @@ -2970,7 +2970,7 @@ }, { "service-instance-id":"7f8b4e13-fc46-4b67-b2b7-d6d8226476fe", - "service-instance-name":"x_mdns_2017_1011_CSI", + "service-instance-name":"x_CHARLOTTE_2017_1011_CSI", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509729899645", @@ -2980,7 +2980,7 @@ }, { "service-instance-id":"4ec4f2c8-6f55-4244-aa36-aac847ac048f", - "service-instance-name":"vMMSC+Sept+22+Svc", + "service-instance-name":"vWINIFRED+Sept+22+Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136029", @@ -3020,7 +3020,7 @@ }, { "service-instance-id":"3191493c-46cd-40d0-b659-c7d1e5f14bda", - "service-instance-name":"vMMSC_MMS_Lab_3_121416_Svc", + "service-instance-name":"vWINIFRED_MMS_Lab_3_121416_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152771", @@ -3040,7 +3040,7 @@ }, { "service-instance-id":"ee612d09-aa6d-455d-97ad-3259d2098d75", - "service-instance-name":"HnportalSriovProviderNet_58", + "service-instance-name":"WILKINSSriovProviderNet_58", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151334", @@ -3050,7 +3050,7 @@ }, { "service-instance-id":"6301180d-d4d8-447d-88f9-37fa585b1502", - "service-instance-name":"vMMSC_AIC_3.0_0622_Svc", + "service-instance-name":"vWINIFRED_AIC_3.0_0622_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500335097279", @@ -3060,7 +3060,7 @@ }, { "service-instance-id":"a5c57309-c13c-4d93-b849-78857cbc1620", - "service-instance-name":"Mobility_Service_297772_nb5443", + "service-instance-name":"Emanuel_Service_297772_nb5443", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505761426908", @@ -3130,7 +3130,7 @@ }, { "service-instance-id":"faac5e72-5fa0-4a3c-84f9-7f582cb6dac7", - "service-instance-name":"HNPortal_OAM_NET_VTO_2", + "service-instance-name":"WILKINS_OAM_NET_VTO_2", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151970", @@ -3170,7 +3170,7 @@ }, { "service-instance-id":"96ebc75f-fb74-4e90-a907-f8e95e12b2f7", - "service-instance-name":"Mobility_Service_297772_DS_0918_01", + "service-instance-name":"Emanuel_Service_297772_DS_0918_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505761575910", @@ -3200,7 +3200,7 @@ }, { "service-instance-id":"ec6b2b5b-b3cc-428d-951a-246b5c520f2d", - "service-instance-name":"VMMSC_AIC_3.0_MVM_0612", + "service-instance-name":"vWINIFRED_AIC_3.0_MVM_0612", "persona-model-id":null, "persona-model-version":null, "resource-version":"1497298262657", @@ -3210,7 +3210,7 @@ }, { "service-instance-id":"8eabacfe-c914-4891-9d1c-68f0ecff1944", - "service-instance-name":"VMMSC_AIC_30_Svc", + "service-instance-name":"vWINIFRED_AIC_30_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505484796812", @@ -3230,7 +3230,7 @@ }, { "service-instance-id":"7d05c5df-e627-43f2-8684-bac0762dacbd", - "service-instance-name":"HnportalSriovProviderNet_98", + "service-instance-name":"WILKINSSriovProviderNet_98", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149640", @@ -3280,7 +3280,7 @@ }, { "service-instance-id":"33c37a25-76a7-40fe-b08e-d88384e5654e", - "service-instance-name":"HnportalSriovProviderNet_96", + "service-instance-name":"WILKINSSriovProviderNet_96", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149632", @@ -3300,7 +3300,7 @@ }, { "service-instance-id":"d0dd8197-b506-4118-97c9-29fa49af77fd", - "service-instance-name":"vMMSC_Lab2_010517_Svc_DS_0615_01", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_DS_0615_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1497539173826", @@ -3340,7 +3340,7 @@ }, { "service-instance-id":"e0aa3f05-1c5d-4205-be72-b4f53c5caf26", - "service-instance-name":"lll_051817_vmme_svc", + "service-instance-name":"lll_051817_vflorence_svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1495131287067", @@ -3350,7 +3350,7 @@ }, { "service-instance-id":"8514ebd9-b681-47e7-86bc-6c803b672dc4", - "service-instance-name":"vMMSC_Lab2_020217_Svc", + "service-instance-name":"vWINIFRED_Lab2_020217_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255147818", @@ -3360,7 +3360,7 @@ }, { "service-instance-id":"d11b6e9b-0c72-4e65-a93e-a94d9c673d05", - "service-instance-name":"vMMSC_Test_06292017_Svc_ds_0720_01", + "service-instance-name":"vWINIFRED_Test_06292017_Svc_ds_0720_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1500490381801", @@ -3370,7 +3370,7 @@ }, { "service-instance-id":"78f93382-b473-47c9-b921-3beb1e73477e", - "service-instance-name":"vMMSC_Lab2_010707_Svc_SA", + "service-instance-name":"vWINIFRED_Lab2_010707_Svc_SA", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499368751374", @@ -3380,7 +3380,7 @@ }, { "service-instance-id":"512cea94-0ae9-4df5-a670-75fdeb709574", - "service-instance-name":"vMMSC_Lab2_010517_Svc_710", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_710", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499701812485", @@ -3420,7 +3420,7 @@ }, { "service-instance-id":"8752cea8-ffee-4dcc-8f80-71641ce7017b", - "service-instance-name":"Service_vMMSC_298109_Svc_DS_0913_01", + "service-instance-name":"Service_vWINIFRED_298109_Svc_DS_0913_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505336746682", @@ -3430,7 +3430,7 @@ }, { "service-instance-id":"5cd4b31f-17e3-4bc2-8a53-fd1aebfc40c8", - "service-instance-name":"HnportalSriovProviderNet_97", + "service-instance-name":"WILKINSSriovProviderNet_97", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149102", @@ -3450,7 +3450,7 @@ }, { "service-instance-id":"5a2cb0c0-e32d-42a9-9a8c-e47ad9dd7978", - "service-instance-name":"HnportalSriovProviderNet_73", + "service-instance-name":"WILKINSSriovProviderNet_73", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149603", @@ -3460,7 +3460,7 @@ }, { "service-instance-id":"1664e68e-5323-4d0a-be16-fbf7a973aede", - "service-instance-name":"HnportalSriovProviderNet_82", + "service-instance-name":"WILKINSSriovProviderNet_82", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255149782", @@ -3480,7 +3480,7 @@ }, { "service-instance-id":"370073cf-89e9-4526-9fc0-dfff468571a8", - "service-instance-name":"SI_vVIGaas_Test_01", + "service-instance-name":"SI_vSalvatore_Test_01", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148452", @@ -3668,7 +3668,7 @@ }, { "service-instance-id":"37aa1cd2-decf-41a8-9edb-ed4407898201", - "service-instance-name":"vMMSC_Lab2_010517_Svc_Rollback", + "service-instance-name":"vWINIFRED_Lab2_010517_Svc_Rollback", "persona-model-id":null, "persona-model-version":null, "resource-version":"1499697119107", @@ -3711,13 +3711,13 @@ "is-permitted":false }, { - "service-type":"FIRSTNET", + "service-type":"LINDSEY", "resource-version":"1509387060781", "service-instances":{ "service-instance":[ { "service-instance-id":"72745ee0-4236-43a4-a2a7-5156f7d5db4d", - "service-instance-name":"RDM5a_TFNET_CORE_NTWK_Svc", + "service-instance-name":"olson5a_TFNET_CORE_NTWK_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255151745", @@ -3727,7 +3727,7 @@ }, { "service-instance-id":"21343700-a9d3-401c-a9cb-d46dacecac8a", - "service-instance-name":"vSAEGW-FN-0630-Svc-RDM5B1", + "service-instance-name":"vSAEGW-FN-0630-Svc-olson5B1", "persona-model-id":null, "persona-model-version":null, "resource-version":"1508454188209", @@ -3797,7 +3797,7 @@ }, { "service-instance-id":"7bb7ea08-d091-433d-b3e5-1e32617b19d7", - "service-instance-name":"APNDNS-1710-SVC-FN-RDM5a", + "service-instance-name":"APNDNS-1710-SVC-FN-olson5a", "persona-model-id":null, "persona-model-version":null, "resource-version":"1509999807693", @@ -3840,7 +3840,7 @@ "is-permitted":false }, { - "service-type":"ACTIVE_CHARGE", + "service-type":"JOHANNA_SANTOS", "resource-version":"1494255101364", "service-instances":{ "service-instance":[ @@ -3859,13 +3859,13 @@ "is-permitted":false }, { - "service-type":"vHSS", + "service-type":"vCarroll", "resource-version":"1494254877333", "service-instances":{ "service-instance":[ { "service-instance-id":"cebf5d96-09d7-4bee-9b5b-c5e116366c5b", - "service-instance-name":"vHSS-EPC-RDM3-Lab-SVC-0921", + "service-instance-name":"vHSS-EPC-olson3-Lab-SVC-0921", "persona-model-id":null, "persona-model-version":null, "resource-version":"1507211398987", @@ -3885,7 +3885,7 @@ }, { "service-instance-id":"99ec97fc-d9c6-47df-b619-b8d51e693b00", - "service-instance-name":"vHSS-RDM3-Lab1-SVC-0803", + "service-instance-name":"vHSS-olson3-Lab1-SVC-0803", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502120091585", @@ -3895,7 +3895,7 @@ }, { "service-instance-id":"86bad36c-e58a-4681-8d6e-9a72caed750e", - "service-instance-name":"vHSS-EPC-RDM3-Lab-SVC-0830", + "service-instance-name":"vHSS-EPC-olson3-Lab-SVC-0830", "persona-model-id":null, "persona-model-version":null, "resource-version":"1505856441762", @@ -3911,4 +3911,117 @@ } } } -}
\ No newline at end of file +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "queryParams" : { + "depth": [ "1" ] + } + } , + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "subscriber-name":"Emanuel", + "subscriber-type":"INFRA", + "resource-version":"1494255056308", + "service-subscriptions":{ + "service-subscription":[ + { + "service-type":"vRichardson", + "resource-version":"1501700976809", + "is-permitted":false + }, + { + "service-type":"Emanuel", + "resource-version":"1505402148533", + "is-permitted":false + }, + { + "service-type":"vJamie", + "resource-version":"1498068165053", + "is-permitted":false + }, + { + "service-type":"vVoiceMail", + "resource-version":"1494254889686", + "is-permitted":false + }, + { + "service-type":"Kennedy", + "resource-version":"1509369877126", + "is-permitted":true + }, + { + "service-type":"vPorfirio", + "resource-version":"1494254851983", + "is-permitted":false + }, + { + "service-type":"vVM", + "resource-version":"1494255049530", + "is-permitted":false + }, + { + "service-type":"vOTA", + "resource-version":"1501692006937", + "is-permitted":false + }, + { + "service-type":"vMME", + "resource-version":"1497729820723", + "is-permitted":false + }, + { + "service-type":"vMNS", + "resource-version":"1509391084129", + "is-permitted":false + }, + { + "service-type":"vEsmeralda", + "resource-version":"1501532104695", + "is-permitted":false + }, + { + "service-type":"VPMS", + "resource-version":"1509738154248", + "is-permitted":false + }, + { + "service-type":"vWINIFRED", + "resource-version":"1498752217386", + "is-permitted":false + }, + { + "service-type":"SSD", + "resource-version":"1494254866295", + "is-permitted":false + }, + { + "service-type":"vMOG", + "resource-version":"1500675745252", + "is-permitted":false + }, + { + "service-type":"LINDSEY", + "resource-version":"1509387060781", + "is-permitted":false + }, + { + "service-type":"JOHANNA_SANTOS", + "resource-version":"1494255101364", + "is-permitted":false + }, + { + "service-type":"vCarroll", + "resource-version":"1494254877333", + "is-permitted":false + } + ] + } + } + } + } +]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_scheduler_details_short.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_scheduler_details_short.json index 88f696a33..bf9713863 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_scheduler_details_short.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_scheduler_details_short.json @@ -5,6 +5,9 @@ }, "simulatorResponse": { "responseCode": 200, + "responseHeaders": { + "Content-Type": "application/json" + }, "body": [ { "vnfName": "ctsf0002v", @@ -52,7 +55,7 @@ "schedulesId": 0 }, { - "vnfName": "ZRDM1MMSC0450d9", + "vnfName": "Zolson1MMSC0450d9", "vnfId": "", "status": "Pending Approval", "startTime": "2017-10-06T17:12:39Z", @@ -69,7 +72,7 @@ "optimizerAttemptsToSchedule": 0, "optimizerReturnDateTime": "2017-10-06T17:11:47Z", "optimizerTransactionId": "83aec7bf-602f-49eb-9788-bbc33ac550d9", - "schedule": "[{\"groupId\":\"\",\"startTime\":\"2017-10-06 17:12:39\",\"finishTime\":\"2017-10-06 17:14:29\",\"latestInstanceStartTime\":\"2017-10-06 17:12:39\",\"node\":[\"ZRDM1MMSC0450d9\"]}]", + "schedule": "[{\"groupId\":\"\",\"startTime\":\"2017-10-06 17:12:39\",\"finishTime\":\"2017-10-06 17:14:29\",\"latestInstanceStartTime\":\"2017-10-06 17:12:39\",\"node\":[\"Zolson1MMSC0450d9\"]}]", "scheduleId": "83aec7bf-602f-49eb-9788-bbc33ac550d9", "scheduleName": "83aec7bf-602f-49eb-9788-bbc33ac550d9", "status": "Pending Approval", @@ -259,7 +262,7 @@ "schedulesId": 0 }, { - "vnfName": "ZRDM1MMSC04482c", + "vnfName": "Zolson1MMSC04482c", "status": "Deleted", "groupId": "", "policyId": "SNIRO.Config_MS_Demo_TimeLimitAndVerticalTopology_zone", diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_scheduler_details_short_with_after_cancel.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_scheduler_details_short_with_after_cancel.json index c027d809e..358bb7bbc 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_scheduler_details_short_with_after_cancel.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_scheduler_details_short_with_after_cancel.json @@ -5,6 +5,9 @@ }, "simulatorResponse": { "responseCode": 200, + "responseHeaders": { + "Content-Type": "application/json" + }, "body": [ { "vnfName": "ctsf0002v", @@ -52,7 +55,7 @@ "schedulesId": 0 }, { - "vnfName": "ZRDM1MMSC0450d9", + "vnfName": "Zolson1MMSC0450d9", "vnfId": "", "status": "Pending Approval", "startTime": "2017-10-06T17:12:39Z", @@ -68,7 +71,7 @@ "optimizerAttemptsToSchedule": 0, "optimizerReturnDateTime": "2017-10-06T17:11:47Z", "optimizerTransactionId": "83aec7bf-602f-49eb-9788-bbc33ac550d9", - "schedule": "[{\"groupId\":\"\",\"startTime\":\"2017-10-06 17:12:39\",\"finishTime\":\"2017-10-06 17:14:29\",\"latestInstanceStartTime\":\"2017-10-06 17:12:39\",\"node\":[\"ZRDM1MMSC0450d9\"]}]", + "schedule": "[{\"groupId\":\"\",\"startTime\":\"2017-10-06 17:12:39\",\"finishTime\":\"2017-10-06 17:14:29\",\"latestInstanceStartTime\":\"2017-10-06 17:12:39\",\"node\":[\"Zolson1MMSC0450d9\"]}]", "scheduleId": "83aec7bf-602f-49eb-9788-bbc33ac550d9", "scheduleName": "83aec7bf-602f-49eb-9788-bbc33ac550d9", "status": "Pending Approval", @@ -256,7 +259,7 @@ "schedulesId": 0 }, { - "vnfName": "ZRDM1MMSC04482c", + "vnfName": "Zolson1MMSC04482c", "status": "Deleted", "groupId": "", "policyId": "SNIRO.Config_MS_Demo_TimeLimitAndVerticalTopology_zone", diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_sdc_catalog_services_2f80c596.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_sdc_catalog_services_2f80c596.json index be0a8c569..fb2204c48 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_sdc_catalog_services_2f80c596.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_sdc_catalog_services_2f80c596.json @@ -25,7 +25,7 @@ "name": "action-data", "version": "1.0", "toscaModelURL": "./2f80c596.zip", - "category": "Mobility", + "category": "Emanuel", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_service-design-and-creation.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_service-design-and-creation.json index db2bf24f7..96529c9cd 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_service-design-and-creation.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_service-design-and-creation.json @@ -19,10 +19,10 @@ "model-ver":[ { "model-version-id":"76e908e0-5201-44d2-a3e2-9e6128d05820", - "model-name":"mdns_2017_1011", + "model-name":"CHARLOTTE_2017_1011", "model-version":"1.0", "distribution-status": "DISTRIBUTION_COMPLETE_ERROR", - "model-description":"mdns_2017_1011", + "model-description":"CHARLOTTE_2017_1011", "resource-version":"1507747452925", "model-elements":{ "model-element":[ @@ -87,9 +87,9 @@ }, { "model-version-id":"90caad85-5d5c-4caf-9ddd-c05f6e088ba2", - "model-name":"mdns_2017_1011", + "model-name":"CHARLOTTE_2017_1011", "model-version":"3.0", - "model-description":"mdns_2017_1011", + "model-description":"CHARLOTTE_2017_1011", "resource-version":"1507920105086", "model-elements":{ "model-element":[ @@ -176,9 +176,9 @@ }, { "model-version-id":"afacccf6-397d-45d6-b5ae-94c39734b168", - "model-name":"mdns_2017_1011", + "model-name":"CHARLOTTE_2017_1011", "model-version":"4.0", - "model-description":"mdns_2017_1011", + "model-description":"CHARLOTTE_2017_1011", "resource-version":"1509315798030", "model-elements":{ "model-element":[ @@ -265,9 +265,9 @@ }, { "model-version-id":"b217c612-7fcf-484c-861b-df0a5c4b5bcb", - "model-name":"mdns_2017_1011", + "model-name":"CHARLOTTE_2017_1011", "model-version":"2.0", - "model-description":"mdns_2017_1011", + "model-description":"CHARLOTTE_2017_1011", "resource-version":"1507830869475", "model-elements":{ "model-element":[ @@ -341,9 +341,9 @@ "model-ver": [ { "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413", - "model-name": "mdns_2017_1011", + "model-name": "CHARLOTTE_2017_1011", "model-version": "1.0", - "model-description": "mdns_2017_1011", + "model-description": "CHARLOTTE_2017_1011", "distribution-status": "DISTRIBUTION_COMPLETE_ERROR", "resource-version": "1507747452925", "model-elements": { diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type.json index 775587e63..f0e1b5e7f 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type.json @@ -16,10 +16,10 @@ { "id": "3400916992", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1", "properties": { "service-instance-id": "66b13cb4-b575-449f-aa45-ffbfe005c7b1", - "service-instance-name": "mDNS_preload_1710_0914", + "service-instance-name": "CHARLOTTE_preload_1710_0914", "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "model-version-id": "1525f534-99a2-408f-b847-ff636997d352", "resource-version": "1505856078810", @@ -29,22 +29,22 @@ { "id": "10207440", "node-type": "service-subscription", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" }, { "id": "3481829392", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec" } ] }, { "id": "3771572432", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95", "properties": { "service-instance-id": "f195837b-ef28-42c3-8dea-47ad37eaed95", - "service-instance-name": "mDNS_preload_1710_0914_0920", + "service-instance-name": "CHARLOTTE_preload_1710_0914_0920", "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", "resource-version": "1505964829466", @@ -54,22 +54,22 @@ { "id": "10207440", "node-type": "service-subscription", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" }, { "id": "3484520464", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1" } ] }, { "id": "3775807704", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700", "properties": { "service-instance-id": "9ad4ac55-a5e0-4b49-95c0-b2d846abf700", - "service-instance-name": "mDNS_preload_1710_0914_100417", + "service-instance-name": "CHARLOTTE_preload_1710_0914_100417", "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", "resource-version": "1507144734087", @@ -79,22 +79,22 @@ { "id": "10207440", "node-type": "service-subscription", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" }, { "id": "3783459064", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165" } ] }, { "id": "4178862184", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2", "properties": { "service-instance-id": "599c7247-b083-447c-b6b1-0cdd5170dfd2", - "service-instance-name": "mDNS_preload_1710_0914_1010", + "service-instance-name": "CHARLOTTE_preload_1710_0914_1010", "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", "resource-version": "1507664240411", @@ -104,22 +104,22 @@ { "id": "10207440", "node-type": "service-subscription", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" }, { "id": "3892133896", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a" } ] }, { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08", "properties": { "service-instance-id": "97315a05-e6f3-4c47-ae7e-d850c327aa08", - "service-instance-name": "mDNS_preload_1710_0914_0927", + "service-instance-name": "CHARLOTTE_preload_1710_0914_0927", "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", "resource-version": "1506527653053", @@ -129,23 +129,23 @@ { "id": "10207440", "node-type": "service-subscription", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" }, { "id": "3418898432", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855" } ] }, { "id": "3481829392", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec", "properties": { "vnf-id": "0c465dd3-4151-4da9-92a2-541bb3174cec", "vnf-name": "Eoghan Fausto", - "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status": "PREPROV", "orchestration-status": "Created", @@ -164,38 +164,38 @@ { "id": "3285635208", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/d49713bf-1bff-4eab-bed1-a8f1bb83aa98" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/d49713bf-1bff-4eab-bed1-a8f1bb83aa98" }, { "id": "3441209432", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/b8397fec-cf13-40b3-be8f-7d0912506419" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/b8397fec-cf13-40b3-be8f-7d0912506419" }, { "id": "3687522312", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/fd098a52-09be-4c48-a9e9-a565d1b39db3" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/fd098a52-09be-4c48-a9e9-a565d1b39db3" }, { "id": "3400916992", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1" }, { "id": "3477385312", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" } ] }, { "id": "3484520464", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1", "properties": { "vnf-id": "c2d2d389-fa00-4fb4-a269-e46d495719e1", "vnf-name": "Odell Romana", - "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status": "PREPROV", "orchestration-status": "Created", @@ -214,58 +214,58 @@ { "id": "3447107680", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/c4711b5c-742e-4d03-8146-bff763f69fbd" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/c4711b5c-742e-4d03-8146-bff763f69fbd" }, { "id": "3448307712", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/0ba3fcdd-0536-4ac7-a9ec-8d8622db7fb2" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/0ba3fcdd-0536-4ac7-a9ec-8d8622db7fb2" }, { "id": "3692179528", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/6bb843eb-ef84-43b1-83b4-3154a7f9928c" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/6bb843eb-ef84-43b1-83b4-3154a7f9928c" }, { "id": "3771588816", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/a4c008c6-cac0-4e3f-928f-90fa37dc8c4b" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/a4c008c6-cac0-4e3f-928f-90fa37dc8c4b" }, { "id": "3904077944", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/eecb619c-a173-4ead-bf48-d4d09cbbdd5e" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/eecb619c-a173-4ead-bf48-d4d09cbbdd5e" }, { "id": "4027855088", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/1e29424e-2dca-45ac-b1df-59a8f74d0bc1" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/1e29424e-2dca-45ac-b1df-59a8f74d0bc1" }, { "id": "4390871192", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/b185220a-7f63-4b29-867d-1452813a4f09" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/b185220a-7f63-4b29-867d-1452813a4f09" }, { "id": "4450529432", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/7a0c4b98-b3cc-490c-bbab-e2d7f169f2d7" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/7a0c4b98-b3cc-490c-bbab-e2d7f169f2d7" }, { "id": "3771572432", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95" } ] }, { "id": "3783459064", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165", "properties": { "vnf-id": "54626a59-ec0d-4fa9-b0c2-08d008688165", "vnf-name": "Dominika Fionnbharr", - "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status": "PREPROV", "orchestration-status": "Created", @@ -284,18 +284,18 @@ { "id": "3775807704", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700" } ] }, { "id": "3892133896", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a", "properties": { "vnf-id": "d74503d8-abab-49c6-ba48-a6211eee9b7a", - "vnf-name": "mDNS_PreloadTest_VNF", - "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0", + "vnf-name": "CHARLOTTE_PreloadTest_VNF", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status": "PREPROV", "orchestration-status": "Created", @@ -314,18 +314,18 @@ { "id": "4178862184", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2" } ] }, { "id": "1507690314", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/385548e2-3f31-4900-9437-317d0346e49a", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/385548e2-3f31-4900-9437-317d0346e49a", "properties": { "vnf-id": "385548e2-3f31-4900-9437-317d0346e49a", "vnf-name": "Senga Gabrielle", - "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status": "PREPROV", "orchestration-status": "Created", @@ -344,28 +344,28 @@ { "id": "3664617648", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" }, { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" }, { "id": "3477385312", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" } ] }, { "id": "5278880615", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0465e048-92a4-4a7f-bfe7-de39b32de4bd", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0465e048-92a4-4a7f-bfe7-de39b32de4bd", "properties": { "vnf-id": "0465e048-92a4-4a7f-bfe7-de39b32de4bd", "vnf-name": "Constantius Raghu", - "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status": "PREPROV", "orchestration-status": "Created", @@ -384,28 +384,28 @@ { "id": "3664617648", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" }, { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" }, { "id": "3477385312", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" } ] }, { "id": "3418898432", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", "properties": { "vnf-id": "8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", - "vnf-name": "zrdm3amdns02test2", - "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0", + "vnf-name": "zolson3amdns02test2", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status": "PREPROV", "orchestration-status": "Created", @@ -424,63 +424,63 @@ { "id": "3664617648", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" }, { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" }, { "id": "3477385312", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" }, { "id": "3647635704", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0" }, { "id": "3664621744", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce" }, { "id": "3975352504", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f" }, { "id": "4059455552", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7" }, { "id": "4098130088", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e" }, { "id": "4401291416", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1" }, { "id": "4458950808", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82" } ] }, { "id": "1024648346", "node-type": "generic-vnf", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/a58bf551-a79c-42d1-83b4-ed9288036245", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/a58bf551-a79c-42d1-83b4-ed9288036245", "properties": { "vnf-id": "a58bf551-a79c-42d1-83b4-ed9288036245", "vnf-name": "Harrison Kris", - "vnf-type": "mDNS preload 1710 0914/mDNS preload 1710 0914 0", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status": "PREPROV", "orchestration-status": "Created", @@ -499,52 +499,127 @@ { "id": "3664617648", "node-type": "vf-module", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" }, { "id": "3008335920", "node-type": "service-instance", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" }, { "id": "3477385312", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" }, { "id": "3647635704", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0" }, { "id": "3664621744", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce" }, { "id": "3975352504", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f" }, { "id": "4059455552", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7" }, { "id": "4098130088", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e" }, { "id": "4401291416", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1" }, { "id": "4458950808", "node-type": "vserver", - "url": "https://aai.api.simpledemo.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82" + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82" + } + ] + }, + { + "id": "1024648346", + "node-type": "generic-vfmodule", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/a58bf551-a79c-42d1-83b4-ed9288036245", + "properties": { + "vnf-id": "a58bf551-a79c-42d1-83b4-ed9288036245", + "vnf-name": "Harrison Kris", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "4679861552759", + "model-invariant-id": "00beb8f9-6d39-452f-816d-c709b9cbb87d", + "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413", + "model-customization-id": "14e8057d-b22a-405c-84aa-90b82bfd6e46", + "nf-type": "DNS", + "nf-function": "Mobile DNS", + "nf-role": "vMobileDNS", + "nf-naming-code": "null" + }, + "related-to": [ + { + "id": "3664617648", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" + }, + { + "id": "3008335920", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + }, + { + "id": "3477385312", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + }, + { + "id": "3647635704", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0" + }, + { + "id": "3664621744", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce" + }, + { + "id": "3975352504", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f" + }, + { + "id": "4059455552", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7" + }, + { + "id": "4098130088", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e" + }, + { + "id": "4401291416", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1" + }, + { + "id": "4458950808", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82" } ] } diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements.json index 79f7d0455..2734cc064 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/mso/orchestrationRequests/v5", + "path": "/mso/orchestrationRequests/v.", "queryParams": { "filter": "modelType:EQUALS:vnf" } @@ -12,305 +12,305 @@ "requestList": [ { "request": { - "requestDetails":{ - "cloudConfiguration":{ - "lcpCloudRegionId":"mtn6", - "tenantId":"ffdf52b5e5104b0e8f329b0b1637ee2e" - }, - "modelInfo":{ - "modelCustomizationName":"VSP1710PID298109_vMMSC 0", - "modelCustomizationId":"24d43fdb-9aa6-4287-a68e-1e702ea89d13", - "modelInvariantId":"e7961100-cde6-4b5a-bcda-b8945086950a", - "modelVersionId":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e", - "modelName":"VSP1710PID298109_vMMSC", - "modelType":"vnf", - "modelVersion":"1.0" - }, - "relatedModelList":[ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "hvf6", + "tenantId": "ffdf52b5e5104b0e8f329b0b1637ee2e" + }, + "modelInfo": { + "modelCustomizationName": "VSP1710PID298109_vWINIFRED 0", + "modelCustomizationId": "24d43fdb-9aa6-4287-a68e-1e702ea89d13", + "modelInvariantId": "e7961100-cde6-4b5a-bcda-b8945086950a", + "modelVersionId": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e", + "modelName": "VSP1710PID298109_vWINIFRED", + "modelType": "vnf", + "modelVersion": "1.0" + }, + "relatedModelList": [ { - "relatedInstance":{ - "instanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "modelInfo":{ - "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df", - "modelType":"service", - "modelName":"ServicevMMSCPID298109", - "modelVersion":"1.0", - "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe" + "relatedInstance": { + "instanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "modelInfo": { + "modelInvariantId": "57e00952-0af7-4f0f-b19a-408a6f73c8df", + "modelType": "service", + "modelName": "ServicevWINIFREDPID298109", + "modelVersion": "1.0", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe" } } } ], - "requestInfo":{ - "source":"VID", - "suppressRollback":false, - "requestorId":"ds828e" + "requestInfo": { + "source": "VID", + "suppressRollback": false, + "requestorId": "ds828e" }, - "requestParameters":{ - "userParams":[ + "requestParameters": { + "userParams": [ ], - "aLaCarte":false, - "usePreload":true, - "rebuildVolumeGroups":false, - "autoBuildVfModules":false, - "cascadeDelete":false + "aLaCarte": false, + "usePreload": true, + "rebuildVolumeGroups": false, + "autoBuildVfModules": false, + "cascadeDelete": false }, - "relatedInstanceList":[ + "relatedInstanceList": [ { - "relatedInstance":{ - "instanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "modelInfo":{ - "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df", - "modelType":"service", - "modelName":"ServicevMMSCPID298109", - "modelVersion":"1.0", - "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe" + "relatedInstance": { + "instanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "modelInfo": { + "modelInvariantId": "57e00952-0af7-4f0f-b19a-408a6f73c8df", + "modelType": "service", + "modelName": "ServicevWINIFREDPID298109", + "modelVersion": "1.0", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe" } } } ] }, - "requestId":"d352c70d-5ef8-4977-9ea8-4c8cbe860422", - "requestScope":"vnf", - "requestStatus":{ - "percentProgress":100.0, - "requestState":"Some Unknown Value", - "statusMessage":"Update Is In Progress", - "finishTime":"Fri, 08 Sep 2017 19:34:33 GMT" + "requestId": "d352c70d-5ef8-4977-9ea8-4c8cbe860422", + "requestScope": "vnf", + "requestStatus": { + "percentProgress": 100.0, + "requestState": "Some Unknown Value", + "statusMessage": "Update Is In Progress", + "finishTime": "Fri, 08 Sep 2017 19:34:33 GMT" }, - "requestType":"updateInstance", - "startTime":"<IN_PROGRESS_DATE>", - "instanceReferences":{ - "serviceInstanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "vnfInstanceId":"7c00cc1e-6425-4fc3-afc3-0289db288d4c", - "requestorId":"ds828e" + "requestType": "updateInstance", + "startTime": "<IN_PROGRESS_DATE>", + "instanceReferences": { + "serviceInstanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "vnfInstanceId": "7c00cc1e-6425-4fc3-afc3-0289db288d4c", + "requestorId": "ds828e" } } }, { "request": { - "requestDetails":{ - "cloudConfiguration":{ - "lcpCloudRegionId":"mtn6", - "tenantId":"ffdf52b5e5104b0e8f329b0b1637ee2e" - }, - "modelInfo":{ - "modelCustomizationName":"VSP1710PID298109_vMMSC 0", - "modelCustomizationId":"24d43fdb-9aa6-4287-a68e-1e702ea89d13", - "modelInvariantId":"e7961100-cde6-4b5a-bcda-b8945086950a", - "modelVersionId":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e", - "modelName":"VSP1710PID298109_vMMSC", - "modelType":"vnf", - "modelVersion":"1.0" - }, - "relatedModelList":[ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "hvf6", + "tenantId": "ffdf52b5e5104b0e8f329b0b1637ee2e" + }, + "modelInfo": { + "modelCustomizationName": "VSP1710PID298109_vWINIFRED 0", + "modelCustomizationId": "24d43fdb-9aa6-4287-a68e-1e702ea89d13", + "modelInvariantId": "e7961100-cde6-4b5a-bcda-b8945086950a", + "modelVersionId": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e", + "modelName": "VSP1710PID298109_vWINIFRED", + "modelType": "vnf", + "modelVersion": "1.0" + }, + "relatedModelList": [ { - "relatedInstance":{ - "instanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "modelInfo":{ - "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df", - "modelType":"service", - "modelName":"ServicevMMSCPID298109", - "modelVersion":"1.0", - "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe" + "relatedInstance": { + "instanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "modelInfo": { + "modelInvariantId": "57e00952-0af7-4f0f-b19a-408a6f73c8df", + "modelType": "service", + "modelName": "ServicevWINIFREDPID298109", + "modelVersion": "1.0", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe" } } } ], - "requestInfo":{ - "source":"VID", - "suppressRollback":false, - "requestorId":"ds828e" + "requestInfo": { + "source": "VID", + "suppressRollback": false, + "requestorId": "ds828e" }, - "requestParameters":{ - "userParams":[ + "requestParameters": { + "userParams": [ ], - "aLaCarte":false, - "usePreload":true, - "rebuildVolumeGroups":false, - "autoBuildVfModules":false, - "cascadeDelete":false + "aLaCarte": false, + "usePreload": true, + "rebuildVolumeGroups": false, + "autoBuildVfModules": false, + "cascadeDelete": false }, - "relatedInstanceList":[ + "relatedInstanceList": [ { - "relatedInstance":{ - "instanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "modelInfo":{ - "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df", - "modelType":"service", - "modelName":"ServicevMMSCPID298109", - "modelVersion":"1.0", - "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe" + "relatedInstance": { + "instanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "modelInfo": { + "modelInvariantId": "57e00952-0af7-4f0f-b19a-408a6f73c8df", + "modelType": "service", + "modelName": "ServicevWINIFREDPID298109", + "modelVersion": "1.0", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe" } } } ] }, - "requestId":"1dc5ff9e-6d5d-4071-9667-cc539b41d8aa", - "requestScope":"vnf", - "requestStatus":{ - "percentProgress":100.0, - "requestState":"PENDING", - "statusMessage":"Pending for A&AI", - "finishTime":"Fri, 08 Sep 2017 20:58:38 GMT" + "requestId": "d352c70d-5ef8-4977-9ea8-4c8cbe860422", + "requestScope": "vnf", + "requestStatus": { + "percentProgress": 100.0, + "requestState": "UNLOCKED", + "statusMessage": "Update Is In Progress", + "finishTime": "Fri, 08 Sep 2017 19:34:33 GMT" }, - "requestType":"replaceInstance", - "startTime":"Fri, 08 Sep 2017 20:58:37 GMT", - "instanceReferences":{ - "serviceInstanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "vnfInstanceId":"7c00cc1e-6425-4fc3-afc3-0289db288d4c", - "requestorId":"ds828e" + "requestType": "updateInstance", + "startTime": "<IN_PROGRESS_DATE>", + "instanceReferences": { + "serviceInstanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "vnfInstanceId": "Unlocked instance", + "requestorId": "ds828e" } } }, { "request": { - "requestDetails":{ - "cloudConfiguration":{ - "lcpCloudRegionId":"mtn6", - "tenantId":"ffdf52b5e5104b0e8f329b0b1637ee2e" - }, - "modelInfo":{ - "modelCustomizationName":"VSP1710PID298109_vMMSC 0", - "modelCustomizationId":"24d43fdb-9aa6-4287-a68e-1e702ea89d13", - "modelInvariantId":"e7961100-cde6-4b5a-bcda-b8945086950a", - "modelVersionId":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e", - "modelName":"VSP1710PID298109_vMMSC", - "modelType":"vnf", - "modelVersion":"1.0" - }, - "relatedModelList":[ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "hvf6", + "tenantId": "ffdf52b5e5104b0e8f329b0b1637ee2e" + }, + "modelInfo": { + "modelCustomizationName": "VSP1710PID298109_vWINIFRED 0", + "modelCustomizationId": "24d43fdb-9aa6-4287-a68e-1e702ea89d13", + "modelInvariantId": "e7961100-cde6-4b5a-bcda-b8945086950a", + "modelVersionId": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e", + "modelName": "VSP1710PID298109_vWINIFRED", + "modelType": "vnf", + "modelVersion": "1.0" + }, + "relatedModelList": [ { - "relatedInstance":{ - "instanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "modelInfo":{ - "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df", - "modelType":"service", - "modelName":"ServicevMMSCPID298109", - "modelVersion":"1.0", - "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe" + "relatedInstance": { + "instanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "modelInfo": { + "modelInvariantId": "57e00952-0af7-4f0f-b19a-408a6f73c8df", + "modelType": "service", + "modelName": "ServicevWINIFREDPID298109", + "modelVersion": "1.0", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe" } } } ], - "requestInfo":{ - "source":"VID", - "suppressRollback":false, - "requestorId":"ds828e" + "requestInfo": { + "source": "VID", + "suppressRollback": false, + "requestorId": "ds828e" }, - "requestParameters":{ - "userParams":[ + "requestParameters": { + "userParams": [ ], - "aLaCarte":false, - "usePreload":true, - "rebuildVolumeGroups":false, - "autoBuildVfModules":false, - "cascadeDelete":false + "aLaCarte": false, + "usePreload": true, + "rebuildVolumeGroups": false, + "autoBuildVfModules": false, + "cascadeDelete": false }, - "relatedInstanceList":[ + "relatedInstanceList": [ { - "relatedInstance":{ - "instanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "modelInfo":{ - "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df", - "modelType":"service", - "modelName":"ServicevMMSCPID298109", - "modelVersion":"1.0", - "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe" + "relatedInstance": { + "instanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "modelInfo": { + "modelInvariantId": "57e00952-0af7-4f0f-b19a-408a6f73c8df", + "modelType": "service", + "modelName": "ServicevWINIFREDPID298109", + "modelVersion": "1.0", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe" } } } ] }, - "requestId":"7b615765-8216-464f-8ac7-32c103013542", - "requestScope":"vnf", - "requestStatus":{ - "percentProgress":100.0, - "requestState":"FAILED", - "statusMessage":"Catch a Java Lang Exception in DecomposeService", - "finishTime":"Mon, 11 Sep 2017 20:14:20 GMT" + "requestId": "1dc5ff9e-6d5d-4071-9667-cc539b41d8aa", + "requestScope": "vnf", + "requestStatus": { + "percentProgress": 100.0, + "requestState": "PENDING", + "statusMessage": "Pending for A&AI", + "finishTime": "Fri, 08 Sep 2017 20:58:38 GMT" }, - "requestType":"updateInstance", - "startTime":"Mon, 11 Sep 2017 20:14:20 GMT", - "instanceReferences":{ - "serviceInstanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "vnfInstanceId":"7c00cc1e-6425-4fc3-afc3-0289db288d4c", - "requestorId":"ds828e" + "requestType": "replaceInstance", + "startTime": "Fri, 08 Sep 2017 20:58:37 GMT", + "instanceReferences": { + "serviceInstanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "vnfInstanceId": "7c00cc1e-6425-4fc3-afc3-0289db288d4c", + "requestorId": "ds828e" } } }, { "request": { - "requestDetails":{ - "cloudConfiguration":{ - "lcpCloudRegionId":"mtn6", - "tenantId":"ffdf52b5e5104b0e8f329b0b1637ee2e" - }, - "modelInfo":{ - "modelCustomizationName":"VSP1710PID298109_vMMSC 0", - "modelCustomizationId":"24d43fdb-9aa6-4287-a68e-1e702ea89d13", - "modelInvariantId":"e7961100-cde6-4b5a-bcda-b8945086950a", - "modelVersionId":"959a7ba0-89ee-4984-9af6-65d5bdda4b0e", - "modelName":"VSP1710PID298109_vMMSC", - "modelType":"vnf", - "modelVersion":"1.0" - }, - "relatedModelList":[ + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "hvf6", + "tenantId": "ffdf52b5e5104b0e8f329b0b1637ee2e" + }, + "modelInfo": { + "modelCustomizationName": "VSP1710PID298109_vWINIFRED 0", + "modelCustomizationId": "24d43fdb-9aa6-4287-a68e-1e702ea89d13", + "modelInvariantId": "e7961100-cde6-4b5a-bcda-b8945086950a", + "modelVersionId": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e", + "modelName": "VSP1710PID298109_vWINIFRED", + "modelType": "vnf", + "modelVersion": "1.0" + }, + "relatedModelList": [ { - "relatedInstance":{ - "instanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "modelInfo":{ - "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df", - "modelType":"service", - "modelName":"ServicevMMSCPID298109", - "modelVersion":"1.0", - "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe" + "relatedInstance": { + "instanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "modelInfo": { + "modelInvariantId": "57e00952-0af7-4f0f-b19a-408a6f73c8df", + "modelType": "service", + "modelName": "ServicevWINIFREDPID298109", + "modelVersion": "1.0", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe" } } } ], - "requestInfo":{ - "source":"VID", - "suppressRollback":false, - "requestorId":"ds828e" + "requestInfo": { + "source": "VID", + "suppressRollback": false, + "requestorId": "ds828e" }, - "requestParameters":{ - "userParams":[ + "requestParameters": { + "userParams": [ ], - "aLaCarte":false, - "usePreload":true, - "rebuildVolumeGroups":false, - "autoBuildVfModules":false, - "cascadeDelete":false + "aLaCarte": false, + "usePreload": true, + "rebuildVolumeGroups": false, + "autoBuildVfModules": false, + "cascadeDelete": false }, - "relatedInstanceList":[ + "relatedInstanceList": [ { - "relatedInstance":{ - "instanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "modelInfo":{ - "modelInvariantId":"57e00952-0af7-4f0f-b19a-408a6f73c8df", - "modelType":"service", - "modelName":"ServicevMMSCPID298109", - "modelVersion":"1.0", - "modelVersionId":"fe6985cd-ea33-3346-ac12-ab121484a3fe" + "relatedInstance": { + "instanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "modelInfo": { + "modelInvariantId": "57e00952-0af7-4f0f-b19a-408a6f73c8df", + "modelType": "service", + "modelName": "ServicevWINIFREDPID298109", + "modelVersion": "1.0", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe" } } } ] }, - "requestId":"a5335d4b-adae-4264-a51c-f3712cb4ae77", - "requestScope":"vnf", - "requestStatus":{ - "percentProgress":100.0, - "requestState":"FAILED", - "statusMessage":"Catch a Java Lang Exception in DecomposeService", - "finishTime":"Tue, 12 Sep 2017 18:22:29 GMT" + "requestId": "7b615765-8216-464f-8ac7-32c103013542", + "requestScope": "vnf", + "requestStatus": { + "percentProgress": 100.0, + "requestState": "FAILED", + "statusMessage": "Catch a Java Lang Exception in DecomposeService", + "finishTime": "Mon, 11 Sep 2017 20:14:20 GMT" }, - "requestType":"updateInstance", - "startTime":"Tue, 12 Sep 2017 18:22:28 GMT", - "instanceReferences":{ - "serviceInstanceId":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "vnfInstanceId":"7c00cc1e-6425-4fc3-afc3-0289db288d4c", - "requestorId":"ds828e" + "requestType": "updateInstance", + "startTime": "Mon, 11 Sep 2017 20:14:20 GMT", + "instanceReferences": { + "serviceInstanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "vnfInstanceId": "7c00cc1e-6425-4fc3-afc3-0289db288d4c", + "requestorId": "ds828e" } } }, @@ -318,15 +318,91 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "mtn6", + "lcpCloudRegionId": "hvf6", "tenantId": "ffdf52b5e5104b0e8f329b0b1637ee2e" }, "modelInfo": { - "modelCustomizationName": "VSP1710PID298109_vMMSC 0", + "modelCustomizationName": "VSP1710PID298109_vWINIFRED 0", "modelCustomizationId": "24d43fdb-9aa6-4287-a68e-1e702ea89d13", "modelInvariantId": "e7961100-cde6-4b5a-bcda-b8945086950a", "modelVersionId": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e", - "modelName": "VSP1710PID298109_vMMSC", + "modelName": "VSP1710PID298109_vWINIFRED", + "modelType": "vnf", + "modelVersion": "1.0" + }, + "relatedModelList": [ + { + "relatedInstance": { + "instanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "modelInfo": { + "modelInvariantId": "57e00952-0af7-4f0f-b19a-408a6f73c8df", + "modelType": "service", + "modelName": "ServicevWINIFREDPID298109", + "modelVersion": "1.0", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe" + } + } + } + ], + "requestInfo": { + "source": "VID", + "suppressRollback": false, + "requestorId": "ds828e" + }, + "requestParameters": { + "userParams": [ + ], + "aLaCarte": false, + "usePreload": true, + "rebuildVolumeGroups": false, + "autoBuildVfModules": false, + "cascadeDelete": false + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "modelInfo": { + "modelInvariantId": "57e00952-0af7-4f0f-b19a-408a6f73c8df", + "modelType": "service", + "modelName": "ServicevWINIFREDPID298109", + "modelVersion": "1.0", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe" + } + } + } + ] + }, + "requestId": "a5335d4b-adae-4264-a51c-f3712cb4ae77", + "requestScope": "vnf", + "requestStatus": { + "percentProgress": 100.0, + "requestState": "FAILED", + "statusMessage": "Catch a Java Lang Exception in DecomposeService", + "finishTime": "Tue, 12 Sep 2017 18:22:29 GMT" + }, + "requestType": "updateInstance", + "startTime": "Tue, 12 Sep 2017 18:22:28 GMT", + "instanceReferences": { + "serviceInstanceId": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", + "vnfInstanceId": "7c00cc1e-6425-4fc3-afc3-0289db288d4c", + "requestorId": "ds828e" + } + } + }, + { + "request": { + "requestDetails": { + "cloudConfiguration": { + "lcpCloudRegionId": "hvf6", + "tenantId": "ffdf52b5e5104b0e8f329b0b1637ee2e" + }, + "modelInfo": { + "modelCustomizationName": "VSP1710PID298109_vWINIFRED 0", + "modelCustomizationId": "24d43fdb-9aa6-4287-a68e-1e702ea89d13", + "modelInvariantId": "e7961100-cde6-4b5a-bcda-b8945086950a", + "modelVersionId": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e", + "modelName": "VSP1710PID298109_vWINIFRED", "modelType": "vnf", "modelVersion": "1.0" }, @@ -337,7 +413,7 @@ "modelInfo": { "modelInvariantId": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", "modelType": "service", - "modelName": "ServicevMMSCPID298109", + "modelName": "ServicevWINIFREDPID298109", "modelVersion": "1.0", "modelVersionId": "57e00952-0af7-4f0f-b19a-408a6f73c8df" } @@ -365,7 +441,7 @@ "modelInfo": { "modelInvariantId": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", "modelType": "service", - "modelName": "ServicevMMSCPID298109", + "modelName": "ServicevWINIFREDPID298109", "modelVersion": "1.0", "modelVersionId": "57e00952-0af7-4f0f-b19a-408a6f73c8df" } @@ -394,7 +470,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -470,7 +546,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -529,7 +605,7 @@ "requestScope": "vnf", "requestStatus": { "percentProgress": 100.0, - "requestState": "FAILED", + "requestState": "UNLOCKED", "statusMessage": "Error validating request. No valid catalog entry is specified", "finishTime": "Fri, 15 Sep 2017 14:43:22 GMT" }, @@ -546,7 +622,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -622,7 +698,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -698,7 +774,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -774,7 +850,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -989,7 +1065,7 @@ "modelCustomizationId": "2a4bcb63-e28b-441c-8df5-b817629d8211", "modelInvariantId": "5d86a112-7157-4a1a-85ce-23fb8403e0e3", "modelVersionId": "207152f3-4f60-41e7-b3f7-5a9e3a0b861f", - "modelName": "zrdm3amogx01", + "modelName": "zolson3amogx01", "modelType": "vnf", "modelVersion": "1.0" }, @@ -1093,7 +1169,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "relatedModelList": [ @@ -1103,7 +1179,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1122,7 +1198,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1157,7 +1233,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "relatedModelList": [ @@ -1167,7 +1243,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1186,7 +1262,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1221,7 +1297,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "relatedModelList": [ @@ -1231,7 +1307,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1250,7 +1326,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1285,7 +1361,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf", "modelVersion": "2.0" }, @@ -1296,7 +1372,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1315,7 +1391,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1351,7 +1427,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "relatedModelList": [ @@ -1361,7 +1437,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1380,7 +1456,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1416,7 +1492,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "relatedModelList": [ @@ -1426,7 +1502,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1445,7 +1521,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "2.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1481,7 +1557,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf", "modelVersion": "3.0" }, @@ -1492,7 +1568,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "4.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1511,7 +1587,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "4.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1547,7 +1623,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf", "modelVersion": "3.0" }, @@ -1558,7 +1634,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "4.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1577,7 +1653,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "4.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1613,7 +1689,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf", "modelVersion": "3.0" }, @@ -1624,7 +1700,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "4.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1643,7 +1719,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "4.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1679,7 +1755,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf", "modelVersion": "3.0" }, @@ -1690,7 +1766,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "4.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } @@ -1709,7 +1785,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelType": "service", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelVersion": "4.0", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd" } diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements_from_e2e.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements_from_e2e.json index 908bf1ea6..e4c5a616c 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements_from_e2e.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements_from_e2e.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/mso/orchestrationRequests/v5", + "path": "/mso/orchestrationRequests/v.", "queryParams": { "filter": "modelType:EQUALS:vnf" } @@ -14,7 +14,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -76,7 +76,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -138,7 +138,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -200,7 +200,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -262,7 +262,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -324,7 +324,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -386,7 +386,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -448,7 +448,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -510,7 +510,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -572,7 +572,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -634,7 +634,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -696,7 +696,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -758,7 +758,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -820,7 +820,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -882,7 +882,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -944,7 +944,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1006,7 +1006,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1068,7 +1068,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1130,7 +1130,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1192,7 +1192,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1254,7 +1254,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1316,7 +1316,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1378,7 +1378,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1440,7 +1440,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1502,7 +1502,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1561,7 +1561,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1623,7 +1623,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1685,7 +1685,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1747,7 +1747,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1809,7 +1809,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1871,7 +1871,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1933,7 +1933,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -1995,7 +1995,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2057,7 +2057,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2119,7 +2119,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2181,7 +2181,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2243,7 +2243,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2305,7 +2305,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2367,7 +2367,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2429,7 +2429,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2491,7 +2491,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2504,7 +2504,7 @@ "modelVersion": "3.0" }, "requestInfo": { - "instanceName": "zrdm3rprb01", + "instanceName": "zolson3rprb01", "source": "VID", "suppressRollback": false, "requestorId": "sg871u" @@ -2546,7 +2546,7 @@ "instanceReferences": { "serviceInstanceId": "8ccda9f2-2a5f-4445-ba64-fc3dad56cdb6", "vnfInstanceId": "330813fb-5ab2-4f0c-83d2-4d6dafc2d0f6", - "vnfInstanceName": "zrdm3rprb01", + "vnfInstanceName": "zolson3rprb01", "requestorId": "sg871u" } } @@ -2555,7 +2555,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2615,7 +2615,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2677,7 +2677,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2737,7 +2737,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2799,7 +2799,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "460f35aeb53542dc9f77105066483e83" }, "modelInfo": { @@ -2845,7 +2845,7 @@ "requestStatus": { "percentProgress": 100, "requestState": "FAILED", - "statusMessage": "Received vfModuleException from VnfAdapter: category='INTERNAL' message='org.openecomp.mso.openstack.exceptions.MsoAdapterException: Authentication Failure: tenant=460f35aeb53542dc9f77105066483e83,cloud=RDM5BDCP' rolledBack='true'", + "statusMessage": "Received vfModuleException from VnfAdapter: category='INTERNAL' message='org.openecomp.mso.openstack.exceptions.MsoAdapterException: Authentication Failure: tenant=460f35aeb53542dc9f77105066483e83,cloud=olson5BDCP' rolledBack='true'", "finishTime": "Fri, 06 Oct 2017 13:54:46 GMT" }, "requestType": "replaceInstance", @@ -2861,7 +2861,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "8830e9086a0f40cc9cf868e792602c4d" }, "modelInfo": { @@ -2923,15 +2923,15 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "868caab7b590480ba6334c2079f98e5c" }, "modelInfo": { - "modelCustomizationName": "mdns_2017_1011 0", + "modelCustomizationName": "CHARLOTTE_2017_1011 0", "modelCustomizationId": "75c035b6-5866-41e6-ba59-7bd898626d74", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "950ddbcf-f2d4-41a1-a1fa-6e62a74686f2", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "vnf", "modelVersion": "1.0" }, @@ -2956,7 +2956,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "ee6e6d7f-203c-4abb-b0d2-c807792093e2", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "1.0" } @@ -2985,15 +2985,15 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "868caab7b590480ba6334c2079f98e5c" }, "modelInfo": { - "modelCustomizationName": "mdns_2017_1011 0", + "modelCustomizationName": "CHARLOTTE_2017_1011 0", "modelCustomizationId": "75c035b6-5866-41e6-ba59-7bd898626d74", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "950ddbcf-f2d4-41a1-a1fa-6e62a74686f2", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "vnf", "modelVersion": "1.0" }, @@ -3018,7 +3018,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "ee6e6d7f-203c-4abb-b0d2-c807792093e2", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "1.0" } @@ -3047,15 +3047,15 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "868caab7b590480ba6334c2079f98e5c" }, "modelInfo": { - "modelCustomizationName": "mdns_2017_1011 1", + "modelCustomizationName": "CHARLOTTE_2017_1011 1", "modelCustomizationId": "796636ca-e9d5-4591-ae12-d1b038f43e4a", "modelInvariantId": "b217c612-7fcf-484c-861b-df0a5c4b5bcb", "modelVersionId": "50d679c7-8543-4d4f-a304-2ff2826bc98e", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "vnf", "modelVersion": "2.0" }, @@ -3080,7 +3080,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "7cce8c53-d391-42aa-984d-c6166dee9abe", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "2.0" } @@ -3109,15 +3109,15 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "868caab7b590480ba6334c2079f98e5c" }, "modelInfo": { - "modelCustomizationName": "mdns_2017_1011 1", + "modelCustomizationName": "CHARLOTTE_2017_1011 1", "modelCustomizationId": "796636ca-e9d5-4591-ae12-d1b038f43e4a", "modelInvariantId": "b217c612-7fcf-484c-861b-df0a5c4b5bcb", "modelVersionId": "50d679c7-8543-4d4f-a304-2ff2826bc98e", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "vnf", "modelVersion": "2.0" }, @@ -3142,7 +3142,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "7cce8c53-d391-42aa-984d-c6166dee9abe", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "2.0" } @@ -3171,15 +3171,15 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "868caab7b590480ba6334c2079f98e5c" }, "modelInfo": { - "modelCustomizationName": "mdns_2017_1011 1", + "modelCustomizationName": "CHARLOTTE_2017_1011 1", "modelCustomizationId": "365a095f-9eb8-4e1a-b567-c9d718d98ee9", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "90caad85-5d5c-4caf-9ddd-c05f6e088ba2", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "vnf", "modelVersion": "3.0" }, @@ -3204,7 +3204,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "e1092bfc-c14c-4de3-8ced-2d98c2a24dc3", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "3.0" } @@ -3233,7 +3233,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "868caab7b590480ba6334c2079f98e5c" }, "modelInfo": { @@ -3266,7 +3266,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "e1092bfc-c14c-4de3-8ced-2d98c2a24dc3", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "3.0" } @@ -3295,7 +3295,7 @@ "request": { "requestDetails": { "cloudConfiguration": { - "lcpCloudRegionId": "rdm5b", + "lcpCloudRegionId": "olson5b", "tenantId": "868caab7b590480ba6334c2079f98e5c" }, "modelInfo": { @@ -3328,7 +3328,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "e1092bfc-c14c-4de3-8ced-2d98c2a24dc3", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "3.0" } @@ -3364,7 +3364,7 @@ "modelCustomizationId": "2a4bcb63-e28b-441c-8df5-b817629d8211", "modelInvariantId": "5d86a112-7157-4a1a-85ce-23fb8403e0e3", "modelVersionId": "207152f3-4f60-41e7-b3f7-5a9e3a0b861f", - "modelName": "zrdm3amogx01", + "modelName": "zolson3amogx01", "modelType": "vnf", "modelVersion": "1.0" }, @@ -3659,7 +3659,7 @@ "requestStatus": { "percentProgress": 100, "requestState": "FAILED", - "statusMessage": "Received vfModuleException from VnfAdapter: category='INTERNAL' message='Resource null_base_dns_0 already exists in cloud/tenant rdm5b/868caab7b590480ba6334c2079f98e5c with ID null_base_dns_0/82b8cd27-b05e-4d04-9944-1275d63f5592' rolledBack='true'", + "statusMessage": "Received vfModuleException from VnfAdapter: category='INTERNAL' message='Resource null_base_dns_0 already exists in cloud/tenant olson5b/868caab7b590480ba6334c2079f98e5c with ID null_base_dns_0/82b8cd27-b05e-4d04-9944-1275d63f5592' rolledBack='true'", "finishTime": "Wed, 01 Nov 2017 21:13:47 GMT" }, "requestType": "replaceInstance", @@ -3887,7 +3887,7 @@ "requestStatus": { "percentProgress": 100, "requestState": "FAILED", - "statusMessage": "Received vfModuleException from VnfAdapter: category='INTERNAL' message='Resource null_base_dns_0 already exists in cloud/tenant rdm5b/868caab7b590480ba6334c2079f98e5c with ID null_base_dns_0/bdca66c9-4c2b-4a42-a402-d6978a34f68d' rolledBack='true'", + "statusMessage": "Received vfModuleException from VnfAdapter: category='INTERNAL' message='Resource null_base_dns_0 already exists in cloud/tenant olson5b/868caab7b590480ba6334c2079f98e5c with ID null_base_dns_0/bdca66c9-4c2b-4a42-a402-d6978a34f68d' rolledBack='true'", "finishTime": "Fri, 03 Nov 2017 18:47:14 GMT" }, "requestType": "replaceInstance", @@ -3964,7 +3964,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -3979,7 +3979,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "3.0" } @@ -4014,7 +4014,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4029,7 +4029,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "2.0" } @@ -4065,7 +4065,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4080,7 +4080,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "4.0" } @@ -4115,7 +4115,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4130,7 +4130,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "3.0" } @@ -4165,7 +4165,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4180,7 +4180,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "1.0" } @@ -4215,7 +4215,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4230,7 +4230,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "4.0" } @@ -4265,7 +4265,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4280,7 +4280,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "4.0" } @@ -4315,7 +4315,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4330,7 +4330,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "4.0" } @@ -4365,7 +4365,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4380,7 +4380,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "4.0" } @@ -4415,7 +4415,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4430,7 +4430,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "4.0" } @@ -4465,7 +4465,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4480,7 +4480,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "4.0" } @@ -4515,7 +4515,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4530,7 +4530,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "4.0" } @@ -4565,7 +4565,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4580,7 +4580,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "4.0" } @@ -4615,7 +4615,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4630,7 +4630,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "1.0" } @@ -4665,7 +4665,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4680,7 +4680,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "1.0" } @@ -4715,7 +4715,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf", "modelVersion": "1.0" }, @@ -4731,7 +4731,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "1.0" } @@ -4767,7 +4767,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4782,7 +4782,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "3.0" } @@ -4817,7 +4817,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4832,7 +4832,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "1.0" } @@ -4867,7 +4867,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf", "modelVersion": "1.0" }, @@ -4883,7 +4883,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "1.0" } @@ -4919,7 +4919,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf", "modelVersion": "4.0" }, @@ -4935,7 +4935,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "5.0" } @@ -4971,7 +4971,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf" }, "requestInfo": { @@ -4986,7 +4986,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "2.0" } @@ -5021,7 +5021,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf", "modelVersion": "1.0" }, @@ -5037,7 +5037,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "1.0" } @@ -5073,7 +5073,7 @@ "modelCustomizationId": "1779a999-ea17-4f31-98e9-75b6fbdd0acb", "modelInvariantId": "93e16072-715a-42ef-9d0a-080052d6b716", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011_oh22u_20171103", + "modelName": "CHARLOTTE_2017_1011_oh22u_20171103", "modelType": "vnf", "modelVersion": "3.0" }, @@ -5089,7 +5089,7 @@ "modelInfo": { "modelInvariantId": "e58733ef-43cb-4b6b-b641-922078b6c88b", "modelVersionId": "4ec07a2d-6bb5-4373-8ed6-4bc7ac1246fd", - "modelName": "mdns_2017_1011", + "modelName": "CHARLOTTE_2017_1011", "modelType": "service", "modelVersion": "3.0" } @@ -5384,7 +5384,7 @@ "requestStatus": { "percentProgress": 100, "requestState": "FAILED", - "statusMessage": "Received vfModuleException from VnfAdapter: category='INTERNAL' message='Resource null_base_dns_0 already exists in cloud/tenant rdm5b/868caab7b590480ba6334c2079f98e5c with ID null_base_dns_0/bdca66c9-4c2b-4a42-a402-d6978a34f68d' rolledBack='true'", + "statusMessage": "Received vfModuleException from VnfAdapter: category='INTERNAL' message='Resource null_base_dns_0 already exists in cloud/tenant olson5b/868caab7b590480ba6334c2079f98e5c with ID null_base_dns_0/bdca66c9-4c2b-4a42-a402-d6978a34f68d' rolledBack='true'", "finishTime": "Wed, 15 Nov 2017 14:41:18 GMT" }, "requestType": "replaceInstance", diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements_many_statuses.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements_many_statuses.json index 8a3c1ea61..5d0169a47 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements_many_statuses.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_change_managements_many_statuses.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/mso/orchestrationRequests/v5", + "path": "/mso/orchestrationRequests/v.", "queryParams": { "filter": "modelType:EQUALS:vnf" } diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_manual_task.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_manual_task.json index 504cfd63b..2b0d1bafb 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_manual_task.json +++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/mso_get_manual_task.json @@ -13,8 +13,8 @@ { "taskId": "daf4dd84-b77a-42da-a051-3239b7a9392c", "type": "fallout", - "nfRole": "vSCP", - "subscriptionServiceType": "Mobility", + "nfRole": "vEsmeralda", + "subscriptionServiceType": "Emanuel", "originalRequestId": "d352c70d-5ef8-4977-9ea8-4c8cbe860422", "originalRequestorId": "ss835w", "errorSource": "A&AI", diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_pnf_instances_by_region.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_pnf_instances_by_region.json index 02b2e78f7..bcfedebf2 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_pnf_instances_by_region.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_pnf_instances_by_region.json @@ -6,8 +6,8 @@ "format": ["simple"] }, "body": { - "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", - "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP" + "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/<SERVICE-TYPE>/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" } }, "simulatorResponse": { diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_tenants.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_tenants.json index 4ac76f824..781dcb3f9 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_tenants.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_tenants.json @@ -1,26 +1,26 @@ [{ "simulatorRequest": { "method": "GET", - "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL.USP" + "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER.SILVIA" } , "simulatorResponse": { "responseCode": 200, "body": { - "service-type": "VIRTUAL USP", + "service-type": "TYLER SILVIA", "resource-version": "1494001841964", "relationship-list": { "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "AAIAIC25" + "relationship-value": "JANET25" }, { "relationship-key": "tenant.tenant-id", @@ -36,15 +36,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -54,21 +54,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-testgamma" + "property-value": "AIN Web Tool-15-D-testalexandria" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -84,567 +84,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "1178612d2b394be4834ad77f567c0af2" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-SSPtestcustome" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "19c5ade915eb461e8af52fb2fd8cd1f2" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-UncheckedEcopm" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/de007636e25249238447264a988a927b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "de007636e25249238447264a988a927b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-dfsdf" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "62f29b3613634ca6a3065cbe0e020c44" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN/SMS-16-D-Multiservices1" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "649289e30d3244e0b48098114d63c2aa" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-SSPST66" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "3f21eeea6c2c486bba31dab816c05a32" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-ASSPST47" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "f60ce21d3ee6427586cff0d22b03b773" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg67246" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8774659e425f479895ae091bb5d46560", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "8774659e425f479895ae091bb5d46560" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg68359" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/624eb554b0d147c19ff8885341760481", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "624eb554b0d147c19ff8885341760481" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-iftach" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/214f55f5fc414c678059c383b03e4962", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "214f55f5fc414c678059c383b03e4962" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg612401" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "c90666c291664841bb98e4d981ff1db5" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg621340" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "ce5b6bc5c7b348e1bf4b91ac9a174278" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "sspjg621351cloned" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "b386b768a3f24c8e953abbe0b3488c02" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-eteancomp" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "dc6c4dbfd225474e9deaadd34968646c" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-T-SPFET" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "02cb5030e9914aa4be120bd9ed1e19eb" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-eeweww" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "f2f3830e4c984d45bcd00e1a04158a79" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-spjg61909" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/05b91bd5137f4929878edd965755c06d", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "05b91bd5137f4929878edd965755c06d" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg621512cloned" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "7002fbe8482d4a989ddf445b1ce336e0" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-vdr" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "4008522be43741dcb1f5422022a2aa0b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-ssasa" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "f44e2e96a1b6476abfda2fa407b00169" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-PFNPT" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "b69a52bec8a84669a37a1e8b72708be7" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-vdre" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "fac7d9fd56154caeb9332202dcf2969f" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-NONPODECOMP" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "2d34d8396e194eb49969fd61ffbff961" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "DN5242-Nov16-T5" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -660,15 +108,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -681,78 +129,6 @@ "property-value": "ro-T112" } ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "4914ab0ab3a743e58f0eefdacc1dde77" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "DN5242-Nov21-T1" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "d0a3e3f2964542259d155a81c41aadc3" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "test-mtn6-09" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "cbb99fe4ada84631b7baf046b6fd2044" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "DN5242-Nov16-T3" - } - ] } ] } @@ -762,26 +138,26 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vMMSC" + "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vWINIFRED" } , "simulatorResponse": { "responseCode": 200, "body": { - "service-type": "vMMSC", + "service-type": "vWINIFRED", "resource-version": "1494001841964", "relationship-list": { "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "AAIAIC25" + "relationship-value": "JANET25" }, { "relationship-key": "tenant.tenant-id", @@ -797,15 +173,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -815,21 +191,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-testgamma" + "property-value": "AIN Web Tool-15-D-testalexandria" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -845,15 +221,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -869,15 +245,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -893,15 +269,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/de007636e25249238447264a988a927b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/de007636e25249238447264a988a927b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -917,15 +293,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -941,15 +317,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -965,15 +341,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -989,15 +365,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1013,15 +389,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8774659e425f479895ae091bb5d46560", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8774659e425f479895ae091bb5d46560", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1037,15 +413,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/624eb554b0d147c19ff8885341760481", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/624eb554b0d147c19ff8885341760481", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1061,15 +437,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/214f55f5fc414c678059c383b03e4962", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/214f55f5fc414c678059c383b03e4962", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1085,15 +461,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1109,15 +485,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1133,15 +509,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1157,15 +533,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1181,15 +557,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1205,15 +581,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1229,15 +605,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/05b91bd5137f4929878edd965755c06d", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/05b91bd5137f4929878edd965755c06d", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1253,15 +629,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1277,15 +653,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1301,15 +677,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1325,15 +701,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1349,15 +725,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1373,15 +749,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1397,15 +773,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1421,15 +797,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1445,15 +821,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1469,15 +845,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1487,21 +863,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "test-mtn6-09" + "property-value": "test-hvf6-09" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_vnf_instances_by_region.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_vnf_instances_by_region.json index 633b9ec67..27d26f397 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_vnf_instances_by_region.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_vnf_instances_by_region.json @@ -5,7 +5,7 @@ "queryParams": { "format": ["simple"] }, - "body": {"start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c", "query": "query/queryvnfFromModelbyRegion?cloudRegionId=AAIAIC25"} + "body": {"start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c", "query": "query/queryvnfFromModelbyRegion?cloudRegionId=JANET25"} }, "simulatorResponse": { "responseCode": 200, @@ -17,7 +17,7 @@ "url": "/aai/v11/network/generic-vnfs/generic-vnf/9be14a4f-7367-4cf9-96a1-f08f10f485a7", "properties": { "vnf-id": "9be14a4f-7367-4cf9-96a1-f08f10f485a7", - "vnf-name": "zmtn6aepdg01", + "vnf-name": "zhvf6aepdg01", "vnf-type": "Service_vEPDG/vf_vEPDG 0", "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status": "PREPROV", @@ -57,37 +57,37 @@ { "id": "2541699144", "node-type": "service-instance", - "url": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Mobility/service-instances/service-instance/b27d786a-eebf-4c79-b504-3f1e1a6b9651" + "url": "/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/b27d786a-eebf-4c79-b504-3f1e1a6b9651" }, { "id": "2376065248", "node-type": "vserver", - "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4752d" + "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4752d" }, { "id": "2376069344", "node-type": "vserver", - "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4753d" + "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4753d" }, { "id": "2662899848", "node-type": "vserver", - "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4754d" + "url": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333/vservers/vserver/a9ee2ed3-9986-4bc5-92d3-a3efdfe4754d" }, { "id": "2662903944", "node-type": "vnfc", - "url": "/aai/v11/network/vnfcs/vnfc/zmtn6aefdg01vlb001" + "url": "/aai/v11/network/vnfcs/vnfc/zhvf6aefdg01vlb001" }, { "id": "2826555472", "node-type": "vnfc", - "url": "/aai/v11/network/vnfcs/vnfc/zmtn6aefdg01vmg001" + "url": "/aai/v11/network/vnfcs/vnfc/zhvf6aefdg01vmg001" }, { "id": "2826567688", "node-type": "vnfc", - "url": "/aai/v11/network/vnfcs/vnfc/zmtn6aefdg01oam001" + "url": "/aai/v11/network/vnfcs/vnfc/zhvf6aefdg01oam001" } ] } diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_activate_configuration.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_activate_configuration.json deleted file mode 100644 index 0429ced0e..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_activate_configuration.json +++ /dev/null @@ -1,77 +0,0 @@ -[{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/serviceInstances/v6/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/<ACTION>", - "body": { - "requestDetails": { - "modelInfo": { - "modelType": "configuration", - "modelInvariantId": "model-invariant-id-9533", - "modelVersionId": "model-version-id-9533", - "modelCustomizationId": "08a181aa-72eb-435f-9593-e88a3ad0a86b" - }, - "cloudConfiguration": { - "lcpCloudRegionId": "mdt1" - }, - "requestInfo": { - "source": "VID", - "requestorId": "us16807000" - }, - "relatedInstanceList": [ - { - "relatedInstance": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "modelInfo": { - "modelType": "service", - "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", - "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "modelName": "ServiceContainerMultiplepProbes", - "modelVersion": "1.0" - } - } - } - ], - "requestParameters": { - "userParams": [] - } - } - } - }, - "simulatorResponse": { - "responseCode": 202, - "body": { - "requestReferences": { - "instanceId": "314cc766-b673-4a50-b9c5-471f68914585", - "requestId": "314cc766-b673-4a50-b9c5-471f68914585" - } - } - } -}, - { - "simulatorRequest": { - "method": "GET", - "path": "/mso/orchestrationRequests/v./314cc766-b673-4a50-b9c5-471f68914585" - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "request": { - "requestId": "311cc766-b673-4a50-b9c5-471f68914586", - "startTime": "Mon, 23 Oct 2017 23:28:39 GMT", - "requestScope": "service", - "requestType": "addRelationships", - "instanceReferences": { - "serviceInstanceId": "3f93c7cb-2fd0-4557-9514-e189b7b04f9d", - "requestorId": "1" - }, - "requestStatus": { - "requestState": "COMPLETE", - "statusMessage": "Success", - "percentProgress": 100, - "finishTime": "Mon, 23 Oct 2017 23:28:39 GMT" - } - } - } - } - } -] diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_create_configuration_orch_req.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_create_configuration_orch_req.json deleted file mode 100644 index 7dca90932..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_create_configuration_orch_req.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/mso/orchestrationRequests/v./314cc766-b673-4a50-b9c5-471f68914585" - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "request": { - "requestId": "314cc766-b673-4a50-b9c5-471f68914585", - "startTime": "Mon, 23 Oct 2017 23:28:39 GMT", - "requestScope": "service", - "requestType": "configurations", - "instanceReferences": { - "serviceInstanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "requestorId": "us16807000" - }, - "requestStatus": { - "requestState": "COMPLETE", - "statusMessage": "Success", - "percentProgress": 100, - "finishTime": "Mon, 23 Oct 2017 23:28:39 GMT" - } - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_create_configuration_pProbe.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_create_configuration_pProbe.json deleted file mode 100644 index 3822e8cb6..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_create_configuration_pProbe.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations", - "body":{ - "requestDetails": { - "modelInfo": { - "modelType": "configuration", - "modelInvariantId": "c30a024e-a6c6-4670-b73c-3df64eb57ff6", - "modelVersionId": "f58d039d-4cfc-40ec-bd75-1f05f0458a6c", - "modelName": "Port Mirroring Configuration By Policy", - "modelVersion": "1.0", - "modelCustomizationId": "4b7ebace-bad6-4526-9be6-bf248e20fc5f", - "modelCustomizationName": "Port Mirroring Configuration By Policy 1" - }, - "cloudConfiguration": { - "lcpCloudRegionId": "AAIAIC25" - }, - "requestInfo": { - "instanceName": "dummy_instance", - "source": "VID", - "requestorId": "us16807000" - }, - "relatedInstanceList": [ - { - "relatedInstance": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "modelInfo": { - "modelType": "service", - "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", - "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "modelName": "ServiceContainerMultiplepProbes", - "modelVersion": "1.0" - } - } - }, - { - "relatedInstance": { - "instanceId": "9be14a4f-7367-4cf9-96a1-f08f10f485a7", - "instanceDirection": "source", - "modelInfo": { - "modelType": "vnf", - "modelInvariantId": "51f2c559-1aba-4fd4-bbf9-8cbbef85ff2a", - "modelVersionId": "cb05b259-9f26-4b33-b96c-13c2c202c091", - "modelName": "vf_vEPDG", - "modelVersion": "2.0", - "modelCustomizationId": "35aeaae9-74f7-4b6a-adda-65edb0110361" - } - } - }, - { - "relatedInstance": { - "instanceName": "AS-pnf2-10219--as988q", - "instanceDirection": "destination", - "modelInfo": { - "modelType": "pnf" - } - } - } - ], - "requestParameters": { - "userParams": [] - } - } - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "requestReferences": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "requestId": "314cc766-b673-4a50-b9c5-471f68914585" - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_create_configuration_pProbe_error.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_create_configuration_pProbe_error.json deleted file mode 100644 index ccb66d8b5..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_create_configuration_pProbe_error.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations", - "body": { - "requestDetails": { - "modelInfo": { - "modelType": "configuration", - "modelInvariantId": "c30a024e-a6c6-4670-b73c-3df64eb57ff6", - "modelVersionId": "f58d039d-4cfc-40ec-bd75-1f05f0458a6c", - "modelName": "Port Mirroring Configuration By Policy", - "modelVersion": "1.0", - "modelCustomizationId": "4b7ebace-bad6-4526-9be6-bf248e20fc5f", - "modelCustomizationName": "Port Mirroring Configuration By Policy 1" - }, - "cloudConfiguration": { - "lcpCloudRegionId": "AAIAIC25" - }, - "requestInfo": { - "instanceName": "dummy_instance", - "source": "VID", - "requestorId": "us16807000" - }, - "relatedInstanceList": [ - { - "relatedInstance": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "modelInfo": { - "modelType": "service", - "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", - "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "modelName": "ServiceContainerMultiplepProbes", - "modelVersion": "1.0" - } - } - }, - { - "relatedInstance": { - "instanceId": "9be14a4f-7367-4cf9-96a1-f08f10f485a7", - "instanceDirection": "source", - "modelInfo": { - "modelType": "vnf", - "modelInvariantId": "51f2c559-1aba-4fd4-bbf9-8cbbef85ff2a", - "modelVersionId": "cb05b259-9f26-4b33-b96c-13c2c202c091", - "modelName": "vf_vEPDG", - "modelVersion": "2.0", - "modelCustomizationId": "35aeaae9-74f7-4b6a-adda-65edb0110361" - } - } - }, - { - "relatedInstance": { - "instanceId": "AS-pnf2-10219--as988q", - "instanceDirection": "destination", - "modelInfo": { - "modelType": "pnf" - } - } - } - ], - "requestParameters": { - "userParams": [] - } - } - } - }, - "simulatorResponse": { - "responseCode": 500 - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_delete_configuration.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_delete_configuration.json deleted file mode 100644 index 1310b8ec5..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_delete_configuration.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "simulatorRequest": { - "method": "DELETE", - "path": "/mso/serviceInstances/v6/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113", - "body": { - "requestDetails": { - "cloudConfiguration": { - "lcpCloudRegionId": "mdt1" - }, - "modelInfo": { - "modelCustomizationId": "08a181aa-72eb-435f-9593-e88a3ad0a86b", - "modelInvariantId": "model-invariant-id-9533", - "modelVersionId": "model-version-id-9533", - "modelType": "configuration" - }, - "requestInfo": { - "source": "VID", - "requestorId": "us16807000" - }, - "requestParameters": { - "userParams": [] - } - } - } - } - , - "simulatorResponse": { - "responseCode": 202, - "body": { - "requestReferences": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "requestId": "314cc766-b673-4a50-b9c5-471f68914585" - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_enable_disable_port.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_enable_disable_port.json deleted file mode 100644 index da0414ec7..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_enable_disable_port.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/serviceInstances/v6/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/<ACTION>", - "body": { - "requestDetails": { - "cloudConfiguration": { - "lcpCloudRegionId": "mdt1" - }, - "modelInfo": { - "modelCustomizationId": "08a181aa-72eb-435f-9593-e88a3ad0a86b", - "modelInvariantId": "model-invariant-id-9533", - "modelVersionId": "model-version-id-9533", - "modelType": "configuration" - }, - "requestInfo": { - "source": "VID", - "requestorId": "us16807000" - }, - "relatedInstanceList": [ - { - "relatedInstance": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "modelInfo": { - "modelType": "service", - "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", - "modelName": "ServiceContainerMultiplepProbes", - "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "modelVersion": "1.0" - } - } - }, - { - "relatedInstance": { - "instanceId": "d35bf534-7d8e-4cb4-87f9-0a8bb6cd47b2", - "instanceDirection": "source", - "modelInfo": { - "modelType": "connectionPoint" - } - } - } - ] - } - } - }, - "simulatorResponse": { - "responseCode": 202, - "body": { - "requestReferences": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "requestId": "314cc766-b673-4a50-b9c5-471f68914585" - } - } - } -} diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_unassign_service.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_unassign_service.json deleted file mode 100644 index 9f953187b..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/mso_unassign_service.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/mso_unassign_svc_instance/c187e9fe-40c3-4862-b73e-84ff056205f6", - //localhost:8080/vid/mso/mso_unassign_svc_instance/c187e9fe-40c3-4862-b73e-84ff056205f6 - "body": { - "requestDetails": { - "cloudConfiguration": { - "lcpCloudRegionId": "mdt1" - }, - "modelInfo": { - "modelCustomizationId": "08a181aa-72eb-435f-9593-e88a3ad0a86b", - "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", - "modelVersionId": "model-version-id-9533", - "modelType": "service" - }, - "requestInfo": { - "source": "VID", - "requestorId": "16807000" - }, - "requestParameters": { - "aLaCarte": "false", - "userParams": [] - } - } - } - } - , - "simulatorResponse": { - "responseCode": 202, - "body": { - "requestReferences": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "requestId": "314cc766-b673-4a50-b9c5-471f68914585" - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_full_subscribers.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_full_subscribers.json index 1b715fb52..ec5685fac 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_full_subscribers.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_full_subscribers.json @@ -12,26 +12,26 @@ "body": { "customer":[ { - "global-customer-id":"MSO_1610_ST", - "subscriber-name":"MSO_1610_ST", + "global-customer-id":"CAR_2020_ER", + "subscriber-name":"CAR_2020_ER", "subscriber-type":"INFRA", "resource-version":"1494001902987" }, { "global-customer-id":"21014aa2-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"PACKET CORE", + "subscriber-name":"JULIO ERICKSON", "subscriber-type":"INFRA", "resource-version":"1494001776295" }, { "global-customer-id":"DHV1707-TestSubscriber-2", - "subscriber-name":"ICORE CORE", + "subscriber-name":"DALE BRIDGES", "subscriber-type":"INFRA", "resource-version":"1498751754450" }, { "global-customer-id":"DHV1707-TestSubscriber-1", - "subscriber-name":"PACKET1 CORE", + "subscriber-name":"LLOYD BRIDGES", "subscriber-type":"INFRA", "resource-version":"1498595633607" }, @@ -48,58 +48,89 @@ "resource-version":"1494001970225" }, { - "global-customer-id":"DHV1802-TestSub-PWT-102", - "subscriber-name":"DHV1802-TestSub-PWT-102", + "global-customer-id":"ERICA5779-TestSub-PWT-102", + "subscriber-name":"ERICA5779-TestSub-PWT-102", "subscriber-type":"INFRA", "resource-version":"1508852495058" }, { - "global-customer-id":"DHV1802-TestSub-PWT-101", - "subscriber-name":"DHV1802-TestSub-PWT-101", + "global-customer-id":"ERICA5779-TestSub-PWT-101", + "subscriber-name":"ERICA5779-TestSub-PWT-101", "subscriber-type":"INFRA", "resource-version":"1508179953733" }, { "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", + "subscriber-name":"Emanuel", "subscriber-type":"INFRA", "resource-version":"1494001894192" }, { - "global-customer-id":"DHV1802-Subscriber-4", - "subscriber-name":"DHV1802-Subscriber-5", + "global-customer-id":"ERICA5779-Subscriber-4", + "subscriber-name":"ERICA5779-Subscriber-5", "subscriber-type":"INFRA", "resource-version":"1509134064531" }, { - "global-customer-id":"DHV1802-TestSub-PWT-103", - "subscriber-name":"DHV1802-TestSub-PWT-103", + "global-customer-id":"ERICA5779-TestSub-PWT-103", + "subscriber-name":"ERICA5779-TestSub-PWT-103", "subscriber-type":"INFRA", "resource-version":"1509045503736" }, { - "global-customer-id":"DHV1802-Subscriber-2", - "subscriber-name":"DHV1802-Subscriber-2", + "global-customer-id":"ERICA5779-Subscriber-2", + "subscriber-name":"ERICA5779-Subscriber-2", "subscriber-type":"INFRA", "resource-version":"1509122065439" }, { "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name":"USP VOICE", + "subscriber-name":"SILVIA ROBBINS", "subscriber-type":"INFRA", "resource-version":"1494001938080" }, { - "global-customer-id":"DHV1802-Subscriber-3", - "subscriber-name":"DHV1802-Subscriber-3", + "global-customer-id":"ERICA5779-Subscriber-3", + "subscriber-name":"ERICA5779-Subscriber-3", "subscriber-type":"INFRA", "resource-version":"1509122759407" }, { "global-customer-id":"31739f3e-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"FIREWALL/MISC", + "subscriber-name":"CRAIG/ROBERTS", "subscriber-type":"INFRA", "resource-version":"1494001772223" + }, + { + "global-customer-id":"global-customer-id", + "subscriber-name":"global-customer-id", + "subscriber-type":"INFRA", + "resource-version":"1494001772226", + "relationship-list":{ + "relationship":[ + { + "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" + } + ] + } + ] + } } ] } diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type.json deleted file mode 100644 index fb4340c2f..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type.json +++ /dev/null @@ -1,15571 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/aai/search/named-query", - "body": { - "instance-filters": { - "instance-filter": [ - { - "customer": { - "global-customer-id": "MSO_1610_ST" - }, - "service-subscription": { - "service-type": "MSO-dev-service-type" - } - } - ] - }, - "query-parameters": { - "named-query": { - "named-query-uuid": "6e806bc2-8f9b-4534-bb68-be91267ff6c8" - } - } - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "inventory-response-item": [ - { - "service-subscription": { - "service-type": "MSO-dev-service-type", - "resource-version": "1494001884455" - }, - "extra-properties": {}, - "inventory-response-items": { - "inventory-response-item": [ - { - "service-instance": { - "service-instance-id": "c4e40635-759f-4e3c-a739-2533473eb599", - "service-instance-name": "mz1936_SERVICE78", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001997249" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a620a5c5-191b-453a-a956-75b08d2e26bc", - "service-instance-name": "mz1936_SERVICE77", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002003533" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b0fddaaa-e9a8-41eb-848c-4204c97529e3", - "service-instance-name": "MSO_ST_12_2_2", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002000838" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8abbdf22-9ffa-4871-98a9-3cfbb36eefc1", - "service-instance-name": "mz1936_SERVICE79", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002000841" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "acd0bfc5-8de4-404a-b5a0-25b224ccda78", - "service-instance-name": "service_test_SS01", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001816781" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a03a82ac-b3df-49e7-9c81-fd6ef55ba84b", - "service-instance-name": "SVC_SS_Test001", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001771583" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "28ac6277-faf5-4673-91e3-3c53fab10b7a", - "service-instance-name": "IST+test+ldf", - "model-invariant-id": "7e8df3f0-adbb-48e0-8491-5126dbc7e989", - "resource-version": "1494001920873" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "53ad9753-6170-4236-ac7e-8815707c872e", - "service-instance-name": "larry+pxmc+test+1011", - "model-invariant-id": "8a699e6f-35e6-475a-8e13-7983aa39b6ea", - "resource-version": "1494001920923" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b10bf94d-a667-4016-b6b3-c6fbf4013a60", - "service-instance-name": "MSO_ST_12_2_5_3", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002011859" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9fcb7233-25f5-4ff2-8db3-4627dc84771f", - "service-instance-name": "VID+instance+demo", - "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", - "resource-version": "1494001859427" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a4bbe019-3592-4d46-b7a2-368a99ae5667", - "service-instance-name": "svc_test_002", - "model-invariant-id": "b08fe7cd-cee2-40b4-a22b-aa2bfe91e21c", - "resource-version": "1494001796817" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999994", - "service-instance-name": "RaaSIName-4", - "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001954447" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "459ecc8a-d75a-41e9-ab29-7c21d5dcd368", - "service-instance-name": "SI_Jw2", - "model-invariant-id": "b08fe7cd-cee2-40b4-a22b-aa2bfe91e21c", - "resource-version": "1494001817414" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b6c17f81-8abd-4c35-8074-c37c5a869195", - "service-instance-name": "TestToDelete-10", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001838858" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999992", - "service-instance-name": "RaaSIName-3", - "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002003548" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "be824c3e-e915-4cf3-8f33-41f4344bdcfa", - "service-instance-name": "VivISTmns1012", - "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", - "resource-version": "1494001959455" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "fbd67eec-526d-4306-9ab9-8350265578b9", - "service-instance-name": "Viv+demo+test+2", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001922217" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "23427b7f-f9a4-439f-9992-fbbd1c4adcee", - "service-instance-name": "A%20-%20D_Test3", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001797865" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b0daf12c-4f7d-4918-8070-80d98a488b1c", - "service-instance-name": "MSO_ST_Val_2", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001861370" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "89ade60f-bed8-47a9-be3d-06ae533a2e8a", - "service-instance-name": "vSAMP12-88", - "model-invariant-id": "1a66578e-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001960279" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5fd1100a-cb42-4eb8-baae-355dff0e592c", - "service-instance-name": "wc248f+is+testing", - "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", - "resource-version": "1494001902993" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "11e5da68-b2cc-4d6e-ab07-7bdaa12a78f9", - "service-instance-name": "MSO.ST%201021%20%205", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001774722" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7e4a151c-2860-4c2c-8906-573656b173ee", - "service-instance-name": "mz1936_SERVICE%205", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001774728" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b8b240f7-f892-4fab-b983-f5b2fe03f2ba", - "service-instance-name": "VidTest20161006b", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001862717" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "04c25b0b-50b2-4dcb-b594-ac289bac960f", - "service-instance-name": "vSAMP10a-88", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001800355" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a10e3348-85d9-4983-80fd-fd3b9e98d38f", - "service-instance-name": "MSO_ST_RT_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001863452" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7f097589-2b04-498a-8889-e94d77444821", - "service-instance-name": "USOSTCDALTX0101VFHN01", - "model-invariant-id": "83995b31-a272-4dfe-911a-16422288cd48", - "resource-version": "1494001777112" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "31247029-bb19-4b37-a030-6aca41e510fa", - "service-instance-name": "MSO_ST_1021_2", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001884184" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "844bb147-e910-437a-a56f-3e9a6e6a4b18", - "service-instance-name": "SI_Jw1", - "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", - "resource-version": "1494001801210" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1f769e44-6839-4d36-9bce-5814bbccc952", - "service-instance-name": "service_test_001", - "model-invariant-id": "4111e6e7-ad99-4b07-a143-e60c47295936", - "resource-version": "1494001962605" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7a67e580-c646-4514-b890-4a5ed8d72c8c", - "service-instance-name": "jimmytest-0006", - "model-invariant-id": "e6f1d393-6432-4820-ab86-7a10ba4b31ac", - "resource-version": "1494001884317" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5c4af4c1-0d01-486e-8055-afc63c00a5d7", - "service-instance-name": "Idan1", - "model-invariant-id": "ba67b22f-a464-48da-aa55-79eb75c0739f", - "resource-version": "1494001905130" - }, - "extra-properties": {} - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "b5d3b0a9-8c81-4615-9c2f-a512cace3928", - "service-instance-name": "Larry_test_101916", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "a9e7f120-4d81-44b2-a88d-21a489089129", - "resource-version": "1494002074530" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "a9e7f120-4d81-44b2-a88d-21a489089129" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "bfc3d2e7-74d5-4bca-ab63-d7d5244da876", - "service-instance-name": "vSAMP12-Zone3", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001821999" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "df6fc4b3-466d-46d8-aff3-86c32fb9de2a", - "service-instance-name": "Service_test_SS002", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001777561" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "479ac8a5-35bd-4131-810b-6d4579d6e318", - "service-instance-name": "vSAMP10a-1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001864865" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "982b1a75-a299-443a-8f7a-905c116d6412", - "service-instance-name": "TestToDelete-106", - "model-invariant-id": "7e3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001822881" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c70f306d-bebf-4801-9009-f9988cf24091", - "service-instance-name": "vSAMP12-1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001802558" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5c41ea11-e800-4be7-91d1-a1f6fd4f40ca", - "service-instance-name": "jimmytest-0011", - "model-invariant-id": "e6f1d393-6432-4820-ab86-7a10ba4b31ac", - "resource-version": "1494001906340" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b3856e89-e734-4ad9-9f14-173359f05873", - "service-instance-name": "dm4252_SERVICE1", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001802580" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "38dc5506-7ba5-4293-aabe-3834be9c5635", - "service-instance-name": "jimmytest-0020", - "model-invariant-id": "e6f1d393-6432-4820-ab86-7a10ba4b31ac", - "resource-version": "1494001906342" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "780a5fb6-34fb-4df9-b3f4-f209999c0627", - "service-instance-name": "SI_Oct11", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001906387" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "cf849cc6-bcc9-400e-9d3f-585c0604dc43", - "service-instance-name": "MSO_ST_NETWORK_04", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001802958" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "e884fa6b-7b71-4953-8cc7-ec60284b2e5a", - "service-instance-name": "mz1936_SERVICE%204", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001886047" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5cab874e-b801-4a94-a0bc-1612509b917c", - "service-instance-name": "MSO_ST_11_4_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001926761" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "fb454f85-fd98-4e5d-b8da-6b254d8d786b", - "service-instance-name": "SS_service001", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001779561" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "47af2d87-5be0-4679-a2ea-2e4a594dd242", - "service-instance-name": "vSAMP10a-77", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001803277" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "55377e61-c4b9-4001-a678-73fd314b7cb3", - "service-instance-name": "VID+demo+instance", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001845574" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ac164d68-d35b-47c7-918f-1a868f00c166", - "service-instance-name": "ist+test+2+ldf", - "model-invariant-id": "7e8df3f0-adbb-48e0-8491-5126dbc7e989", - "resource-version": "1494001965111" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b432d1e1-99ec-45cb-975c-9cc75c09d1d7", - "service-instance-name": "vSAMP12-Zone2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001887020" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7614702d-eb13-4632-94ae-92b16fea4b3b", - "service-instance-name": "ldf+vDBE+svc+IST", - "model-invariant-id": "277569d9-9165-43e0-81f6-d198999bb164", - "resource-version": "1494001867830" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "51e03670-b4bc-4033-80d8-d3c12d6c2829", - "service-instance-name": "mz1936_SERVICE3", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001887279" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1f956c81-b175-4b2a-9153-f2da9a2c289e", - "service-instance-name": "SS_test", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001887283" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5601f1e4-b62e-4bd6-a2ad-7fc42f4bb894", - "service-instance-name": "i9", - "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", - "resource-version": "1494001887516" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6c1e66f8-4a08-4855-96f9-c64f9709d8b8", - "service-instance-name": "MSO_ST_updateVF", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001805044" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "591182d2-8307-48a6-89fc-b62d1ae5c8a6", - "service-instance-name": "MSO_ST_1021_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001805056" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8169d685-c638-488e-8487-d06866875369", - "service-instance-name": "TestSample_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001908867" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1bc869ce-34be-4d38-ac29-b49fbd9b1f44", - "service-instance-name": "MSO_ST_1028_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001908871" - }, - "extra-properties": {} - }, - { - "model-name": "PCRF_1610_SVC_10_13", - "service-instance": { - "service-instance-id": "0206fef7-5f35-41cc-927f-5020348e7318", - "service-instance-name": "VivISTDemo1018", - "model-invariant-id": "c8819132-38d8-4bb6-8aa2-23169721615f", - "model-version-id": "615ebe30-9f9b-49e4-9502-942717efd9e6", - "resource-version": "1494002075581" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Pcrf updated for vid 10/19/2016" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "615ebe30-9f9b-49e4-9502-942717efd9e6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "PCRF_1610_SVC_10_13" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "c8819132-38d8-4bb6-8aa2-23169721615f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "58cdc1e9-6c2d-4963-8c7c-e89c844b9e1f", - "service-instance-name": "mz1936VIDTest", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "resource-version": "1494001869760" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "aac409c2-2bf4-418e-94d0-696f9524ddea", - "service-instance-name": "wc248f+test+2", - "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", - "resource-version": "1494001806385" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "297517db-0933-41d5-9d4f-130ef9c1ec81", - "service-instance-name": "jimmytest-10007", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001848055" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9ef10027-d1fc-4eae-9c49-3d3fb2417551", - "service-instance-name": "MSO_ST_1024_3", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001869973" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7f097589-2b04-498a-8889-e94d77444820", - "service-instance-name": "vSAMP10a-ZoneV3", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001930028" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8532b508-65b5-4fc2-95ac-0e1004118af7", - "service-instance-name": "TestToDelete-2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001806786" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "441f7bcb-50b9-425c-8f7c-3c60b0371790", - "service-instance-name": "testccf-1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001848461" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "cc6fd226-b6a9-45a6-8cea-5c320dc93908", - "service-instance-name": "SI_J001", - "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", - "resource-version": "1494001870420" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "45b0ccbd-e099-4ab8-9c26-f793014c971c", - "service-instance-name": "Viv+IST+Oct6+IXLA+Network+L1-3", - "model-invariant-id": "4111e6e7-ad99-4b07-a143-e60c47295936", - "resource-version": "1494001911181" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "dc158c33-b8f1-4d64-bfdb-9e1e8880464c", - "service-instance-name": "lllsvcexample", - "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", - "resource-version": "1494001871176" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "aac1c1bf-3cdb-48b0-b290-894968648a2b", - "service-instance-name": "MSO_ST_NETWORK_02", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001931606" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f0c6646e-ff18-44f5-86e5-903833c8d482", - "service-instance-name": "mz1936_SERVICE%205", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001969332" - }, - "extra-properties": {} - }, - { - "model-name": "PCRF_1610_SVC_10_13", - "service-instance": { - "service-instance-id": "97b7a1ca-4674-4e22-b5d4-c6634aaae9ee", - "service-instance-name": "lllsvc2", - "model-invariant-id": "c8819132-38d8-4bb6-8aa2-23169721615f", - "model-version-id": "615ebe30-9f9b-49e4-9502-942717efd9e6", - "resource-version": "1494002076178" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Pcrf updated for vid 10/19/2016" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "615ebe30-9f9b-49e4-9502-942717efd9e6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "PCRF_1610_SVC_10_13" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "c8819132-38d8-4bb6-8aa2-23169721615f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "1c5f4d92-ff0c-4a3d-8a81-bf52ad8f55d6", - "service-instance-name": "test+case", - "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", - "resource-version": "1494001850311" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1cd44a48-a1bb-4ea1-9bd3-b8f51f9f979f", - "service-instance-name": "MSO.ST%201021%20%205", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001891784" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "df072a0d-f1bf-46c2-9757-47c2198ec614", - "service-instance-name": "A%20-%20D_Test3", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001785749" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "86fac413-aa5f-44ed-8fb9-37c73d496f41", - "service-instance-name": "MSO_ST_1027_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001970378" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "55dc9840-1723-4836-bf9f-311c6fef088d", - "service-instance-name": "bnsNetworkV3", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001970762" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "fcfed1dd-dce6-4f06-af35-506dc0796ec6", - "service-instance-name": "MSO_ST_11_7_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001892675" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "be6986dc-6a41-4893-a6af-0ed1bcfebba2", - "service-instance-name": "bnsNetworkZone1", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001873402" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "d59a42d7-6fbb-40df-9ff3-318ec7736852", - "service-instance-name": "mz1936_SERVICE%205", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001787316" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "78d533c9-685a-469f-900f-1149c1ff903f", - "service-instance-name": "svc0001", - "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", - "resource-version": "1494001810689" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6e45032e-0be5-41e8-bd8a-b343b2cacb8c", - "service-instance-name": "mz1936_SERVICE%204", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001852965" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8eb3d347-3fcc-415d-b058-5cfcba5343b9", - "service-instance-name": "wc248f+wants+to+go+home", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001935213" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "238ccfc1-c0fd-4a5a-be6f-b55268a83be8", - "service-instance-name": "VNF_Jw_Test_01", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001935239" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c4daa4d7-e241-4c0e-82a8-9ad68e13db0e", - "service-instance-name": "MSO_ST_1018_D", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001894737" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "686811d1-98bc-4987-b207-394408560bf2", - "service-instance-name": "mz1936_SERVICE%204", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001853586" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "56f0203c-c445-4134-8e76-0a7fba50a70b", - "service-instance-name": "MSO.ST%201021%20%205", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001853588" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "424f7012-a441-4c39-b990-58c20cadd4d6", - "service-instance-name": "MSO_ST_1025_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001936961" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f9f95109-0850-4af6-85fb-20931f009a53", - "service-instance-name": "testsvc1007", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001939777" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "73d3ab0b-e67b-4465-a4c9-7961a93b1e6e", - "service-instance-name": "SI_Oct10", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001939784" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6f6f8bc8-6056-4c33-8a92-0d988c65aef2", - "service-instance-name": "SS_VolumeGroup_test", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001940067" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "84acb99c-17a1-4410-8ab4-e3dc9f55206c", - "service-instance-name": "mz1936_SERVICE4", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001941860" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c136c73b-9f45-40f1-aaa3-e6ea2b5f1385", - "service-instance-name": "MSOST100", - "model-invariant-id": "18dbf3b5-a51e-4409-b754-ab7afa594912", - "resource-version": "1494001946180" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a7409e83-cc9b-4410-9e49-84f25783cbfc", - "service-instance-name": "MSO_ST_1028_5", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001946218" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "21573d47-2cf0-493b-a9e3-fe7cebd35c61", - "service-instance-name": "MSO_ST_11_30_3", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002008539" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "04c25f51-0bdb-44e6-a257-31306f51a23c", - "service-instance-name": "MSO_ST_12_2_5_4", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001833297" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "141d0cde-91ea-4dce-8b84-d077e54b560c", - "service-instance-name": "Service_Test_020", - "model-invariant-id": "6ba43345-454c-4929-9d18-34fa9ae8204f", - "resource-version": "1494001833310" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f4bf539f-dffe-4828-85c4-4428bbdb2e21", - "service-instance-name": "MSO_ST_12_2_5_5", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001833312" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "82703390-62aa-46a1-8e9f-a3a0df57bc49", - "service-instance-name": "mz1936_SERVICE6", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002003647" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1a804731-e080-4a0b-b6fc-cedf51a91d6e", - "service-instance-name": "MSO_ST_12_2_5", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001835804" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999999", - "service-instance-name": "RaaSIName-1", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001984658" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999991", - "service-instance-name": "RaaSIName-2", - "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001917697" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6d4c5dcb-1a4a-4c1e-a2eb-2933cc00cde1", - "service-instance-name": "mz1936_SERVICE%205", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001948491" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "0f56e8b1-53af-4b59-bf37-fadf73bcb63a", - "service-instance-name": "mz1936_SERVICE%205", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001948493" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8bc6c0b8-9df4-4419-92f6-45552837c27c", - "service-instance-name": "MSO_ST_NETWORK_01", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001949574" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "93c811ca-e2ed-4a37-9166-f8b276186de8", - "service-instance-name": "MSO_ST_11_30_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001972936" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ae5e1bfe-f301-4b5b-9089-49db72f3bc8d", - "service-instance-name": "MSO_ST_12_2_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002017280" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "2d564278-da14-479f-aefc-81e69ba4d028", - "service-instance-name": "ST-vSAMP10a-Zone1610", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001991559" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "4db29f8c-a003-4732-8a85-7366173829d5", - "service-instance-name": "mz1936_SERVICE80", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002003669" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ee0650ad-3486-4ee3-93a4-ef5d427738b4", - "service-instance-name": "xxx", - "model-invariant-id": "50307011-41f2-432a-aba9-7a68632c39b1", - "resource-version": "1494001876093" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "692db28b-7df1-4aca-bea1-7ac98a338639", - "service-instance-name": "MSO_ST_12_13_200", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001897708" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999995", - "service-instance-name": "RaaSIName-5", - "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001835994" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "523d669b-96da-45b9-b9b4-66e5263fdd7c", - "service-instance-name": "mtn6vSAMP10a-77", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494002001139" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999996", - "service-instance-name": "RaaSIName-6", - "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001789829" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c99c9bec-8533-423c-b7d6-2197fb4fe842", - "service-instance-name": "yyy", - "model-invariant-id": "50307011-41f2-432a-aba9-7a68632c39b1", - "resource-version": "1494002001183" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "31522b4c-857c-4f4d-b4a4-1a6c30718421", - "service-instance-name": "vSAMP12-Zone101", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002001198" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f576f7d5-ff71-400c-be05-939f7e08249b", - "service-instance-name": "vSAMP10a-Zone801", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001833405" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "2bfc1936-b0d6-4831-83f4-3093402a49df", - "service-instance-name": "service_test_100", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "resource-version": "1494001988416" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f009c5b7-9047-4b13-b05e-a26a5587a6bd", - "service-instance-name": "MSO_ST_12_2_5_4", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001812320" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ad171f54-9003-489a-b580-d974c4d284a5", - "service-instance-name": "MSO_ST_12_12_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001766529" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "e2132e57-29e0-4ef9-a158-3108840824c7", - "service-instance-name": "NetworkZone1702", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001766958" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a486ece8-e4bc-4d62-ad53-8908ccf1ede5", - "service-instance-name": "MSO_Dev_1702_V3_3600", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001918029" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6d020991-9bd4-427d-8202-8481b32e1db2", - "service-instance-name": "MSO_ST_0104-1A", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001954877" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b880d66c-20cc-46b1-8aa5-3c35349ef7e8", - "service-instance-name": "ST-vSAMP12-1702-aLaCarte-101", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001954882" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "79b10fb4-1161-48c9-91b5-8935deed809f", - "service-instance-name": "MSO_Dev_1702_V3_3200", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001954907" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "2b1d61aa-a0e8-48bc-8914-fa6beae43cfb", - "service-instance-name": "MSO_Dev_1702_V3_3500", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001954914" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5929e10b-b831-444d-acb2-dd48f8650e1e", - "service-instance-name": "ST-mtn16-vSAMP12-Zone1702", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001954917" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "cd27abe5-04c9-44a9-8e6f-f2dea8934446", - "service-instance-name": "MSO_ST_11_30_2", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001950663" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "dc32921f-4c3f-40b9-a454-fa5641bbdbac", - "service-instance-name": "MSO_ST_010301A", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002017417" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a0207e9e-251b-4a98-bec6-e59915b04408", - "service-instance-name": "MSO_Dev_1702_V3_3100", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001836307" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "0f6315be-12b9-40c9-b498-b005895fc963", - "service-instance-name": "ST-vSAMP12-Zone1610", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001997891" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "bad73156-d694-41c6-b6cd-ddf7083613eb", - "service-instance-name": "MSOST-1702-vSAMP12-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001992069" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "e57eb160-e9e7-41b6-a96d-875e006bce20", - "service-instance-name": "REGRESS_vSAMP12_1610_001", - "model-invariant-id": "3a4f2942-c229-11e6-a4a6-cec0c932ce01", - "resource-version": "1494001857125" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ac02fe78-617c-4537-886f-6d789035d298", - "service-instance-name": "mtn6NetworkZone1702", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001857246" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "e536ebf7-807c-4786-8066-8c8e241a85a7", - "service-instance-name": "mtn16NetworkZone1702", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001857248" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "e1e9c97c-02c0-4919-9b4c-eb5d5ef68970", - "service-instance-name": "lll_svc_010317", - "model-invariant-id": "3cf30cbb-5fe7-4fb3-b049-559a4997b221", - "resource-version": "1494001895478" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8bf166a8-4715-4a1d-a764-773bf05558af", - "service-instance-name": "ST-vSAMP12-1702-aLaCarte-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002017431" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6189e28c-4fb1-44fa-aa76-c00df83379dd", - "service-instance-name": "ST-vSAMP10a-1702-aLaCarte-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001997919" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c5dd1d6b-3dd0-45b4-b96a-1cb93c3c499e", - "service-instance-name": "MSOST-1702-119-002", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001898610" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "ccb1c797-9bcb-4ed5-ac87-04254f7b034a", - "service-instance-name": "Dev-OAMNetwork-31-003", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494002015140" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "5ccba007-b57f-49df-bdb5-a0253c67e887", - "service-instance-name": "MSOST-1702-116-003", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001985222" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "13c00d90-ba65-476c-9815-9d8920944643", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001916535" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7fa986db-ef92-4407-a549-1371102d6ded", - "service-instance-name": "MSOST-1702-MTN6-Network-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002004656" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "594604c5-905f-45ac-8d28-1f4ea0fc869b", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002009079" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f488a8fc-646e-4a13-a057-852db75a51f0", - "service-instance-name": "MSOST-1702-123-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001992579" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "bf1f132b-5d99-4bf0-a082-2e91d13ba3f7", - "service-instance-name": "MSOST-1702-vSAMP10a-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001790482" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "87eec00e-3e34-4865-92c0-c3354925a96c", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-2001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001836640" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "651c88c4-62de-41e1-a5a9-acec829d9529", - "service-instance-name": "MSOST-1702-MTN6-Network-9001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001833771" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5d4122df-9af7-45bb-8620-7fdb846972ad", - "service-instance-name": "MSOST-1702-MTN6-Network-temp3", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001833813" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "14317189-ac12-49f6-8c98-5558e0e66c5a", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp3", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002013147" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "4b5248b1-206f-42b9-944a-449416530696", - "service-instance-name": "mz1936_Test_2017", - "model-invariant-id": "c73dd832-d1eb-4c3a-bd04-00353c032209", - "resource-version": "1494001998111" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c7788855-b659-4713-a605-c37edf67dad6", - "service-instance-name": "MSOST-1702-119-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001979982" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "66e7b071-25b6-4ff7-a8d6-884171e14033", - "service-instance-name": "MSOST-1702-123-002", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001896029" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "8a08920c-3013-41b0-99e8-5665ff7ca2e1", - "service-instance-name": "null", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001916539" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "d255f2c0-311d-4ce6-bd19-7d55836d525a", - "service-instance-name": "mz1936_SERVICE84", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001877701" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c6d9ded7-5e8c-495b-99d2-58bf1be6e27a", - "service-instance-name": "MSO_Dev_1702_V3_3000", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001812671" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "9dee2847-1413-4e93-8d8b-a4627f240e6f", - "service-instance-name": "ST-OAMNetwork-31-3", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494002005035" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "8c2ef3a6-f01d-4e4c-853e-51f1555e011a", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-1001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002024220" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "450d94fc-7927-40c5-99ce-3cd662687360", - "service-instance-name": "svc_010517", - "model-invariant-id": "3cf30cbb-5fe7-4fb3-b049-559a4997b221", - "resource-version": "1494001812692" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "29bcb671-d16e-49ed-832e-e85402881c49", - "service-instance-name": "ST-OAMNetwork-31-8", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001855368" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "2cc1ea57-dbe8-4fd1-9e2e-a85df64dd0e9", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-2001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001983384" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ac41a7cd-3466-468d-88d6-3f9308889943", - "service-instance-name": "MSOST-1702-MTN6-Network-2001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001983401" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9bd9decf-8385-4ab7-97f5-98c2ef3ff587", - "service-instance-name": "MSO_ST_0106-1A", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001812723" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "4ed86252-d359-4a0d-b146-7cdc2aa917bb", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001999021" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "0834363f-5f88-43e0-b87f-e3e74b1d7031", - "service-instance-name": "MSOST-1702-Network-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001793512" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "3e2406e1-84eb-47bc-8d3c-57af1ea3bbdd", - "service-instance-name": "mz1936_SERVICE85", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002005253" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6e6a517a-20d1-4a8a-bc36-772c85047713", - "service-instance-name": "MSOST-1702-120-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001768568" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "d7b39e95-dee8-4fec-b31d-ab7d4e7d42e9", - "service-instance-name": "Dev-OAMNetwork-30-311", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001993244" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "d4f4b34e-876a-4dcd-b853-d016fef3855d", - "service-instance-name": "ST-OAMNetwork-30-001", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001993246" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "ff0b448f-9341-45d1-965e-308a886543be", - "service-instance-name": "MSOST-1702-MTN6-Network-temp2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002024506" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "08cf190a-e9b7-4d7f-b0cb-cbb789c1a895", - "service-instance-name": "MSOST-1702-MTN6-Network-temp1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001793575" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "fac00ff4-5953-47a9-8642-3833cba691c5", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001878101" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "ab839fe0-6714-43bc-afb2-f4d791859ffe", - "service-instance-name": "HngwOamNetVto_15", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001995695" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "dae630d9-04d9-4511-a7c8-868351e89ee9", - "service-instance-name": "mz1936_SERVICE81", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001985905" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "d7b2a99e-e008-4519-ab4a-a3d9a0e14f39", - "service-instance-name": "mz1936_SERVICE83", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001986020" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8e6f40a3-20e0-4c19-aeeb-fe3f430957d5", - "service-instance-name": "MSOST-1702-126-ST_1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001956174" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "49b55b22-f794-4140-ae98-d779460495e2", - "service-instance-name": "ST-OAMNetwork-31-5", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001983763" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "441d1dad-d6bf-4940-8ccf-4d0e03e9a81b", - "service-instance-name": "MSOST-1702-0209-ST_1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001837157" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c1d35ce3-e0b4-4b18-be73-81432e236fed", - "service-instance-name": "MSOST-1702-SI-MTN6-vSAMP12-9001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001983902" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9cfdf5df-14f9-409e-b4c5-1c30329c81de", - "service-instance-name": "MSOST-1702-Network-16001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001878352" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "40213999-e434-4984-929c-e9c29fd9bab4", - "service-instance-name": "MSOST-1702-125-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001794129" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "db9b23c8-785c-4b27-b864-70e65ef22a67", - "service-instance-name": "MSOST-1702-2-232", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001995742" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "d84bfb65-d585-4f83-886a-9331303138b8", - "service-instance-name": "HnportalProviderNetwork_36", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001995842" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "f8234127-8955-414a-a3a6-371edef4a3d7", - "service-instance-name": "HnportalProviderNetwork_52", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001996280" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "911afcb6-6a93-417a-8e1c-90ceebdb3842", - "service-instance-name": "MSOST-1702-MTN16-VFNetworkFqdn-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002015761" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ec1672c2-ea52-402d-a61a-f78618d8dd67", - "service-instance-name": "MSOST-1702-vSAMP12-16001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001986290" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "9023a892-ab4b-48f7-9432-032d4a183caf", - "service-instance-name": "ST-OAMNetwork-31-6", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494002019174" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "09540526-6d1f-4fb9-acd6-3ba7e066ae7f", - "service-instance-name": "MSOST-1702-0329-ST_b", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001858397" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "3afd440d-8d20-4534-a6f7-dafdd64a9be3", - "service-instance-name": "MSOST-1702-117-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001951694" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "8b66c9f3-9c22-4514-9980-7657f97b198d", - "service-instance-name": "Dev-OAMNetwork-31-001", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001794546" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "415be983-80d3-4af4-83e2-07fdb3783d9d", - "service-instance-name": "MSOST-1702-0308-ST_3", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002021664" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "809d2976-0065-49f2-83cb-35180adb0b85", - "service-instance-name": "MSOST-1702-0328-ST_A", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002005729" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "76bb867c-6218-4381-9873-bc79e31e387d", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-Err", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001791325" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9a45dab1-c908-4625-81f1-993cb8f26e8d", - "service-instance-name": "MSOST-1702-vSAMP12-vol_Err", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001791334" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "762f01ab-26a2-406d-bfd4-2b4f6853941e", - "service-instance-name": "MSOST-1702-MTN6-Network-1001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001794605" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "adc03856-9e87-4a03-885a-c151f8061d62", - "service-instance-name": "HnportalProviderNetwork_12", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001993433" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "neng4", - "resource-version": "1494002005843" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9bec0408-e674-4945-bc97-1e09894ce12a", - "service-instance-name": "MSOST-1702-VidTest_vSAMP12-SI-v1.0-003", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494002005869", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "ac8f2f5b-dd60-4413-b2d1-61067462dc76", - "service-instance-name": "MSOST-1702-ToDelete-001", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494002005876" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "72dbe562-01bd-4cde-bb0b-c861bb87c556", - "service-instance-name": "HngwOamNetVto_9", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1494002005893", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/72dbe562-01bd-4cde-bb0b-c861bb87c556/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "8f973eb3-eb98-417d-b062-753721c31919", - "service-instance-name": "HngwOamNetVto_29", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001896736" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "22778c84-c18a-4d4f-8ae6-d0d339862bd0", - "service-instance-name": "HngwOamNetVto_42", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494002015904" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "6843a8ed-61a0-4dcf-a3b4-4159a8fb4f0f", - "service-instance-name": "HnportalProviderNetwork_37", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494002015930" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "4b945be9-4801-4b61-be37-535ed8283407", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-1001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001952041" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "ca741a4c-3554-4dea-b76b-ba47cb2d9a84", - "service-instance-name": "HngwOamNetVto_10", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001999418" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "4d389e30-7cfe-43e1-83a6-dc211bb7d046", - "service-instance-name": "HngwOamNetVto_13", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001999423" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "d1bb4ff0-8d91-408a-92a3-343963fc95e8", - "service-instance-name": "MSOST-1702-0308-ST_0", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001834591" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "12f56a37-3966-4626-9cb1-d9067d616a66", - "service-instance-name": "MSOST-1702-MTN6-Network-2002", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001770162" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "cf26ca49-c9f0-4a0e-b8e6-3284ec6ccedf", - "service-instance-name": "MSOST-1702-Network-16667", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001837510" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "3061fc64-2649-4b73-b0f9-6c20d60170f4", - "service-instance-name": "MSOST-1702-VFNetworkFqdn-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001952929" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "d5cfe521-1b8a-41fc-8e64-fd335debfd09", - "service-instance-name": "HnportalProviderNetwork_26", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001984121" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "1e48119c-cd72-456a-acf9-911ed4ebca7e", - "service-instance-name": "HnportalProviderNetwork_30", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001986763" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "8946c0a9-103f-4a23-b9f3-b9f16face559", - "service-instance-name": "HngwOamNetVto_35", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494002010173" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "0691c9ce-bf13-483f-b29d-4583634c59fa", - "service-instance-name": "HngwOamNetVto_53", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001899421" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "3c39d2ac-bdd6-4c45-82d6-6bd241d25bd7", - "service-instance-name": "MSOST-1702-0308-ST_2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001878784" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "65dbf0ab-fdce-4376-89bc-cdedee4aa287", - "service-instance-name": "MSOST-1702-vSAMP12-16019", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001834901" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "aac3cc7c-d147-491a-8308-c70a787a465d", - "service-instance-name": "MSOST-1702-0309-ST_1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001834925" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "163278f1-c06a-4e5b-ad55-7d43cb83d279", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-ErrPatch", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001899632" - }, - "extra-properties": {} - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "neng2", - "service-instance-name": "neng2name", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001920065", - "orchestration-status": "active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "neng6", - "service-instance-name": "neng6name", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001920067", - "orchestration-status": "active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "147951d2-2c9f-4fa4-91a5-bed88254dc1d", - "service-instance-name": "MSOST-1702-0329_MTN6V", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001917201" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "3fc6a66d-103d-4ec6-b3be-19b6226f8d1f", - "service-instance-name": "HngwOamNetVto_30", - "resource-version": "1494001858519", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/3fc6a66d-103d-4ec6-b3be-19b6226f8d1f/service-data/service-topology/" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "b651cb05-87d9-4747-9dea-e0b5b52995eb", - "service-instance-name": "HngwOamNetVto_16", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001855976" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "50bc936e-a4b9-43a1-a983-08ab93a7a545", - "service-instance-name": "MSOST-1702-vSAMP12-16018", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001855979" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "3d7a2c7e-1a9d-4792-bd81-8d6bda5ec332", - "service-instance-name": "MSODEV_1702_vSAMP12_424-005", - "resource-version": "1494001858573" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9e08454b-2eeb-4f1f-a162-0d570c1779fb", - "service-instance-name": "MSOST_MTN6_1702_vSAMP12_426-001", - "resource-version": "1494001858576" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9dd1d6fd-58b4-4fbf-8ea1-e807b7e5824c", - "service-instance-name": "MSOST-1702-0321-ST_2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001878962" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "raaSiId2", - "resource-version": "1494001834995" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "raaSiId5", - "resource-version": "1494001834997" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9bb87462-f66e-4f94-8819-fb0b86026938", - "service-instance-name": "MSOST-1702-0410-ST_03", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494002022294" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "bf4304d6-0fe6-4158-8adb-1d32a5f49e50", - "service-instance-name": "HngwOamNetVto_52", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001990190" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "09ba3179-7f29-4097-b373-e3b54a82c095", - "service-instance-name": "HngwOamNetVto_28", - "resource-version": "1494002013961", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/09ba3179-7f29-4097-b373-e3b54a82c095/service-data/service-topology/" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "cec5f96f-447d-41d3-a8c7-9bdcc796fe59", - "service-instance-name": "HngwOamNetVto_28", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001770362" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "ef282765-c364-4726-a45d-5873dce7674f", - "service-instance-name": "MSOST-1702-0321-ST_1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001957151" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "45546ded-dccf-4040-8f59-9fe89a1a000b", - "service-instance-name": "MSOST-1702-0321-ST_3", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001791855" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "169710db-e92a-4e11-886e-00178c23808d", - "service-instance-name": "HnportalProviderNetwork_2", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1494001920140", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/169710db-e92a-4e11-886e-00178c23808d/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "9f1561ca-2e2d-4947-b3c3-55ccc9344d17", - "service-instance-name": "MSOST-1702-0329V_MTN6_1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002025584" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "raaSiId1", - "resource-version": "1494001975456" - }, - "extra-properties": {} - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "ffd92795-5fdd-4cf5-905c-e4a7755f5501", - "service-instance-name": "MSOST-1702-VidTest_vSAMP12-SI-v1.0-002", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494002019420", - "orchestration-status": "active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "aaff8829-0d2c-4371-99de-c6f2c85c8eb0", - "service-instance-name": "MSODEV_1702_vSAMP12_424-001", - "resource-version": "1494001920216" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b09fedd8-bbb8-4ea2-8c33-e287aeb65b09", - "service-instance-name": "MSOST-1702-04110-ST_03", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494002019461" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "0ceebdf7-48d5-4bfd-a610-e23bcb2a1324", - "service-instance-name": "HnportalProviderNetwork_38", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001815517" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "9fd66f32-fc9f-4c27-a1c8-728e4cc5015e", - "service-instance-name": "HnportalProviderNetwork_50", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001815618" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "f1bfdcee-6809-4954-b91d-932dea04a149", - "service-instance-name": "MSOST-1702-0410-ST_02", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494001896882" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "893b131d-09a7-40b2-9fb3-0cc0c9bce3a1", - "service-instance-name": "MSOST-1702-VidTest_vSAMP10a-SI-v1.0-001", - "model-version-id": "f9253bf0-3b74-4f6b-a966-697bc599691c", - "resource-version": "1494001896884", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Basa-6" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "f9253bf0-3b74-4f6b-a966-697bc599691c" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "8a6a9177-5eab-4e16-9fe5-65966e610545", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-ErrPatch2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001816089" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "neng3", - "resource-version": "1494002000289" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "327ff0ed-76ff-4ec7-9b45-faa6a6314692", - "service-instance-name": "MSOST-1707-VidTest_vSAMP12-SI-v1.0-501", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001975619", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "VidTest_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "0b850e59-1fc9-4069-90b3-172d7b6176f3", - "service-instance-name": "MSO-ST-SI-1707-VidTestvSAMP10aService-v2.0-1XXX", - "model-invariant-id": "c73dd832-d1eb-4c3a-bd04-00353c032209", - "model-version-id": "98d5b2c7-4bd9-416c-bfb7-d7ed1ee5dd31", - "resource-version": "1495034515307", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Basa-6" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "98d5b2c7-4bd9-416c-bfb7-d7ed1ee5dd31" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "c73dd832-d1eb-4c3a-bd04-00353c032209" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "627178db-1470-4223-9516-c34ca154a22c", - "service-instance-name": "MSOST-1702-VidTest_vSAMP12-SI-v1.0-001", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001984228" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "raaSiId4", - "resource-version": "1494001795687" - }, - "extra-properties": {} - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "5400069f-17d6-44d7-92dd-8478cc87b268", - "service-instance-name": "MSO-ST-SI-1707-VidTestvSAMP12Service-v2.0-2XXX", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "4be59625-2143-49ac-b8d5-06b34c3f28f6", - "resource-version": "1495033782720", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4be59625-2143-49ac-b8d5-06b34c3f28f6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "VidTest_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "527f7aaf-a595-4b40-9b7c-c945722a2986", - "service-instance-name": "MSO-ST-SI-1707-VidTestvSAMP10aService-v1.0-1XXX", - "model-invariant-id": "c73dd832-d1eb-4c3a-bd04-00353c032209", - "model-version-id": "f9253bf0-3b74-4f6b-a966-697bc599691c", - "resource-version": "1495034671913", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Basa-6" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "f9253bf0-3b74-4f6b-a966-697bc599691c" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "c73dd832-d1eb-4c3a-bd04-00353c032209" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "7d0a92b7-42cd-4a02-b653-c46ff9f2bd6c", - "service-instance-name": "HnportalProviderNetwork_34", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001953467" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "1cca02a5-72a6-4aec-bb9c-535bae207086", - "service-instance-name": "HnportalProviderNetwork_42", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001953493" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "raaSiId3", - "resource-version": "1494001816163" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "67ca1f14-73ef-4e93-ada0-e1ec1d2788d3", - "service-instance-name": "HnportalProviderNetwork_4", - "resource-version": "1494001987746", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/67ca1f14-73ef-4e93-ada0-e1ec1d2788d3/service-data/service-topology/" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "6977963a-042d-4c5e-a82a-ba2eb1004067", - "service-instance-name": "HnportalProviderNetwork_42", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1499272428096", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/6977963a-042d-4c5e-a82a-ba2eb1004067/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "5c9cd7f5-461c-4ee5-b3dc-3f09320f55eb", - "service-instance-name": "MSOST-1702-0418-ST_2", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494001896946" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "neng7", - "resource-version": "1494001990952" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "60eb325a-218e-47f8-b39d-d10687e8de4c", - "service-instance-name": "MSOST-1702-0411-ST_10", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494001990969" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1b896f1c-803b-47d2-a6b3-022b3083c19e", - "service-instance-name": "HnportalProviderNetwork_1", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1494001990972", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/1b896f1c-803b-47d2-a6b3-022b3083c19e/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "c6ae0b6d-962f-4e45-85c2-a1c5ef875b5a", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-060802", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1496954934363", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "neng1", - "resource-version": "1494001795748" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ed53f825-94b7-42ae-bd6a-49ac5fc6b162", - "service-instance-name": "MSOST-1707-VidTest_vSAMP12-SI-v1.0-4111", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001795765" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "d083e8af-7df9-465a-86df-ef4703cd15bc", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0712-01", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1499874782600", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "a5f88840-e117-4507-a68d-b47dafcfe934", - "service-instance-name": "HngwOamNetVto_19", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1494001795807", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/a5f88840-e117-4507-a68d-b47dafcfe934/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "99b91443-219a-4b61-a3e9-19045d8833c4", - "service-instance-name": "HnportalProviderNetwork_31", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1497320472238", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/99b91443-219a-4b61-a3e9-19045d8833c4/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "926e5a7c-a38d-4aaa-8363-d194447fee8e", - "service-instance-name": "MSOST-1707-VidTest_vSAMP12-SI-v1.0-500", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001953978", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "2a8ee11e-969a-4b70-810d-01537def1b96", - "service-instance-name": "HngwOamNetVto_10", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1494001953987", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/2a8ee11e-969a-4b70-810d-01537def1b96/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "821c1485-de82-451e-b413-22ccdbf2c52e", - "service-instance-name": "HngwOamNetVto_20", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1494002003024", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/821c1485-de82-451e-b413-22ccdbf2c52e/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "994121b4-b5c6-44ef-b20b-49523b4cb9c3", - "service-instance-name": "HnportalProviderNetwork_3", - "resource-version": "1494002000388", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/994121b4-b5c6-44ef-b20b-49523b4cb9c3/service-data/service-topology/" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "f849bcb5-8541-492b-a639-97db55020be1", - "service-instance-name": "HnportalProviderNetwork_22", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1496856562847", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/f849bcb5-8541-492b-a639-97db55020be1/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "f48b5a16-babb-45d3-be8e-2dcf3cd50e87", - "service-instance-name": "HnportalProviderNetwork_24", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1497049864624", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/f48b5a16-babb-45d3-be8e-2dcf3cd50e87/service-data/service-topology/", - "orchestration-status": "PendingDelete" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "58caa2ae-a460-4dfe-8f17-60d1a5b256a8", - "service-instance-name": "MSO-ST-SI-1707-1707-MSOTestNetwork-Update", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1495561755803", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "00db6bfa-9875-405c-8504-8d3c70d6d775", - "service-instance-name": "MSO-ST-SI-1707-1707-MSOTestNetwork-4XXX", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1494971866238", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "e9ab60f8-5895-4fd3-b8b3-e60028ceee3a", - "service-instance-name": "", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1494975407863", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "7279e4bb-960d-4566-8cfa-b30ba1b9fee7", - "service-instance-name": "", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1495017424680", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "3d5622b7-8ba6-4a06-bc9e-d8eaccf567e4", - "service-instance-name": "MSO-ST-SI-1707-msoTest-5-17-1", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1495024652825", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "961fc73c-8f34-4110-af5e-83a07a34caad", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-060101", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1496344150090", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "a11a89d7-5fb5-48dc-ae7f-976b496f2960", - "service-instance-name": "MSO-ST-SI-1707-mtn6-InfraMSOvSAMP12Service-v5.0-2XXX", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1499970280223", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "a989010e-42f0-4dc6-a568-82c55be705bbfa68a4b9-637e-4741-b69b-cc0275e0023b", - "resource-version": "1502133293589" - }, - "extra-properties": {} - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "3f7bb408-e17b-4cd0-a319-295108915fd8", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0807-10", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502143103360", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "df5b349a-e83d-4a4b-a868-d6975830dd8b", - "service-instance-name": "MSO-ST-SI-1707-VidTestvSAMP12Service-v1.0-2XXX", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1495033866213", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "f9974af3-aa6e-4b8c-8fd2-f45c8bdb310a", - "service-instance-name": "MSO-ST-SI-1707-VidTestvSAMP12Service-v3.0-2XXX", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "a9e7f120-4d81-44b2-a88d-21a489089129", - "resource-version": "1495034308616", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "a9e7f120-4d81-44b2-a88d-21a489089129" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "PCRF_10_17_1610_SVC", - "service-instance": { - "service-instance-id": "24afca09-100c-45b7-a640-ccaf0b1cfef3", - "service-instance-name": "MSO-ST-SI-1707-PCRF_10_17_1610_SVC-v1.0-9XXX", - "model-invariant-id": "103e2e96-97fa-4f9d-8969-f56cc6be9871", - "model-version-id": "e8d73f18-404d-4b61-8d06-d9e824c79c56", - "resource-version": "1495227731141", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vol_grp" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e8d73f18-404d-4b61-8d06-d9e824c79c56" - }, - { - "property-name": "model-ver.model-name", - "property-value": "PCRF_10_17_1610_SVC" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "103e2e96-97fa-4f9d-8969-f56cc6be9871" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "40b9f4bd-1b76-49d0-be6e-6d2d3299c6dc", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-061301", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1497402960061", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "bc1e909a-c062-4791-ab98-2c29b1db210b", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-0620-01", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1497971439678", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "4ee52741-493a-41b7-bf15-75b287dc751a", - "service-instance-name": "MSO-ST-SI-1707-mtn6-MSOTestNetwork-33XX_Update", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1499975637828", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "4JDurnoIZEAYdjpWdWQP1", - "service-instance": { - "service-instance-id": "6238024a-48c2-446e-afa3-2715a4fa8137", - "service-instance-name": "testhmger", - "model-invariant-id": "4c35d46f-de47-4bbc-bcda-0d46caeddf09", - "model-version-id": "9014b6b1-33c1-4092-87ab-62c230c74d74", - "resource-version": "1499857774073", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "description_JresjKOFjY1" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9014b6b1-33c1-4092-87ab-62c230c74d74" - }, - { - "property-name": "model-ver.model-name", - "property-value": "4JDurnoIZEAYdjpWdWQP1" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "4c35d46f-de47-4bbc-bcda-0d46caeddf09" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "0bf3c089-a656-48e8-8895-d49239762b18", - "service-instance-name": "MSO-ST-SI-1707-InfraMSOvSAMP12Service-0816-1", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1502897572889", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "7b45454d-de6d-443b-932d-99dff9b2fd52", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-MSOTestNetwork-33XX_Update", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1503001449498", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "fab82a56-aae6-4204-bfa2-95e51a8596e5", - "service-instance-name": "HngwOamNetVto_67", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1496388185071", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/fab82a56-aae6-4204-bfa2-95e51a8596e5/service-data/service-topology/", - "orchestration-status": "PendingDelete" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "927134c6-8187-4c20-8a30-30541937fe9e", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-0726-01", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1501069438917", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "7391705b-95b4-4ba2-81cb-6234180d3c36", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-0706-01", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1499351301343", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "d694242e-d119-47ce-bcf4-d2b4e8bffba8", - "service-instance-name": "HngwOamNetVto_79", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1502762958016", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/d694242e-d119-47ce-bcf4-d2b4e8bffba8/service-data/service-topology/", - "orchestration-status": "PendingDelete" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "d338012c-fa17-442b-b8a4-16b3947fef32", - "service-instance-name": "MSO-ST-SI-1707-InfraMSOvSAMP12Service-v1.0-2XXX", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "ff052511-7eda-4770-a48f-91150f797a01", - "resource-version": "1499464374479", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ff052511-7eda-4770-a48f-91150f797a01" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "493d5299-286e-4c18-b2f6-e58d1662a63d", - "service-instance-name": "MSO-ST-SI-1707-mtn16a-InfraMSOvSAMP10aService-v1.0-1XXX", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1499979599759", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "c542dac4-0fc2-4f96-93ed-34bc162640e2", - "service-instance-name": "MSO-DEV-SI-1707-MSOTestNetwork-0802-2", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1501681678325", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "f3ec623c-936e-4f7a-81fd-1d2194f060ff", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-0713-01", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1499956984708", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "6e14a44c-401b-4a8a-b5c0-dd0eb61b9ad7", - "service-instance-name": "MSO-ST-SI-1707-mtn6-MSOTestNetwork-3XXX", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1499971131822", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "8849ce8f-f6be-423a-9541-c017bc560125", - "service-instance-name": "MSO-DEV-SI-1707-MSOTestNetwork-0802-3", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1501682613646", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "3f85870c-832d-483f-ade4-4c0c6d59da9b", - "service-instance-name": "MSO-DEV-SI-1707-MSOTestNetwork-0802-4", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1501682703655", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "4e6f2308-bae9-4591-97d7-de6228642fab", - "service-instance-name": "MSO-ST-SI-1707-mtn6-InfraMSOvSAMP10aService-v1.0-1XXX", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1499956704355", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "91242dc2-0074-49f9-89cb-7648b20f8cb2", - "service-instance-name": "MSOdev-1707-7-5-Name-vipr1", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1499970133703", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/91242dc2-0074-49f9-89cb-7648b20f8cb2/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "b3d920de-ffa1-4453-b23a-3267993dcd40", - "service-instance-name": "mz1936test1", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1500476019167", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "589acefd-1de1-4f41-bbee-07048e0f8fd1", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-0721-01", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1500660027833", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "90330e27-34d6-4b38-a1f1-3f3e22c04cd9", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP12Service-v1.0-2XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "ff052511-7eda-4770-a48f-91150f797a01", - "resource-version": "1502125802006", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ff052511-7eda-4770-a48f-91150f797a01" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "\ta989010e-42f0-4dc6-a568-82c55be705bbfa68a4b9-637e-4741-b69b-cc0275e0023b", - "resource-version": "1502133232750" - }, - "extra-properties": {} - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "cb1cefa8-24a0-48c5-9280-089595954f3c", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0807-11", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502146477727", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "a3e39f1b-7fe2-4423-89c0-85150179afbc", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0803-01", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1501779665130", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "\tfa68a4b9-637e-4741-b69b-cc0275e0023b", - "resource-version": "1502128868819" - }, - "extra-properties": {} - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "a989010e-42f0-4dc6-a568-82c55be705bb", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0807-5", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502133034154", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "053b5bcf-4c44-4e00-8d94-94695fb01f56", - "service-instance-name": "MSO-ST-SI-1710-InfraMSOvSAMP10aService-v4.0-1XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502825606629", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "62bdb063-6461-4135-8bb0-bec4ed54874d", - "service-instance-name": "MSO-DEV-SI-1710-MSOTestNetwork-0815-1", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1502797578781", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "46b6092f-8047-45c3-b423-d780afaa64af", - "service-instance-name": "MSO-ST-SI-1707-InfraMSOvSAMP12Service-0807-1", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1502152362553", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "fe6d1eb5-85cd-43ae-901a-1a6b0266264a", - "service-instance-name": "MSO-ST-SI-1707-mtn16a-MSOTestNetwork-3XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1502372167295", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "6516ecce-cd3d-4d21-9204-32b71142f932", - "service-instance-name": "MSO-ST-SI-1710-InfraMSOvSAMP12Service-0810-1", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1502381336007", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "a3a03c99-fbbf-48ab-b513-cb09a723a179", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP10aService-4.0-1XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502384871086", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "7edf8b66-a7ba-4351-8304-a24fb004ce50", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0811-1001", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502480914799", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "98723cf0-e755-4652-8851-182b060d4ffd", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0825-001-R", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1503663930025", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "db6ae2d4-8b5f-476d-b9f8-44751d504e38", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0803-05", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1501781759617", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "8fe6eed2-9823-426c-ad27-95545c42ce4c", - "service-instance-name": "MSO-ST-SI-1710-mtn6-InfraMSOvSAMP10aService-4.0-1XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502808860080", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "49e739f8-963e-4abf-ad5a-bd4418f9544a", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP12Service-v5.0-2XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1502991526931", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "6c5ce12f-d028-43a7-97f6-699e7aac64ac", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-MSOTestNetwork-3XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1503000992667", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "25b6aeee-00a2-471b-82d2-e009e529b772", - "service-instance-name": "MSO-ST-SI-1712-vSamp10a-PCM-1010-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1507672565803", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "963f3c7e-b110-4216-85c2-dfc5f6364c0e", - "service-instance-name": "shani_shani", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508391834049", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "36561f34-ba0a-4cba-b743-0b08ecffbd64", - "service-instance-name": "VPROBE_Instance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1508670668611", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "7839d807-37ca-4b7e-9c29-53e94d41405a", - "service-instance-name": "VMEE_instance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "14eb42f2-b30d-4863-bcaf-f1f30ea68f2a", - "resource-version": "1508670917581", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "14eb42f2-b30d-4863-bcaf-f1f30ea68f2a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "59264fdb-50bc-4141-b072-5d99dc8782b9", - "service-instance-name": "shani_cfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508671098479", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "5e849f9a-e43e-44ea-9378-515d28dd5c31", - "service-instance-name": "vmee_service_cfg3", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1508672120074", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "ef6c7fba-80a5-4943-8cb4-f29f3dab6b94", - "service-instance-name": "shani_service_vprobe", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1508763065871", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "241e1576-3f6b-4c06-8577-8d1d38f25885", - "service-instance-name": "shani_vmee_service", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1508763229986", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "34d0e502-c29f-4360-9d31-92f23736be70", - "service-instance-name": "MSO-ST-SI-1707-InfraMSOvSAMP10aService-v1.0-1XXX", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "4af9f859-ac6a-458f-8e18-af439edda497", - "resource-version": "1499462698495", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4af9f859-ac6a-458f-8e18-af439edda497" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "06-15-VID-Issue-SERVICE", - "service-instance": { - "service-instance-id": "1d8342bd-aaa3-4141-af3b-9de0ad50ac96", - "service-instance-name": "shani_test1", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", - "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", - "resource-version": "1508675026370", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ae5d24f4-f602-46d0-9a62-ed3f28928b50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "2fa617d0-50b3-4d74-861d-4b39301acd2c" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Service For Macro Installation", - "service-instance": { - "service-instance-id": "2f7aa9a6-eac3-49f5-ab9c-6db7557ca3f6", - "service-instance-name": "dsfds", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", - "model-version-id": "c347eede-0b13-4251-9cd9-bd0258c0d411", - "resource-version": "1508417179346", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "c347eede-0b13-4251-9cd9-bd0258c0d411" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "248173d1-99a5-4e78-851c-777e318d07ee", - "service-instance-name": "bvccmcmhjjjj", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510264824355", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "03e8185b-39bd-48d2-944d-a6c7427d52a4", - "service-instance-name": "ih980", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510567003530", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "Service With VF Shani", - "service-instance": { - "service-instance-id": "c2c324d4-e946-42fe-aeb4-7aba28a2f479", - "service-instance-name": "de_cafe_shnia", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "f07db45c-949c-4698-94c3-5a328a0d4d4f", - "model-version-id": "8c4093ce-404f-416a-a91c-4c146b5945db", - "resource-version": "1508319271399", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "8c4093ce-404f-416a-a91c-4c146b5945db" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "f07db45c-949c-4698-94c3-5a328a0d4d4f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "7ae73cc0-7df3-455d-bd5b-bc00fde41cd1", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0803-02", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1501780927877", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "b5f4278d-490d-489b-aded-66db3a84f61d", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0803-04", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1501781438162", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "183b9c62-9f3b-4613-bc67-7ba743bbfcf0", - "service-instance-name": "hellowworld", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1511335547286", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "ad43c6c0-7de0-4772-83d4-139ffb65c50c", - "service-instance-name": "vmeeshani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1509288736569", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "2f98f58d-426e-4377-9317-5e256c458324", - "service-instance-name": "shanireg05", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511700800516", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "2d652dff-df5e-4303-983c-cdbce5b6681c", - "service-instance-name": "MSO-ST-SI-1712-vSamp10a-1010-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1507672023403", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "f787cb85-b9e0-4658-b3a7-9faec9d66386", - "service-instance-name": "MSO-ST-SI-1707-InfraMSOvSAMP12Service-0815-2", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1502819957223", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "da064d24-88a7-49e2-a668-5b07992cd393", - "service-instance-name": "fgkkjhk", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511789843410", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "Service_PNF", - "service-instance": { - "service-instance-id": "498797fe-b0c2-4509-9cdd-86a0a776d31f", - "service-instance-name": "ServicePnf_23", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1508996597163", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/498797fe-b0c2-4509-9cdd-86a0a776d31f/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_PNF_2" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_PNF" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "43596836-ae36-4608-a987-6608ede10dac" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "727c5caa-2b07-41b0-94f9-9408b3c7a0d1", - "service-instance-name": "rfghSHANI", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508996704272", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "86f68df5-d3cd-4311-b8c5-983e021838a5", - "service-instance-name": "erterte", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1512299719186", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "6bac0939-3caf-423a-811d-7e2669cd7efa", - "service-instance-name": "MSO-DEV-SI-1707-MSOTestNetwork-0808-1", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1502198626624", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "13afd726-d181-4e29-b759-c51a702de2df", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0929-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1506714221339", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "ac3e73bc-b1e2-4833-836b-021a86229c97", - "service-instance-name": "shani_cfg2", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508671869668", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "8e39f14f-21d3-44ec-9f05-99d0f3dc8092", - "service-instance-name": "vmee_service_instance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1508675655654", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "489a93ad-dd10-4d5c-8295-c6c9605c368b", - "service-instance-name": "ittay_Service_VProbe_FE", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1508677371671", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "13e6d21d-2e3c-4612-a367-219b238581e9", - "service-instance-name": "MSO-ST-SI-1802-mtn6-InfraMSOvSAMP12-2XXX", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1506712978064", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "85b7b646-ad1b-42c2-b6f0-076e5cd6b533", - "service-instance-name": "MSO-ST-SI-1712-vSamp10a-PCM-1011-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1507808056820", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "0cd1f62b-fe23-4469-ba40-01aae4944350", - "service-instance-name": "PM_Shani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508670174978", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "048bda59-8dcf-4446-bdb2-ecdb7f3633b5", - "service-instance-name": "pm_liz", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508675153913", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "4004c645-7648-4434-8f61-08abe54df923", - "service-instance-name": "vprobe_service_instance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1508675422421", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "f0b545f7-56ad-49b6-854f-a37d586735b7", - "service-instance-name": "cvcvsdfgfdg.df..", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508326737165", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Dip_221117_Service", - "service-instance": { - "service-instance-id": "6fa380a6-547e-47ef-b052-250863dde19a", - "service-instance-name": "dip_vid_deploy_serv", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "dc621f45-db9c-42b2-a182-b429c675ef26", - "model-version-id": "0c628f95-b7ad-420a-87c6-80f8893d2629", - "resource-version": "1511385989449", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Add Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "0c628f95-b7ad-420a-87c6-80f8893d2629" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Dip_221117_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "dc621f45-db9c-42b2-a182-b429c675ef26" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "a98c", - "resource-version": "1502133388652" - }, - "extra-properties": {} - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "b468a213-57d8-43c2-b2d5-92e09873b491", - "service-instance-name": "shanipmtest", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509290086766", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Ver1with_inputs_Ver2without_inputs", - "service-instance": { - "service-instance-id": "c431cf21-9cfa-419b-9c81-7749f2d64264", - "service-instance-name": "dghfghfgh", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "821b337c-d1d6-41b8-91f2-62acbeea74e0", - "model-version-id": "93a77919-7e3e-477b-97b4-f756cc85a281", - "resource-version": "1511767920515", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93a77919-7e3e-477b-97b4-f756cc85a281" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "821b337c-d1d6-41b8-91f2-62acbeea74e0" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "b6ebaa3c-b8aa-4a04-b4d3-4f58d2e1c238", - "service-instance-name": "dfhfghfgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509006600145", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "4df9bda8-d626-48c6-8545-200539347535", - "service-instance-name": "shanifranc", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509281280372", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "ariel_inputmap_service_02", - "service-instance": { - "service-instance-id": "4ccd52f9-5488-4d00-83f0-7e1a5d56a50a", - "service-instance-name": "uniqueeeee", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339", - "model-version-id": "a5b89224-c03d-4142-b4ce-8b8e8b8de54a", - "resource-version": "1508945316985", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ariel_inputmap_service_01" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "a5b89224-c03d-4142-b4ce-8b8e8b8de54a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ariel_inputmap_service_02" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b594a6ec-94e0-4c95-826f-4c3d3af56339" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "15f27065-7448-4b04-8e81-d29b465c1300", - "service-instance-name": "shani-fr", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508319478155", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "74cdfd63-c7b0-4bce-813c-eaa4efc00833", - "service-instance-name": "casesens", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508332804519", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "f1cb84c5-94e2-4a57-95ac-747e911cc0f8", - "service-instance-name": "gyjgh.fgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509634059882", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "ChaniPick", - "service-instance": { - "service-instance-id": "f09f8f7b-bc0e-4726-b5b3-f7ee6cbfd08e", - "service-instance-name": "ChaniPickInstance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "91fb7ec2-f05d-45dd-8690-f381a5c970c3", - "model-version-id": "0856b6e0-4bc2-4f61-96f5-b9469a101181", - "resource-version": "1509609427601", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ChaniPick" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "0856b6e0-4bc2-4f61-96f5-b9469a101181" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ChaniPick" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "91fb7ec2-f05d-45dd-8690-f381a5c970c3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "7a4c4bcf-59c1-416a-92d8-2006713f3ca9", - "service-instance-name": "vprobeshani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1509289395572", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "cd5262ca-5b20-46ed-b2ce-24452bd82e2d", - "service-instance-name": "fafasdfasdfasdfasdf", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509523416897", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "4891cd09-4417-45b7-8992-c94a432a2b6a", - "service-instance-name": "MSO-ST-SI-1712-vSamp10a-PCM-111-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1509552966925", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "shay-VID-Service-test", - "service-instance": { - "service-instance-id": "7e4b4e61-c1a1-49af-9aec-bee2c39f8bc7", - "service-instance-name": "serviceinputssss", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1508831847194", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shay-VID-Service-test" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "8c16d416-f183-4f2e-8a05-48a7ee0738f7" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shay-VID-Service-test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "74b2fa72-e3b9-4942-8448-983a4b50891a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "08f3ffc7-9c52-4421-9863-9aaa488019d5", - "service-instance-name": "Macrooo", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511338974905", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "dbd480ec-f5f8-422d-8c31-22c1178c3f1f", - "service-instance-name": "shaniti", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1509283263161", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "c140cd3e-8e17-4055-a7d9-bce3da86a888", - "service-instance-name": "sanity0005", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510242624842", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Service With VF Shani", - "service-instance": { - "service-instance-id": "22491345-7ca4-49e9-b6df-4b578e9e4549", - "service-instance-name": "ghjghjghjgh_shani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "f07db45c-949c-4698-94c3-5a328a0d4d4f", - "model-version-id": "8c4093ce-404f-416a-a91c-4c146b5945db", - "resource-version": "1508318646144", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "8c4093ce-404f-416a-a91c-4c146b5945db" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "f07db45c-949c-4698-94c3-5a328a0d4d4f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "b33b85d7-a6ab-48e7-9ef9-ed52b69f18d0", - "service-instance-name": "CASESENS", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508332681298", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "20099c17-6a00-4ca5-969c-f9ca82691962", - "service-instance-name": "xzdfgsdfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510566667141", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "fdf4f3fc-ee2d-42d1-94d9-aadbc899bfee", - "service-instance-name": "fghfdggfdsssasdf", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511182118419", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "fdb9dd6f-cb05-4849-8aef-d08ea2019111", - "service-instance-name": "sertgretretret", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1509891380008", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "BJ_vDBE_21NOV_Service", - "service-instance": { - "service-instance-id": "af046361-54f7-4956-b059-78d11e15b7c1", - "service-instance-name": "vDBE_BJ_21NOV", - "service-type": "Vdbe", - "service-role": "oam", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "e6e9d408-6176-4cc2-b83b-2345995ae592", - "model-version-id": "4debb130-a4bd-46c8-88ba-6e5c11df49d0", - "resource-version": "1511298043321", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "BJ_vDBE_21NOV_Service_desc" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4debb130-a4bd-46c8-88ba-6e5c11df49d0" - }, - { - "property-name": "model-ver.model-name", - "property-value": "BJ_vDBE_21NOV_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e6e9d408-6176-4cc2-b83b-2345995ae592" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Shani Service step 4", - "service-instance": { - "service-instance-id": "9b3a07d6-f8c5-4087-8cb0-c50f0a19e436", - "service-instance-name": "tyurtuyt", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "713783d5-9e21-49c5-86f1-77dc331586a2", - "model-version-id": "a50a43bb-4ac8-410c-acf3-c30aa39dd109", - "resource-version": "1512301853845", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Shani Service step 4" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "a50a43bb-4ac8-410c-acf3-c30aa39dd109" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Shani Service step 4" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "713783d5-9e21-49c5-86f1-77dc331586a2" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Service For Macro Installation", - "service-instance": { - "service-instance-id": "c82cd122-5b00-4126-85cf-895828608324", - "service-instance-name": "ServiceForMacroInstallation_17", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", - "model-version-id": "b9436fbb-dc96-4163-90b8-846c6518a05a", - "resource-version": "1512386849481", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/c82cd122-5b00-4126-85cf-895828608324/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b9436fbb-dc96-4163-90b8-846c6518a05a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "73fe6eb7-a683-4c29-b12a-6a1ee6f58741", - "service-instance-name": "pn_cfg_sanity08", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510052183786", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "3ccaf20a-9409-4b2e-8fb8-3d0cfb5ce0ea", - "service-instance-name": "RG_10-25_SCM", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f", - "resource-version": "1508967663290", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "7.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "9ccae314-d9b6-463b-9f1f-03981c515d6b", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0929-02", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1507672495938", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "c1bf29ae-5486-42f8-ad71-600cb52bac2c", - "service-instance-name": "sanity0003", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510240640053", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "736abd8b-1167-4b6f-b1e3-d7871dda0c1e", - "service-instance-name": "service_port_mirroring", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508753804445", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "74ef78e8-624a-4283-b969-ad7930b6c807", - "service-instance-name": "dfdgfdgfdrr", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510731069641", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "664410cc-8ae6-4a52-9e63-8d5ef76845cb", - "service-instance-name": "dkjgbo4", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510733439804", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "c0cdb0b8-6dc6-47ab-a9f9-f37e9fe68614", - "service-instance-name": "sdfghksdfh", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511103394878", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "dfc32fb0-e134-42f3-bf7c-2c16c302f2fd", - "service-instance-name": "PM123", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508675054323", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "b9c1db26-8853-4fdf-b963-58a2c00cf352", - "service-instance-name": "pm_cfg_sanity88", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511342074819", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "ba58ccf5-fb34-4160-ad43-d641e3df4782", - "service-instance-name": "sanity185_test5", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511337721530", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "fb8d1641-1a94-4cae-b33b-3e569cca6e22", - "service-instance-name": "ghgtf", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1512387312823", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "c6e90753-51ce-4847-8d36-8f0690dd4dd0", - "service-instance-name": "fgjghj", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511761219526", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "e67d5f74-e98f-4867-856f-ddf0178ebaeb", - "service-instance-name": "using_vid_for_voip_net", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511873426321", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Shani Service step 4", - "service-instance": { - "service-instance-id": "831911c5-2c0f-41df-a84e-f64b0b29b014", - "service-instance-name": "shanishanif", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "713783d5-9e21-49c5-86f1-77dc331586a2", - "model-version-id": "a100b77d-132c-4856-b6e0-9ec4261436d1", - "resource-version": "1509016215708", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Shani Service step 4" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "a100b77d-132c-4856-b6e0-9ec4261436d1" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Shani Service step 4" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "713783d5-9e21-49c5-86f1-77dc331586a2" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "network_with_subnet_info_shani", - "service-instance": { - "service-instance-id": "c32876e3-1d72-4a5e-ba9b-cf7e76314a46", - "service-instance-name": "instance_with_VL_with_subnet_info", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "6b438530-82e1-41b5-b754-d415993db358", - "model-version-id": "82b05a7f-2735-40b9-9fcd-6db86cc47371", - "resource-version": "1512036274754", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "network_with_subnet_info_shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "82b05a7f-2735-40b9-9fcd-6db86cc47371" - }, - { - "property-name": "model-ver.model-name", - "property-value": "network_with_subnet_info_shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "6b438530-82e1-41b5-b754-d415993db358" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "90b9d477-9891-4392-8327-d934e13b23c5", - "service-instance-name": "shani_port_mirroring", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "d1853b18-5eb6-4a4b-99f0-66f6ac298153", - "resource-version": "1508762813922", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d1853b18-5eb6-4a4b-99f0-66f6ac298153" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "e22b44ed-874a-45dd-bfa0-9d53a47d00bd", - "service-instance-name": "pmtestshani_sanity8", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510832335695", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Clear Service Shani", - "service-instance": { - "service-instance-id": "728b899a-fa1e-4c20-8706-d0df732b1110", - "service-instance-name": "asdfghj", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "241e071e-7445-48b1-b05e-deb7926e49f8", - "model-version-id": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e", - "resource-version": "1511082067020", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "241e071e-7445-48b1-b05e-deb7926e49f8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "5762ed31-7171-48ed-9957-aba6be2d77da", - "service-instance-name": "New353660", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f", - "resource-version": "1512065977733", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "7.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "60a5cd1b-2afc-42ca-b6e0-a5cc76e07369", - "service-instance-name": "jgjfdhsdfggdg_pm_cfg", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1512309245215", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "AVPN MOW vPE OAM Network _New", - "service-instance": { - "service-instance-id": "6413537b-794e-4f85-a049-3c821536cdf2", - "service-instance-name": "dfhgfhgfhgffg", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "f903efcf-f2fa-4eec-8185-dfd2a446280d", - "model-version-id": "6610e100-9c62-45cc-b1a8-37f221aff1d5", - "resource-version": "1512316460270", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant OAM Network for vPE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "6610e100-9c62-45cc-b1a8-37f221aff1d5" - }, - { - "property-name": "model-ver.model-name", - "property-value": "AVPN MOW vPE OAM Network _New" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "f903efcf-f2fa-4eec-8185-dfd2a446280d" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "91a7e849-eeda-4d21-8d56-b02da4666971", - "service-instance-name": "ghkhjkgh", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511880922718", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "b0a49434-af4f-4c96-9d70-b9e726a6e4b6", - "service-instance-name": "dfgfdgfgg_macro", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511340504429", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "49769492-5def-4c89-8e73-b236f958fa40", - "service-instance-name": "fghghfhgf", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "d1853b18-5eb6-4a4b-99f0-66f6ac298153", - "resource-version": "1509021587199", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d1853b18-5eb6-4a4b-99f0-66f6ac298153" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "30653672-78b1-4d30-b15e-a5b7c6d5efb2", - "service-instance-name": "portmirroringinstance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508672376379", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "59abe4ee-9859-4eae-8d87-e43869dd2d04", - "service-instance-name": "oren_instance_vprobe", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1508683058609", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "28880a13-3e43-439e-9d00-db0ffe387d1a", - "service-instance-name": "mmmmm", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1508849264590", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "240c3288-65ee-43fa-8654-14238448b826", - "service-instance-name": "sanityyy444", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509614603771", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "ffa9584c-33d4-439b-9600-57804cff7a97", - "service-instance-name": "fgjghjgfjgdhj2", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1511879880134", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "aa060c7d-6dd4-4d36-af5a-2183add04456", - "service-instance-name": "sdvvrfgrfgg43543", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510566062873", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "add53750-fb62-42a1-b590-2d16be514d46", - "service-instance-name": "ghjhjhj", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510567799399", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "1003f475-b9e8-45b4-b5b0-2e26892a0eac", - "service-instance-name": "shani_sanity_2", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1510730703001", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "722b3bd0-6f8d-45d4-bbcf-279543d87b9d", - "service-instance-name": "seghh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509280388974", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "27dc52c1-6061-41ab-ac28-aa4e58ecd102", - "service-instance-name": "luckyNo.7", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f", - "resource-version": "1508755493786", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "7.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "0607973b-60fd-4b2b-8a91-fffff50a55d3", - "service-instance-name": "fdgSHANI.", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509616333566", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "bfeb2945-95ba-45ce-99b5-45c74e61913d", - "service-instance-name": "FiveSanity5", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511098840741", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "alacarte_ecomp_generated_naming_is_false", - "service-instance": { - "service-instance-id": "3f63064b-6137-4b26-8c79-eb247fe3e95a", - "service-instance-name": "jhdsa", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a63c3a9e-2bfc-430f-af4b-608ec92e368f", - "model-version-id": "0eaab9e3-32a0-4944-a461-705e74699a80", - "resource-version": "1511161770782", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "alacarte_false" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "0eaab9e3-32a0-4944-a461-705e74699a80" - }, - { - "property-name": "model-ver.model-name", - "property-value": "alacarte_ecomp_generated_naming_is_false" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a63c3a9e-2bfc-430f-af4b-608ec92e368f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "434a116e-1b34-4522-b30c-891803bdcc35", - "service-instance-name": "service_vmee_of_source_port_oe30_projectY", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1511264435143", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "fae55295-8fed-45bb-b0c5-14848f242c7b", - "service-instance-name": "s2anity", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509889424393", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "a947dfbf-3598-41fa-a175-4467359d65e4", - "service-instance-name": "sanity05", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510050378976", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "8d8c828b-1b19-4dc4-bf46-b56d963d76ea", - "service-instance-name": "dfgdfgdfgdfgd", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510048733365", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "5f4f5707-1a02-4da6-b9fe-8c526e1b730b", - "service-instance-name": "sanity005", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510050765466", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "8d516685-5bf0-41b7-bfb9-e8617638eb66", - "service-instance-name": "sdfgsdgfsdg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1512300164307", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "d4ded325-ac0b-479b-bebb-c6470df034aa", - "service-instance-name": "macroo5645", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1512308160535", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "Service_PNF", - "service-instance": { - "service-instance-id": "8a924433-c084-4bda-819e-6280c871fd38", - "service-instance-name": "ghjghj", - "service-type": "Transform", - "service-role": "PNF", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "9a4d9d41-e686-43da-a558-c45448d6023a", - "resource-version": "1512379889052", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_PNF_2" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9a4d9d41-e686-43da-a558-c45448d6023a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_PNF" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "43596836-ae36-4608-a987-6608ede10dac" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "eff18c1f-3007-4701-b098-54ee035abdf8", - "service-instance-name": "sanity000003", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510241403647", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "4f2976ce-d79c-4a56-829a-9d6dc6367f1b", - "service-instance-name": "macro006", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510244395140", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "af9d52f9-13b2-4657-a198-463677f82dc0", - "service-instance-name": "xbghrftgr_shani", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1510659519538", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "8ab8a0c7-8fd7-4345-ae0f-b1e4b1041aa1", - "service-instance-name": "sdddf_shani", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510725658977", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "862139f4-f51d-4a99-afee-f062095906ad", - "service-instance-name": "service_pm", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510734014131", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "d9e67c21-6756-4f12-8633-73d1541090a8", - "service-instance-name": "test9876543456", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510734314247", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "8eda88ea-50c6-4419-bf69-7d53a8f8c6a4", - "service-instance-name": "jhhgggfgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510727126995", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "42376493-017d-4dda-a923-244c5c5d47b3", - "service-instance-name": "zsdff_6shanii", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510734387613", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "Clear Service Shani", - "service-instance": { - "service-instance-id": "71cffd2f-669c-42a5-9273-730ee04bf806", - "service-instance-name": "shani_vnf_inputs", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "241e071e-7445-48b1-b05e-deb7926e49f8", - "model-version-id": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e", - "resource-version": "1510849889358", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "241e071e-7445-48b1-b05e-deb7926e49f8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "4610365e-95d5-45c9-bad0-b47a3c358358", - "service-instance-name": "dfrgthjkl", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510832959675", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "BJ_20NOV_vDBE_Service", - "service-instance": { - "service-instance-id": "c8a85099-e5a3-4e4d-a75d-afa3e2ed2a94", - "service-instance-name": "BJ_20NOV_vDBE_VLM_VID", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "2d3b91f4-2844-4b3d-972c-8de8f4ae461d", - "model-version-id": "35e8f11c-f0fc-46b2-b01a-8409d03e1bac", - "resource-version": "1511278284445", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "BJ_20NOV_vDBE_Service_Desc" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "35e8f11c-f0fc-46b2-b01a-8409d03e1bac" - }, - { - "property-name": "model-ver.model-name", - "property-value": "BJ_20NOV_vDBE_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "2d3b91f4-2844-4b3d-972c-8de8f4ae461d" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "5955c55b-f3df-48d4-84d0-7c12ed006b29", - "service-instance-name": "vidnf17070", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511184390151", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "8ca77f98-4f4b-48d6-9824-48e694cf14f2", - "service-instance-name": "fdgdfgfdgfdgfgg", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511179094909", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "e75edbc7-66c4-4493-a674-9bdc6fa3d1f5", - "service-instance-name": "sanity555", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509890717717", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "99481f05-eb44-40e0-be75-00cb6eccbc12", - "service-instance-name": "sssshaniiiiii", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509891853510", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "2fbfdefc-da88-4a38-b80a-997f2dfbc0cf", - "service-instance-name": "s88anity", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509892664097", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Ver1with_inputs_Ver2without_inputs", - "service-instance": { - "service-instance-id": "d35bd758-7bf0-454a-9abd-7e0d873d6cb9", - "service-instance-name": "nnnnnnnnngfdgfdgfd", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "821b337c-d1d6-41b8-91f2-62acbeea74e0", - "model-version-id": "93a77919-7e3e-477b-97b4-f756cc85a281", - "resource-version": "1511343196134", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93a77919-7e3e-477b-97b4-f756cc85a281" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "821b337c-d1d6-41b8-91f2-62acbeea74e0" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "817866f5-bc91-49a5-9124-6adc9070afc0", - "service-instance-name": "project_p1_oe_own1", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511341665118", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "d59f882d-bbd1-4955-9af1-28eed0e5313c", - "service-instance-name": "fgjgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1512317186625", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "88333c1c-ad7d-4074-890f-8868c9ddcf65", - "service-instance-name": "netSHANI", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509018500825", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "4fd3c0d4-1cd1-4d88-b3b8-5c4f7eb4ef25", - "service-instance-name": "shaniPMService", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "d1853b18-5eb6-4a4b-99f0-66f6ac298153", - "resource-version": "1509019261453", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d1853b18-5eb6-4a4b-99f0-66f6ac298153" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "20292856-3f41-4295-b657-f08d08388dcb", - "service-instance-name": "vmee", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1511101512030", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service_PNF", - "service-instance": { - "service-instance-id": "217c9b78-fe7d-41fb-ba1a-de4fc2e5813a", - "service-instance-name": "ServicePnf_34", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1511183768410", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/217c9b78-fe7d-41fb-ba1a-de4fc2e5813a/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_PNF_2" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_PNF" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "43596836-ae36-4608-a987-6608ede10dac" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "c096de2b-4d60-44e6-a5c9-e174cd1d99ad", - "service-instance-name": "shani_pm_instance", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511266111639", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "5bc480c7-e21d-4a0c-9e2d-7db9953401b6", - "service-instance-name": "shani_cfg_pm_sanity8", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511436640616", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service_PNF", - "service-instance": { - "service-instance-id": "1fa073df-ebf3-4d8d-8b30-2d60d1df84be", - "service-instance-name": "macro_1", - "service-type": "Transform", - "service-role": "PNF", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "9a4d9d41-e686-43da-a558-c45448d6023a", - "resource-version": "1511339191417", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_PNF_2" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9a4d9d41-e686-43da-a558-c45448d6023a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_PNF" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "43596836-ae36-4608-a987-6608ede10dac" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "38ab2b5c-63d0-48c2-a7a8-7f218270a7da", - "service-instance-name": "lkjkjdfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511956863413", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "3ed83f85-3c0a-48ca-9e9d-90de3e896572", - "service-instance-name": "dsfgfdgfdgdf88", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1512307818748", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "06-15-VID-Issue-SERVICE", - "service-instance": { - "service-instance-id": "dab6ac44-17e0-4aa6-9680-ea4214f23260", - "service-instance-name": "tyiyui", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", - "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", - "resource-version": "1512315000975", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ae5d24f4-f602-46d0-9a62-ed3f28928b50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "2fa617d0-50b3-4d74-861d-4b39301acd2c" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "900f026f-1192-4bc0-b678-73ca9cd322d1", - "service-instance-name": "jkhgjkfg", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1512373651939", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "ea880103-dbd5-4d21-aaa7-f8ebac440818", - "service-instance-name": "sanity33", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509614222525", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "b93a4674-0bf0-44dc-8431-8af8c4e4b8e1", - "service-instance-name": "hghgEWTWG", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510245286466", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "ChaniPick", - "service-instance": { - "service-instance-id": "63680970-b1d9-41c8-90d1-eb00f87c5919", - "service-instance-name": "fghfghgfhhgfhfghfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "91fb7ec2-f05d-45dd-8690-f381a5c970c3", - "model-version-id": "0856b6e0-4bc2-4f61-96f5-b9469a101181", - "resource-version": "1509368073925", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ChaniPick" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "0856b6e0-4bc2-4f61-96f5-b9469a101181" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ChaniPick" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "91fb7ec2-f05d-45dd-8690-f381a5c970c3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "ariel_test_vnfonly01", - "service-instance": { - "service-instance-id": "9b108e4e-7bbf-458a-b059-eedbb46295bf", - "service-instance-name": "bvfghfhff", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "cf3fa46a-e026-4171-9496-56f5e5184b38", - "model-version-id": "e03239af-b20e-4966-aeb8-b558ef4203b6", - "resource-version": "1510265203217", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ariel_test_vnfonly01" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e03239af-b20e-4966-aeb8-b558ef4203b6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ariel_test_vnfonly01" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "cf3fa46a-e026-4171-9496-56f5e5184b38" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "AlinaTest0714", - "service-instance": { - "service-instance-id": "a64033f8-1035-4286-9dd5-92c248b6671e", - "service-instance-name": "shaninumber", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "ceab97cd-ca68-41a6-9b34-d571b2dd05ed", - "model-version-id": "1a6ae314-7a89-408b-93e5-6d8b8ee4c28a", - "resource-version": "1510586085248", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "test service for Byung" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "1a6ae314-7a89-408b-93e5-6d8b8ee4c28a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "AlinaTest0714" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "ceab97cd-ca68-41a6-9b34-d571b2dd05ed" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "b8fe12c0-5ebe-4592-a984-089d9e0eeb00", - "service-instance-name": "shani_pmTest_sanity8", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510726327332", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "affb2e0e-32de-494c-bfdb-ab49643bd263", - "service-instance-name": "net5shanii", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510731361356", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "e04f9e1c-e2ae-4212-9fbf-e092840ee46f", - "service-instance-name": "fgghjghjhg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510739272610", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "BJ_vDBE_Service", - "service-instance": { - "service-instance-id": "16785eac-7537-405e-a814-2f1dc58b3f80", - "service-instance-name": "BJ_vDBE_Service_vdi", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "3993cc03-f8d4-4a5c-b4ef-06a77743eba7", - "model-version-id": "6fd530e1-5f30-48f9-a301-750353e66599", - "resource-version": "1510953400508", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "BJ_vDBE_Service_1" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "6fd530e1-5f30-48f9-a301-750353e66599" - }, - { - "property-name": "model-ver.model-name", - "property-value": "BJ_vDBE_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "3993cc03-f8d4-4a5c-b4ef-06a77743eba7" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Clear Service Shani", - "service-instance": { - "service-instance-id": "06b9419f-9d3f-432b-b5f9-152f69723683", - "service-instance-name": "serivce_shay", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "241e071e-7445-48b1-b05e-deb7926e49f8", - "model-version-id": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e", - "resource-version": "1511096310692", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "241e071e-7445-48b1-b05e-deb7926e49f8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "a9c9bc36-9b6b-4dcf-9dbd-d3b8ac98bb08", - "service-instance-name": "tgjghjhgjhgj", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511103149152", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "691e5947-19aa-47b5-b072-aba3701a00c0", - "service-instance-name": "reg3a", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511159558051", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "Dip_221117_Service", - "service-instance": { - "service-instance-id": "9f9b27a9-fd95-4064-a303-f9744e1a7a3c", - "service-instance-name": "dip_serinst", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "dc621f45-db9c-42b2-a182-b429c675ef26", - "model-version-id": "0c628f95-b7ad-420a-87c6-80f8893d2629", - "resource-version": "1511385760681", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Add Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "0c628f95-b7ad-420a-87c6-80f8893d2629" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Dip_221117_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "dc621f45-db9c-42b2-a182-b429c675ef26" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "38154be9-e6e6-4903-86ea-f867ddfdd88d", - "service-instance-name": "sdfgdffd", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1512317905490", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Service_PNF", - "service-instance": { - "service-instance-id": "e32970bc-4cc7-4574-b2b6-15dc10c51328", - "service-instance-name": "tytytru7", - "service-type": "Transform", - "service-role": "PNF", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "9a4d9d41-e686-43da-a558-c45448d6023a", - "resource-version": "1512312663089", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_PNF_2" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9a4d9d41-e686-43da-a558-c45448d6023a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_PNF" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "43596836-ae36-4608-a987-6608ede10dac" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "646de125-bb00-4e9a-8f9d-2ee9f275dd53", - "service-instance-name": "sanity06macro", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510051690302", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "a170a02e-5eb2-4fcb-b236-fe0101e8f9c2", - "service-instance-name": "dfggf.1", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510064179849", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "35fcb108-21bf-4a96-9644-d38d22491c1e", - "service-instance-name": "macro_2", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510158949346", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "7e0d64f5-dc67-48a3-bedf-f1dab87f011e", - "service-instance-name": "sanity003", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510564924456", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "aad8ed06-f432-4334-8f76-aaf2e8b1135e", - "service-instance-name": "PM1234", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510577187877", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Mvm2017-417041917_IST_Service", - "service-instance": { - "service-instance-id": "56d43b2a-2d55-412c-80e2-b496c0268151", - "service-instance-name": "MVM_instance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "4cc34fbb-e99f-49d1-854a-f6474670b373", - "model-version-id": "10e0fe81-172a-4f15-acb0-68fd28120771", - "resource-version": "1510832704173", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Mvm2017-417041917_IST_Service - E2E Service creating in IST to check -Updating Service with latest vf" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "10e0fe81-172a-4f15-acb0-68fd28120771" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Mvm2017-417041917_IST_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "4cc34fbb-e99f-49d1-854a-f6474670b373" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "08085da8-0836-48fd-b0b7-f25f0191720d", - "service-instance-name": "oiuytre", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510836497023", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Ver1with_inputs_Ver2without_inputs", - "service-instance": { - "service-instance-id": "ebf3ef3f-63ac-4652-95ca-9358b4b65f2a", - "service-instance-name": "noinputs", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "821b337c-d1d6-41b8-91f2-62acbeea74e0", - "model-version-id": "efcbf4dc-4a83-4c86-987e-4e35a25dd890", - "resource-version": "1511176867478", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "efcbf4dc-4a83-4c86-987e-4e35a25dd890" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "821b337c-d1d6-41b8-91f2-62acbeea74e0" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "21227284-b6d1-4cf4-ba04-6a7e70725cf3", - "service-instance-name": "tghjrthr", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511179806111", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "8b0e0064-c2ec-40cb-a1e7-32708d29cf9f", - "service-instance-name": "oe_step4", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511185002297", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "99e3a5fa-d8ed-4b0d-b2ac-c6b3aa519d3d", - "service-instance-name": "MSO-ST-SI-1712-vSamp10a-PCM-126-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1512577438341", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "a86149da-05ca-424b-8477-3464ba1b660b", - "service-instance-name": "defghghj_cdg", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510568355774", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "102cc0d3-e21e-4671-9078-c80ec17c6632", - "service-instance-name": "vidnf1707", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510573503448", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Service_with_network_with_subnet_info", - "service-instance": { - "service-instance-id": "37511a1d-182d-4b67-9b59-a07a4cde980e", - "service-instance-name": "subnet_service", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "b72eb6fe-070b-484b-836a-4c4fdf016817", - "model-version-id": "7d27189c-9d96-45de-92f6-8fafd543d9eb", - "resource-version": "1511165928126", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_with_network_with_subnet_info" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "7d27189c-9d96-45de-92f6-8fafd543d9eb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_with_network_with_subnet_info" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b72eb6fe-070b-484b-836a-4c4fdf016817" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "44719876-3083-44ae-9c9f-330158fc2a03", - "service-instance-name": "kjhgdfssd", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511434850122", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "5a987291-57de-4f5a-8f13-bf0b83924ab5", - "service-instance-name": "macro_instance_sanity06", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511435849163", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "6c0f1667-2dab-4b88-9cd3-2e9462c0f278", - "service-instance-name": "fgjhg.fgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509633002414", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "d47bfc99-c021-498e-87c8-7273ee160172", - "service-instance-name": "sanity03", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510047060871", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "e99c03c3-5748-4c24-a770-176c6b226223", - "service-instance-name": "ghjhjhgjkh", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511881237177", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "078cc9a4-34df-4508-a872-5771c197e898", - "service-instance-name": "pm_service", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510157749550", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "09df2bc4-2a94-48e6-885a-b1465ac96974", - "service-instance-name": "service_instance_ss_22", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510158367169", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Service With VF Shani", - "service-instance": { - "service-instance-id": "5370c6cd-8037-4dce-a13c-fa34483f5cb9", - "service-instance-name": "nbnvnvmn", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "f07db45c-949c-4698-94c3-5a328a0d4d4f", - "model-version-id": "8c4093ce-404f-416a-a91c-4c146b5945db", - "resource-version": "1510264975222", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "8c4093ce-404f-416a-a91c-4c146b5945db" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "f07db45c-949c-4698-94c3-5a328a0d4d4f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "4f6f291d-90ca-41dd-9dbb-ec3c62d47c77", - "service-instance-name": "xcvbnmfghj", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510836914620", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "60e8b42f-6f30-436b-9158-1022d69b98de", - "service-instance-name": "vmeeeee", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1510848255404", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "d273900d-a452-4330-99cd-d0aeb4826629", - "service-instance-name": "reg2", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1511158435811", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "Ver1with_inputs_Ver2without_inputs", - "service-instance": { - "service-instance-id": "3da86740-528d-4409-9d0c-f5c4a13f2158", - "service-instance-name": "fghfghgf", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "821b337c-d1d6-41b8-91f2-62acbeea74e0", - "model-version-id": "93a77919-7e3e-477b-97b4-f756cc85a281", - "resource-version": "1511175822262", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93a77919-7e3e-477b-97b4-f756cc85a281" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "821b337c-d1d6-41b8-91f2-62acbeea74e0" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "Lital_Port_Mirroring_SVC", - "service-instance": { - "service-instance-id": "9e794181-1d8d-4478-811e-22bcb2954250", - "service-instance-name": "Instance371386", - "service-type": "PORT-MIRROR", - "service-role": "VPROBE", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "96c66f9a-5171-4234-a9f6-40a9b51cf2f9", - "model-version-id": "455c6848-c910-45f9-a402-8283cdb119e1", - "resource-version": "1512673992546", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/9e794181-1d8d-4478-811e-22bcb2954250/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Lital_Port_Mirroring_SVC" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "455c6848-c910-45f9-a402-8283cdb119e1" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Lital_Port_Mirroring_SVC" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "96c66f9a-5171-4234-a9f6-40a9b51cf2f9" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "SDC_ServiceModel_Portal03", - "service-instance": { - "service-instance-id": "cf6a5227-0e7b-44d4-b079-c259aaf34960", - "service-instance-name": "NewInstance_123", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "0f0b5c20-d9e0-4904-8303-2a44df1a673f", - "model-version-id": "ab9ecd71-83e6-4225-8b3c-e3fd2bff54e0", - "resource-version": "1512508318711", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SDC_ServiceModel_Portal03" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ab9ecd71-83e6-4225-8b3c-e3fd2bff54e0" - }, - { - "property-name": "model-ver.model-name", - "property-value": "SDC_ServiceModel_Portal03" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "0f0b5c20-d9e0-4904-8303-2a44df1a673f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "a6f4113f-86ea-4218-a0dc-bd2ce304be61", - "service-instance-name": "dfgdfgdgd", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1512377557678", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "029a23a2-2d4b-4bcb-b912-c6faf680db1d", - "service-instance-name": "shani000002", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1511434238472", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "c15fe241-c00a-4826-8fed-5014299df488", - "service-instance-name": "sdf", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509021900268", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "06-15-VID-Issue-SERVICE", - "service-instance": { - "service-instance-id": "43300442-d455-42b9-87cd-15cbc05d98d5", - "service-instance-name": "InstanceName_-.", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", - "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", - "resource-version": "1511779626467", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ae5d24f4-f602-46d0-9a62-ed3f28928b50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "2fa617d0-50b3-4d74-861d-4b39301acd2c" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "8690c96e-23b2-4323-87e7-26c25f7804e9", - "service-instance-name": "gkkk", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511761450698", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "a29bf3be-816e-4128-bc83-fa8a6d347118", - "service-instance-name": "deployPM", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511883371551", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "fdf95043-bf0d-435d-b222-b04d54f909cd", - "service-instance-name": "kjhkjhkjhk", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511788905599", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "6bb59496-8745-4b7c-9bb0-f2add303cd7b", - "service-instance-name": "yujutyutyuty", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1512302067216", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "ADIOD adhoc SRIOV Provider Network", - "service-instance": { - "service-instance-id": "d1676469-b555-417c-8655-5ce9cdb2e54c", - "service-instance-name": "dsfgdfgdfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "37df8e9b-3a8f-4070-8e86-dfb11161e7aa", - "model-version-id": "585a5172-0124-4bc9-b76e-c358093fb522", - "resource-version": "1512316855016", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "PID 291364a adhoc testing" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "585a5172-0124-4bc9-b76e-c358093fb522" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ADIOD adhoc SRIOV Provider Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "37df8e9b-3a8f-4070-8e86-dfb11161e7aa" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service For Macro Installation", - "service-instance": { - "service-instance-id": "9c16c382-8001-4dc9-8fa9-e8ac345df8cd", - "service-instance-name": "yutyutyut0", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", - "model-version-id": "b9436fbb-dc96-4163-90b8-846c6518a05a", - "resource-version": "1512381957060", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b9436fbb-dc96-4163-90b8-846c6518a05a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "ServiceForPortMirroringTest", - "service-instance": { - "service-instance-id": "a0d58fd3-0bcd-468b-83ee-8945223e2728", - "service-instance-name": "RG_10-25_PortMirror", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "47222909-317e-41e5-a44b-6a4d5e4afd6c", - "model-version-id": "fd1b87b2-898f-41ad-93ac-c6e8e200280d", - "resource-version": "1508951185010", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceForPortMirroringTest" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "fd1b87b2-898f-41ad-93ac-c6e8e200280d" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceForPortMirroringTest" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "47222909-317e-41e5-a44b-6a4d5e4afd6c" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "b814d896-c630-4e87-8a8c-9c466d46420e", - "service-instance-name": "pmm", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509548195386", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "bf8856d0-1257-47da-9db8-c5cc619a5b4f", - "service-instance-name": "NewPM_1030", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f", - "resource-version": "1509390159180", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "7.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "d830c755-16e5-47e3-9053-35da8b83f630", - "service-instance-name": "ghjhg_h", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509633743082", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "mdns_2017_1011_IST_Service", - "service-instance": { - "service-instance-id": "f378264e-bb84-4444-b406-d9153b3bcaaa", - "service-instance-name": "NewTest_1106", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "c54c1178-ab4b-498c-aea0-52cc2043d44f", - "model-version-id": "6fcbe458-fe21-4c68-b131-3fe7ec26e17a", - "resource-version": "1510003414035", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "mdns_2017_1011_IST_Service -Creating Service for PID 298109a" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "6fcbe458-fe21-4c68-b131-3fe7ec26e17a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "mdns_2017_1011_IST_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "c54c1178-ab4b-498c-aea0-52cc2043d44f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "65c4c22d-0b37-4ed3-b6d3-902d1c0d8834", - "service-instance-name": "fghghgfh_cfg", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510568658568", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "76a9d5b5-733c-453f-bc30-ec8e26fe7bbf", - "service-instance-name": "jkjkjkl9887", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510576422163", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "fc782096-7232-4099-ad5a-044b9ffaa3d7", - "service-instance-name": "Shani_Regression_5", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510819081691", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "bd58287e-186a-4490-9776-11c25f5a96aa", - "service-instance-name": "TwoSanity2", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1511094049552", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "6699ae39-2df6-4ade-8f51-dcfa3f77336c", - "service-instance-name": "sdfh7iu6ytr", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511102636703", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "1b4f600c-3bd6-4e9a-8f22-7fe950937c59", - "service-instance-name": "dfgghdf", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510662887894", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "55e20cb6-75ea-4df7-a56c-bbeef278c5b9", - "service-instance-name": "sddddsa", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510733725706", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "05b4960c-b138-47f0-90d5-d7d543fcd6d9", - "service-instance-name": "instance_of_vprobe", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1511265743057", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - } - ] - } - } - ] - } - } -} diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_CAR_2020_ER.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_CAR_2020_ER.json new file mode 100644 index 000000000..496461cbe --- /dev/null +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_CAR_2020_ER.json @@ -0,0 +1,2460 @@ +{ + "simulatorRequest": { + "method": "POST", + "path": "/aai/search/named-query", + "body": { + "instance-filters": { + "instance-filter": [ + { + "customer": { + "global-customer-id": "CAR_2020_ER" + }, + "service-subscription": { + "service-type": "MSO-dev-service-type" + } + } + ] + }, + "query-parameters": { + "named-query": { + "named-query-uuid": "6e806bc2-8f9b-4534-bb68-be91267ff6c8" + } + } + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "inventory-response-item": [ + { + "service-subscription": { + "service-type": "MSO-dev-service-type", + "resource-version": "1494001884455" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "service-instance": { + "service-instance-id": "c4e40635-759f-4e3c-a739-2533473eb599", + "service-instance-name": "mz1936_SERVICE78", + "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "resource-version": "1494001997249" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "a620a5c5-191b-453a-a956-75b08d2e26bc", + "service-instance-name": "mz1936_SERVICE77", + "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "resource-version": "1494002003533" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "b0fddaaa-e9a8-41eb-848c-4204c97529e3", + "service-instance-name": "MSO_ST_12_2_2", + "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", + "resource-version": "1494002000838" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "8abbdf22-9ffa-4871-98a9-3cfbb36eefc1", + "service-instance-name": "mz1936_SERVICE79", + "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "resource-version": "1494002000841" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "acd0bfc5-8de4-404a-b5a0-25b224ccda78", + "service-instance-name": "service_test_SS01", + "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", + "resource-version": "1494001816781" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "a03a82ac-b3df-49e7-9c81-fd6ef55ba84b", + "service-instance-name": "SVC_SS_Test001", + "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", + "resource-version": "1494001771583" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "28ac6277-faf5-4673-91e3-3c53fab10b7a", + "service-instance-name": "IST+test+ldf", + "model-invariant-id": "7e8df3f0-adbb-48e0-8491-5126dbc7e989", + "resource-version": "1494001920873" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "53ad9753-6170-4236-ac7e-8815707c872e", + "service-instance-name": "larry+CORNELIUS+test+1011", + "model-invariant-id": "8a699e6f-35e6-475a-8e13-7983aa39b6ea", + "resource-version": "1494001920923" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "b10bf94d-a667-4016-b6b3-c6fbf4013a60", + "service-instance-name": "MSO_ST_12_2_5_3", + "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", + "resource-version": "1494002011859" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "9fcb7233-25f5-4ff2-8db3-4627dc84771f", + "service-instance-name": "VID+instance+demo", + "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", + "resource-version": "1494001859427" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "a4bbe019-3592-4d46-b7a2-368a99ae5667", + "service-instance-name": "svc_test_002", + "model-invariant-id": "b08fe7cd-cee2-40b4-a22b-aa2bfe91e21c", + "resource-version": "1494001796817" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "99999999999999994", + "service-instance-name": "RaaSIName-4", + "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", + "resource-version": "1494001954447" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "459ecc8a-d75a-41e9-ab29-7c21d5dcd368", + "service-instance-name": "SI_Jw2", + "model-invariant-id": "b08fe7cd-cee2-40b4-a22b-aa2bfe91e21c", + "resource-version": "1494001817414" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "b6c17f81-8abd-4c35-8074-c37c5a869195", + "service-instance-name": "TestToDelete-10", + "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", + "resource-version": "1494001838858" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "99999999999999992", + "service-instance-name": "RaaSIName-3", + "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", + "resource-version": "1494002003548" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "be824c3e-e915-4cf3-8f33-41f4344bdcfa", + "service-instance-name": "VivISTmns1012", + "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", + "resource-version": "1494001959455" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "fbd67eec-526d-4306-9ab9-8350265578b9", + "service-instance-name": "Viv+demo+test+2", + "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", + "resource-version": "1494001922217" + }, + "extra-properties": {} + }, + { + "service-instance": { + "service-instance-id": "23427b7f-f9a4-439f-9992-fbbd1c4adcee", + "service-instance-name": "A%20-%20D_Test3", + "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", + "resource-version": "1494001797865" + }, + "extra-properties": {} + }, + { + "model-name": "vidmacrofalsenaming", + "service-instance": { + "service-instance-id": "35fcb108-21bf-4a96-9644-d38d22491c1e", + "service-instance-name": "macro_2", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", + "resource-version": "1510158949346", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "vidmacrofalsenaming" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" + }, + { + "property-name": "model-ver.model-name", + "property-value": "vidmacrofalsenaming" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "3.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "7e0d64f5-dc67-48a3-bedf-f1dab87f011e", + "service-instance-name": "sanity003", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1510564924456", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "aad8ed06-f432-4334-8f76-aaf2e8b1135e", + "service-instance-name": "PM1234", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1510577187877", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "Mvm2017-417041917_IST_Service", + "service-instance": { + "service-instance-id": "56d43b2a-2d55-412c-80e2-b496c0268151", + "service-instance-name": "MVM_instance", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "4cc34fbb-e99f-49d1-854a-f6474670b373", + "model-version-id": "10e0fe81-172a-4f15-acb0-68fd28120771", + "resource-version": "1510832704173", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "Mvm2017-417041917_IST_Service - E2E Service creating in IST to check -Updating Service with latest vf" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "10e0fe81-172a-4f15-acb0-68fd28120771" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Mvm2017-417041917_IST_Service" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "4cc34fbb-e99f-49d1-854a-f6474670b373" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "08085da8-0836-48fd-b0b7-f25f0191720d", + "service-instance-name": "oiuytre", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1510836497023", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "Ver1with_inputs_Ver2without_inputs", + "service-instance": { + "service-instance-id": "ebf3ef3f-63ac-4652-95ca-9358b4b65f2a", + "service-instance-name": "noinputs", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "821b337c-d1d6-41b8-91f2-62acbeea74e0", + "model-version-id": "efcbf4dc-4a83-4c86-987e-4e35a25dd890", + "resource-version": "1511176867478", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "Ver1with_inputs_Ver2without_inputs" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "efcbf4dc-4a83-4c86-987e-4e35a25dd890" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Ver1with_inputs_Ver2without_inputs" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "821b337c-d1d6-41b8-91f2-62acbeea74e0" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "5.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "21227284-b6d1-4cf4-ba04-6a7e70725cf3", + "service-instance-name": "tghjrthr", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1511179806111", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "Using VID for VoIP Network Instantiations Shani", + "service-instance": { + "service-instance-id": "8b0e0064-c2ec-40cb-a1e7-32708d29cf9f", + "service-instance-name": "oe_step4", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", + "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", + "resource-version": "1511185002297", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "Using VID for VoIP Network Instantiations Shani" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Using VID for VoIP Network Instantiations Shani" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1.0" + } + ] + } + }, + { + "model-name": "InfraMSO_vSAMP10a_Service", + "service-instance": { + "service-instance-id": "99e3a5fa-d8ed-4b0d-b2ac-c6b3aa519d3d", + "service-instance-name": "MSO-ST-SI-1712-vSamp10a-PCM-126-01", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", + "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", + "resource-version": "1512577438341", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "InfraMSO_vSAMP10a_Service" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" + }, + { + "property-name": "model-ver.model-name", + "property-value": "InfraMSO_vSAMP10a_Service" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "4.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "a86149da-05ca-424b-8477-3464ba1b660b", + "service-instance-name": "defghghj_cdg", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1510568355774", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "102cc0d3-e21e-4671-9078-c80ec17c6632", + "service-instance-name": "vidnf1707", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1510573503448", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "Service_with_network_with_subnet_info", + "service-instance": { + "service-instance-id": "37511a1d-182d-4b67-9b59-a07a4cde980e", + "service-instance-name": "subnet_service", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "b72eb6fe-070b-484b-836a-4c4fdf016817", + "model-version-id": "7d27189c-9d96-45de-92f6-8fafd543d9eb", + "resource-version": "1511165928126", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "Service_with_network_with_subnet_info" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "7d27189c-9d96-45de-92f6-8fafd543d9eb" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Service_with_network_with_subnet_info" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "b72eb6fe-070b-484b-836a-4c4fdf016817" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "44719876-3083-44ae-9c9f-330158fc2a03", + "service-instance-name": "kjhgdfssd", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1511434850122", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "vidmacrofalsenaming", + "service-instance": { + "service-instance-id": "5a987291-57de-4f5a-8f13-bf0b83924ab5", + "service-instance-name": "macro_instance_sanity06", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", + "resource-version": "1511435849163", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "vidmacrofalsenaming" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" + }, + { + "property-name": "model-ver.model-name", + "property-value": "vidmacrofalsenaming" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "3.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "6c0f1667-2dab-4b88-9cd3-2e9462c0f278", + "service-instance-name": "fgjhg.fgh", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1509633002414", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "d47bfc99-c021-498e-87c8-7273ee160172", + "service-instance-name": "sanity03", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1510047060871", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "vidmacrofalsenaming", + "service-instance": { + "service-instance-id": "e99c03c3-5748-4c24-a770-176c6b226223", + "service-instance-name": "ghjhjhgjkh", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", + "resource-version": "1511881237177", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "vidmacrofalsenaming" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" + }, + { + "property-name": "model-ver.model-name", + "property-value": "vidmacrofalsenaming" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "3.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "078cc9a4-34df-4508-a872-5771c197e898", + "service-instance-name": "pm_service", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1510157749550", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "09df2bc4-2a94-48e6-885a-b1465ac96974", + "service-instance-name": "service_instance_ss_22", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1510158367169", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "Service With VF Shani", + "service-instance": { + "service-instance-id": "5370c6cd-8037-4dce-a13c-fa34483f5cb9", + "service-instance-name": "nbnvnvmn", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "f07db45c-949c-4698-94c3-5a328a0d4d4f", + "model-version-id": "8c4093ce-404f-416a-a91c-4c146b5945db", + "resource-version": "1510264975222", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "Service With VF Shani" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "8c4093ce-404f-416a-a91c-4c146b5945db" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Service With VF Shani" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "f07db45c-949c-4698-94c3-5a328a0d4d4f" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "4f6f291d-90ca-41dd-9dbb-ec3c62d47c77", + "service-instance-name": "xcvbnmfghj", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1510836914620", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "Vgeraldine_Mor_Service", + "service-instance": { + "service-instance-id": "60e8b42f-6f30-436b-9158-1022d69b98de", + "service-instance-name": "vgeraldineeee", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", + "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", + "resource-version": "1510848255404", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "Vgeraldine_Mor_Service" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Vgeraldine_Mor_Service" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "d273900d-a452-4330-99cd-d0aeb4826629", + "service-instance-name": "reg2", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", + "resource-version": "1511158435811", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "11.0" + } + ] + } + }, + { + "model-name": "Ver1with_inputs_Ver2without_inputs", + "service-instance": { + "service-instance-id": "3da86740-528d-4409-9d0c-f5c4a13f2158", + "service-instance-name": "fghfghgf", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "821b337c-d1d6-41b8-91f2-62acbeea74e0", + "model-version-id": "93a77919-7e3e-477b-97b4-f756cc85a281", + "resource-version": "1511175822262", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "Ver1with_inputs_Ver2without_inputs" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "93a77919-7e3e-477b-97b4-f756cc85a281" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Ver1with_inputs_Ver2without_inputs" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "821b337c-d1d6-41b8-91f2-62acbeea74e0" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "4.0" + } + ] + } + }, + { + "model-name": "Lital_Port_Mirroring_SVC", + "service-instance": { + "service-instance-id": "9e794181-1d8d-4478-811e-22bcb2954250", + "service-instance-name": "Instance371386", + "service-type": "PORT-MIRROR", + "service-role": "VPROBE", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "96c66f9a-5171-4234-a9f6-40a9b51cf2f9", + "model-version-id": "455c6848-c910-45f9-a402-8283cdb119e1", + "resource-version": "1512673992546", + "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/9e794181-1d8d-4478-811e-22bcb2954250/service-data/service-topology/", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "Lital_Port_Mirroring_SVC" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "455c6848-c910-45f9-a402-8283cdb119e1" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Lital_Port_Mirroring_SVC" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "96c66f9a-5171-4234-a9f6-40a9b51cf2f9" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1.0" + } + ] + } + }, + { + "model-name": "SDC_ServiceModel_Portal03", + "service-instance": { + "service-instance-id": "cf6a5227-0e7b-44d4-b079-c259aaf34960", + "service-instance-name": "NewInstance_123", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "0f0b5c20-d9e0-4904-8303-2a44df1a673f", + "model-version-id": "ab9ecd71-83e6-4225-8b3c-e3fd2bff54e0", + "resource-version": "1512508318711", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "SDC_ServiceModel_Portal03" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ab9ecd71-83e6-4225-8b3c-e3fd2bff54e0" + }, + { + "property-name": "model-ver.model-name", + "property-value": "SDC_ServiceModel_Portal03" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "0f0b5c20-d9e0-4904-8303-2a44df1a673f" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "a6f4113f-86ea-4218-a0dc-bd2ce304be61", + "service-instance-name": "dfgdfgdgd", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1512377557678", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "029a23a2-2d4b-4bcb-b912-c6faf680db1d", + "service-instance-name": "shani000002", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", + "resource-version": "1511434238472", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "11.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "c15fe241-c00a-4826-8fed-5014299df488", + "service-instance-name": "sdf", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1509021900268", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "06-15-VID-Issue-SERVICE", + "service-instance": { + "service-instance-id": "43300442-d455-42b9-87cd-15cbc05d98d5", + "service-instance-name": "InstanceName_-.", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "Production", + "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", + "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", + "resource-version": "1511779626467", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "06-15-VID-Issue-SERVICE" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ae5d24f4-f602-46d0-9a62-ed3f28928b50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "06-15-VID-Issue-SERVICE" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "2fa617d0-50b3-4d74-861d-4b39301acd2c" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "8690c96e-23b2-4323-87e7-26c25f7804e9", + "service-instance-name": "gkkk", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1511761450698", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "a29bf3be-816e-4128-bc83-fa8a6d347118", + "service-instance-name": "deployPM", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1511883371551", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "vidmacrofalsenaming", + "service-instance": { + "service-instance-id": "fdf95043-bf0d-435d-b222-b04d54f909cd", + "service-instance-name": "kjhkjhkjhk", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", + "resource-version": "1511788905599", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "vidmacrofalsenaming" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" + }, + { + "property-name": "model-ver.model-name", + "property-value": "vidmacrofalsenaming" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "3.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "6bb59496-8745-4b7c-9bb0-f2add303cd7b", + "service-instance-name": "yujutyutyuty", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", + "resource-version": "1512302067216", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "11.0" + } + ] + } + }, + { + "model-name": "PASQUALE adhoc SRIOV Provider Network", + "service-instance": { + "service-instance-id": "d1676469-b555-417c-8655-5ce9cdb2e54c", + "service-instance-name": "dsfgdfgdfg", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "37df8e9b-3a8f-4070-8e86-dfb11161e7aa", + "model-version-id": "585a5172-0124-4bc9-b76e-c358093fb522", + "resource-version": "1512316855016", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "PID 291364a adhoc testing" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "585a5172-0124-4bc9-b76e-c358093fb522" + }, + { + "property-name": "model-ver.model-name", + "property-value": "PASQUALE adhoc SRIOV Provider Network" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "37df8e9b-3a8f-4070-8e86-dfb11161e7aa" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "Service For Macro Installation", + "service-instance": { + "service-instance-id": "9c16c382-8001-4dc9-8fa9-e8ac345df8cd", + "service-instance-name": "yutyutyut0", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", + "model-version-id": "b9436fbb-dc96-4163-90b8-846c6518a05a", + "resource-version": "1512381957060", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "Service For Macro Installation" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "b9436fbb-dc96-4163-90b8-846c6518a05a" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Service For Macro Installation" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "ServiceForPortMirroringTest", + "service-instance": { + "service-instance-id": "a0d58fd3-0bcd-468b-83ee-8945223e2728", + "service-instance-name": "RG_10-25_PortMirror", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "47222909-317e-41e5-a44b-6a4d5e4afd6c", + "model-version-id": "fd1b87b2-898f-41ad-93ac-c6e8e200280d", + "resource-version": "1508951185010", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "ServiceForPortMirroringTest" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "fd1b87b2-898f-41ad-93ac-c6e8e200280d" + }, + { + "property-name": "model-ver.model-name", + "property-value": "ServiceForPortMirroringTest" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "47222909-317e-41e5-a44b-6a4d5e4afd6c" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "3.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "b814d896-c630-4e87-8a8c-9c466d46420e", + "service-instance-name": "pmm", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1509548195386", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "ServiceContainerMor", + "service-instance": { + "service-instance-id": "bf8856d0-1257-47da-9db8-c5cc619a5b4f", + "service-instance-name": "NewPM_1030", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", + "model-version-id": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f", + "resource-version": "1509390159180", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "ServiceContainerMor" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "ServiceContainerMor" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "7.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "d830c755-16e5-47e3-9053-35da8b83f630", + "service-instance-name": "ghjhg_h", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1509633743082", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "CHARLOTTE_2017_1011_IST_Service", + "service-instance": { + "service-instance-id": "f378264e-bb84-4444-b406-d9153b3bcaaa", + "service-instance-name": "NewTest_1106", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "c54c1178-ab4b-498c-aea0-52cc2043d44f", + "model-version-id": "6fcbe458-fe21-4c68-b131-3fe7ec26e17a", + "resource-version": "1510003414035", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "CHARLOTTE_2017_1011_IST_Service -Creating Service for PID 298109a" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "6fcbe458-fe21-4c68-b131-3fe7ec26e17a" + }, + { + "property-name": "model-ver.model-name", + "property-value": "CHARLOTTE_2017_1011_IST_Service" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "c54c1178-ab4b-498c-aea0-52cc2043d44f" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "65c4c22d-0b37-4ed3-b6d3-902d1c0d8834", + "service-instance-name": "fghghgfh_cfg", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1510568658568", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "76a9d5b5-733c-453f-bc30-ec8e26fe7bbf", + "service-instance-name": "jkjkjkl9887", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1510576422163", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "fc782096-7232-4099-ad5a-044b9ffaa3d7", + "service-instance-name": "Shani_Regression_5", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", + "resource-version": "1510819081691", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "9.0" + } + ] + } + }, + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "bd58287e-186a-4490-9776-11c25f5a96aa", + "service-instance-name": "TwoSanity2", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", + "resource-version": "1511094049552", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" + }, + { + "property-name": "model-ver.model-name", + "property-value": "1707vidnf" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "11.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "6699ae39-2df6-4ade-8f51-dcfa3f77336c", + "service-instance-name": "sdfh7iu6ytr", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1511102636703", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "vidmacrofalsenaming", + "service-instance": { + "service-instance-id": "1b4f600c-3bd6-4e9a-8f22-7fe950937c59", + "service-instance-name": "dfgghdf", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", + "resource-version": "1510662887894", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "vidmacrofalsenaming" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" + }, + { + "property-name": "model-ver.model-name", + "property-value": "vidmacrofalsenaming" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "3.0" + } + ] + } + }, + { + "model-name": "shani_PM_Test", + "service-instance": { + "service-instance-id": "55e20cb6-75ea-4df7-a56c-bbeef278c5b9", + "service-instance-name": "sddddsa", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1510733725706", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "shani_PM_Test description" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" + }, + { + "property-name": "model-ver.model-name", + "property-value": "shani_PM_Test" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "2.0" + } + ] + } + }, + { + "model-name": "Service_VProbe_FE", + "service-instance": { + "service-instance-id": "05b4960c-b138-47f0-90d5-d7d543fcd6d9", + "service-instance-name": "instance_of_vprobe", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", + "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", + "resource-version": "1511265743057", + "orchestration-status": "Active" + }, + "extra-properties": { + "extra-property": [ + { + "property-name": "model-ver.model-description", + "property-value": "Service_VProbe_FE" + }, + { + "property-name": "model-ver.model-version-id", + "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" + }, + { + "property-name": "model-ver.model-name", + "property-value": "Service_VProbe_FE" + }, + { + "property-name": "model.model-type", + "property-value": "service" + }, + { + "property-name": "model.model-invariant-id", + "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" + }, + { + "property-name": "model.model-description" + }, + { + "property-name": "model-ver.model-version", + "property-value": "1.0" + } + ] + } + } + ] + } + } + ] + } + } +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_MSO_1610_ST.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_MSO_1610_ST.json deleted file mode 100644 index fb4340c2f..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_MSO_1610_ST.json +++ /dev/null @@ -1,15571 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/aai/search/named-query", - "body": { - "instance-filters": { - "instance-filter": [ - { - "customer": { - "global-customer-id": "MSO_1610_ST" - }, - "service-subscription": { - "service-type": "MSO-dev-service-type" - } - } - ] - }, - "query-parameters": { - "named-query": { - "named-query-uuid": "6e806bc2-8f9b-4534-bb68-be91267ff6c8" - } - } - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "inventory-response-item": [ - { - "service-subscription": { - "service-type": "MSO-dev-service-type", - "resource-version": "1494001884455" - }, - "extra-properties": {}, - "inventory-response-items": { - "inventory-response-item": [ - { - "service-instance": { - "service-instance-id": "c4e40635-759f-4e3c-a739-2533473eb599", - "service-instance-name": "mz1936_SERVICE78", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001997249" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a620a5c5-191b-453a-a956-75b08d2e26bc", - "service-instance-name": "mz1936_SERVICE77", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002003533" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b0fddaaa-e9a8-41eb-848c-4204c97529e3", - "service-instance-name": "MSO_ST_12_2_2", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002000838" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8abbdf22-9ffa-4871-98a9-3cfbb36eefc1", - "service-instance-name": "mz1936_SERVICE79", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002000841" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "acd0bfc5-8de4-404a-b5a0-25b224ccda78", - "service-instance-name": "service_test_SS01", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001816781" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a03a82ac-b3df-49e7-9c81-fd6ef55ba84b", - "service-instance-name": "SVC_SS_Test001", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001771583" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "28ac6277-faf5-4673-91e3-3c53fab10b7a", - "service-instance-name": "IST+test+ldf", - "model-invariant-id": "7e8df3f0-adbb-48e0-8491-5126dbc7e989", - "resource-version": "1494001920873" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "53ad9753-6170-4236-ac7e-8815707c872e", - "service-instance-name": "larry+pxmc+test+1011", - "model-invariant-id": "8a699e6f-35e6-475a-8e13-7983aa39b6ea", - "resource-version": "1494001920923" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b10bf94d-a667-4016-b6b3-c6fbf4013a60", - "service-instance-name": "MSO_ST_12_2_5_3", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002011859" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9fcb7233-25f5-4ff2-8db3-4627dc84771f", - "service-instance-name": "VID+instance+demo", - "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", - "resource-version": "1494001859427" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a4bbe019-3592-4d46-b7a2-368a99ae5667", - "service-instance-name": "svc_test_002", - "model-invariant-id": "b08fe7cd-cee2-40b4-a22b-aa2bfe91e21c", - "resource-version": "1494001796817" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999994", - "service-instance-name": "RaaSIName-4", - "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001954447" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "459ecc8a-d75a-41e9-ab29-7c21d5dcd368", - "service-instance-name": "SI_Jw2", - "model-invariant-id": "b08fe7cd-cee2-40b4-a22b-aa2bfe91e21c", - "resource-version": "1494001817414" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b6c17f81-8abd-4c35-8074-c37c5a869195", - "service-instance-name": "TestToDelete-10", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001838858" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999992", - "service-instance-name": "RaaSIName-3", - "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002003548" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "be824c3e-e915-4cf3-8f33-41f4344bdcfa", - "service-instance-name": "VivISTmns1012", - "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", - "resource-version": "1494001959455" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "fbd67eec-526d-4306-9ab9-8350265578b9", - "service-instance-name": "Viv+demo+test+2", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001922217" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "23427b7f-f9a4-439f-9992-fbbd1c4adcee", - "service-instance-name": "A%20-%20D_Test3", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001797865" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b0daf12c-4f7d-4918-8070-80d98a488b1c", - "service-instance-name": "MSO_ST_Val_2", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001861370" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "89ade60f-bed8-47a9-be3d-06ae533a2e8a", - "service-instance-name": "vSAMP12-88", - "model-invariant-id": "1a66578e-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001960279" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5fd1100a-cb42-4eb8-baae-355dff0e592c", - "service-instance-name": "wc248f+is+testing", - "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", - "resource-version": "1494001902993" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "11e5da68-b2cc-4d6e-ab07-7bdaa12a78f9", - "service-instance-name": "MSO.ST%201021%20%205", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001774722" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7e4a151c-2860-4c2c-8906-573656b173ee", - "service-instance-name": "mz1936_SERVICE%205", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001774728" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b8b240f7-f892-4fab-b983-f5b2fe03f2ba", - "service-instance-name": "VidTest20161006b", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001862717" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "04c25b0b-50b2-4dcb-b594-ac289bac960f", - "service-instance-name": "vSAMP10a-88", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001800355" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a10e3348-85d9-4983-80fd-fd3b9e98d38f", - "service-instance-name": "MSO_ST_RT_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001863452" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7f097589-2b04-498a-8889-e94d77444821", - "service-instance-name": "USOSTCDALTX0101VFHN01", - "model-invariant-id": "83995b31-a272-4dfe-911a-16422288cd48", - "resource-version": "1494001777112" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "31247029-bb19-4b37-a030-6aca41e510fa", - "service-instance-name": "MSO_ST_1021_2", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001884184" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "844bb147-e910-437a-a56f-3e9a6e6a4b18", - "service-instance-name": "SI_Jw1", - "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", - "resource-version": "1494001801210" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1f769e44-6839-4d36-9bce-5814bbccc952", - "service-instance-name": "service_test_001", - "model-invariant-id": "4111e6e7-ad99-4b07-a143-e60c47295936", - "resource-version": "1494001962605" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7a67e580-c646-4514-b890-4a5ed8d72c8c", - "service-instance-name": "jimmytest-0006", - "model-invariant-id": "e6f1d393-6432-4820-ab86-7a10ba4b31ac", - "resource-version": "1494001884317" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5c4af4c1-0d01-486e-8055-afc63c00a5d7", - "service-instance-name": "Idan1", - "model-invariant-id": "ba67b22f-a464-48da-aa55-79eb75c0739f", - "resource-version": "1494001905130" - }, - "extra-properties": {} - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "b5d3b0a9-8c81-4615-9c2f-a512cace3928", - "service-instance-name": "Larry_test_101916", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "a9e7f120-4d81-44b2-a88d-21a489089129", - "resource-version": "1494002074530" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "a9e7f120-4d81-44b2-a88d-21a489089129" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "bfc3d2e7-74d5-4bca-ab63-d7d5244da876", - "service-instance-name": "vSAMP12-Zone3", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001821999" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "df6fc4b3-466d-46d8-aff3-86c32fb9de2a", - "service-instance-name": "Service_test_SS002", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001777561" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "479ac8a5-35bd-4131-810b-6d4579d6e318", - "service-instance-name": "vSAMP10a-1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001864865" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "982b1a75-a299-443a-8f7a-905c116d6412", - "service-instance-name": "TestToDelete-106", - "model-invariant-id": "7e3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001822881" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c70f306d-bebf-4801-9009-f9988cf24091", - "service-instance-name": "vSAMP12-1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001802558" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5c41ea11-e800-4be7-91d1-a1f6fd4f40ca", - "service-instance-name": "jimmytest-0011", - "model-invariant-id": "e6f1d393-6432-4820-ab86-7a10ba4b31ac", - "resource-version": "1494001906340" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b3856e89-e734-4ad9-9f14-173359f05873", - "service-instance-name": "dm4252_SERVICE1", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001802580" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "38dc5506-7ba5-4293-aabe-3834be9c5635", - "service-instance-name": "jimmytest-0020", - "model-invariant-id": "e6f1d393-6432-4820-ab86-7a10ba4b31ac", - "resource-version": "1494001906342" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "780a5fb6-34fb-4df9-b3f4-f209999c0627", - "service-instance-name": "SI_Oct11", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001906387" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "cf849cc6-bcc9-400e-9d3f-585c0604dc43", - "service-instance-name": "MSO_ST_NETWORK_04", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001802958" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "e884fa6b-7b71-4953-8cc7-ec60284b2e5a", - "service-instance-name": "mz1936_SERVICE%204", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001886047" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5cab874e-b801-4a94-a0bc-1612509b917c", - "service-instance-name": "MSO_ST_11_4_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001926761" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "fb454f85-fd98-4e5d-b8da-6b254d8d786b", - "service-instance-name": "SS_service001", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001779561" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "47af2d87-5be0-4679-a2ea-2e4a594dd242", - "service-instance-name": "vSAMP10a-77", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001803277" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "55377e61-c4b9-4001-a678-73fd314b7cb3", - "service-instance-name": "VID+demo+instance", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001845574" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ac164d68-d35b-47c7-918f-1a868f00c166", - "service-instance-name": "ist+test+2+ldf", - "model-invariant-id": "7e8df3f0-adbb-48e0-8491-5126dbc7e989", - "resource-version": "1494001965111" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b432d1e1-99ec-45cb-975c-9cc75c09d1d7", - "service-instance-name": "vSAMP12-Zone2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001887020" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7614702d-eb13-4632-94ae-92b16fea4b3b", - "service-instance-name": "ldf+vDBE+svc+IST", - "model-invariant-id": "277569d9-9165-43e0-81f6-d198999bb164", - "resource-version": "1494001867830" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "51e03670-b4bc-4033-80d8-d3c12d6c2829", - "service-instance-name": "mz1936_SERVICE3", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001887279" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1f956c81-b175-4b2a-9153-f2da9a2c289e", - "service-instance-name": "SS_test", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001887283" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5601f1e4-b62e-4bd6-a2ad-7fc42f4bb894", - "service-instance-name": "i9", - "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", - "resource-version": "1494001887516" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6c1e66f8-4a08-4855-96f9-c64f9709d8b8", - "service-instance-name": "MSO_ST_updateVF", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001805044" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "591182d2-8307-48a6-89fc-b62d1ae5c8a6", - "service-instance-name": "MSO_ST_1021_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001805056" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8169d685-c638-488e-8487-d06866875369", - "service-instance-name": "TestSample_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001908867" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1bc869ce-34be-4d38-ac29-b49fbd9b1f44", - "service-instance-name": "MSO_ST_1028_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001908871" - }, - "extra-properties": {} - }, - { - "model-name": "PCRF_1610_SVC_10_13", - "service-instance": { - "service-instance-id": "0206fef7-5f35-41cc-927f-5020348e7318", - "service-instance-name": "VivISTDemo1018", - "model-invariant-id": "c8819132-38d8-4bb6-8aa2-23169721615f", - "model-version-id": "615ebe30-9f9b-49e4-9502-942717efd9e6", - "resource-version": "1494002075581" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Pcrf updated for vid 10/19/2016" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "615ebe30-9f9b-49e4-9502-942717efd9e6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "PCRF_1610_SVC_10_13" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "c8819132-38d8-4bb6-8aa2-23169721615f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "58cdc1e9-6c2d-4963-8c7c-e89c844b9e1f", - "service-instance-name": "mz1936VIDTest", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "resource-version": "1494001869760" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "aac409c2-2bf4-418e-94d0-696f9524ddea", - "service-instance-name": "wc248f+test+2", - "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", - "resource-version": "1494001806385" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "297517db-0933-41d5-9d4f-130ef9c1ec81", - "service-instance-name": "jimmytest-10007", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001848055" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9ef10027-d1fc-4eae-9c49-3d3fb2417551", - "service-instance-name": "MSO_ST_1024_3", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001869973" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7f097589-2b04-498a-8889-e94d77444820", - "service-instance-name": "vSAMP10a-ZoneV3", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001930028" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8532b508-65b5-4fc2-95ac-0e1004118af7", - "service-instance-name": "TestToDelete-2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001806786" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "441f7bcb-50b9-425c-8f7c-3c60b0371790", - "service-instance-name": "testccf-1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001848461" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "cc6fd226-b6a9-45a6-8cea-5c320dc93908", - "service-instance-name": "SI_J001", - "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", - "resource-version": "1494001870420" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "45b0ccbd-e099-4ab8-9c26-f793014c971c", - "service-instance-name": "Viv+IST+Oct6+IXLA+Network+L1-3", - "model-invariant-id": "4111e6e7-ad99-4b07-a143-e60c47295936", - "resource-version": "1494001911181" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "dc158c33-b8f1-4d64-bfdb-9e1e8880464c", - "service-instance-name": "lllsvcexample", - "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", - "resource-version": "1494001871176" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "aac1c1bf-3cdb-48b0-b290-894968648a2b", - "service-instance-name": "MSO_ST_NETWORK_02", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001931606" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f0c6646e-ff18-44f5-86e5-903833c8d482", - "service-instance-name": "mz1936_SERVICE%205", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001969332" - }, - "extra-properties": {} - }, - { - "model-name": "PCRF_1610_SVC_10_13", - "service-instance": { - "service-instance-id": "97b7a1ca-4674-4e22-b5d4-c6634aaae9ee", - "service-instance-name": "lllsvc2", - "model-invariant-id": "c8819132-38d8-4bb6-8aa2-23169721615f", - "model-version-id": "615ebe30-9f9b-49e4-9502-942717efd9e6", - "resource-version": "1494002076178" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Pcrf updated for vid 10/19/2016" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "615ebe30-9f9b-49e4-9502-942717efd9e6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "PCRF_1610_SVC_10_13" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "c8819132-38d8-4bb6-8aa2-23169721615f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "1c5f4d92-ff0c-4a3d-8a81-bf52ad8f55d6", - "service-instance-name": "test+case", - "model-invariant-id": "06b6206b-7a42-4a37-8ddc-bc6fe4464735", - "resource-version": "1494001850311" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1cd44a48-a1bb-4ea1-9bd3-b8f51f9f979f", - "service-instance-name": "MSO.ST%201021%20%205", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001891784" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "df072a0d-f1bf-46c2-9757-47c2198ec614", - "service-instance-name": "A%20-%20D_Test3", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001785749" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "86fac413-aa5f-44ed-8fb9-37c73d496f41", - "service-instance-name": "MSO_ST_1027_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001970378" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "55dc9840-1723-4836-bf9f-311c6fef088d", - "service-instance-name": "bnsNetworkV3", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001970762" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "fcfed1dd-dce6-4f06-af35-506dc0796ec6", - "service-instance-name": "MSO_ST_11_7_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001892675" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "be6986dc-6a41-4893-a6af-0ed1bcfebba2", - "service-instance-name": "bnsNetworkZone1", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001873402" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "d59a42d7-6fbb-40df-9ff3-318ec7736852", - "service-instance-name": "mz1936_SERVICE%205", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001787316" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "78d533c9-685a-469f-900f-1149c1ff903f", - "service-instance-name": "svc0001", - "model-invariant-id": "5ab25684-8164-49b2-9b5b-a8c3ac386597", - "resource-version": "1494001810689" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6e45032e-0be5-41e8-bd8a-b343b2cacb8c", - "service-instance-name": "mz1936_SERVICE%204", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001852965" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8eb3d347-3fcc-415d-b058-5cfcba5343b9", - "service-instance-name": "wc248f+wants+to+go+home", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001935213" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "238ccfc1-c0fd-4a5a-be6f-b55268a83be8", - "service-instance-name": "VNF_Jw_Test_01", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001935239" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c4daa4d7-e241-4c0e-82a8-9ad68e13db0e", - "service-instance-name": "MSO_ST_1018_D", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001894737" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "686811d1-98bc-4987-b207-394408560bf2", - "service-instance-name": "mz1936_SERVICE%204", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001853586" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "56f0203c-c445-4134-8e76-0a7fba50a70b", - "service-instance-name": "MSO.ST%201021%20%205", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001853588" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "424f7012-a441-4c39-b990-58c20cadd4d6", - "service-instance-name": "MSO_ST_1025_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001936961" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f9f95109-0850-4af6-85fb-20931f009a53", - "service-instance-name": "testsvc1007", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001939777" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "73d3ab0b-e67b-4465-a4c9-7961a93b1e6e", - "service-instance-name": "SI_Oct10", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001939784" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6f6f8bc8-6056-4c33-8a92-0d988c65aef2", - "service-instance-name": "SS_VolumeGroup_test", - "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", - "resource-version": "1494001940067" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "84acb99c-17a1-4410-8ab4-e3dc9f55206c", - "service-instance-name": "mz1936_SERVICE4", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001941860" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c136c73b-9f45-40f1-aaa3-e6ea2b5f1385", - "service-instance-name": "MSOST100", - "model-invariant-id": "18dbf3b5-a51e-4409-b754-ab7afa594912", - "resource-version": "1494001946180" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a7409e83-cc9b-4410-9e49-84f25783cbfc", - "service-instance-name": "MSO_ST_1028_5", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001946218" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "21573d47-2cf0-493b-a9e3-fe7cebd35c61", - "service-instance-name": "MSO_ST_11_30_3", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002008539" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "04c25f51-0bdb-44e6-a257-31306f51a23c", - "service-instance-name": "MSO_ST_12_2_5_4", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001833297" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "141d0cde-91ea-4dce-8b84-d077e54b560c", - "service-instance-name": "Service_Test_020", - "model-invariant-id": "6ba43345-454c-4929-9d18-34fa9ae8204f", - "resource-version": "1494001833310" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f4bf539f-dffe-4828-85c4-4428bbdb2e21", - "service-instance-name": "MSO_ST_12_2_5_5", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001833312" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "82703390-62aa-46a1-8e9f-a3a0df57bc49", - "service-instance-name": "mz1936_SERVICE6", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002003647" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1a804731-e080-4a0b-b6fc-cedf51a91d6e", - "service-instance-name": "MSO_ST_12_2_5", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001835804" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999999", - "service-instance-name": "RaaSIName-1", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001984658" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999991", - "service-instance-name": "RaaSIName-2", - "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001917697" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6d4c5dcb-1a4a-4c1e-a2eb-2933cc00cde1", - "service-instance-name": "mz1936_SERVICE%205", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001948491" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "0f56e8b1-53af-4b59-bf37-fadf73bcb63a", - "service-instance-name": "mz1936_SERVICE%205", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001948493" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8bc6c0b8-9df4-4419-92f6-45552837c27c", - "service-instance-name": "MSO_ST_NETWORK_01", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001949574" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "93c811ca-e2ed-4a37-9166-f8b276186de8", - "service-instance-name": "MSO_ST_11_30_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001972936" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ae5e1bfe-f301-4b5b-9089-49db72f3bc8d", - "service-instance-name": "MSO_ST_12_2_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002017280" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "2d564278-da14-479f-aefc-81e69ba4d028", - "service-instance-name": "ST-vSAMP10a-Zone1610", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001991559" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "4db29f8c-a003-4732-8a85-7366173829d5", - "service-instance-name": "mz1936_SERVICE80", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002003669" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ee0650ad-3486-4ee3-93a4-ef5d427738b4", - "service-instance-name": "xxx", - "model-invariant-id": "50307011-41f2-432a-aba9-7a68632c39b1", - "resource-version": "1494001876093" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "692db28b-7df1-4aca-bea1-7ac98a338639", - "service-instance-name": "MSO_ST_12_13_200", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001897708" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999995", - "service-instance-name": "RaaSIName-5", - "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001835994" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "523d669b-96da-45b9-b9b4-66e5263fdd7c", - "service-instance-name": "mtn6vSAMP10a-77", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494002001139" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "99999999999999996", - "service-instance-name": "RaaSIName-6", - "model-invariant-id": "fe3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001789829" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c99c9bec-8533-423c-b7d6-2197fb4fe842", - "service-instance-name": "yyy", - "model-invariant-id": "50307011-41f2-432a-aba9-7a68632c39b1", - "resource-version": "1494002001183" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "31522b4c-857c-4f4d-b4a4-1a6c30718421", - "service-instance-name": "vSAMP12-Zone101", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002001198" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f576f7d5-ff71-400c-be05-939f7e08249b", - "service-instance-name": "vSAMP10a-Zone801", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001833405" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "2bfc1936-b0d6-4831-83f4-3093402a49df", - "service-instance-name": "service_test_100", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "resource-version": "1494001988416" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f009c5b7-9047-4b13-b05e-a26a5587a6bd", - "service-instance-name": "MSO_ST_12_2_5_4", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001812320" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ad171f54-9003-489a-b580-d974c4d284a5", - "service-instance-name": "MSO_ST_12_12_1", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001766529" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "e2132e57-29e0-4ef9-a158-3108840824c7", - "service-instance-name": "NetworkZone1702", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001766958" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a486ece8-e4bc-4d62-ad53-8908ccf1ede5", - "service-instance-name": "MSO_Dev_1702_V3_3600", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001918029" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6d020991-9bd4-427d-8202-8481b32e1db2", - "service-instance-name": "MSO_ST_0104-1A", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001954877" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b880d66c-20cc-46b1-8aa5-3c35349ef7e8", - "service-instance-name": "ST-vSAMP12-1702-aLaCarte-101", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001954882" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "79b10fb4-1161-48c9-91b5-8935deed809f", - "service-instance-name": "MSO_Dev_1702_V3_3200", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001954907" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "2b1d61aa-a0e8-48bc-8914-fa6beae43cfb", - "service-instance-name": "MSO_Dev_1702_V3_3500", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001954914" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5929e10b-b831-444d-acb2-dd48f8650e1e", - "service-instance-name": "ST-mtn16-vSAMP12-Zone1702", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001954917" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "cd27abe5-04c9-44a9-8e6f-f2dea8934446", - "service-instance-name": "MSO_ST_11_30_2", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001950663" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "dc32921f-4c3f-40b9-a454-fa5641bbdbac", - "service-instance-name": "MSO_ST_010301A", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002017417" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "a0207e9e-251b-4a98-bec6-e59915b04408", - "service-instance-name": "MSO_Dev_1702_V3_3100", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001836307" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "0f6315be-12b9-40c9-b498-b005895fc963", - "service-instance-name": "ST-vSAMP12-Zone1610", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001997891" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "bad73156-d694-41c6-b6cd-ddf7083613eb", - "service-instance-name": "MSOST-1702-vSAMP12-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001992069" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "e57eb160-e9e7-41b6-a96d-875e006bce20", - "service-instance-name": "REGRESS_vSAMP12_1610_001", - "model-invariant-id": "3a4f2942-c229-11e6-a4a6-cec0c932ce01", - "resource-version": "1494001857125" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ac02fe78-617c-4537-886f-6d789035d298", - "service-instance-name": "mtn6NetworkZone1702", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001857246" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "e536ebf7-807c-4786-8066-8c8e241a85a7", - "service-instance-name": "mtn16NetworkZone1702", - "model-invariant-id": "04254480-8cb1-11e6-ae22-56b6b6499611", - "resource-version": "1494001857248" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "e1e9c97c-02c0-4919-9b4c-eb5d5ef68970", - "service-instance-name": "lll_svc_010317", - "model-invariant-id": "3cf30cbb-5fe7-4fb3-b049-559a4997b221", - "resource-version": "1494001895478" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8bf166a8-4715-4a1d-a764-773bf05558af", - "service-instance-name": "ST-vSAMP12-1702-aLaCarte-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002017431" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6189e28c-4fb1-44fa-aa76-c00df83379dd", - "service-instance-name": "ST-vSAMP10a-1702-aLaCarte-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001997919" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c5dd1d6b-3dd0-45b4-b96a-1cb93c3c499e", - "service-instance-name": "MSOST-1702-119-002", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001898610" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "ccb1c797-9bcb-4ed5-ac87-04254f7b034a", - "service-instance-name": "Dev-OAMNetwork-31-003", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494002015140" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "5ccba007-b57f-49df-bdb5-a0253c67e887", - "service-instance-name": "MSOST-1702-116-003", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001985222" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "13c00d90-ba65-476c-9815-9d8920944643", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001916535" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "7fa986db-ef92-4407-a549-1371102d6ded", - "service-instance-name": "MSOST-1702-MTN6-Network-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002004656" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "594604c5-905f-45ac-8d28-1f4ea0fc869b", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002009079" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "f488a8fc-646e-4a13-a057-852db75a51f0", - "service-instance-name": "MSOST-1702-123-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001992579" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "bf1f132b-5d99-4bf0-a082-2e91d13ba3f7", - "service-instance-name": "MSOST-1702-vSAMP10a-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001790482" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "87eec00e-3e34-4865-92c0-c3354925a96c", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-2001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001836640" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "651c88c4-62de-41e1-a5a9-acec829d9529", - "service-instance-name": "MSOST-1702-MTN6-Network-9001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001833771" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "5d4122df-9af7-45bb-8620-7fdb846972ad", - "service-instance-name": "MSOST-1702-MTN6-Network-temp3", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001833813" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "14317189-ac12-49f6-8c98-5558e0e66c5a", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp3", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002013147" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "4b5248b1-206f-42b9-944a-449416530696", - "service-instance-name": "mz1936_Test_2017", - "model-invariant-id": "c73dd832-d1eb-4c3a-bd04-00353c032209", - "resource-version": "1494001998111" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c7788855-b659-4713-a605-c37edf67dad6", - "service-instance-name": "MSOST-1702-119-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001979982" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "66e7b071-25b6-4ff7-a8d6-884171e14033", - "service-instance-name": "MSOST-1702-123-002", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001896029" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "8a08920c-3013-41b0-99e8-5665ff7ca2e1", - "service-instance-name": "null", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001916539" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "d255f2c0-311d-4ce6-bd19-7d55836d525a", - "service-instance-name": "mz1936_SERVICE84", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001877701" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c6d9ded7-5e8c-495b-99d2-58bf1be6e27a", - "service-instance-name": "MSO_Dev_1702_V3_3000", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001812671" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "9dee2847-1413-4e93-8d8b-a4627f240e6f", - "service-instance-name": "ST-OAMNetwork-31-3", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494002005035" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "8c2ef3a6-f01d-4e4c-853e-51f1555e011a", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-1001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002024220" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "450d94fc-7927-40c5-99ce-3cd662687360", - "service-instance-name": "svc_010517", - "model-invariant-id": "3cf30cbb-5fe7-4fb3-b049-559a4997b221", - "resource-version": "1494001812692" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "29bcb671-d16e-49ed-832e-e85402881c49", - "service-instance-name": "ST-OAMNetwork-31-8", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001855368" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "2cc1ea57-dbe8-4fd1-9e2e-a85df64dd0e9", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-2001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001983384" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ac41a7cd-3466-468d-88d6-3f9308889943", - "service-instance-name": "MSOST-1702-MTN6-Network-2001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001983401" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9bd9decf-8385-4ab7-97f5-98c2ef3ff587", - "service-instance-name": "MSO_ST_0106-1A", - "model-invariant-id": "713297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001812723" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "4ed86252-d359-4a0d-b146-7cdc2aa917bb", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001999021" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "0834363f-5f88-43e0-b87f-e3e74b1d7031", - "service-instance-name": "MSOST-1702-Network-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001793512" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "3e2406e1-84eb-47bc-8d3c-57af1ea3bbdd", - "service-instance-name": "mz1936_SERVICE85", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494002005253" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "6e6a517a-20d1-4a8a-bc36-772c85047713", - "service-instance-name": "MSOST-1702-120-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001768568" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "d7b39e95-dee8-4fec-b31d-ab7d4e7d42e9", - "service-instance-name": "Dev-OAMNetwork-30-311", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001993244" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "d4f4b34e-876a-4dcd-b853-d016fef3855d", - "service-instance-name": "ST-OAMNetwork-30-001", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001993246" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "ff0b448f-9341-45d1-965e-308a886543be", - "service-instance-name": "MSOST-1702-MTN6-Network-temp2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002024506" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "08cf190a-e9b7-4d7f-b0cb-cbb789c1a895", - "service-instance-name": "MSOST-1702-MTN6-Network-temp1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001793575" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "fac00ff4-5953-47a9-8642-3833cba691c5", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001878101" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "ab839fe0-6714-43bc-afb2-f4d791859ffe", - "service-instance-name": "HngwOamNetVto_15", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001995695" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "dae630d9-04d9-4511-a7c8-868351e89ee9", - "service-instance-name": "mz1936_SERVICE81", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001985905" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "d7b2a99e-e008-4519-ab4a-a3d9a0e14f39", - "service-instance-name": "mz1936_SERVICE83", - "model-invariant-id": "ff3514e3-5a33-55df-13ab-12abad84e7ff", - "resource-version": "1494001986020" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "8e6f40a3-20e0-4c19-aeeb-fe3f430957d5", - "service-instance-name": "MSOST-1702-126-ST_1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001956174" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "49b55b22-f794-4140-ae98-d779460495e2", - "service-instance-name": "ST-OAMNetwork-31-5", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001983763" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "441d1dad-d6bf-4940-8ccf-4d0e03e9a81b", - "service-instance-name": "MSOST-1702-0209-ST_1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001837157" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "c1d35ce3-e0b4-4b18-be73-81432e236fed", - "service-instance-name": "MSOST-1702-SI-MTN6-vSAMP12-9001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001983902" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9cfdf5df-14f9-409e-b4c5-1c30329c81de", - "service-instance-name": "MSOST-1702-Network-16001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001878352" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "40213999-e434-4984-929c-e9c29fd9bab4", - "service-instance-name": "MSOST-1702-125-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001794129" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "db9b23c8-785c-4b27-b864-70e65ef22a67", - "service-instance-name": "MSOST-1702-2-232", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001995742" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "d84bfb65-d585-4f83-886a-9331303138b8", - "service-instance-name": "HnportalProviderNetwork_36", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001995842" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "f8234127-8955-414a-a3a6-371edef4a3d7", - "service-instance-name": "HnportalProviderNetwork_52", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001996280" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "911afcb6-6a93-417a-8e1c-90ceebdb3842", - "service-instance-name": "MSOST-1702-MTN16-VFNetworkFqdn-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002015761" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ec1672c2-ea52-402d-a61a-f78618d8dd67", - "service-instance-name": "MSOST-1702-vSAMP12-16001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001986290" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "9023a892-ab4b-48f7-9432-032d4a183caf", - "service-instance-name": "ST-OAMNetwork-31-6", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494002019174" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "09540526-6d1f-4fb9-acd6-3ba7e066ae7f", - "service-instance-name": "MSOST-1702-0329-ST_b", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001858397" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "3afd440d-8d20-4534-a6f7-dafdd64a9be3", - "service-instance-name": "MSOST-1702-117-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001951694" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "8b66c9f3-9c22-4514-9980-7657f97b198d", - "service-instance-name": "Dev-OAMNetwork-31-001", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001794546" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "415be983-80d3-4af4-83e2-07fdb3783d9d", - "service-instance-name": "MSOST-1702-0308-ST_3", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002021664" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "809d2976-0065-49f2-83cb-35180adb0b85", - "service-instance-name": "MSOST-1702-0328-ST_A", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002005729" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "76bb867c-6218-4381-9873-bc79e31e387d", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-Err", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001791325" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9a45dab1-c908-4625-81f1-993cb8f26e8d", - "service-instance-name": "MSOST-1702-vSAMP12-vol_Err", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001791334" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "762f01ab-26a2-406d-bfd4-2b4f6853941e", - "service-instance-name": "MSOST-1702-MTN6-Network-1001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001794605" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "adc03856-9e87-4a03-885a-c151f8061d62", - "service-instance-name": "HnportalProviderNetwork_12", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001993433" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "neng4", - "resource-version": "1494002005843" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9bec0408-e674-4945-bc97-1e09894ce12a", - "service-instance-name": "MSOST-1702-VidTest_vSAMP12-SI-v1.0-003", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494002005869", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "ac8f2f5b-dd60-4413-b2d1-61067462dc76", - "service-instance-name": "MSOST-1702-ToDelete-001", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494002005876" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "72dbe562-01bd-4cde-bb0b-c861bb87c556", - "service-instance-name": "HngwOamNetVto_9", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1494002005893", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/72dbe562-01bd-4cde-bb0b-c861bb87c556/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "8f973eb3-eb98-417d-b062-753721c31919", - "service-instance-name": "HngwOamNetVto_29", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001896736" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "22778c84-c18a-4d4f-8ae6-d0d339862bd0", - "service-instance-name": "HngwOamNetVto_42", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494002015904" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "6843a8ed-61a0-4dcf-a3b4-4159a8fb4f0f", - "service-instance-name": "HnportalProviderNetwork_37", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494002015930" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "4b945be9-4801-4b61-be37-535ed8283407", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-1001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001952041" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "ca741a4c-3554-4dea-b76b-ba47cb2d9a84", - "service-instance-name": "HngwOamNetVto_10", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001999418" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "4d389e30-7cfe-43e1-83a6-dc211bb7d046", - "service-instance-name": "HngwOamNetVto_13", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001999423" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "d1bb4ff0-8d91-408a-92a3-343963fc95e8", - "service-instance-name": "MSOST-1702-0308-ST_0", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001834591" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "12f56a37-3966-4626-9cb1-d9067d616a66", - "service-instance-name": "MSOST-1702-MTN6-Network-2002", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001770162" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "cf26ca49-c9f0-4a0e-b8e6-3284ec6ccedf", - "service-instance-name": "MSOST-1702-Network-16667", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001837510" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "3061fc64-2649-4b73-b0f9-6c20d60170f4", - "service-instance-name": "MSOST-1702-VFNetworkFqdn-001", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001952929" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "d5cfe521-1b8a-41fc-8e64-fd335debfd09", - "service-instance-name": "HnportalProviderNetwork_26", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001984121" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "1e48119c-cd72-456a-acf9-911ed4ebca7e", - "service-instance-name": "HnportalProviderNetwork_30", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001986763" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "8946c0a9-103f-4a23-b9f3-b9f16face559", - "service-instance-name": "HngwOamNetVto_35", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494002010173" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "0691c9ce-bf13-483f-b29d-4583634c59fa", - "service-instance-name": "HngwOamNetVto_53", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001899421" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "3c39d2ac-bdd6-4c45-82d6-6bd241d25bd7", - "service-instance-name": "MSOST-1702-0308-ST_2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001878784" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "65dbf0ab-fdce-4376-89bc-cdedee4aa287", - "service-instance-name": "MSOST-1702-vSAMP12-16019", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001834901" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "aac3cc7c-d147-491a-8308-c70a787a465d", - "service-instance-name": "MSOST-1702-0309-ST_1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001834925" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "163278f1-c06a-4e5b-ad55-7d43cb83d279", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-ErrPatch", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001899632" - }, - "extra-properties": {} - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "neng2", - "service-instance-name": "neng2name", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001920065", - "orchestration-status": "active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "neng6", - "service-instance-name": "neng6name", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001920067", - "orchestration-status": "active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "147951d2-2c9f-4fa4-91a5-bed88254dc1d", - "service-instance-name": "MSOST-1702-0329_MTN6V", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001917201" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "3fc6a66d-103d-4ec6-b3be-19b6226f8d1f", - "service-instance-name": "HngwOamNetVto_30", - "resource-version": "1494001858519", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/3fc6a66d-103d-4ec6-b3be-19b6226f8d1f/service-data/service-topology/" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "b651cb05-87d9-4747-9dea-e0b5b52995eb", - "service-instance-name": "HngwOamNetVto_16", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001855976" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "50bc936e-a4b9-43a1-a983-08ab93a7a545", - "service-instance-name": "MSOST-1702-vSAMP12-16018", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001855979" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "3d7a2c7e-1a9d-4792-bd81-8d6bda5ec332", - "service-instance-name": "MSODEV_1702_vSAMP12_424-005", - "resource-version": "1494001858573" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9e08454b-2eeb-4f1f-a162-0d570c1779fb", - "service-instance-name": "MSOST_MTN6_1702_vSAMP12_426-001", - "resource-version": "1494001858576" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9dd1d6fd-58b4-4fbf-8ea1-e807b7e5824c", - "service-instance-name": "MSOST-1702-0321-ST_2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001878962" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "raaSiId2", - "resource-version": "1494001834995" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "raaSiId5", - "resource-version": "1494001834997" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "9bb87462-f66e-4f94-8819-fb0b86026938", - "service-instance-name": "MSOST-1702-0410-ST_03", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494002022294" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "bf4304d6-0fe6-4158-8adb-1d32a5f49e50", - "service-instance-name": "HngwOamNetVto_52", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001990190" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "09ba3179-7f29-4097-b373-e3b54a82c095", - "service-instance-name": "HngwOamNetVto_28", - "resource-version": "1494002013961", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/09ba3179-7f29-4097-b373-e3b54a82c095/service-data/service-topology/" - }, - "extra-properties": {} - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "cec5f96f-447d-41d3-a8c7-9bdcc796fe59", - "service-instance-name": "HngwOamNetVto_28", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", - "resource-version": "1494001770362" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b29dc510-99ec-465d-9e20-734e521f3d8b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "ef282765-c364-4726-a45d-5873dce7674f", - "service-instance-name": "MSOST-1702-0321-ST_1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001957151" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "45546ded-dccf-4040-8f59-9fe89a1a000b", - "service-instance-name": "MSOST-1702-0321-ST_3", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001791855" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "169710db-e92a-4e11-886e-00178c23808d", - "service-instance-name": "HnportalProviderNetwork_2", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1494001920140", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/169710db-e92a-4e11-886e-00178c23808d/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "9f1561ca-2e2d-4947-b3c3-55ccc9344d17", - "service-instance-name": "MSOST-1702-0329V_MTN6_1", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494002025584" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "raaSiId1", - "resource-version": "1494001975456" - }, - "extra-properties": {} - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "ffd92795-5fdd-4cf5-905c-e4a7755f5501", - "service-instance-name": "MSOST-1702-VidTest_vSAMP12-SI-v1.0-002", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494002019420", - "orchestration-status": "active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "aaff8829-0d2c-4371-99de-c6f2c85c8eb0", - "service-instance-name": "MSODEV_1702_vSAMP12_424-001", - "resource-version": "1494001920216" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "b09fedd8-bbb8-4ea2-8c33-e287aeb65b09", - "service-instance-name": "MSOST-1702-04110-ST_03", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494002019461" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "0ceebdf7-48d5-4bfd-a610-e23bcb2a1324", - "service-instance-name": "HnportalProviderNetwork_38", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001815517" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "9fd66f32-fc9f-4c27-a1c8-728e4cc5015e", - "service-instance-name": "HnportalProviderNetwork_50", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001815618" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "f1bfdcee-6809-4954-b91d-932dea04a149", - "service-instance-name": "MSOST-1702-0410-ST_02", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494001896882" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "893b131d-09a7-40b2-9fb3-0cc0c9bce3a1", - "service-instance-name": "MSOST-1702-VidTest_vSAMP10a-SI-v1.0-001", - "model-version-id": "f9253bf0-3b74-4f6b-a966-697bc599691c", - "resource-version": "1494001896884", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Basa-6" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "f9253bf0-3b74-4f6b-a966-697bc599691c" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "8a6a9177-5eab-4e16-9fe5-65966e610545", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-ErrPatch2", - "model-invariant-id": "6d3297fe-84e4-11e6-ae22-56b6b6499611", - "resource-version": "1494001816089" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "neng3", - "resource-version": "1494002000289" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "327ff0ed-76ff-4ec7-9b45-faa6a6314692", - "service-instance-name": "MSOST-1707-VidTest_vSAMP12-SI-v1.0-501", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001975619", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "VidTest_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "0b850e59-1fc9-4069-90b3-172d7b6176f3", - "service-instance-name": "MSO-ST-SI-1707-VidTestvSAMP10aService-v2.0-1XXX", - "model-invariant-id": "c73dd832-d1eb-4c3a-bd04-00353c032209", - "model-version-id": "98d5b2c7-4bd9-416c-bfb7-d7ed1ee5dd31", - "resource-version": "1495034515307", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Basa-6" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "98d5b2c7-4bd9-416c-bfb7-d7ed1ee5dd31" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "c73dd832-d1eb-4c3a-bd04-00353c032209" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "627178db-1470-4223-9516-c34ca154a22c", - "service-instance-name": "MSOST-1702-VidTest_vSAMP12-SI-v1.0-001", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001984228" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "raaSiId4", - "resource-version": "1494001795687" - }, - "extra-properties": {} - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "5400069f-17d6-44d7-92dd-8478cc87b268", - "service-instance-name": "MSO-ST-SI-1707-VidTestvSAMP12Service-v2.0-2XXX", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "4be59625-2143-49ac-b8d5-06b34c3f28f6", - "resource-version": "1495033782720", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4be59625-2143-49ac-b8d5-06b34c3f28f6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "VidTest_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "527f7aaf-a595-4b40-9b7c-c945722a2986", - "service-instance-name": "MSO-ST-SI-1707-VidTestvSAMP10aService-v1.0-1XXX", - "model-invariant-id": "c73dd832-d1eb-4c3a-bd04-00353c032209", - "model-version-id": "f9253bf0-3b74-4f6b-a966-697bc599691c", - "resource-version": "1495034671913", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Basa-6" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "f9253bf0-3b74-4f6b-a966-697bc599691c" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "c73dd832-d1eb-4c3a-bd04-00353c032209" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "7d0a92b7-42cd-4a02-b653-c46ff9f2bd6c", - "service-instance-name": "HnportalProviderNetwork_34", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001953467" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "1cca02a5-72a6-4aec-bb9c-535bae207086", - "service-instance-name": "HnportalProviderNetwork_42", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "43eb0423-0e88-47ac-bbd1-a4811ddd2156", - "resource-version": "1494001953493" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "43eb0423-0e88-47ac-bbd1-a4811ddd2156" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "raaSiId3", - "resource-version": "1494001816163" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "67ca1f14-73ef-4e93-ada0-e1ec1d2788d3", - "service-instance-name": "HnportalProviderNetwork_4", - "resource-version": "1494001987746", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/67ca1f14-73ef-4e93-ada0-e1ec1d2788d3/service-data/service-topology/" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "6977963a-042d-4c5e-a82a-ba2eb1004067", - "service-instance-name": "HnportalProviderNetwork_42", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1499272428096", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/6977963a-042d-4c5e-a82a-ba2eb1004067/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "5c9cd7f5-461c-4ee5-b3dc-3f09320f55eb", - "service-instance-name": "MSOST-1702-0418-ST_2", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494001896946" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "neng7", - "resource-version": "1494001990952" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "60eb325a-218e-47f8-b39d-d10687e8de4c", - "service-instance-name": "MSOST-1702-0411-ST_10", - "model-version-id": "fe6985cd-ea33-3346-ac12-ab1214812345", - "resource-version": "1494001990969" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "1b896f1c-803b-47d2-a6b3-022b3083c19e", - "service-instance-name": "HnportalProviderNetwork_1", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1494001990972", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/1b896f1c-803b-47d2-a6b3-022b3083c19e/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "c6ae0b6d-962f-4e45-85c2-a1c5ef875b5a", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-060802", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1496954934363", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "neng1", - "resource-version": "1494001795748" - }, - "extra-properties": {} - }, - { - "service-instance": { - "service-instance-id": "ed53f825-94b7-42ae-bd6a-49ac5fc6b162", - "service-instance-name": "MSOST-1707-VidTest_vSAMP12-SI-v1.0-4111", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001795765" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "d083e8af-7df9-465a-86df-ef4703cd15bc", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0712-01", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1499874782600", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "a5f88840-e117-4507-a68d-b47dafcfe934", - "service-instance-name": "HngwOamNetVto_19", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1494001795807", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/a5f88840-e117-4507-a68d-b47dafcfe934/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "99b91443-219a-4b61-a3e9-19045d8833c4", - "service-instance-name": "HnportalProviderNetwork_31", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1497320472238", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/99b91443-219a-4b61-a3e9-19045d8833c4/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "926e5a7c-a38d-4aaa-8363-d194447fee8e", - "service-instance-name": "MSOST-1707-VidTest_vSAMP12-SI-v1.0-500", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1494001953978", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "2a8ee11e-969a-4b70-810d-01537def1b96", - "service-instance-name": "HngwOamNetVto_10", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1494001953987", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/2a8ee11e-969a-4b70-810d-01537def1b96/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "821c1485-de82-451e-b413-22ccdbf2c52e", - "service-instance-name": "HngwOamNetVto_20", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1494002003024", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/821c1485-de82-451e-b413-22ccdbf2c52e/service-data/service-topology/" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "994121b4-b5c6-44ef-b20b-49523b4cb9c3", - "service-instance-name": "HnportalProviderNetwork_3", - "resource-version": "1494002000388", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/994121b4-b5c6-44ef-b20b-49523b4cb9c3/service-data/service-topology/" - }, - "extra-properties": {} - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "f849bcb5-8541-492b-a639-97db55020be1", - "service-instance-name": "HnportalProviderNetwork_22", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1496856562847", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/f849bcb5-8541-492b-a639-97db55020be1/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "f48b5a16-babb-45d3-be8e-2dcf3cd50e87", - "service-instance-name": "HnportalProviderNetwork_24", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1497049864624", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/f48b5a16-babb-45d3-be8e-2dcf3cd50e87/service-data/service-topology/", - "orchestration-status": "PendingDelete" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "58caa2ae-a460-4dfe-8f17-60d1a5b256a8", - "service-instance-name": "MSO-ST-SI-1707-1707-MSOTestNetwork-Update", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1495561755803", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "00db6bfa-9875-405c-8504-8d3c70d6d775", - "service-instance-name": "MSO-ST-SI-1707-1707-MSOTestNetwork-4XXX", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1494971866238", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "e9ab60f8-5895-4fd3-b8b3-e60028ceee3a", - "service-instance-name": "", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1494975407863", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "7279e4bb-960d-4566-8cfa-b30ba1b9fee7", - "service-instance-name": "", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1495017424680", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "3d5622b7-8ba6-4a06-bc9e-d8eaccf567e4", - "service-instance-name": "MSO-ST-SI-1707-msoTest-5-17-1", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1495024652825", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "961fc73c-8f34-4110-af5e-83a07a34caad", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-060101", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1496344150090", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "a11a89d7-5fb5-48dc-ae7f-976b496f2960", - "service-instance-name": "MSO-ST-SI-1707-mtn6-InfraMSOvSAMP12Service-v5.0-2XXX", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1499970280223", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "a989010e-42f0-4dc6-a568-82c55be705bbfa68a4b9-637e-4741-b69b-cc0275e0023b", - "resource-version": "1502133293589" - }, - "extra-properties": {} - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "3f7bb408-e17b-4cd0-a319-295108915fd8", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0807-10", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502143103360", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "df5b349a-e83d-4a4b-a868-d6975830dd8b", - "service-instance-name": "MSO-ST-SI-1707-VidTestvSAMP12Service-v1.0-2XXX", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3", - "resource-version": "1495033866213", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9b4dc38e-4a5a-4ef5-b1a9-8d196ddd7cd3" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "VidTest_vSAMP12_Service", - "service-instance": { - "service-instance-id": "f9974af3-aa6e-4b8c-8fd2-f45c8bdb310a", - "service-instance-name": "MSO-ST-SI-1707-VidTestvSAMP12Service-v3.0-2XXX", - "model-invariant-id": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33", - "model-version-id": "a9e7f120-4d81-44b2-a88d-21a489089129", - "resource-version": "1495034308616", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Volume" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "a9e7f120-4d81-44b2-a88d-21a489089129" - }, - { - "property-name": "model-ver.model-name", - "property-value": "VidTest_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b6f85c0e-2a62-49b5-8ea1-3bc36c5aab33" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "PCRF_10_17_1610_SVC", - "service-instance": { - "service-instance-id": "24afca09-100c-45b7-a640-ccaf0b1cfef3", - "service-instance-name": "MSO-ST-SI-1707-PCRF_10_17_1610_SVC-v1.0-9XXX", - "model-invariant-id": "103e2e96-97fa-4f9d-8969-f56cc6be9871", - "model-version-id": "e8d73f18-404d-4b61-8d06-d9e824c79c56", - "resource-version": "1495227731141", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vol_grp" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e8d73f18-404d-4b61-8d06-d9e824c79c56" - }, - { - "property-name": "model-ver.model-name", - "property-value": "PCRF_10_17_1610_SVC" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "103e2e96-97fa-4f9d-8969-f56cc6be9871" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "40b9f4bd-1b76-49d0-be6e-6d2d3299c6dc", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-061301", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1497402960061", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "bc1e909a-c062-4791-ab98-2c29b1db210b", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-0620-01", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1497971439678", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "4ee52741-493a-41b7-bf15-75b287dc751a", - "service-instance-name": "MSO-ST-SI-1707-mtn6-MSOTestNetwork-33XX_Update", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1499975637828", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "4JDurnoIZEAYdjpWdWQP1", - "service-instance": { - "service-instance-id": "6238024a-48c2-446e-afa3-2715a4fa8137", - "service-instance-name": "testhmger", - "model-invariant-id": "4c35d46f-de47-4bbc-bcda-0d46caeddf09", - "model-version-id": "9014b6b1-33c1-4092-87ab-62c230c74d74", - "resource-version": "1499857774073", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "description_JresjKOFjY1" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9014b6b1-33c1-4092-87ab-62c230c74d74" - }, - { - "property-name": "model-ver.model-name", - "property-value": "4JDurnoIZEAYdjpWdWQP1" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "4c35d46f-de47-4bbc-bcda-0d46caeddf09" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "0bf3c089-a656-48e8-8895-d49239762b18", - "service-instance-name": "MSO-ST-SI-1707-InfraMSOvSAMP12Service-0816-1", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1502897572889", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "7b45454d-de6d-443b-932d-99dff9b2fd52", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-MSOTestNetwork-33XX_Update", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1503001449498", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "fab82a56-aae6-4204-bfa2-95e51a8596e5", - "service-instance-name": "HngwOamNetVto_67", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1496388185071", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/fab82a56-aae6-4204-bfa2-95e51a8596e5/service-data/service-topology/", - "orchestration-status": "PendingDelete" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "927134c6-8187-4c20-8a30-30541937fe9e", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-0726-01", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1501069438917", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "7391705b-95b4-4ba2-81cb-6234180d3c36", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-0706-01", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1499351301343", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "HNGW OAM NET VTO", - "service-instance": { - "service-instance-id": "d694242e-d119-47ce-bcf4-d2b4e8bffba8", - "service-instance-name": "HngwOamNetVto_79", - "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", - "model-version-id": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea", - "resource-version": "1502762958016", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/d694242e-d119-47ce-bcf4-d2b4e8bffba8/service-data/service-topology/", - "orchestration-status": "PendingDelete" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "contrail 3.0.x L3 network for AIC 3.x sites, specifically used to create vIPR protected tenant oam networks." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93b7e40e-12bf-4a4a-b9eb-6dc41fa75aea" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNGW OAM NET VTO" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "edcff8c1-05a7-4954-9d99-1a71a2ff6536" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "d338012c-fa17-442b-b8a4-16b3947fef32", - "service-instance-name": "MSO-ST-SI-1707-InfraMSOvSAMP12Service-v1.0-2XXX", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "ff052511-7eda-4770-a48f-91150f797a01", - "resource-version": "1499464374479", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ff052511-7eda-4770-a48f-91150f797a01" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "493d5299-286e-4c18-b2f6-e58d1662a63d", - "service-instance-name": "MSO-ST-SI-1707-mtn16a-InfraMSOvSAMP10aService-v1.0-1XXX", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1499979599759", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "c542dac4-0fc2-4f96-93ed-34bc162640e2", - "service-instance-name": "MSO-DEV-SI-1707-MSOTestNetwork-0802-2", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1501681678325", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "f3ec623c-936e-4f7a-81fd-1d2194f060ff", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-0713-01", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1499956984708", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "6e14a44c-401b-4a8a-b5c0-dd0eb61b9ad7", - "service-instance-name": "MSO-ST-SI-1707-mtn6-MSOTestNetwork-3XXX", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1499971131822", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "8849ce8f-f6be-423a-9541-c017bc560125", - "service-instance-name": "MSO-DEV-SI-1707-MSOTestNetwork-0802-3", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1501682613646", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "3f85870c-832d-483f-ade4-4c0c6d59da9b", - "service-instance-name": "MSO-DEV-SI-1707-MSOTestNetwork-0802-4", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1501682703655", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "4e6f2308-bae9-4591-97d7-de6228642fab", - "service-instance-name": "MSO-ST-SI-1707-mtn6-InfraMSOvSAMP10aService-v1.0-1XXX", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1499956704355", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "HNPortal PROVIDER NETWORK", - "service-instance": { - "service-instance-id": "91242dc2-0074-49f9-89cb-7648b20f8cb2", - "service-instance-name": "MSOdev-1707-7-5-Name-vipr1", - "model-invariant-id": "e301f6e8-1c29-4990-9aea-e943a2ec3d21", - "model-version-id": "06b8966e-097c-4d63-afda-e0d3bb7015fb", - "resource-version": "1499970133703", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/91242dc2-0074-49f9-89cb-7648b20f8cb2/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SRIOV Provider Network model for HN Portal" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06b8966e-097c-4d63-afda-e0d3bb7015fb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "HNPortal PROVIDER NETWORK" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e301f6e8-1c29-4990-9aea-e943a2ec3d21" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "b3d920de-ffa1-4453-b23a-3267993dcd40", - "service-instance-name": "mz1936test1", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1500476019167", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "589acefd-1de1-4f41-bbee-07048e0f8fd1", - "service-instance-name": "MSO-ST-SI-1707-MSOTestNetwork-0721-01", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1500660027833", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "90330e27-34d6-4b38-a1f1-3f3e22c04cd9", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP12Service-v1.0-2XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "ff052511-7eda-4770-a48f-91150f797a01", - "resource-version": "1502125802006", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ff052511-7eda-4770-a48f-91150f797a01" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "\ta989010e-42f0-4dc6-a568-82c55be705bbfa68a4b9-637e-4741-b69b-cc0275e0023b", - "resource-version": "1502133232750" - }, - "extra-properties": {} - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "cb1cefa8-24a0-48c5-9280-089595954f3c", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0807-11", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502146477727", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "a3e39f1b-7fe2-4423-89c0-85150179afbc", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0803-01", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1501779665130", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "\tfa68a4b9-637e-4741-b69b-cc0275e0023b", - "resource-version": "1502128868819" - }, - "extra-properties": {} - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "a989010e-42f0-4dc6-a568-82c55be705bb", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0807-5", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502133034154", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "053b5bcf-4c44-4e00-8d94-94695fb01f56", - "service-instance-name": "MSO-ST-SI-1710-InfraMSOvSAMP10aService-v4.0-1XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502825606629", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "62bdb063-6461-4135-8bb0-bec4ed54874d", - "service-instance-name": "MSO-DEV-SI-1710-MSOTestNetwork-0815-1", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1502797578781", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "46b6092f-8047-45c3-b423-d780afaa64af", - "service-instance-name": "MSO-ST-SI-1707-InfraMSOvSAMP12Service-0807-1", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1502152362553", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "fe6d1eb5-85cd-43ae-901a-1a6b0266264a", - "service-instance-name": "MSO-ST-SI-1707-mtn16a-MSOTestNetwork-3XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1502372167295", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "6516ecce-cd3d-4d21-9204-32b71142f932", - "service-instance-name": "MSO-ST-SI-1710-InfraMSOvSAMP12Service-0810-1", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1502381336007", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "a3a03c99-fbbf-48ab-b513-cb09a723a179", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP10aService-4.0-1XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502384871086", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "7edf8b66-a7ba-4351-8304-a24fb004ce50", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0811-1001", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502480914799", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "98723cf0-e755-4652-8851-182b060d4ffd", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0825-001-R", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1503663930025", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "db6ae2d4-8b5f-476d-b9f8-44751d504e38", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0803-05", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1501781759617", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "8fe6eed2-9823-426c-ad27-95545c42ce4c", - "service-instance-name": "MSO-ST-SI-1710-mtn6-InfraMSOvSAMP10aService-4.0-1XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1502808860080", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "49e739f8-963e-4abf-ad5a-bd4418f9544a", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP12Service-v5.0-2XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1502991526931", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "6c5ce12f-d028-43a7-97f6-699e7aac64ac", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-MSOTestNetwork-3XXX", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1503000992667", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "25b6aeee-00a2-471b-82d2-e009e529b772", - "service-instance-name": "MSO-ST-SI-1712-vSamp10a-PCM-1010-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1507672565803", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "963f3c7e-b110-4216-85c2-dfc5f6364c0e", - "service-instance-name": "shani_shani", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508391834049", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "36561f34-ba0a-4cba-b743-0b08ecffbd64", - "service-instance-name": "VPROBE_Instance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1508670668611", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "7839d807-37ca-4b7e-9c29-53e94d41405a", - "service-instance-name": "VMEE_instance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "14eb42f2-b30d-4863-bcaf-f1f30ea68f2a", - "resource-version": "1508670917581", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "14eb42f2-b30d-4863-bcaf-f1f30ea68f2a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "59264fdb-50bc-4141-b072-5d99dc8782b9", - "service-instance-name": "shani_cfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508671098479", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "5e849f9a-e43e-44ea-9378-515d28dd5c31", - "service-instance-name": "vmee_service_cfg3", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1508672120074", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "ef6c7fba-80a5-4943-8cb4-f29f3dab6b94", - "service-instance-name": "shani_service_vprobe", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1508763065871", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "241e1576-3f6b-4c06-8577-8d1d38f25885", - "service-instance-name": "shani_vmee_service", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1508763229986", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "34d0e502-c29f-4360-9d31-92f23736be70", - "service-instance-name": "MSO-ST-SI-1707-InfraMSOvSAMP10aService-v1.0-1XXX", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "4af9f859-ac6a-458f-8e18-af439edda497", - "resource-version": "1499462698495", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4af9f859-ac6a-458f-8e18-af439edda497" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "06-15-VID-Issue-SERVICE", - "service-instance": { - "service-instance-id": "1d8342bd-aaa3-4141-af3b-9de0ad50ac96", - "service-instance-name": "shani_test1", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", - "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", - "resource-version": "1508675026370", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ae5d24f4-f602-46d0-9a62-ed3f28928b50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "2fa617d0-50b3-4d74-861d-4b39301acd2c" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Service For Macro Installation", - "service-instance": { - "service-instance-id": "2f7aa9a6-eac3-49f5-ab9c-6db7557ca3f6", - "service-instance-name": "dsfds", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", - "model-version-id": "c347eede-0b13-4251-9cd9-bd0258c0d411", - "resource-version": "1508417179346", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "c347eede-0b13-4251-9cd9-bd0258c0d411" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "248173d1-99a5-4e78-851c-777e318d07ee", - "service-instance-name": "bvccmcmhjjjj", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510264824355", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "03e8185b-39bd-48d2-944d-a6c7427d52a4", - "service-instance-name": "ih980", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510567003530", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "Service With VF Shani", - "service-instance": { - "service-instance-id": "c2c324d4-e946-42fe-aeb4-7aba28a2f479", - "service-instance-name": "de_cafe_shnia", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "f07db45c-949c-4698-94c3-5a328a0d4d4f", - "model-version-id": "8c4093ce-404f-416a-a91c-4c146b5945db", - "resource-version": "1508319271399", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "8c4093ce-404f-416a-a91c-4c146b5945db" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "f07db45c-949c-4698-94c3-5a328a0d4d4f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "7ae73cc0-7df3-455d-bd5b-bc00fde41cd1", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0803-02", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1501780927877", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "b5f4278d-490d-489b-aded-66db3a84f61d", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0803-04", - "service-type": "", - "service-role": "", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1501781438162", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "183b9c62-9f3b-4613-bc67-7ba743bbfcf0", - "service-instance-name": "hellowworld", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1511335547286", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "ad43c6c0-7de0-4772-83d4-139ffb65c50c", - "service-instance-name": "vmeeshani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1509288736569", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "2f98f58d-426e-4377-9317-5e256c458324", - "service-instance-name": "shanireg05", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511700800516", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "2d652dff-df5e-4303-983c-cdbce5b6681c", - "service-instance-name": "MSO-ST-SI-1712-vSamp10a-1010-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1507672023403", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "f787cb85-b9e0-4658-b3a7-9faec9d66386", - "service-instance-name": "MSO-ST-SI-1707-InfraMSOvSAMP12Service-0815-2", - "service-type": "", - "service-role": "", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1502819957223", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "da064d24-88a7-49e2-a668-5b07992cd393", - "service-instance-name": "fgkkjhk", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511789843410", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "Service_PNF", - "service-instance": { - "service-instance-id": "498797fe-b0c2-4509-9cdd-86a0a776d31f", - "service-instance-name": "ServicePnf_23", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1508996597163", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/498797fe-b0c2-4509-9cdd-86a0a776d31f/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_PNF_2" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_PNF" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "43596836-ae36-4608-a987-6608ede10dac" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "727c5caa-2b07-41b0-94f9-9408b3c7a0d1", - "service-instance-name": "rfghSHANI", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508996704272", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "86f68df5-d3cd-4311-b8c5-983e021838a5", - "service-instance-name": "erterte", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1512299719186", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "MSO Test Network", - "service-instance": { - "service-instance-id": "6bac0939-3caf-423a-811d-7e2669cd7efa", - "service-instance-name": "MSO-DEV-SI-1707-MSOTestNetwork-0808-1", - "service-type": "", - "service-role": "", - "model-invariant-id": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f", - "model-version-id": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e", - "resource-version": "1502198626624", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant and providers" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "MSO Test Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "13afd726-d181-4e29-b759-c51a702de2df", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0929-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1506714221339", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "ac3e73bc-b1e2-4833-836b-021a86229c97", - "service-instance-name": "shani_cfg2", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508671869668", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "8e39f14f-21d3-44ec-9f05-99d0f3dc8092", - "service-instance-name": "vmee_service_instance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1508675655654", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "489a93ad-dd10-4d5c-8295-c6c9605c368b", - "service-instance-name": "ittay_Service_VProbe_FE", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1508677371671", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP12_Service", - "service-instance": { - "service-instance-id": "13e6d21d-2e3c-4612-a367-219b238581e9", - "service-instance-name": "MSO-ST-SI-1802-mtn6-InfraMSOvSAMP12-2XXX", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "408363aa-8b43-475c-be20-1e5a560b5caf", - "model-version-id": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b", - "resource-version": "1506712978064", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "185e99c6-abf4-4b9f-83c2-cd6c01aefc9b" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP12_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "408363aa-8b43-475c-be20-1e5a560b5caf" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "85b7b646-ad1b-42c2-b6f0-076e5cd6b533", - "service-instance-name": "MSO-ST-SI-1712-vSamp10a-PCM-1011-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1507808056820", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "0cd1f62b-fe23-4469-ba40-01aae4944350", - "service-instance-name": "PM_Shani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508670174978", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "048bda59-8dcf-4446-bdb2-ecdb7f3633b5", - "service-instance-name": "pm_liz", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508675153913", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "4004c645-7648-4434-8f61-08abe54df923", - "service-instance-name": "vprobe_service_instance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1508675422421", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "f0b545f7-56ad-49b6-854f-a37d586735b7", - "service-instance-name": "cvcvsdfgfdg.df..", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508326737165", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Dip_221117_Service", - "service-instance": { - "service-instance-id": "6fa380a6-547e-47ef-b052-250863dde19a", - "service-instance-name": "dip_vid_deploy_serv", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "dc621f45-db9c-42b2-a182-b429c675ef26", - "model-version-id": "0c628f95-b7ad-420a-87c6-80f8893d2629", - "resource-version": "1511385989449", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Add Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "0c628f95-b7ad-420a-87c6-80f8893d2629" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Dip_221117_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "dc621f45-db9c-42b2-a182-b429c675ef26" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "service-instance": { - "service-instance-id": "a98c", - "resource-version": "1502133388652" - }, - "extra-properties": {} - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "b468a213-57d8-43c2-b2d5-92e09873b491", - "service-instance-name": "shanipmtest", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509290086766", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Ver1with_inputs_Ver2without_inputs", - "service-instance": { - "service-instance-id": "c431cf21-9cfa-419b-9c81-7749f2d64264", - "service-instance-name": "dghfghfgh", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "821b337c-d1d6-41b8-91f2-62acbeea74e0", - "model-version-id": "93a77919-7e3e-477b-97b4-f756cc85a281", - "resource-version": "1511767920515", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93a77919-7e3e-477b-97b4-f756cc85a281" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "821b337c-d1d6-41b8-91f2-62acbeea74e0" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "b6ebaa3c-b8aa-4a04-b4d3-4f58d2e1c238", - "service-instance-name": "dfhfghfgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509006600145", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "4df9bda8-d626-48c6-8545-200539347535", - "service-instance-name": "shanifranc", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509281280372", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "ariel_inputmap_service_02", - "service-instance": { - "service-instance-id": "4ccd52f9-5488-4d00-83f0-7e1a5d56a50a", - "service-instance-name": "uniqueeeee", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339", - "model-version-id": "a5b89224-c03d-4142-b4ce-8b8e8b8de54a", - "resource-version": "1508945316985", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ariel_inputmap_service_01" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "a5b89224-c03d-4142-b4ce-8b8e8b8de54a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ariel_inputmap_service_02" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b594a6ec-94e0-4c95-826f-4c3d3af56339" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "15f27065-7448-4b04-8e81-d29b465c1300", - "service-instance-name": "shani-fr", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508319478155", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "74cdfd63-c7b0-4bce-813c-eaa4efc00833", - "service-instance-name": "casesens", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508332804519", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "f1cb84c5-94e2-4a57-95ac-747e911cc0f8", - "service-instance-name": "gyjgh.fgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509634059882", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "ChaniPick", - "service-instance": { - "service-instance-id": "f09f8f7b-bc0e-4726-b5b3-f7ee6cbfd08e", - "service-instance-name": "ChaniPickInstance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "91fb7ec2-f05d-45dd-8690-f381a5c970c3", - "model-version-id": "0856b6e0-4bc2-4f61-96f5-b9469a101181", - "resource-version": "1509609427601", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ChaniPick" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "0856b6e0-4bc2-4f61-96f5-b9469a101181" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ChaniPick" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "91fb7ec2-f05d-45dd-8690-f381a5c970c3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "7a4c4bcf-59c1-416a-92d8-2006713f3ca9", - "service-instance-name": "vprobeshani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1509289395572", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "cd5262ca-5b20-46ed-b2ce-24452bd82e2d", - "service-instance-name": "fafasdfasdfasdfasdf", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509523416897", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "4891cd09-4417-45b7-8992-c94a432a2b6a", - "service-instance-name": "MSO-ST-SI-1712-vSamp10a-PCM-111-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1509552966925", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "shay-VID-Service-test", - "service-instance": { - "service-instance-id": "7e4b4e61-c1a1-49af-9aec-bee2c39f8bc7", - "service-instance-name": "serviceinputssss", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1508831847194", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shay-VID-Service-test" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "8c16d416-f183-4f2e-8a05-48a7ee0738f7" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shay-VID-Service-test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "74b2fa72-e3b9-4942-8448-983a4b50891a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "08f3ffc7-9c52-4421-9863-9aaa488019d5", - "service-instance-name": "Macrooo", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511338974905", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "dbd480ec-f5f8-422d-8c31-22c1178c3f1f", - "service-instance-name": "shaniti", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1509283263161", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "c140cd3e-8e17-4055-a7d9-bce3da86a888", - "service-instance-name": "sanity0005", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510242624842", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Service With VF Shani", - "service-instance": { - "service-instance-id": "22491345-7ca4-49e9-b6df-4b578e9e4549", - "service-instance-name": "ghjghjghjgh_shani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "f07db45c-949c-4698-94c3-5a328a0d4d4f", - "model-version-id": "8c4093ce-404f-416a-a91c-4c146b5945db", - "resource-version": "1508318646144", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "8c4093ce-404f-416a-a91c-4c146b5945db" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "f07db45c-949c-4698-94c3-5a328a0d4d4f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "b33b85d7-a6ab-48e7-9ef9-ed52b69f18d0", - "service-instance-name": "CASESENS", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508332681298", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "20099c17-6a00-4ca5-969c-f9ca82691962", - "service-instance-name": "xzdfgsdfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510566667141", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "fdf4f3fc-ee2d-42d1-94d9-aadbc899bfee", - "service-instance-name": "fghfdggfdsssasdf", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511182118419", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "fdb9dd6f-cb05-4849-8aef-d08ea2019111", - "service-instance-name": "sertgretretret", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1509891380008", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "BJ_vDBE_21NOV_Service", - "service-instance": { - "service-instance-id": "af046361-54f7-4956-b059-78d11e15b7c1", - "service-instance-name": "vDBE_BJ_21NOV", - "service-type": "Vdbe", - "service-role": "oam", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "e6e9d408-6176-4cc2-b83b-2345995ae592", - "model-version-id": "4debb130-a4bd-46c8-88ba-6e5c11df49d0", - "resource-version": "1511298043321", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "BJ_vDBE_21NOV_Service_desc" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4debb130-a4bd-46c8-88ba-6e5c11df49d0" - }, - { - "property-name": "model-ver.model-name", - "property-value": "BJ_vDBE_21NOV_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "e6e9d408-6176-4cc2-b83b-2345995ae592" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Shani Service step 4", - "service-instance": { - "service-instance-id": "9b3a07d6-f8c5-4087-8cb0-c50f0a19e436", - "service-instance-name": "tyurtuyt", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "713783d5-9e21-49c5-86f1-77dc331586a2", - "model-version-id": "a50a43bb-4ac8-410c-acf3-c30aa39dd109", - "resource-version": "1512301853845", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Shani Service step 4" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "a50a43bb-4ac8-410c-acf3-c30aa39dd109" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Shani Service step 4" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "713783d5-9e21-49c5-86f1-77dc331586a2" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Service For Macro Installation", - "service-instance": { - "service-instance-id": "c82cd122-5b00-4126-85cf-895828608324", - "service-instance-name": "ServiceForMacroInstallation_17", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", - "model-version-id": "b9436fbb-dc96-4163-90b8-846c6518a05a", - "resource-version": "1512386849481", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/c82cd122-5b00-4126-85cf-895828608324/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b9436fbb-dc96-4163-90b8-846c6518a05a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "73fe6eb7-a683-4c29-b12a-6a1ee6f58741", - "service-instance-name": "pn_cfg_sanity08", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510052183786", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "3ccaf20a-9409-4b2e-8fb8-3d0cfb5ce0ea", - "service-instance-name": "RG_10-25_SCM", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f", - "resource-version": "1508967663290", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "7.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "9ccae314-d9b6-463b-9f1f-03981c515d6b", - "service-instance-name": "MSO-ST-SI-1707-vSamp10a-0929-02", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1507672495938", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "c1bf29ae-5486-42f8-ad71-600cb52bac2c", - "service-instance-name": "sanity0003", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510240640053", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "736abd8b-1167-4b6f-b1e3-d7871dda0c1e", - "service-instance-name": "service_port_mirroring", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508753804445", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "74ef78e8-624a-4283-b969-ad7930b6c807", - "service-instance-name": "dfdgfdgfdrr", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510731069641", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "664410cc-8ae6-4a52-9e63-8d5ef76845cb", - "service-instance-name": "dkjgbo4", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510733439804", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "c0cdb0b8-6dc6-47ab-a9f9-f37e9fe68614", - "service-instance-name": "sdfghksdfh", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511103394878", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "dfc32fb0-e134-42f3-bf7c-2c16c302f2fd", - "service-instance-name": "PM123", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508675054323", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "b9c1db26-8853-4fdf-b963-58a2c00cf352", - "service-instance-name": "pm_cfg_sanity88", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511342074819", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "ba58ccf5-fb34-4160-ad43-d641e3df4782", - "service-instance-name": "sanity185_test5", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511337721530", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "fb8d1641-1a94-4cae-b33b-3e569cca6e22", - "service-instance-name": "ghgtf", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1512387312823", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "c6e90753-51ce-4847-8d36-8f0690dd4dd0", - "service-instance-name": "fgjghj", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511761219526", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "e67d5f74-e98f-4867-856f-ddf0178ebaeb", - "service-instance-name": "using_vid_for_voip_net", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511873426321", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Shani Service step 4", - "service-instance": { - "service-instance-id": "831911c5-2c0f-41df-a84e-f64b0b29b014", - "service-instance-name": "shanishanif", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "713783d5-9e21-49c5-86f1-77dc331586a2", - "model-version-id": "a100b77d-132c-4856-b6e0-9ec4261436d1", - "resource-version": "1509016215708", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Shani Service step 4" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "a100b77d-132c-4856-b6e0-9ec4261436d1" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Shani Service step 4" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "713783d5-9e21-49c5-86f1-77dc331586a2" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "network_with_subnet_info_shani", - "service-instance": { - "service-instance-id": "c32876e3-1d72-4a5e-ba9b-cf7e76314a46", - "service-instance-name": "instance_with_VL_with_subnet_info", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "6b438530-82e1-41b5-b754-d415993db358", - "model-version-id": "82b05a7f-2735-40b9-9fcd-6db86cc47371", - "resource-version": "1512036274754", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "network_with_subnet_info_shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "82b05a7f-2735-40b9-9fcd-6db86cc47371" - }, - { - "property-name": "model-ver.model-name", - "property-value": "network_with_subnet_info_shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "6b438530-82e1-41b5-b754-d415993db358" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "90b9d477-9891-4392-8327-d934e13b23c5", - "service-instance-name": "shani_port_mirroring", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "d1853b18-5eb6-4a4b-99f0-66f6ac298153", - "resource-version": "1508762813922", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d1853b18-5eb6-4a4b-99f0-66f6ac298153" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "e22b44ed-874a-45dd-bfa0-9d53a47d00bd", - "service-instance-name": "pmtestshani_sanity8", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510832335695", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Clear Service Shani", - "service-instance": { - "service-instance-id": "728b899a-fa1e-4c20-8706-d0df732b1110", - "service-instance-name": "asdfghj", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "241e071e-7445-48b1-b05e-deb7926e49f8", - "model-version-id": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e", - "resource-version": "1511082067020", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "241e071e-7445-48b1-b05e-deb7926e49f8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "5762ed31-7171-48ed-9957-aba6be2d77da", - "service-instance-name": "New353660", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f", - "resource-version": "1512065977733", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "7.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "60a5cd1b-2afc-42ca-b6e0-a5cc76e07369", - "service-instance-name": "jgjfdhsdfggdg_pm_cfg", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1512309245215", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "AVPN MOW vPE OAM Network _New", - "service-instance": { - "service-instance-id": "6413537b-794e-4f85-a049-3c821536cdf2", - "service-instance-name": "dfhgfhgfhgffg", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "f903efcf-f2fa-4eec-8185-dfd2a446280d", - "model-version-id": "6610e100-9c62-45cc-b1a8-37f221aff1d5", - "resource-version": "1512316460270", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Tenant OAM Network for vPE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "6610e100-9c62-45cc-b1a8-37f221aff1d5" - }, - { - "property-name": "model-ver.model-name", - "property-value": "AVPN MOW vPE OAM Network _New" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "f903efcf-f2fa-4eec-8185-dfd2a446280d" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "91a7e849-eeda-4d21-8d56-b02da4666971", - "service-instance-name": "ghkhjkgh", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511880922718", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "b0a49434-af4f-4c96-9d70-b9e726a6e4b6", - "service-instance-name": "dfgfdgfgg_macro", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511340504429", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "49769492-5def-4c89-8e73-b236f958fa40", - "service-instance-name": "fghghfhgf", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "d1853b18-5eb6-4a4b-99f0-66f6ac298153", - "resource-version": "1509021587199", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d1853b18-5eb6-4a4b-99f0-66f6ac298153" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "30653672-78b1-4d30-b15e-a5b7c6d5efb2", - "service-instance-name": "portmirroringinstance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508672376379", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "6.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "59abe4ee-9859-4eae-8d87-e43869dd2d04", - "service-instance-name": "oren_instance_vprobe", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1508683058609", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "28880a13-3e43-439e-9d00-db0ffe387d1a", - "service-instance-name": "mmmmm", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1508849264590", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "240c3288-65ee-43fa-8654-14238448b826", - "service-instance-name": "sanityyy444", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509614603771", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "ffa9584c-33d4-439b-9600-57804cff7a97", - "service-instance-name": "fgjghjgfjgdhj2", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1511879880134", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "aa060c7d-6dd4-4d36-af5a-2183add04456", - "service-instance-name": "sdvvrfgrfgg43543", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510566062873", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "add53750-fb62-42a1-b590-2d16be514d46", - "service-instance-name": "ghjhjhj", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510567799399", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "1003f475-b9e8-45b4-b5b0-2e26892a0eac", - "service-instance-name": "shani_sanity_2", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1510730703001", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "722b3bd0-6f8d-45d4-bbcf-279543d87b9d", - "service-instance-name": "seghh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509280388974", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "27dc52c1-6061-41ab-ac28-aa4e58ecd102", - "service-instance-name": "luckyNo.7", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f", - "resource-version": "1508755493786", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "7.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "0607973b-60fd-4b2b-8a91-fffff50a55d3", - "service-instance-name": "fdgSHANI.", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509616333566", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "bfeb2945-95ba-45ce-99b5-45c74e61913d", - "service-instance-name": "FiveSanity5", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511098840741", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "alacarte_ecomp_generated_naming_is_false", - "service-instance": { - "service-instance-id": "3f63064b-6137-4b26-8c79-eb247fe3e95a", - "service-instance-name": "jhdsa", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a63c3a9e-2bfc-430f-af4b-608ec92e368f", - "model-version-id": "0eaab9e3-32a0-4944-a461-705e74699a80", - "resource-version": "1511161770782", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "alacarte_false" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "0eaab9e3-32a0-4944-a461-705e74699a80" - }, - { - "property-name": "model-ver.model-name", - "property-value": "alacarte_ecomp_generated_naming_is_false" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a63c3a9e-2bfc-430f-af4b-608ec92e368f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "434a116e-1b34-4522-b30c-891803bdcc35", - "service-instance-name": "service_vmee_of_source_port_oe30_projectY", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1511264435143", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "fae55295-8fed-45bb-b0c5-14848f242c7b", - "service-instance-name": "s2anity", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509889424393", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "a947dfbf-3598-41fa-a175-4467359d65e4", - "service-instance-name": "sanity05", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510050378976", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "8d8c828b-1b19-4dc4-bf46-b56d963d76ea", - "service-instance-name": "dfgdfgdfgdfgd", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510048733365", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "5f4f5707-1a02-4da6-b9fe-8c526e1b730b", - "service-instance-name": "sanity005", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510050765466", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "8d516685-5bf0-41b7-bfb9-e8617638eb66", - "service-instance-name": "sdfgsdgfsdg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1512300164307", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "d4ded325-ac0b-479b-bebb-c6470df034aa", - "service-instance-name": "macroo5645", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1512308160535", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "Service_PNF", - "service-instance": { - "service-instance-id": "8a924433-c084-4bda-819e-6280c871fd38", - "service-instance-name": "ghjghj", - "service-type": "Transform", - "service-role": "PNF", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "9a4d9d41-e686-43da-a558-c45448d6023a", - "resource-version": "1512379889052", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_PNF_2" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9a4d9d41-e686-43da-a558-c45448d6023a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_PNF" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "43596836-ae36-4608-a987-6608ede10dac" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "eff18c1f-3007-4701-b098-54ee035abdf8", - "service-instance-name": "sanity000003", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510241403647", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "4f2976ce-d79c-4a56-829a-9d6dc6367f1b", - "service-instance-name": "macro006", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510244395140", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "af9d52f9-13b2-4657-a198-463677f82dc0", - "service-instance-name": "xbghrftgr_shani", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1510659519538", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "8ab8a0c7-8fd7-4345-ae0f-b1e4b1041aa1", - "service-instance-name": "sdddf_shani", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510725658977", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "862139f4-f51d-4a99-afee-f062095906ad", - "service-instance-name": "service_pm", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510734014131", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "d9e67c21-6756-4f12-8633-73d1541090a8", - "service-instance-name": "test9876543456", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510734314247", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "8eda88ea-50c6-4419-bf69-7d53a8f8c6a4", - "service-instance-name": "jhhgggfgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510727126995", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "42376493-017d-4dda-a923-244c5c5d47b3", - "service-instance-name": "zsdff_6shanii", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510734387613", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "Clear Service Shani", - "service-instance": { - "service-instance-id": "71cffd2f-669c-42a5-9273-730ee04bf806", - "service-instance-name": "shani_vnf_inputs", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "241e071e-7445-48b1-b05e-deb7926e49f8", - "model-version-id": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e", - "resource-version": "1510849889358", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "241e071e-7445-48b1-b05e-deb7926e49f8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "4610365e-95d5-45c9-bad0-b47a3c358358", - "service-instance-name": "dfrgthjkl", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510832959675", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "BJ_20NOV_vDBE_Service", - "service-instance": { - "service-instance-id": "c8a85099-e5a3-4e4d-a75d-afa3e2ed2a94", - "service-instance-name": "BJ_20NOV_vDBE_VLM_VID", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "2d3b91f4-2844-4b3d-972c-8de8f4ae461d", - "model-version-id": "35e8f11c-f0fc-46b2-b01a-8409d03e1bac", - "resource-version": "1511278284445", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "BJ_20NOV_vDBE_Service_Desc" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "35e8f11c-f0fc-46b2-b01a-8409d03e1bac" - }, - { - "property-name": "model-ver.model-name", - "property-value": "BJ_20NOV_vDBE_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "2d3b91f4-2844-4b3d-972c-8de8f4ae461d" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "5955c55b-f3df-48d4-84d0-7c12ed006b29", - "service-instance-name": "vidnf17070", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511184390151", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "8ca77f98-4f4b-48d6-9824-48e694cf14f2", - "service-instance-name": "fdgdfgfdgfdgfgg", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511179094909", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "e75edbc7-66c4-4493-a674-9bdc6fa3d1f5", - "service-instance-name": "sanity555", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509890717717", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "99481f05-eb44-40e0-be75-00cb6eccbc12", - "service-instance-name": "sssshaniiiiii", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509891853510", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "2fbfdefc-da88-4a38-b80a-997f2dfbc0cf", - "service-instance-name": "s88anity", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509892664097", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Ver1with_inputs_Ver2without_inputs", - "service-instance": { - "service-instance-id": "d35bd758-7bf0-454a-9abd-7e0d873d6cb9", - "service-instance-name": "nnnnnnnnngfdgfdgfd", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "821b337c-d1d6-41b8-91f2-62acbeea74e0", - "model-version-id": "93a77919-7e3e-477b-97b4-f756cc85a281", - "resource-version": "1511343196134", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93a77919-7e3e-477b-97b4-f756cc85a281" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "821b337c-d1d6-41b8-91f2-62acbeea74e0" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "817866f5-bc91-49a5-9124-6adc9070afc0", - "service-instance-name": "project_p1_oe_own1", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511341665118", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "d59f882d-bbd1-4955-9af1-28eed0e5313c", - "service-instance-name": "fgjgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1512317186625", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "88333c1c-ad7d-4074-890f-8868c9ddcf65", - "service-instance-name": "netSHANI", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509018500825", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "4fd3c0d4-1cd1-4d88-b3b8-5c4f7eb4ef25", - "service-instance-name": "shaniPMService", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "d1853b18-5eb6-4a4b-99f0-66f6ac298153", - "resource-version": "1509019261453", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d1853b18-5eb6-4a4b-99f0-66f6ac298153" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "20292856-3f41-4295-b657-f08d08388dcb", - "service-instance-name": "vmee", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1511101512030", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service_PNF", - "service-instance": { - "service-instance-id": "217c9b78-fe7d-41fb-ba1a-de4fc2e5813a", - "service-instance-name": "ServicePnf_34", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1511183768410", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/217c9b78-fe7d-41fb-ba1a-de4fc2e5813a/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_PNF_2" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_PNF" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "43596836-ae36-4608-a987-6608ede10dac" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "c096de2b-4d60-44e6-a5c9-e174cd1d99ad", - "service-instance-name": "shani_pm_instance", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511266111639", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "5bc480c7-e21d-4a0c-9e2d-7db9953401b6", - "service-instance-name": "shani_cfg_pm_sanity8", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511436640616", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service_PNF", - "service-instance": { - "service-instance-id": "1fa073df-ebf3-4d8d-8b30-2d60d1df84be", - "service-instance-name": "macro_1", - "service-type": "Transform", - "service-role": "PNF", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "9a4d9d41-e686-43da-a558-c45448d6023a", - "resource-version": "1511339191417", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_PNF_2" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9a4d9d41-e686-43da-a558-c45448d6023a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_PNF" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "43596836-ae36-4608-a987-6608ede10dac" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "38ab2b5c-63d0-48c2-a7a8-7f218270a7da", - "service-instance-name": "lkjkjdfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511956863413", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "3ed83f85-3c0a-48ca-9e9d-90de3e896572", - "service-instance-name": "dsfgfdgfdgdf88", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1512307818748", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "06-15-VID-Issue-SERVICE", - "service-instance": { - "service-instance-id": "dab6ac44-17e0-4aa6-9680-ea4214f23260", - "service-instance-name": "tyiyui", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", - "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", - "resource-version": "1512315000975", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ae5d24f4-f602-46d0-9a62-ed3f28928b50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "2fa617d0-50b3-4d74-861d-4b39301acd2c" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "900f026f-1192-4bc0-b678-73ca9cd322d1", - "service-instance-name": "jkhgjkfg", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1512373651939", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "ea880103-dbd5-4d21-aaa7-f8ebac440818", - "service-instance-name": "sanity33", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509614222525", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "b93a4674-0bf0-44dc-8431-8af8c4e4b8e1", - "service-instance-name": "hghgEWTWG", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510245286466", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "ChaniPick", - "service-instance": { - "service-instance-id": "63680970-b1d9-41c8-90d1-eb00f87c5919", - "service-instance-name": "fghfghgfhhgfhfghfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "91fb7ec2-f05d-45dd-8690-f381a5c970c3", - "model-version-id": "0856b6e0-4bc2-4f61-96f5-b9469a101181", - "resource-version": "1509368073925", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ChaniPick" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "0856b6e0-4bc2-4f61-96f5-b9469a101181" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ChaniPick" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "91fb7ec2-f05d-45dd-8690-f381a5c970c3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "ariel_test_vnfonly01", - "service-instance": { - "service-instance-id": "9b108e4e-7bbf-458a-b059-eedbb46295bf", - "service-instance-name": "bvfghfhff", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "cf3fa46a-e026-4171-9496-56f5e5184b38", - "model-version-id": "e03239af-b20e-4966-aeb8-b558ef4203b6", - "resource-version": "1510265203217", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ariel_test_vnfonly01" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e03239af-b20e-4966-aeb8-b558ef4203b6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ariel_test_vnfonly01" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "cf3fa46a-e026-4171-9496-56f5e5184b38" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "AlinaTest0714", - "service-instance": { - "service-instance-id": "a64033f8-1035-4286-9dd5-92c248b6671e", - "service-instance-name": "shaninumber", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "ceab97cd-ca68-41a6-9b34-d571b2dd05ed", - "model-version-id": "1a6ae314-7a89-408b-93e5-6d8b8ee4c28a", - "resource-version": "1510586085248", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "test service for Byung" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "1a6ae314-7a89-408b-93e5-6d8b8ee4c28a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "AlinaTest0714" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "ceab97cd-ca68-41a6-9b34-d571b2dd05ed" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "b8fe12c0-5ebe-4592-a984-089d9e0eeb00", - "service-instance-name": "shani_pmTest_sanity8", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510726327332", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "affb2e0e-32de-494c-bfdb-ab49643bd263", - "service-instance-name": "net5shanii", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510731361356", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "e04f9e1c-e2ae-4212-9fbf-e092840ee46f", - "service-instance-name": "fgghjghjhg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510739272610", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "BJ_vDBE_Service", - "service-instance": { - "service-instance-id": "16785eac-7537-405e-a814-2f1dc58b3f80", - "service-instance-name": "BJ_vDBE_Service_vdi", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "3993cc03-f8d4-4a5c-b4ef-06a77743eba7", - "model-version-id": "6fd530e1-5f30-48f9-a301-750353e66599", - "resource-version": "1510953400508", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "BJ_vDBE_Service_1" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "6fd530e1-5f30-48f9-a301-750353e66599" - }, - { - "property-name": "model-ver.model-name", - "property-value": "BJ_vDBE_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "3993cc03-f8d4-4a5c-b4ef-06a77743eba7" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "Clear Service Shani", - "service-instance": { - "service-instance-id": "06b9419f-9d3f-432b-b5f9-152f69723683", - "service-instance-name": "serivce_shay", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "241e071e-7445-48b1-b05e-deb7926e49f8", - "model-version-id": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e", - "resource-version": "1511096310692", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "194d58a0-3520-45fc-ba1f-5ac6d06bf56e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Clear Service Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "241e071e-7445-48b1-b05e-deb7926e49f8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "a9c9bc36-9b6b-4dcf-9dbd-d3b8ac98bb08", - "service-instance-name": "tgjghjhgjhgj", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511103149152", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "691e5947-19aa-47b5-b072-aba3701a00c0", - "service-instance-name": "reg3a", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511159558051", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "Dip_221117_Service", - "service-instance": { - "service-instance-id": "9f9b27a9-fd95-4064-a303-f9744e1a7a3c", - "service-instance-name": "dip_serinst", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "dc621f45-db9c-42b2-a182-b429c675ef26", - "model-version-id": "0c628f95-b7ad-420a-87c6-80f8893d2629", - "resource-version": "1511385760681", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Add Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "0c628f95-b7ad-420a-87c6-80f8893d2629" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Dip_221117_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "dc621f45-db9c-42b2-a182-b429c675ef26" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "38154be9-e6e6-4903-86ea-f867ddfdd88d", - "service-instance-name": "sdfgdffd", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1512317905490", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Service_PNF", - "service-instance": { - "service-instance-id": "e32970bc-4cc7-4574-b2b6-15dc10c51328", - "service-instance-name": "tytytru7", - "service-type": "Transform", - "service-role": "PNF", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "9a4d9d41-e686-43da-a558-c45448d6023a", - "resource-version": "1512312663089", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_PNF_2" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "9a4d9d41-e686-43da-a558-c45448d6023a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_PNF" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "43596836-ae36-4608-a987-6608ede10dac" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "646de125-bb00-4e9a-8f9d-2ee9f275dd53", - "service-instance-name": "sanity06macro", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510051690302", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "a170a02e-5eb2-4fcb-b236-fe0101e8f9c2", - "service-instance-name": "dfggf.1", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510064179849", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "35fcb108-21bf-4a96-9644-d38d22491c1e", - "service-instance-name": "macro_2", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510158949346", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "7e0d64f5-dc67-48a3-bedf-f1dab87f011e", - "service-instance-name": "sanity003", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510564924456", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "aad8ed06-f432-4334-8f76-aaf2e8b1135e", - "service-instance-name": "PM1234", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510577187877", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Mvm2017-417041917_IST_Service", - "service-instance": { - "service-instance-id": "56d43b2a-2d55-412c-80e2-b496c0268151", - "service-instance-name": "MVM_instance", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "4cc34fbb-e99f-49d1-854a-f6474670b373", - "model-version-id": "10e0fe81-172a-4f15-acb0-68fd28120771", - "resource-version": "1510832704173", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Mvm2017-417041917_IST_Service - E2E Service creating in IST to check -Updating Service with latest vf" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "10e0fe81-172a-4f15-acb0-68fd28120771" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Mvm2017-417041917_IST_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "4cc34fbb-e99f-49d1-854a-f6474670b373" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "08085da8-0836-48fd-b0b7-f25f0191720d", - "service-instance-name": "oiuytre", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510836497023", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Ver1with_inputs_Ver2without_inputs", - "service-instance": { - "service-instance-id": "ebf3ef3f-63ac-4652-95ca-9358b4b65f2a", - "service-instance-name": "noinputs", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "821b337c-d1d6-41b8-91f2-62acbeea74e0", - "model-version-id": "efcbf4dc-4a83-4c86-987e-4e35a25dd890", - "resource-version": "1511176867478", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "efcbf4dc-4a83-4c86-987e-4e35a25dd890" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "821b337c-d1d6-41b8-91f2-62acbeea74e0" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "5.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "21227284-b6d1-4cf4-ba04-6a7e70725cf3", - "service-instance-name": "tghjrthr", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511179806111", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Using VID for VoIP Network Instantiations Shani", - "service-instance": { - "service-instance-id": "8b0e0064-c2ec-40cb-a1e7-32708d29cf9f", - "service-instance-name": "oe_step4", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1511185002297", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Using VID for VoIP Network Instantiations Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "5b9c0f33-eec1-484a-bf77-736a6644d7a8" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "InfraMSO_vSAMP10a_Service", - "service-instance": { - "service-instance-id": "99e3a5fa-d8ed-4b0d-b2ac-c6b3aa519d3d", - "service-instance-name": "MSO-ST-SI-1712-vSamp10a-PCM-126-01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "653030db-85e2-4bd1-8c61-3764ebf5860a", - "model-version-id": "17844177-36b9-4da2-ac43-64fb612c7b8e", - "resource-version": "1512577438341", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "17844177-36b9-4da2-ac43-64fb612c7b8e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "InfraMSO_vSAMP10a_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "653030db-85e2-4bd1-8c61-3764ebf5860a" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "a86149da-05ca-424b-8477-3464ba1b660b", - "service-instance-name": "defghghj_cdg", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510568355774", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "102cc0d3-e21e-4671-9078-c80ec17c6632", - "service-instance-name": "vidnf1707", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510573503448", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Service_with_network_with_subnet_info", - "service-instance": { - "service-instance-id": "37511a1d-182d-4b67-9b59-a07a4cde980e", - "service-instance-name": "subnet_service", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "b72eb6fe-070b-484b-836a-4c4fdf016817", - "model-version-id": "7d27189c-9d96-45de-92f6-8fafd543d9eb", - "resource-version": "1511165928126", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_with_network_with_subnet_info" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "7d27189c-9d96-45de-92f6-8fafd543d9eb" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_with_network_with_subnet_info" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "b72eb6fe-070b-484b-836a-4c4fdf016817" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "44719876-3083-44ae-9c9f-330158fc2a03", - "service-instance-name": "kjhgdfssd", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511434850122", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "5a987291-57de-4f5a-8f13-bf0b83924ab5", - "service-instance-name": "macro_instance_sanity06", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511435849163", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "6c0f1667-2dab-4b88-9cd3-2e9462c0f278", - "service-instance-name": "fgjhg.fgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509633002414", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "d47bfc99-c021-498e-87c8-7273ee160172", - "service-instance-name": "sanity03", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510047060871", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "e99c03c3-5748-4c24-a770-176c6b226223", - "service-instance-name": "ghjhjhgjkh", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511881237177", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "078cc9a4-34df-4508-a872-5771c197e898", - "service-instance-name": "pm_service", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510157749550", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "09df2bc4-2a94-48e6-885a-b1465ac96974", - "service-instance-name": "service_instance_ss_22", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510158367169", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "Service With VF Shani", - "service-instance": { - "service-instance-id": "5370c6cd-8037-4dce-a13c-fa34483f5cb9", - "service-instance-name": "nbnvnvmn", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "f07db45c-949c-4698-94c3-5a328a0d4d4f", - "model-version-id": "8c4093ce-404f-416a-a91c-4c146b5945db", - "resource-version": "1510264975222", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "8c4093ce-404f-416a-a91c-4c146b5945db" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service With VF Shani" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "f07db45c-949c-4698-94c3-5a328a0d4d4f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "4f6f291d-90ca-41dd-9dbb-ec3c62d47c77", - "service-instance-name": "xcvbnmfghj", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510836914620", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Vmee_Mor_Service", - "service-instance": { - "service-instance-id": "60e8b42f-6f30-436b-9158-1022d69b98de", - "service-instance-name": "vmeeeee", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1510848255404", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "06ac9663-54cf-4c77-b926-6e8757cf6380" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "d273900d-a452-4330-99cd-d0aeb4826629", - "service-instance-name": "reg2", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1511158435811", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "Ver1with_inputs_Ver2without_inputs", - "service-instance": { - "service-instance-id": "3da86740-528d-4409-9d0c-f5c4a13f2158", - "service-instance-name": "fghfghgf", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "821b337c-d1d6-41b8-91f2-62acbeea74e0", - "model-version-id": "93a77919-7e3e-477b-97b4-f756cc85a281", - "resource-version": "1511175822262", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "93a77919-7e3e-477b-97b4-f756cc85a281" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Ver1with_inputs_Ver2without_inputs" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "821b337c-d1d6-41b8-91f2-62acbeea74e0" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "4.0" - } - ] - } - }, - { - "model-name": "Lital_Port_Mirroring_SVC", - "service-instance": { - "service-instance-id": "9e794181-1d8d-4478-811e-22bcb2954250", - "service-instance-name": "Instance371386", - "service-type": "PORT-MIRROR", - "service-role": "VPROBE", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "96c66f9a-5171-4234-a9f6-40a9b51cf2f9", - "model-version-id": "455c6848-c910-45f9-a402-8283cdb119e1", - "resource-version": "1512673992546", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/9e794181-1d8d-4478-811e-22bcb2954250/service-data/service-topology/", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Lital_Port_Mirroring_SVC" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "455c6848-c910-45f9-a402-8283cdb119e1" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Lital_Port_Mirroring_SVC" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "96c66f9a-5171-4234-a9f6-40a9b51cf2f9" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "SDC_ServiceModel_Portal03", - "service-instance": { - "service-instance-id": "cf6a5227-0e7b-44d4-b079-c259aaf34960", - "service-instance-name": "NewInstance_123", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "0f0b5c20-d9e0-4904-8303-2a44df1a673f", - "model-version-id": "ab9ecd71-83e6-4225-8b3c-e3fd2bff54e0", - "resource-version": "1512508318711", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "SDC_ServiceModel_Portal03" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ab9ecd71-83e6-4225-8b3c-e3fd2bff54e0" - }, - { - "property-name": "model-ver.model-name", - "property-value": "SDC_ServiceModel_Portal03" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "0f0b5c20-d9e0-4904-8303-2a44df1a673f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "a6f4113f-86ea-4218-a0dc-bd2ce304be61", - "service-instance-name": "dfgdfgdgd", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1512377557678", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "029a23a2-2d4b-4bcb-b912-c6faf680db1d", - "service-instance-name": "shani000002", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1511434238472", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "c15fe241-c00a-4826-8fed-5014299df488", - "service-instance-name": "sdf", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509021900268", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "06-15-VID-Issue-SERVICE", - "service-instance": { - "service-instance-id": "43300442-d455-42b9-87cd-15cbc05d98d5", - "service-instance-name": "InstanceName_-.", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", - "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", - "resource-version": "1511779626467", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ae5d24f4-f602-46d0-9a62-ed3f28928b50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "06-15-VID-Issue-SERVICE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "2fa617d0-50b3-4d74-861d-4b39301acd2c" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "8690c96e-23b2-4323-87e7-26c25f7804e9", - "service-instance-name": "gkkk", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1511761450698", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "a29bf3be-816e-4128-bc83-fa8a6d347118", - "service-instance-name": "deployPM", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511883371551", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "fdf95043-bf0d-435d-b222-b04d54f909cd", - "service-instance-name": "kjhkjhkjhk", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1511788905599", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "6bb59496-8745-4b7c-9bb0-f2add303cd7b", - "service-instance-name": "yujutyutyuty", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1512302067216", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "ADIOD adhoc SRIOV Provider Network", - "service-instance": { - "service-instance-id": "d1676469-b555-417c-8655-5ce9cdb2e54c", - "service-instance-name": "dsfgdfgdfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "37df8e9b-3a8f-4070-8e86-dfb11161e7aa", - "model-version-id": "585a5172-0124-4bc9-b76e-c358093fb522", - "resource-version": "1512316855016", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "PID 291364a adhoc testing" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "585a5172-0124-4bc9-b76e-c358093fb522" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ADIOD adhoc SRIOV Provider Network" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "37df8e9b-3a8f-4070-8e86-dfb11161e7aa" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service For Macro Installation", - "service-instance": { - "service-instance-id": "9c16c382-8001-4dc9-8fa9-e8ac345df8cd", - "service-instance-name": "yutyutyut0", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", - "model-version-id": "b9436fbb-dc96-4163-90b8-846c6518a05a", - "resource-version": "1512381957060", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "b9436fbb-dc96-4163-90b8-846c6518a05a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service For Macro Installation" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "ServiceForPortMirroringTest", - "service-instance": { - "service-instance-id": "a0d58fd3-0bcd-468b-83ee-8945223e2728", - "service-instance-name": "RG_10-25_PortMirror", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "47222909-317e-41e5-a44b-6a4d5e4afd6c", - "model-version-id": "fd1b87b2-898f-41ad-93ac-c6e8e200280d", - "resource-version": "1508951185010", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceForPortMirroringTest" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "fd1b87b2-898f-41ad-93ac-c6e8e200280d" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceForPortMirroringTest" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "47222909-317e-41e5-a44b-6a4d5e4afd6c" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "b814d896-c630-4e87-8a8c-9c466d46420e", - "service-instance-name": "pmm", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509548195386", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "ServiceContainerMor", - "service-instance": { - "service-instance-id": "bf8856d0-1257-47da-9db8-c5cc619a5b4f", - "service-instance-name": "NewPM_1030", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f", - "resource-version": "1509390159180", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "d799809d-0bb4-4c2d-9dbc-d4ba0db06e0f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "ServiceContainerMor" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "a1ac367e-3f20-43cb-801e-5cb381aef876" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "7.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "d830c755-16e5-47e3-9053-35da8b83f630", - "service-instance-name": "ghjhg_h", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509633743082", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "mdns_2017_1011_IST_Service", - "service-instance": { - "service-instance-id": "f378264e-bb84-4444-b406-d9153b3bcaaa", - "service-instance-name": "NewTest_1106", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "c54c1178-ab4b-498c-aea0-52cc2043d44f", - "model-version-id": "6fcbe458-fe21-4c68-b131-3fe7ec26e17a", - "resource-version": "1510003414035", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "mdns_2017_1011_IST_Service -Creating Service for PID 298109a" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "6fcbe458-fe21-4c68-b131-3fe7ec26e17a" - }, - { - "property-name": "model-ver.model-name", - "property-value": "mdns_2017_1011_IST_Service" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "c54c1178-ab4b-498c-aea0-52cc2043d44f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "65c4c22d-0b37-4ed3-b6d3-902d1c0d8834", - "service-instance-name": "fghghgfh_cfg", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510568658568", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "76a9d5b5-733c-453f-bc30-ec8e26fe7bbf", - "service-instance-name": "jkjkjkl9887", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510576422163", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "fc782096-7232-4099-ad5a-044b9ffaa3d7", - "service-instance-name": "Shani_Regression_5", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1510819081691", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "418f32e5-484a-4073-8fa9-fab7d497459f" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "9.0" - } - ] - } - }, - { - "model-name": "1707vidnf", - "service-instance": { - "service-instance-id": "bd58287e-186a-4490-9776-11c25f5a96aa", - "service-instance-name": "TwoSanity2", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e", - "resource-version": "1511094049552", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "1707 Models that contain: nf_type,nf_role,nf_function,nf_code." - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "1707vidnf" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "709d1be4-9a3f-4a29-8c4d-a20465e808a3" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "11.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "6699ae39-2df6-4ade-8f51-dcfa3f77336c", - "service-instance-name": "sdfh7iu6ytr", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1511102636703", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "vidmacrofalsenaming", - "service-instance": { - "service-instance-id": "1b4f600c-3bd6-4e9a-8f22-7fe950937c59", - "service-instance-name": "dfgghdf", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510662887894", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "4d71990b-d8ad-4510-ac61-496288d9078e" - }, - { - "property-name": "model-ver.model-name", - "property-value": "vidmacrofalsenaming" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "d27e42cf-087e-4d31-88ac-6c4b7585f800" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "3.0" - } - ] - } - }, - { - "model-name": "shani_PM_Test", - "service-instance": { - "service-instance-id": "55e20cb6-75ea-4df7-a56c-bbeef278c5b9", - "service-instance-name": "sddddsa", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1510733725706", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "shani_PM_Test description" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50" - }, - { - "property-name": "model-ver.model-name", - "property-value": "shani_PM_Test" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "340f3957-ff0a-4503-866d-a34fd1b97450" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "2.0" - } - ] - } - }, - { - "model-name": "Service_VProbe_FE", - "service-instance": { - "service-instance-id": "05b4960c-b138-47f0-90d5-d7d543fcd6d9", - "service-instance-name": "instance_of_vprobe", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "711b3105-5efb-4a16-9a76-bf252d068c6f", - "model-version-id": "e492158d-cc1b-4e08-8800-38112a9658d2", - "resource-version": "1511265743057", - "orchestration-status": "Active" - }, - "extra-properties": { - "extra-property": [ - { - "property-name": "model-ver.model-description", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model-ver.model-version-id", - "property-value": "e492158d-cc1b-4e08-8800-38112a9658d2" - }, - { - "property-name": "model-ver.model-name", - "property-value": "Service_VProbe_FE" - }, - { - "property-name": "model.model-type", - "property-value": "service" - }, - { - "property-name": "model.model-invariant-id", - "property-value": "711b3105-5efb-4a16-9a76-bf252d068c6f" - }, - { - "property-name": "model.model-description" - }, - { - "property-name": "model-ver.model-version", - "property-value": "1.0" - } - ] - } - } - ] - } - } - ] - } - } -} diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_USP_VOICE.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json index df6a69a58..af955a40b 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_USP_VOICE.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json @@ -10,7 +10,7 @@ "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89" }, "service-subscription": { - "service-type": "VIRTUAL USP" + "service-type": "TYLER SILVIA" } } ] @@ -28,7 +28,7 @@ "inventory-response-item": [ { "service-subscription": { - "service-type": "VIRTUAL USP", + "service-type": "TYLER SILVIA", "resource-version": "1494001841964" }, "extra-properties": {}, @@ -83,7 +83,7 @@ } }, { - "model-name": "VID-PCRF-05-15-17-SRVS", + "model-name": "VID-RODERICK-05-15-17-SRVS", "service-instance": { "service-instance-id": "e25c1753-d5f7-4b5e-880e-cdad5c2f74f7", "service-instance-name": "lll052617B", @@ -96,7 +96,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model-ver.model-version-id", @@ -104,7 +104,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model.model-type", @@ -377,7 +377,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "28378666-89cd-47df-8ed9-fc1839a4b265", "service-instance-name": "test_rt945klol4", @@ -390,7 +390,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -398,7 +398,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -589,7 +589,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "5bfa3a21-65b3-4047-8455-69af6e8451f2", "service-instance-name": "HHHKJKJKJKJKJ", @@ -604,7 +604,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -612,7 +612,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -1353,7 +1353,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "f53eeb76-3011-4745-8bd4-fb725ee54e8b", "service-instance-name": "bcvbcvc", @@ -1366,7 +1366,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -1374,7 +1374,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -1775,7 +1775,7 @@ } }, { - "model-name": "VID-PCRF-05-15-17-SRVS", + "model-name": "VID-RODERICK-05-15-17-SRVS", "service-instance": { "service-instance-id": "d8f23bb5-5822-4374-8ece-964c0af90d60", "service-instance-name": "lll052617A", @@ -1788,7 +1788,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model-ver.model-version-id", @@ -1796,7 +1796,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model.model-type", @@ -1861,7 +1861,7 @@ } }, { - "model-name": "VID-PCRF-05-15-17-SRVS", + "model-name": "VID-RODERICK-05-15-17-SRVS", "service-instance": { "service-instance-id": "f363b54e-ed50-4c7b-b404-b54291da2f25", "service-instance-name": "test0450450", @@ -1876,7 +1876,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model-ver.model-version-id", @@ -1884,7 +1884,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model.model-type", @@ -1905,7 +1905,7 @@ } }, { - "model-name": "VID-PCRF-05-15-17-SRVS", + "model-name": "VID-RODERICK-05-15-17-SRVS", "service-instance": { "service-instance-id": "da3ac66a-fdcb-44b8-bef5-16bc0603acfc", "service-instance-name": "dfhmg", @@ -1918,7 +1918,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model-ver.model-version-id", @@ -1926,7 +1926,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model.model-type", @@ -2847,7 +2847,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "6f9f86b0-ef30-45a6-b92b-df246a5c6168", "service-instance-name": "mnbkjhgfddsa", @@ -2862,7 +2862,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -2870,7 +2870,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -4879,7 +4879,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "45ae5259-949e-4163-ae40-61e564eb04ba", "service-instance-name": "dfgbdfbgdf", @@ -4894,7 +4894,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -4902,7 +4902,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -4967,7 +4967,7 @@ } }, { - "model-name": "VID-PCRF-05-15-17-SRVS", + "model-name": "VID-RODERICK-05-15-17-SRVS", "service-instance": { "service-instance-id": "6798f1fa-fb5c-4638-b1ff-b7b66052e71d", "service-instance-name": "vid-test-creation-3333", @@ -4982,7 +4982,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model-ver.model-version-id", @@ -4990,7 +4990,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model.model-type", @@ -5447,7 +5447,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "643e277d-7dfe-4ff2-8894-a1ad18860d95", "service-instance-name": "test_045004", @@ -5462,7 +5462,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -5470,7 +5470,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -5579,7 +5579,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "16626bff-21ad-4a2b-820e-1894d06be31c", "service-instance-name": "test0560560", @@ -5594,7 +5594,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -5602,7 +5602,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -5711,7 +5711,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "f778648a-1db5-4fd2-9d6d-1c3e9dc810c9", "service-instance-name": "test_0er50405", @@ -5726,7 +5726,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -5734,7 +5734,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -6147,7 +6147,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "e720e20f-9997-4e42-a959-a5e4f20135fd", "service-instance-name": "hjgfdsfrg", @@ -6162,7 +6162,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -6170,7 +6170,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -6235,7 +6235,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "a2a9e86a-2639-4d3d-8aae-24736c0aa5ac", "service-instance-name": "test_94589485", @@ -6250,7 +6250,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -6258,7 +6258,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -6279,7 +6279,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "8330708c-8d75-466a-9a95-4dd4c4b56863", "service-instance-name": "almog-test-003", @@ -6294,7 +6294,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -6302,7 +6302,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -6411,7 +6411,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "1d439d6d-5867-4522-a730-528256378011", "service-instance-name": "test_84584", @@ -6426,7 +6426,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -6434,7 +6434,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -6499,7 +6499,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "c9407d5f-0227-4335-b1b2-9148a5a27c0e", "service-instance-name": "ready", @@ -6514,7 +6514,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -6522,7 +6522,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -6675,7 +6675,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "7bdaca06-8242-48bc-a20e-b882426a1cd2", "service-instance-name": "test_jhgjhghh5", @@ -6690,7 +6690,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -6698,7 +6698,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -7029,7 +7029,7 @@ } }, { - "model-name": "RG-7-7_mDNS_Service", + "model-name": "RG-7-7_CHARLOTTE_Service", "service-instance": { "service-instance-id": "ae3e6c21-8463-456e-a746-d9932c467e79", "service-instance-name": "mdnsinstance", @@ -7046,7 +7046,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "RG-7-7_mDNS_Service" + "property-value": "RG-7-7_CHARLOTTE_Service" }, { "property-name": "model-ver.model-version-id", @@ -7054,7 +7054,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "RG-7-7_mDNS_Service" + "property-value": "RG-7-7_CHARLOTTE_Service" }, { "property-name": "model.model-type", @@ -7251,7 +7251,7 @@ } }, { - "model-name": "HNPortal SRIOV Provider Net 4", + "model-name": "WILKINS SRIOV Provider Net 4", "service-instance": { "service-instance-id": "1f9c366c-c3c2-4c7b-8f31-fa1ed8f440ad", "service-instance-name": "", @@ -7274,7 +7274,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "HNPortal SRIOV Provider Net 4" + "property-value": "WILKINS SRIOV Provider Net 4" }, { "property-name": "model.model-type", @@ -7473,7 +7473,7 @@ } }, { - "model-name": "VID-PCRF-05-15-17-SRVS", + "model-name": "VID-RODERICK-05-15-17-SRVS", "service-instance": { "service-instance-id": "b1891b75-b45a-4862-8f4d-bc41b68b9760", "service-instance-name": "svc", @@ -7488,7 +7488,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model-ver.model-version-id", @@ -7496,7 +7496,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "VID-PCRF-05-15-17-SRVS" + "property-value": "VID-RODERICK-05-15-17-SRVS" }, { "property-name": "model.model-type", @@ -7607,7 +7607,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "7c569714-4174-4d91-9fd0-14051794c3d2", "service-instance-name": "sdfsdfdsf", @@ -7622,7 +7622,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -7630,7 +7630,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -7695,7 +7695,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "47f70a06-7846-44ff-9488-2d60536baf72", "service-instance-name": "dfghdfghsdfg", @@ -7710,7 +7710,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -7718,7 +7718,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -7739,7 +7739,7 @@ } }, { - "model-name": "HNPortal SRIOV Provider Net 4", + "model-name": "WILKINS SRIOV Provider Net 4", "service-instance": { "service-instance-id": "145dc127-918e-46dc-beca-fe07cc00c62b", "service-instance-name": "", @@ -7762,7 +7762,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "HNPortal SRIOV Provider Net 4" + "property-value": "WILKINS SRIOV Provider Net 4" }, { "property-name": "model.model-type", @@ -7827,7 +7827,7 @@ } }, { - "model-name": "BK-PCRF-1707-SRVS", + "model-name": "BK-RODERICK-1707-SRVS", "service-instance": { "service-instance-id": "d712579c-75fd-4a8f-9378-bfb9bf3aaf58", "service-instance-name": "demolynn", @@ -7842,7 +7842,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "BK-PCRF-1707-SRVS" + "property-value": "BK-RODERICK-1707-SRVS" }, { "property-name": "model-ver.model-version-id", @@ -7850,7 +7850,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "BK-PCRF-1707-SRVS" + "property-value": "BK-RODERICK-1707-SRVS" }, { "property-name": "model.model-type", @@ -9903,7 +9903,7 @@ } }, { - "model-name": "ADIOD vCE Tenant OAM Network", + "model-name": "PASQUALE vCE Tenant OAM Network", "service-instance": { "service-instance-id": "13dec3b0-ab57-4359-b4ec-4db0811256fc", "service-instance-name": "newadio", @@ -9918,7 +9918,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PID 291364a : ASTRA Tenant OAM network model for vCE (ADIOD)" + "property-value": "PID 291364a : ASTRA Tenant OAM network model for vCE (PASQUALE)" }, { "property-name": "model-ver.model-version-id", @@ -9926,7 +9926,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "ADIOD vCE Tenant OAM Network" + "property-value": "PASQUALE vCE Tenant OAM Network" }, { "property-name": "model.model-type", @@ -10265,7 +10265,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "54705472-6522-4d55-a6b8-091a3173f5dd", "service-instance-name": "test_9934585345", @@ -10280,7 +10280,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -10288,7 +10288,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -10441,10 +10441,10 @@ } }, { - "model-name": "Mobility_VSP_Service", + "model-name": "Emanuel_VSP_Service", "service-instance": { "service-instance-id": "e089b589-5227-4a7c-aa19-92c99507f147", - "service-instance-name": "Mobility_VSP_Service_DS_0906_01", + "service-instance-name": "Emanuel_VSP_Service_DS_0906_01", "service-type": "", "service-role": "", "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -10456,7 +10456,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "Mobility_VSP_Service_msdn" + "property-value": "Emanuel_VSP_Service_msdn" }, { "property-name": "model-ver.model-version-id", @@ -10464,7 +10464,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "Mobility_VSP_Service" + "property-value": "Emanuel_VSP_Service" }, { "property-name": "model.model-type", @@ -11568,7 +11568,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "54515abc-20c2-4852-9f79-f54530b1c17b", "service-instance-name": "XSXSXXSX", @@ -11583,7 +11583,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -11591,7 +11591,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -12211,7 +12211,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "e62bf002-1de0-4efb-9b5a-7f48ec5400f3", "service-instance-name": "test_056056", @@ -12226,7 +12226,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -12234,7 +12234,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -12299,7 +12299,7 @@ } }, { - "model-name": "3_PCRF_TEST", + "model-name": "3_RODERICK_TEST", "service-instance": { "service-instance-id": "f001f409-8cd7-4e5a-b104-a193d0e596ab", "service-instance-name": "test_0450450777", @@ -12322,7 +12322,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_TEST" + "property-value": "3_RODERICK_TEST" }, { "property-name": "model.model-type", @@ -12705,7 +12705,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "6eeb541a-2976-4ae2-986f-1e34c7927983", "service-instance-name": "test_lfgfjdf7", @@ -12720,7 +12720,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -12728,7 +12728,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -12749,7 +12749,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "45a68dc7-6d41-47b1-b123-5c958abe49e3", "service-instance-name": "test_jhjhjjh", @@ -12764,7 +12764,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -12772,7 +12772,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -13062,7 +13062,7 @@ } }, { - "model-name": "3_PCRF_SERV", + "model-name": "3_RODERICK_SERV", "service-instance": { "service-instance-id": "09e1de12-2b12-431c-abbe-cb786fba1d3e", "service-instance-name": "test03490348", @@ -13077,7 +13077,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "PCRF_SERV" + "property-value": "RODERICK_SERV" }, { "property-name": "model-ver.model-version-id", @@ -13085,7 +13085,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_SERV" + "property-value": "3_RODERICK_SERV" }, { "property-name": "model.model-type", @@ -13428,7 +13428,7 @@ } }, { - "model-name": "3_PCRF_TEST", + "model-name": "3_RODERICK_TEST", "service-instance": { "service-instance-id": "7b66fff7-15e3-4421-8e80-695ce78e9a40", "service-instance-name": "test865555665", @@ -13451,7 +13451,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "3_PCRF_TEST" + "property-value": "3_RODERICK_TEST" }, { "property-name": "model.model-type", @@ -15433,10 +15433,10 @@ } }, { - "model-name": "Vmee_Mor_Service", + "model-name": "Vgeraldine_Mor_Service", "service-instance": { "service-instance-id": "0f2624ba-94cf-4ac5-b903-652d49002c97", - "service-instance-name": "vmee1", + "service-instance-name": "vgeraldine1", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -15450,7 +15450,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "Vmee_Mor_Service" + "property-value": "Vgeraldine_Mor_Service" }, { "property-name": "model-ver.model-version-id", @@ -15458,7 +15458,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "Vmee_Mor_Service" + "property-value": "Vgeraldine_Mor_Service" }, { "property-name": "model.model-type", diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_services.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_services.json index ef9725e40..7df5aaab4 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_services.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_services.json @@ -9,17 +9,17 @@ "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" }, { @@ -28,18 +28,18 @@ "resource-version":"1494001980153" }, { - "service-id":"vRRaaS", - "service-description":"vRRaaS", + "service-id":"vTerrance", + "service-description":"vTerrance", "resource-version":"1484865266" }, { "service-id":"323d69d9-2efe-4r45-ay0a-89ea7ard4e6f", - "service-description":"vSCP", + "service-description":"vEsmeralda", "resource-version":"1494001903012" }, { "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "service-description":"Mobility", + "service-description":"Emanuel", "resource-version":"1503954056794" }, { @@ -49,7 +49,7 @@ }, { "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0", - "service-description":"FIRSTNET", + "service-description":"LINDSEY", "resource-version":"1490910095155" }, { @@ -58,18 +58,18 @@ "resource-version":"1494001863930" }, { - "service-id":"vHNGWaas", + "service-id":"vRosemarie", "service-description":"HNGATEWAY", "resource-version":"1501192849249" }, { "service-id":"vHNPaas", - "service-description":"HNPORTAL", + "service-description":"WILKINS", "resource-version":"1501192982895" }, { "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "service-description":"VIRTUAL USP", + "service-description":"TYLER SILVIA", "resource-version":"1494001802638" }, { @@ -78,18 +78,18 @@ "resource-version":"1492533254036" }, { - "service-id":"VIPRaaS", - "service-description":"vIPRaaS", + "service-id":"vMuriel", + "service-description":"vMuriel", "resource-version":"1490910058887" }, { "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" }, { @@ -98,23 +98,23 @@ "resource-version":"1506361785997" }, { - "service-id":"vVIGaaS", - "service-description":"vVIGaaS", + "service-id":"vSalvatore", + "service-description":"vSalvatore", "resource-version":"1494001900545" }, { "service-id":"d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4", - "service-description":"uCPE-VMS", + "service-description":"JOSEFINA", "resource-version":"1494001941772" }, { - "service-id":"vPEaaS", - "service-description":"vPEaaS", + "service-id":"vHubbard", + "service-description":"vHubbard", "resource-version":"1494001988229" }, { "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/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer.json index fc7f3945d..43b1ecb45 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer.json @@ -1,7 +1,7 @@ -{ +[{ "simulatorRequest": { "method": "GET", - "path": "/aai/v../business/customers/customer/MSO_1610_ST", + "path": "/aai/v../business/customers/customer/CAR_2020_ER", "queryParams": { "depth": 2 } @@ -9,14 +9,14 @@ "simulatorResponse": { "responseCode": 200, "body": { - "global-customer-id": "MSO_1610_ST", - "subscriber-name": "MSO_1610_ST", + "global-customer-id": "CAR_2020_ER", + "subscriber-name": "CAR_2020_ER", "subscriber-type": "INFRA", "resource-version": "1494001902987", "service-subscriptions": { "service-subscription": [ { - "service-type": "HOSTED COMMUNICATIONS", + "service-type": "DARREN MCGEE", "resource-version": "1494001839747", "service-instances": { "service-instance": [ @@ -670,7 +670,7 @@ }, { "service-instance-id": "5e849f9a-e43e-44ea-9378-515d28dd5c31", - "service-instance-name": "vmee_service_cfg3", + "service-instance-name": "vgeraldine_service_cfg3", "persona-model-id": null, "persona-model-version": null, "resource-version": "1508672120074", @@ -740,7 +740,7 @@ }, { "service-instance-id": "1b896f1c-803b-47d2-a6b3-022b3083c19e", - "service-instance-name": "HnportalProviderNetwork_1", + "service-instance-name": "WILKINSProviderNetwork_1", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001990972", @@ -810,7 +810,7 @@ }, { "service-instance-id": "5d4122df-9af7-45bb-8620-7fdb846972ad", - "service-instance-name": "MSOST-1702-MTN6-Network-temp3", + "service-instance-name": "MSOST-1702-hvf6-Network-temp3", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001833813", @@ -830,7 +830,7 @@ }, { "service-instance-id": "1e48119c-cd72-456a-acf9-911ed4ebca7e", - "service-instance-name": "HnportalProviderNetwork_30", + "service-instance-name": "WILKINSProviderNetwork_30", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001986763", @@ -920,7 +920,7 @@ }, { "service-instance-id": "5929e10b-b831-444d-acb2-dd48f8650e1e", - "service-instance-name": "ST-mtn16-vSAMP12-Zone1702", + "service-instance-name": "ST-hvf16-vSAMP12-Zone1702", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001954917", @@ -1070,7 +1070,7 @@ }, { "service-instance-id": "a11a89d7-5fb5-48dc-ae7f-976b496f2960", - "service-instance-name": "MSO-ST-SI-1707-mtn6-InfraMSOvSAMP12Service-v5.0-2XXX", + "service-instance-name": "MSO-ST-SI-1707-hvf6-InfraMSOvSAMP12Service-v5.0-2XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499970280223", @@ -1080,7 +1080,7 @@ }, { "service-instance-id": "fab82a56-aae6-4204-bfa2-95e51a8596e5", - "service-instance-name": "HngwOamNetVto_67", + "service-instance-name": "RosemaOamNetVto_67", "persona-model-id": null, "persona-model-version": null, "resource-version": "1496388185071", @@ -1120,7 +1120,7 @@ }, { "service-instance-id": "13c00d90-ba65-476c-9815-9d8920944643", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP10a-001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001916535", @@ -1130,7 +1130,7 @@ }, { "service-instance-id": "2a8ee11e-969a-4b70-810d-01537def1b96", - "service-instance-name": "HngwOamNetVto_10", + "service-instance-name": "RosemaOamNetVto_10", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001953987", @@ -1150,7 +1150,7 @@ }, { "service-instance-id": "53ad9753-6170-4236-ac7e-8815707c872e", - "service-instance-name": "larry+pxmc+test+1011", + "service-instance-name": "larry+CORNELIUS+test+1011", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001920923", @@ -1240,7 +1240,7 @@ }, { "service-instance-id": "1cca02a5-72a6-4aec-bb9c-535bae207086", - "service-instance-name": "HnportalProviderNetwork_42", + "service-instance-name": "WILKINSProviderNetwork_42", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001953493", @@ -1340,7 +1340,7 @@ }, { "service-instance-id": "ad43c6c0-7de0-4772-83d4-139ffb65c50c", - "service-instance-name": "vmeeshani", + "service-instance-name": "vgeraldineshani", "persona-model-id": null, "persona-model-version": null, "resource-version": "1509288736569", @@ -1350,7 +1350,7 @@ }, { "service-instance-id": "3fc6a66d-103d-4ec6-b3be-19b6226f8d1f", - "service-instance-name": "HngwOamNetVto_30", + "service-instance-name": "RosemaOamNetVto_30", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001858519", @@ -1360,7 +1360,7 @@ }, { "service-instance-id": "f849bcb5-8541-492b-a639-97db55020be1", - "service-instance-name": "HnportalProviderNetwork_22", + "service-instance-name": "WILKINSProviderNetwork_22", "persona-model-id": null, "persona-model-version": null, "resource-version": "1496856562847", @@ -1440,7 +1440,7 @@ }, { "service-instance-id": "163278f1-c06a-4e5b-ad55-7d43cb83d279", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-ErrPatch", + "service-instance-name": "MSOST-1702-hvf16-vSAMP10a-ErrPatch", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001899632", @@ -1460,7 +1460,7 @@ }, { "service-instance-id": "0691c9ce-bf13-483f-b29d-4583634c59fa", - "service-instance-name": "HngwOamNetVto_53", + "service-instance-name": "RosemaOamNetVto_53", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001899421", @@ -1540,7 +1540,7 @@ }, { "service-instance-id": "8e39f14f-21d3-44ec-9f05-99d0f3dc8092", - "service-instance-name": "vmee_service_instance", + "service-instance-name": "vgeraldine_service_instance", "persona-model-id": null, "persona-model-version": null, "resource-version": "1508675655654", @@ -1550,7 +1550,7 @@ }, { "service-instance-id": "90330e27-34d6-4b38-a1f1-3f3e22c04cd9", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP12Service-v1.0-2XXX", + "service-instance-name": "MSO-ST-SI-1710-hvf16a-InfraMSOvSAMP12Service-v1.0-2XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502125802006", @@ -1670,7 +1670,7 @@ }, { "service-instance-id": "762f01ab-26a2-406d-bfd4-2b4f6853941e", - "service-instance-name": "MSOST-1702-MTN6-Network-1001", + "service-instance-name": "MSOST-1702-hvf6-Network-1001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001794605", @@ -1690,7 +1690,7 @@ }, { "service-instance-id": "e536ebf7-807c-4786-8066-8c8e241a85a7", - "service-instance-name": "mtn16NetworkZone1702", + "service-instance-name": "hvf16NetworkZone1702", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001857248", @@ -1710,7 +1710,7 @@ }, { "service-instance-id": "08cf190a-e9b7-4d7f-b0cb-cbb789c1a895", - "service-instance-name": "MSOST-1702-MTN6-Network-temp1", + "service-instance-name": "MSOST-1702-hvf6-Network-temp1", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001793575", @@ -1800,7 +1800,7 @@ }, { "service-instance-id": "fe6d1eb5-85cd-43ae-901a-1a6b0266264a", - "service-instance-name": "MSO-ST-SI-1707-mtn16a-MSOTestNetwork-3XXX", + "service-instance-name": "MSO-ST-SI-1707-hvf16a-MSOTestNetwork-3XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502372167295", @@ -1820,7 +1820,7 @@ }, { "service-instance-id": "4d389e30-7cfe-43e1-83a6-dc211bb7d046", - "service-instance-name": "HngwOamNetVto_13", + "service-instance-name": "RosemaOamNetVto_13", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001999423", @@ -1830,7 +1830,7 @@ }, { "service-instance-id": "b651cb05-87d9-4747-9dea-e0b5b52995eb", - "service-instance-name": "HngwOamNetVto_16", + "service-instance-name": "RosemaOamNetVto_16", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001855976", @@ -1910,7 +1910,7 @@ }, { "service-instance-id": "4ed86252-d359-4a0d-b146-7cdc2aa917bb", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp1", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-temp1", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001999021", @@ -1950,7 +1950,7 @@ }, { "service-instance-id": "493d5299-286e-4c18-b2f6-e58d1662a63d", - "service-instance-name": "MSO-ST-SI-1707-mtn16a-InfraMSOvSAMP10aService-v1.0-1XXX", + "service-instance-name": "MSO-ST-SI-1707-hvf16a-InfraMSOvSAMP10aService-v1.0-1XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499979599759", @@ -2010,7 +2010,7 @@ }, { "service-instance-id": "994121b4-b5c6-44ef-b20b-49523b4cb9c3", - "service-instance-name": "HnportalProviderNetwork_3", + "service-instance-name": "WILKINSProviderNetwork_3", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002000388", @@ -2110,7 +2110,7 @@ }, { "service-instance-id": "ca741a4c-3554-4dea-b76b-ba47cb2d9a84", - "service-instance-name": "HngwOamNetVto_10", + "service-instance-name": "RosemaOamNetVto_10", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001999418", @@ -2120,7 +2120,7 @@ }, { "service-instance-id": "6e14a44c-401b-4a8a-b5c0-dd0eb61b9ad7", - "service-instance-name": "MSO-ST-SI-1707-mtn6-MSOTestNetwork-3XXX", + "service-instance-name": "MSO-ST-SI-1707-hvf6-MSOTestNetwork-3XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499971131822", @@ -2130,7 +2130,7 @@ }, { "service-instance-id": "49e739f8-963e-4abf-ad5a-bd4418f9544a", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP12Service-v5.0-2XXX", + "service-instance-name": "MSO-ST-SI-1710-hvf16a-InfraMSOvSAMP12Service-v5.0-2XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502991526931", @@ -2160,7 +2160,7 @@ }, { "service-instance-id": "6c5ce12f-d028-43a7-97f6-699e7aac64ac", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-MSOTestNetwork-3XXX", + "service-instance-name": "MSO-ST-SI-1710-hvf16a-MSOTestNetwork-3XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1503000992667", @@ -2270,7 +2270,7 @@ }, { "service-instance-id": "ac41a7cd-3466-468d-88d6-3f9308889943", - "service-instance-name": "MSOST-1702-MTN6-Network-2001", + "service-instance-name": "MSOST-1702-hvf6-Network-2001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001983401", @@ -2280,7 +2280,7 @@ }, { "service-instance-id": "2cc1ea57-dbe8-4fd1-9e2e-a85df64dd0e9", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-2001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-2001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001983384", @@ -2320,7 +2320,7 @@ }, { "service-instance-id": "8fe6eed2-9823-426c-ad27-95545c42ce4c", - "service-instance-name": "MSO-ST-SI-1710-mtn6-InfraMSOvSAMP10aService-4.0-1XXX", + "service-instance-name": "MSO-ST-SI-1710-hvf6-InfraMSOvSAMP10aService-4.0-1XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502808860080", @@ -2370,7 +2370,7 @@ }, { "service-instance-id": "af046361-54f7-4956-b059-78d11e15b7c1", - "service-instance-name": "vDBE_BJ_21NOV", + "service-instance-name": "vDOROTHEA_BJ_21NOV", "persona-model-id": null, "persona-model-version": null, "resource-version": "1511298043321", @@ -2390,7 +2390,7 @@ }, { "service-instance-id": "d84bfb65-d585-4f83-886a-9331303138b8", - "service-instance-name": "HnportalProviderNetwork_36", + "service-instance-name": "WILKINSProviderNetwork_36", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001995842", @@ -2450,7 +2450,7 @@ }, { "service-instance-id": "8946c0a9-103f-4a23-b9f3-b9f16face559", - "service-instance-name": "HngwOamNetVto_35", + "service-instance-name": "RosemaOamNetVto_35", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002010173", @@ -2460,7 +2460,7 @@ }, { "service-instance-id": "99b91443-219a-4b61-a3e9-19045d8833c4", - "service-instance-name": "HnportalProviderNetwork_31", + "service-instance-name": "WILKINSProviderNetwork_31", "persona-model-id": null, "persona-model-version": null, "resource-version": "1497320472238", @@ -2500,7 +2500,7 @@ }, { "service-instance-id": "cec5f96f-447d-41d3-a8c7-9bdcc796fe59", - "service-instance-name": "HngwOamNetVto_28", + "service-instance-name": "RosemaOamNetVto_28", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001770362", @@ -2550,7 +2550,7 @@ }, { "service-instance-id": "169710db-e92a-4e11-886e-00178c23808d", - "service-instance-name": "HnportalProviderNetwork_2", + "service-instance-name": "WILKINSProviderNetwork_2", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001920140", @@ -2610,7 +2610,7 @@ }, { "service-instance-id": "12f56a37-3966-4626-9cb1-d9067d616a66", - "service-instance-name": "MSOST-1702-MTN6-Network-2002", + "service-instance-name": "MSOST-1702-hvf6-Network-2002", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001770162", @@ -2640,7 +2640,7 @@ }, { "service-instance-id": "adc03856-9e87-4a03-885a-c151f8061d62", - "service-instance-name": "HnportalProviderNetwork_12", + "service-instance-name": "WILKINSProviderNetwork_12", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001993433", @@ -2700,7 +2700,7 @@ }, { "service-instance-id": "821c1485-de82-451e-b413-22ccdbf2c52e", - "service-instance-name": "HngwOamNetVto_20", + "service-instance-name": "RosemaOamNetVto_20", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002003024", @@ -2740,7 +2740,7 @@ }, { "service-instance-id": "7b45454d-de6d-443b-932d-99dff9b2fd52", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-MSOTestNetwork-33XX_Update", + "service-instance-name": "MSO-ST-SI-1710-hvf16a-MSOTestNetwork-33XX_Update", "persona-model-id": null, "persona-model-version": null, "resource-version": "1503001449498", @@ -2860,7 +2860,7 @@ }, { "service-instance-id": "24afca09-100c-45b7-a640-ccaf0b1cfef3", - "service-instance-name": "MSO-ST-SI-1707-PCRF_10_17_1610_SVC-v1.0-9XXX", + "service-instance-name": "MSO-ST-SI-1707-RODERICK_10_17_1610_SVC-v1.0-9XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1495227731141", @@ -2900,7 +2900,7 @@ }, { "service-instance-id": "76bb867c-6218-4381-9873-bc79e31e387d", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-Err", + "service-instance-name": "MSOST-1702-hvf16-vSAMP10a-Err", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001791325", @@ -2930,7 +2930,7 @@ }, { "service-instance-id": "22778c84-c18a-4d4f-8ae6-d0d339862bd0", - "service-instance-name": "HngwOamNetVto_42", + "service-instance-name": "RosemaOamNetVto_42", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002015904", @@ -2980,7 +2980,7 @@ }, { "service-instance-id": "d694242e-d119-47ce-bcf4-d2b4e8bffba8", - "service-instance-name": "HngwOamNetVto_79", + "service-instance-name": "RosemaOamNetVto_79", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502762958016", @@ -2990,7 +2990,7 @@ }, { "service-instance-id": "911afcb6-6a93-417a-8e1c-90ceebdb3842", - "service-instance-name": "MSOST-1702-MTN16-VFNetworkFqdn-001", + "service-instance-name": "MSOST-1702-hvf16-VFNetworkFqdn-001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002015761", @@ -3010,7 +3010,7 @@ }, { "service-instance-id": "16785eac-7537-405e-a814-2f1dc58b3f80", - "service-instance-name": "BJ_vDBE_Service_vdi", + "service-instance-name": "BJ_vDOROTHEA_Service_vdi", "persona-model-id": null, "persona-model-version": null, "resource-version": "1510953400508", @@ -3070,7 +3070,7 @@ }, { "service-instance-id": "67ca1f14-73ef-4e93-ada0-e1ec1d2788d3", - "service-instance-name": "HnportalProviderNetwork_4", + "service-instance-name": "WILKINSProviderNetwork_4", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001987746", @@ -3090,7 +3090,7 @@ }, { "service-instance-id": "fac00ff4-5953-47a9-8642-3833cba691c5", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp2", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-temp2", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001878101", @@ -3110,7 +3110,7 @@ }, { "service-instance-id": "7614702d-eb13-4632-94ae-92b16fea4b3b", - "service-instance-name": "ldf+vDBE+svc+IST", + "service-instance-name": "ldf+vDOROTHEA+svc+IST", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001867830", @@ -3220,7 +3220,7 @@ }, { "service-instance-id": "6977963a-042d-4c5e-a82a-ba2eb1004067", - "service-instance-name": "HnportalProviderNetwork_42", + "service-instance-name": "WILKINSProviderNetwork_42", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499272428096", @@ -3300,7 +3300,7 @@ }, { "service-instance-id": "72dbe562-01bd-4cde-bb0b-c861bb87c556", - "service-instance-name": "HngwOamNetVto_9", + "service-instance-name": "RosemaOamNetVto_9", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002005893", @@ -3400,7 +3400,7 @@ }, { "service-instance-id": "7fa986db-ef92-4407-a549-1371102d6ded", - "service-instance-name": "MSOST-1702-MTN6-Network-001", + "service-instance-name": "MSOST-1702-hvf6-Network-001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002004656", @@ -3410,7 +3410,7 @@ }, { "service-instance-id": "241e1576-3f6b-4c06-8577-8d1d38f25885", - "service-instance-name": "shani_vmee_service", + "service-instance-name": "shani_vgeraldine_service", "persona-model-id": null, "persona-model-version": null, "resource-version": "1508763229986", @@ -3440,7 +3440,7 @@ }, { "service-instance-id": "7839d807-37ca-4b7e-9c29-53e94d41405a", - "service-instance-name": "VMEE_instance", + "service-instance-name": "VGERALDINE_instance", "persona-model-id": null, "persona-model-version": null, "resource-version": "1508670917581", @@ -3540,7 +3540,7 @@ }, { "service-instance-id": "651c88c4-62de-41e1-a5a9-acec829d9529", - "service-instance-name": "MSOST-1702-MTN6-Network-9001", + "service-instance-name": "MSOST-1702-hvf6-Network-9001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001833771", @@ -3580,7 +3580,7 @@ }, { "service-instance-id": "8a6a9177-5eab-4e16-9fe5-65966e610545", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-ErrPatch2", + "service-instance-name": "MSOST-1702-hvf16-vSAMP10a-ErrPatch2", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001816089", @@ -3630,7 +3630,7 @@ }, { "service-instance-id": "9fd66f32-fc9f-4c27-a1c8-728e4cc5015e", - "service-instance-name": "HnportalProviderNetwork_50", + "service-instance-name": "WILKINSProviderNetwork_50", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001815618", @@ -3640,7 +3640,7 @@ }, { "service-instance-id": "0ceebdf7-48d5-4bfd-a610-e23bcb2a1324", - "service-instance-name": "HnportalProviderNetwork_38", + "service-instance-name": "WILKINSProviderNetwork_38", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001815517", @@ -3670,7 +3670,7 @@ }, { "service-instance-id": "bf4304d6-0fe6-4158-8adb-1d32a5f49e50", - "service-instance-name": "HngwOamNetVto_52", + "service-instance-name": "RosemaOamNetVto_52", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001990190", @@ -3700,7 +3700,7 @@ }, { "service-instance-id": "60e8b42f-6f30-436b-9158-1022d69b98de", - "service-instance-name": "vmeeeee", + "service-instance-name": "vgeraldineeee", "persona-model-id": null, "persona-model-version": null, "resource-version": "1510848255404", @@ -3770,7 +3770,7 @@ }, { "service-instance-id": "13e6d21d-2e3c-4612-a367-219b238581e9", - "service-instance-name": "MSO-ST-SI-1802-mtn6-InfraMSOvSAMP12-2XXX", + "service-instance-name": "MSO-ST-SI-1802-hvf6-InfraMSOvSAMP12-2XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1506712978064", @@ -4010,7 +4010,7 @@ }, { "service-instance-id": "7d0a92b7-42cd-4a02-b653-c46ff9f2bd6c", - "service-instance-name": "HnportalProviderNetwork_34", + "service-instance-name": "WILKINSProviderNetwork_34", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001953467", @@ -4080,7 +4080,7 @@ }, { "service-instance-id": "434a116e-1b34-4522-b30c-891803bdcc35", - "service-instance-name": "service_vmee_of_source_port_oe30_projectY", + "service-instance-name": "service_vgeraldine_of_source_port_oe30_projectY", "persona-model-id": null, "persona-model-version": null, "resource-version": "1511264435143", @@ -4190,7 +4190,7 @@ }, { "service-instance-id": "4b945be9-4801-4b61-be37-535ed8283407", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-1001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-1001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001952041", @@ -4210,7 +4210,7 @@ }, { "service-instance-id": "f48b5a16-babb-45d3-be8e-2dcf3cd50e87", - "service-instance-name": "HnportalProviderNetwork_24", + "service-instance-name": "WILKINSProviderNetwork_24", "persona-model-id": null, "persona-model-version": null, "resource-version": "1497049864624", @@ -4430,7 +4430,7 @@ }, { "service-instance-id": "ac02fe78-617c-4537-886f-6d789035d298", - "service-instance-name": "mtn6NetworkZone1702", + "service-instance-name": "hvf6NetworkZone1702", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001857246", @@ -4450,7 +4450,7 @@ }, { "service-instance-id": "a5f88840-e117-4507-a68d-b47dafcfe934", - "service-instance-name": "HngwOamNetVto_19", + "service-instance-name": "RosemaOamNetVto_19", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001795807", @@ -4460,7 +4460,7 @@ }, { "service-instance-id": "4e6f2308-bae9-4591-97d7-de6228642fab", - "service-instance-name": "MSO-ST-SI-1707-mtn6-InfraMSOvSAMP10aService-v1.0-1XXX", + "service-instance-name": "MSO-ST-SI-1707-hvf6-InfraMSOvSAMP10aService-v1.0-1XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499956704355", @@ -4510,7 +4510,7 @@ }, { "service-instance-id": "a3a03c99-fbbf-48ab-b513-cb09a723a179", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP10aService-4.0-1XXX", + "service-instance-name": "MSO-ST-SI-1710-hvf16a-InfraMSOvSAMP10aService-4.0-1XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502384871086", @@ -4610,7 +4610,7 @@ }, { "service-instance-id": "4ee52741-493a-41b7-bf15-75b287dc751a", - "service-instance-name": "MSO-ST-SI-1707-mtn6-MSOTestNetwork-33XX_Update", + "service-instance-name": "MSO-ST-SI-1707-hvf6-MSOTestNetwork-33XX_Update", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499975637828", @@ -4670,7 +4670,7 @@ }, { "service-instance-id": "ff0b448f-9341-45d1-965e-308a886543be", - "service-instance-name": "MSOST-1702-MTN6-Network-temp2", + "service-instance-name": "MSOST-1702-hvf6-Network-temp2", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002024506", @@ -4690,7 +4690,7 @@ }, { "service-instance-id": "8f973eb3-eb98-417d-b062-753721c31919", - "service-instance-name": "HngwOamNetVto_29", + "service-instance-name": "RosemaOamNetVto_29", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001896736", @@ -4730,7 +4730,7 @@ }, { "service-instance-id": "8c2ef3a6-f01d-4e4c-853e-51f1555e011a", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-1001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP10a-1001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002024220", @@ -4740,7 +4740,7 @@ }, { "service-instance-id": "d5cfe521-1b8a-41fc-8e64-fd335debfd09", - "service-instance-name": "HnportalProviderNetwork_26", + "service-instance-name": "WILKINSProviderNetwork_26", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001984121", @@ -4870,7 +4870,7 @@ }, { "service-instance-id": "c1d35ce3-e0b4-4b18-be73-81432e236fed", - "service-instance-name": "MSOST-1702-SI-MTN6-vSAMP12-9001", + "service-instance-name": "MSOST-1702-SI-hvf6-vSAMP12-9001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001983902", @@ -4920,7 +4920,7 @@ }, { "service-instance-id": "87eec00e-3e34-4865-92c0-c3354925a96c", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-2001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP10a-2001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001836640", @@ -4950,7 +4950,7 @@ }, { "service-instance-id": "20292856-3f41-4295-b657-f08d08388dcb", - "service-instance-name": "vmee", + "service-instance-name": "vgeraldine", "persona-model-id": null, "persona-model-version": null, "resource-version": "1511101512030", @@ -5030,7 +5030,7 @@ }, { "service-instance-id": "594604c5-905f-45ac-8d28-1f4ea0fc869b", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002009079", @@ -5050,7 +5050,7 @@ }, { "service-instance-id": "ab839fe0-6714-43bc-afb2-f4d791859ffe", - "service-instance-name": "HngwOamNetVto_15", + "service-instance-name": "RosemaOamNetVto_15", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001995695", @@ -5210,7 +5210,7 @@ }, { "service-instance-id": "f8234127-8955-414a-a3a6-371edef4a3d7", - "service-instance-name": "HnportalProviderNetwork_52", + "service-instance-name": "WILKINSProviderNetwork_52", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001996280", @@ -5250,7 +5250,7 @@ }, { "service-instance-id": "14317189-ac12-49f6-8c98-5558e0e66c5a", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp3", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-temp3", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002013147", @@ -5280,7 +5280,7 @@ }, { "service-instance-id": "c8a85099-e5a3-4e4d-a75d-afa3e2ed2a94", - "service-instance-name": "BJ_20NOV_vDBE_VLM_VID", + "service-instance-name": "BJ_20NOV_vDOROTHEA_VLM_VID", "persona-model-id": null, "persona-model-version": null, "resource-version": "1511278284445", @@ -5290,7 +5290,7 @@ }, { "service-instance-id": "523d669b-96da-45b9-b9b4-66e5263fdd7c", - "service-instance-name": "mtn6vSAMP10a-77", + "service-instance-name": "hvf6vSAMP10a-77", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002001139", @@ -5370,7 +5370,7 @@ }, { "service-instance-id": "09ba3179-7f29-4097-b373-e3b54a82c095", - "service-instance-name": "HngwOamNetVto_28", + "service-instance-name": "RosemaOamNetVto_28", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002013961", @@ -5530,7 +5530,7 @@ }, { "service-instance-id": "6843a8ed-61a0-4dcf-a3b4-4159a8fb4f0f", - "service-instance-name": "HnportalProviderNetwork_37", + "service-instance-name": "WILKINSProviderNetwork_37", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002015930", @@ -5572,7 +5572,7 @@ } }, { - "service-type": "VIRTUAL USP", + "service-type": "TYLER SILVIA", "resource-version": "1494001837398", "service-instances": { "service-instance": [ @@ -5598,7 +5598,7 @@ }, { "service-instance-id": "6ee26748-6755-467b-8b64-e403e0545455", - "service-instance-name": "MSOST-1702-VIRTUAL-USP-Network-001", + "service-instance-name": "MSOST-1702-TYLER-SILVIA-Network-001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001878678", @@ -5693,4 +5693,38 @@ } } } -}
\ No newline at end of file +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/CAR_2020_ER", + "queryParams": { + "depth": 1 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "CAR_2020_ER", + "subscriber-name": "CAR_2020_ER", + "subscriber-type": "INFRA", + "resource-version": "1494001902987", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "DARREN MCGEE", + "resource-version": "1494001839747" + }, + { + "service-type": "MSO-dev-service-type", + "resource-version": "1494001884455" + }, + { + "service-type": "TYLER SILVIA", + "resource-version": "1494001837398" + } + ] + } + } + } + }]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_MSO_1610_ST.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_CAR_2020_ER.json index fc7f3945d..6d827128f 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_MSO_1610_ST.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_CAR_2020_ER.json @@ -1,7 +1,7 @@ -{ +[{ "simulatorRequest": { "method": "GET", - "path": "/aai/v../business/customers/customer/MSO_1610_ST", + "path": "/aai/v../business/customers/customer/CAR_2020_ER", "queryParams": { "depth": 2 } @@ -9,14 +9,14 @@ "simulatorResponse": { "responseCode": 200, "body": { - "global-customer-id": "MSO_1610_ST", - "subscriber-name": "MSO_1610_ST", + "global-customer-id": "CAR_2020_ER", + "subscriber-name": "CAR_2020_ER", "subscriber-type": "INFRA", "resource-version": "1494001902987", "service-subscriptions": { "service-subscription": [ { - "service-type": "HOSTED COMMUNICATIONS", + "service-type": "DARREN MCGEE", "resource-version": "1494001839747", "service-instances": { "service-instance": [ @@ -670,7 +670,7 @@ }, { "service-instance-id": "5e849f9a-e43e-44ea-9378-515d28dd5c31", - "service-instance-name": "vmee_service_cfg3", + "service-instance-name": "vgeraldine_service_cfg3", "persona-model-id": null, "persona-model-version": null, "resource-version": "1508672120074", @@ -740,7 +740,7 @@ }, { "service-instance-id": "1b896f1c-803b-47d2-a6b3-022b3083c19e", - "service-instance-name": "HnportalProviderNetwork_1", + "service-instance-name": "WILKINSProviderNetwork_1", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001990972", @@ -810,7 +810,7 @@ }, { "service-instance-id": "5d4122df-9af7-45bb-8620-7fdb846972ad", - "service-instance-name": "MSOST-1702-MTN6-Network-temp3", + "service-instance-name": "MSOST-1702-hvf6-Network-temp3", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001833813", @@ -830,7 +830,7 @@ }, { "service-instance-id": "1e48119c-cd72-456a-acf9-911ed4ebca7e", - "service-instance-name": "HnportalProviderNetwork_30", + "service-instance-name": "WILKINSProviderNetwork_30", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001986763", @@ -920,7 +920,7 @@ }, { "service-instance-id": "5929e10b-b831-444d-acb2-dd48f8650e1e", - "service-instance-name": "ST-mtn16-vSAMP12-Zone1702", + "service-instance-name": "ST-hvf16-vSAMP12-Zone1702", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001954917", @@ -1070,7 +1070,7 @@ }, { "service-instance-id": "a11a89d7-5fb5-48dc-ae7f-976b496f2960", - "service-instance-name": "MSO-ST-SI-1707-mtn6-InfraMSOvSAMP12Service-v5.0-2XXX", + "service-instance-name": "MSO-ST-SI-1707-hvf6-InfraMSOvSAMP12Service-v5.0-2XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499970280223", @@ -1080,7 +1080,7 @@ }, { "service-instance-id": "fab82a56-aae6-4204-bfa2-95e51a8596e5", - "service-instance-name": "HngwOamNetVto_67", + "service-instance-name": "RosemaOamNetVto_67", "persona-model-id": null, "persona-model-version": null, "resource-version": "1496388185071", @@ -1120,7 +1120,7 @@ }, { "service-instance-id": "13c00d90-ba65-476c-9815-9d8920944643", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP10a-001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001916535", @@ -1130,7 +1130,7 @@ }, { "service-instance-id": "2a8ee11e-969a-4b70-810d-01537def1b96", - "service-instance-name": "HngwOamNetVto_10", + "service-instance-name": "RosemaOamNetVto_10", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001953987", @@ -1150,7 +1150,7 @@ }, { "service-instance-id": "53ad9753-6170-4236-ac7e-8815707c872e", - "service-instance-name": "larry+pxmc+test+1011", + "service-instance-name": "larry+CORNELIUS+test+1011", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001920923", @@ -1240,7 +1240,7 @@ }, { "service-instance-id": "1cca02a5-72a6-4aec-bb9c-535bae207086", - "service-instance-name": "HnportalProviderNetwork_42", + "service-instance-name": "WILKINSProviderNetwork_42", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001953493", @@ -1340,7 +1340,7 @@ }, { "service-instance-id": "ad43c6c0-7de0-4772-83d4-139ffb65c50c", - "service-instance-name": "vmeeshani", + "service-instance-name": "vgeraldineshani", "persona-model-id": null, "persona-model-version": null, "resource-version": "1509288736569", @@ -1350,7 +1350,7 @@ }, { "service-instance-id": "3fc6a66d-103d-4ec6-b3be-19b6226f8d1f", - "service-instance-name": "HngwOamNetVto_30", + "service-instance-name": "RosemaOamNetVto_30", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001858519", @@ -1360,7 +1360,7 @@ }, { "service-instance-id": "f849bcb5-8541-492b-a639-97db55020be1", - "service-instance-name": "HnportalProviderNetwork_22", + "service-instance-name": "WILKINSProviderNetwork_22", "persona-model-id": null, "persona-model-version": null, "resource-version": "1496856562847", @@ -1440,7 +1440,7 @@ }, { "service-instance-id": "163278f1-c06a-4e5b-ad55-7d43cb83d279", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-ErrPatch", + "service-instance-name": "MSOST-1702-hvf16-vSAMP10a-ErrPatch", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001899632", @@ -1460,7 +1460,7 @@ }, { "service-instance-id": "0691c9ce-bf13-483f-b29d-4583634c59fa", - "service-instance-name": "HngwOamNetVto_53", + "service-instance-name": "RosemaOamNetVto_53", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001899421", @@ -1540,7 +1540,7 @@ }, { "service-instance-id": "8e39f14f-21d3-44ec-9f05-99d0f3dc8092", - "service-instance-name": "vmee_service_instance", + "service-instance-name": "vgeraldine_service_instance", "persona-model-id": null, "persona-model-version": null, "resource-version": "1508675655654", @@ -1550,7 +1550,7 @@ }, { "service-instance-id": "90330e27-34d6-4b38-a1f1-3f3e22c04cd9", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP12Service-v1.0-2XXX", + "service-instance-name": "MSO-ST-SI-1710-hvf16a-InfraMSOvSAMP12Service-v1.0-2XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502125802006", @@ -1670,7 +1670,7 @@ }, { "service-instance-id": "762f01ab-26a2-406d-bfd4-2b4f6853941e", - "service-instance-name": "MSOST-1702-MTN6-Network-1001", + "service-instance-name": "MSOST-1702-hvf6-Network-1001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001794605", @@ -1690,7 +1690,7 @@ }, { "service-instance-id": "e536ebf7-807c-4786-8066-8c8e241a85a7", - "service-instance-name": "mtn16NetworkZone1702", + "service-instance-name": "hvf16NetworkZone1702", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001857248", @@ -1710,7 +1710,7 @@ }, { "service-instance-id": "08cf190a-e9b7-4d7f-b0cb-cbb789c1a895", - "service-instance-name": "MSOST-1702-MTN6-Network-temp1", + "service-instance-name": "MSOST-1702-hvf6-Network-temp1", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001793575", @@ -1800,7 +1800,7 @@ }, { "service-instance-id": "fe6d1eb5-85cd-43ae-901a-1a6b0266264a", - "service-instance-name": "MSO-ST-SI-1707-mtn16a-MSOTestNetwork-3XXX", + "service-instance-name": "MSO-ST-SI-1707-hvf16a-MSOTestNetwork-3XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502372167295", @@ -1820,7 +1820,7 @@ }, { "service-instance-id": "4d389e30-7cfe-43e1-83a6-dc211bb7d046", - "service-instance-name": "HngwOamNetVto_13", + "service-instance-name": "RosemaOamNetVto_13", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001999423", @@ -1830,7 +1830,7 @@ }, { "service-instance-id": "b651cb05-87d9-4747-9dea-e0b5b52995eb", - "service-instance-name": "HngwOamNetVto_16", + "service-instance-name": "RosemaOamNetVto_16", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001855976", @@ -1910,7 +1910,7 @@ }, { "service-instance-id": "4ed86252-d359-4a0d-b146-7cdc2aa917bb", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp1", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-temp1", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001999021", @@ -1950,7 +1950,7 @@ }, { "service-instance-id": "493d5299-286e-4c18-b2f6-e58d1662a63d", - "service-instance-name": "MSO-ST-SI-1707-mtn16a-InfraMSOvSAMP10aService-v1.0-1XXX", + "service-instance-name": "MSO-ST-SI-1707-hvf16a-InfraMSOvSAMP10aService-v1.0-1XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499979599759", @@ -2010,7 +2010,7 @@ }, { "service-instance-id": "994121b4-b5c6-44ef-b20b-49523b4cb9c3", - "service-instance-name": "HnportalProviderNetwork_3", + "service-instance-name": "WILKINSProviderNetwork_3", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002000388", @@ -2110,7 +2110,7 @@ }, { "service-instance-id": "ca741a4c-3554-4dea-b76b-ba47cb2d9a84", - "service-instance-name": "HngwOamNetVto_10", + "service-instance-name": "RosemaOamNetVto_10", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001999418", @@ -2120,7 +2120,7 @@ }, { "service-instance-id": "6e14a44c-401b-4a8a-b5c0-dd0eb61b9ad7", - "service-instance-name": "MSO-ST-SI-1707-mtn6-MSOTestNetwork-3XXX", + "service-instance-name": "MSO-ST-SI-1707-hvf6-MSOTestNetwork-3XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499971131822", @@ -2130,7 +2130,7 @@ }, { "service-instance-id": "49e739f8-963e-4abf-ad5a-bd4418f9544a", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP12Service-v5.0-2XXX", + "service-instance-name": "MSO-ST-SI-1710-hvf16a-InfraMSOvSAMP12Service-v5.0-2XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502991526931", @@ -2160,7 +2160,7 @@ }, { "service-instance-id": "6c5ce12f-d028-43a7-97f6-699e7aac64ac", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-MSOTestNetwork-3XXX", + "service-instance-name": "MSO-ST-SI-1710-hvf16a-MSOTestNetwork-3XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1503000992667", @@ -2270,7 +2270,7 @@ }, { "service-instance-id": "ac41a7cd-3466-468d-88d6-3f9308889943", - "service-instance-name": "MSOST-1702-MTN6-Network-2001", + "service-instance-name": "MSOST-1702-hvf6-Network-2001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001983401", @@ -2280,7 +2280,7 @@ }, { "service-instance-id": "2cc1ea57-dbe8-4fd1-9e2e-a85df64dd0e9", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-2001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-2001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001983384", @@ -2320,7 +2320,7 @@ }, { "service-instance-id": "8fe6eed2-9823-426c-ad27-95545c42ce4c", - "service-instance-name": "MSO-ST-SI-1710-mtn6-InfraMSOvSAMP10aService-4.0-1XXX", + "service-instance-name": "MSO-ST-SI-1710-hvf6-InfraMSOvSAMP10aService-4.0-1XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502808860080", @@ -2370,7 +2370,7 @@ }, { "service-instance-id": "af046361-54f7-4956-b059-78d11e15b7c1", - "service-instance-name": "vDBE_BJ_21NOV", + "service-instance-name": "vDOROTHEA_BJ_21NOV", "persona-model-id": null, "persona-model-version": null, "resource-version": "1511298043321", @@ -2390,7 +2390,7 @@ }, { "service-instance-id": "d84bfb65-d585-4f83-886a-9331303138b8", - "service-instance-name": "HnportalProviderNetwork_36", + "service-instance-name": "WILKINSProviderNetwork_36", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001995842", @@ -2450,7 +2450,7 @@ }, { "service-instance-id": "8946c0a9-103f-4a23-b9f3-b9f16face559", - "service-instance-name": "HngwOamNetVto_35", + "service-instance-name": "RosemaOamNetVto_35", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002010173", @@ -2460,7 +2460,7 @@ }, { "service-instance-id": "99b91443-219a-4b61-a3e9-19045d8833c4", - "service-instance-name": "HnportalProviderNetwork_31", + "service-instance-name": "WILKINSProviderNetwork_31", "persona-model-id": null, "persona-model-version": null, "resource-version": "1497320472238", @@ -2500,7 +2500,7 @@ }, { "service-instance-id": "cec5f96f-447d-41d3-a8c7-9bdcc796fe59", - "service-instance-name": "HngwOamNetVto_28", + "service-instance-name": "RosemaOamNetVto_28", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001770362", @@ -2550,7 +2550,7 @@ }, { "service-instance-id": "169710db-e92a-4e11-886e-00178c23808d", - "service-instance-name": "HnportalProviderNetwork_2", + "service-instance-name": "WILKINSProviderNetwork_2", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001920140", @@ -2610,7 +2610,7 @@ }, { "service-instance-id": "12f56a37-3966-4626-9cb1-d9067d616a66", - "service-instance-name": "MSOST-1702-MTN6-Network-2002", + "service-instance-name": "MSOST-1702-hvf6-Network-2002", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001770162", @@ -2640,7 +2640,7 @@ }, { "service-instance-id": "adc03856-9e87-4a03-885a-c151f8061d62", - "service-instance-name": "HnportalProviderNetwork_12", + "service-instance-name": "WILKINSProviderNetwork_12", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001993433", @@ -2700,7 +2700,7 @@ }, { "service-instance-id": "821c1485-de82-451e-b413-22ccdbf2c52e", - "service-instance-name": "HngwOamNetVto_20", + "service-instance-name": "RosemaOamNetVto_20", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002003024", @@ -2740,7 +2740,7 @@ }, { "service-instance-id": "7b45454d-de6d-443b-932d-99dff9b2fd52", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-MSOTestNetwork-33XX_Update", + "service-instance-name": "MSO-ST-SI-1710-hvf16a-MSOTestNetwork-33XX_Update", "persona-model-id": null, "persona-model-version": null, "resource-version": "1503001449498", @@ -2860,7 +2860,7 @@ }, { "service-instance-id": "24afca09-100c-45b7-a640-ccaf0b1cfef3", - "service-instance-name": "MSO-ST-SI-1707-PCRF_10_17_1610_SVC-v1.0-9XXX", + "service-instance-name": "MSO-ST-SI-1707-RODERICK_10_17_1610_SVC-v1.0-9XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1495227731141", @@ -2900,7 +2900,7 @@ }, { "service-instance-id": "76bb867c-6218-4381-9873-bc79e31e387d", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-Err", + "service-instance-name": "MSOST-1702-hvf16-vSAMP10a-Err", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001791325", @@ -2930,7 +2930,7 @@ }, { "service-instance-id": "22778c84-c18a-4d4f-8ae6-d0d339862bd0", - "service-instance-name": "HngwOamNetVto_42", + "service-instance-name": "RosemaOamNetVto_42", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002015904", @@ -2980,7 +2980,7 @@ }, { "service-instance-id": "d694242e-d119-47ce-bcf4-d2b4e8bffba8", - "service-instance-name": "HngwOamNetVto_79", + "service-instance-name": "RosemaOamNetVto_79", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502762958016", @@ -2990,7 +2990,7 @@ }, { "service-instance-id": "911afcb6-6a93-417a-8e1c-90ceebdb3842", - "service-instance-name": "MSOST-1702-MTN16-VFNetworkFqdn-001", + "service-instance-name": "MSOST-1702-hvf16-VFNetworkFqdn-001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002015761", @@ -3010,7 +3010,7 @@ }, { "service-instance-id": "16785eac-7537-405e-a814-2f1dc58b3f80", - "service-instance-name": "BJ_vDBE_Service_vdi", + "service-instance-name": "BJ_vDOROTHEA_Service_vdi", "persona-model-id": null, "persona-model-version": null, "resource-version": "1510953400508", @@ -3070,7 +3070,7 @@ }, { "service-instance-id": "67ca1f14-73ef-4e93-ada0-e1ec1d2788d3", - "service-instance-name": "HnportalProviderNetwork_4", + "service-instance-name": "WILKINSProviderNetwork_4", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001987746", @@ -3090,7 +3090,7 @@ }, { "service-instance-id": "fac00ff4-5953-47a9-8642-3833cba691c5", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp2", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-temp2", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001878101", @@ -3110,7 +3110,7 @@ }, { "service-instance-id": "7614702d-eb13-4632-94ae-92b16fea4b3b", - "service-instance-name": "ldf+vDBE+svc+IST", + "service-instance-name": "ldf+vDOROTHEA+svc+IST", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001867830", @@ -3220,7 +3220,7 @@ }, { "service-instance-id": "6977963a-042d-4c5e-a82a-ba2eb1004067", - "service-instance-name": "HnportalProviderNetwork_42", + "service-instance-name": "WILKINSProviderNetwork_42", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499272428096", @@ -3300,7 +3300,7 @@ }, { "service-instance-id": "72dbe562-01bd-4cde-bb0b-c861bb87c556", - "service-instance-name": "HngwOamNetVto_9", + "service-instance-name": "RosemaOamNetVto_9", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002005893", @@ -3400,7 +3400,7 @@ }, { "service-instance-id": "7fa986db-ef92-4407-a549-1371102d6ded", - "service-instance-name": "MSOST-1702-MTN6-Network-001", + "service-instance-name": "MSOST-1702-hvf6-Network-001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002004656", @@ -3410,7 +3410,7 @@ }, { "service-instance-id": "241e1576-3f6b-4c06-8577-8d1d38f25885", - "service-instance-name": "shani_vmee_service", + "service-instance-name": "shani_vgeraldine_service", "persona-model-id": null, "persona-model-version": null, "resource-version": "1508763229986", @@ -3440,7 +3440,7 @@ }, { "service-instance-id": "7839d807-37ca-4b7e-9c29-53e94d41405a", - "service-instance-name": "VMEE_instance", + "service-instance-name": "VGERALDINE_instance", "persona-model-id": null, "persona-model-version": null, "resource-version": "1508670917581", @@ -3540,7 +3540,7 @@ }, { "service-instance-id": "651c88c4-62de-41e1-a5a9-acec829d9529", - "service-instance-name": "MSOST-1702-MTN6-Network-9001", + "service-instance-name": "MSOST-1702-hvf6-Network-9001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001833771", @@ -3580,7 +3580,7 @@ }, { "service-instance-id": "8a6a9177-5eab-4e16-9fe5-65966e610545", - "service-instance-name": "MSOST-1702-MTN16-vSAMP10a-ErrPatch2", + "service-instance-name": "MSOST-1702-hvf16-vSAMP10a-ErrPatch2", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001816089", @@ -3630,7 +3630,7 @@ }, { "service-instance-id": "9fd66f32-fc9f-4c27-a1c8-728e4cc5015e", - "service-instance-name": "HnportalProviderNetwork_50", + "service-instance-name": "WILKINSProviderNetwork_50", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001815618", @@ -3640,7 +3640,7 @@ }, { "service-instance-id": "0ceebdf7-48d5-4bfd-a610-e23bcb2a1324", - "service-instance-name": "HnportalProviderNetwork_38", + "service-instance-name": "WILKINSProviderNetwork_38", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001815517", @@ -3670,7 +3670,7 @@ }, { "service-instance-id": "bf4304d6-0fe6-4158-8adb-1d32a5f49e50", - "service-instance-name": "HngwOamNetVto_52", + "service-instance-name": "RosemaOamNetVto_52", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001990190", @@ -3700,7 +3700,7 @@ }, { "service-instance-id": "60e8b42f-6f30-436b-9158-1022d69b98de", - "service-instance-name": "vmeeeee", + "service-instance-name": "vgeraldineeee", "persona-model-id": null, "persona-model-version": null, "resource-version": "1510848255404", @@ -3770,7 +3770,7 @@ }, { "service-instance-id": "13e6d21d-2e3c-4612-a367-219b238581e9", - "service-instance-name": "MSO-ST-SI-1802-mtn6-InfraMSOvSAMP12-2XXX", + "service-instance-name": "MSO-ST-SI-1802-hvf6-InfraMSOvSAMP12-2XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1506712978064", @@ -4010,7 +4010,7 @@ }, { "service-instance-id": "7d0a92b7-42cd-4a02-b653-c46ff9f2bd6c", - "service-instance-name": "HnportalProviderNetwork_34", + "service-instance-name": "WILKINSProviderNetwork_34", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001953467", @@ -4080,7 +4080,7 @@ }, { "service-instance-id": "434a116e-1b34-4522-b30c-891803bdcc35", - "service-instance-name": "service_vmee_of_source_port_oe30_projectY", + "service-instance-name": "service_vgeraldine_of_source_port_oe30_projectY", "persona-model-id": null, "persona-model-version": null, "resource-version": "1511264435143", @@ -4190,7 +4190,7 @@ }, { "service-instance-id": "4b945be9-4801-4b61-be37-535ed8283407", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-1001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-1001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001952041", @@ -4210,7 +4210,7 @@ }, { "service-instance-id": "f48b5a16-babb-45d3-be8e-2dcf3cd50e87", - "service-instance-name": "HnportalProviderNetwork_24", + "service-instance-name": "WILKINSProviderNetwork_24", "persona-model-id": null, "persona-model-version": null, "resource-version": "1497049864624", @@ -4430,7 +4430,7 @@ }, { "service-instance-id": "ac02fe78-617c-4537-886f-6d789035d298", - "service-instance-name": "mtn6NetworkZone1702", + "service-instance-name": "hvf6NetworkZone1702", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001857246", @@ -4450,7 +4450,7 @@ }, { "service-instance-id": "a5f88840-e117-4507-a68d-b47dafcfe934", - "service-instance-name": "HngwOamNetVto_19", + "service-instance-name": "RosemaOamNetVto_19", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001795807", @@ -4460,7 +4460,7 @@ }, { "service-instance-id": "4e6f2308-bae9-4591-97d7-de6228642fab", - "service-instance-name": "MSO-ST-SI-1707-mtn6-InfraMSOvSAMP10aService-v1.0-1XXX", + "service-instance-name": "MSO-ST-SI-1707-hvf6-InfraMSOvSAMP10aService-v1.0-1XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499956704355", @@ -4510,7 +4510,7 @@ }, { "service-instance-id": "a3a03c99-fbbf-48ab-b513-cb09a723a179", - "service-instance-name": "MSO-ST-SI-1710-mtn16a-InfraMSOvSAMP10aService-4.0-1XXX", + "service-instance-name": "MSO-ST-SI-1710-hvf16a-InfraMSOvSAMP10aService-4.0-1XXX", "persona-model-id": null, "persona-model-version": null, "resource-version": "1502384871086", @@ -4610,7 +4610,7 @@ }, { "service-instance-id": "4ee52741-493a-41b7-bf15-75b287dc751a", - "service-instance-name": "MSO-ST-SI-1707-mtn6-MSOTestNetwork-33XX_Update", + "service-instance-name": "MSO-ST-SI-1707-hvf6-MSOTestNetwork-33XX_Update", "persona-model-id": null, "persona-model-version": null, "resource-version": "1499975637828", @@ -4670,7 +4670,7 @@ }, { "service-instance-id": "ff0b448f-9341-45d1-965e-308a886543be", - "service-instance-name": "MSOST-1702-MTN6-Network-temp2", + "service-instance-name": "MSOST-1702-hvf6-Network-temp2", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002024506", @@ -4690,7 +4690,7 @@ }, { "service-instance-id": "8f973eb3-eb98-417d-b062-753721c31919", - "service-instance-name": "HngwOamNetVto_29", + "service-instance-name": "RosemaOamNetVto_29", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001896736", @@ -4730,7 +4730,7 @@ }, { "service-instance-id": "8c2ef3a6-f01d-4e4c-853e-51f1555e011a", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-1001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP10a-1001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002024220", @@ -4740,7 +4740,7 @@ }, { "service-instance-id": "d5cfe521-1b8a-41fc-8e64-fd335debfd09", - "service-instance-name": "HnportalProviderNetwork_26", + "service-instance-name": "WILKINSProviderNetwork_26", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001984121", @@ -4870,7 +4870,7 @@ }, { "service-instance-id": "c1d35ce3-e0b4-4b18-be73-81432e236fed", - "service-instance-name": "MSOST-1702-SI-MTN6-vSAMP12-9001", + "service-instance-name": "MSOST-1702-SI-hvf6-vSAMP12-9001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001983902", @@ -4920,7 +4920,7 @@ }, { "service-instance-id": "87eec00e-3e34-4865-92c0-c3354925a96c", - "service-instance-name": "MSOST-1702-MTN6-vSAMP10a-2001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP10a-2001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001836640", @@ -4950,7 +4950,7 @@ }, { "service-instance-id": "20292856-3f41-4295-b657-f08d08388dcb", - "service-instance-name": "vmee", + "service-instance-name": "vgeraldine", "persona-model-id": null, "persona-model-version": null, "resource-version": "1511101512030", @@ -5030,7 +5030,7 @@ }, { "service-instance-id": "594604c5-905f-45ac-8d28-1f4ea0fc869b", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-001", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002009079", @@ -5050,7 +5050,7 @@ }, { "service-instance-id": "ab839fe0-6714-43bc-afb2-f4d791859ffe", - "service-instance-name": "HngwOamNetVto_15", + "service-instance-name": "RosemaOamNetVto_15", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001995695", @@ -5210,7 +5210,7 @@ }, { "service-instance-id": "f8234127-8955-414a-a3a6-371edef4a3d7", - "service-instance-name": "HnportalProviderNetwork_52", + "service-instance-name": "WILKINSProviderNetwork_52", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001996280", @@ -5250,7 +5250,7 @@ }, { "service-instance-id": "14317189-ac12-49f6-8c98-5558e0e66c5a", - "service-instance-name": "MSOST-1702-MTN6-vSAMP12-temp3", + "service-instance-name": "MSOST-1702-hvf6-vSAMP12-temp3", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002013147", @@ -5280,7 +5280,7 @@ }, { "service-instance-id": "c8a85099-e5a3-4e4d-a75d-afa3e2ed2a94", - "service-instance-name": "BJ_20NOV_vDBE_VLM_VID", + "service-instance-name": "BJ_20NOV_vDOROTHEA_VLM_VID", "persona-model-id": null, "persona-model-version": null, "resource-version": "1511278284445", @@ -5290,7 +5290,7 @@ }, { "service-instance-id": "523d669b-96da-45b9-b9b4-66e5263fdd7c", - "service-instance-name": "mtn6vSAMP10a-77", + "service-instance-name": "hvf6vSAMP10a-77", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002001139", @@ -5370,7 +5370,7 @@ }, { "service-instance-id": "09ba3179-7f29-4097-b373-e3b54a82c095", - "service-instance-name": "HngwOamNetVto_28", + "service-instance-name": "RosemaOamNetVto_28", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002013961", @@ -5530,7 +5530,7 @@ }, { "service-instance-id": "6843a8ed-61a0-4dcf-a3b4-4159a8fb4f0f", - "service-instance-name": "HnportalProviderNetwork_37", + "service-instance-name": "WILKINSProviderNetwork_37", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494002015930", @@ -5572,7 +5572,7 @@ } }, { - "service-type": "VIRTUAL USP", + "service-type": "TYLER SILVIA", "resource-version": "1494001837398", "service-instances": { "service-instance": [ @@ -5598,7 +5598,7 @@ }, { "service-instance-id": "6ee26748-6755-467b-8b64-e403e0545455", - "service-instance-name": "MSOST-1702-VIRTUAL-USP-Network-001", + "service-instance-name": "MSOST-1702-TYLER-SILVIA-Network-001", "persona-model-id": null, "persona-model-version": null, "resource-version": "1494001878678", @@ -5693,4 +5693,39 @@ } } } -}
\ No newline at end of file +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/CAR_2020_ER", + "queryParams": { + "depth": 1 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "CAR_2020_ER", + "subscriber-name": "CAR_2020_ER", + "subscriber-type": "INFRA", + "resource-version": "1494001902987", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "DARREN MCGEE", + "resource-version": "1494001839747" + }, + { + "service-type": "MSO-dev-service-type", + "resource-version": "1494001884455" + }, + { + "service-type": "TYLER SILVIA", + "resource-version": "1494001837398" + } + ] + } + } + } + } + ]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_USP_VOICE.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json index 54eb7a343..82ee8f555 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_USP_VOICE.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json @@ -1,4 +1,4 @@ -{ +[{ "simulatorRequest": { "method": "GET", "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", @@ -10,13 +10,13 @@ "responseCode": 200, "body": { "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name": "USP VOICE", + "subscriber-name": "SILVIA ROBBINS", "subscriber-type": "INFRA", "resource-version": "1494001938080", "service-subscriptions": { "service-subscription": [ { - "service-type": "VIRTUAL USP", + "service-type": "TYLER SILVIA", "resource-version": "1494001841964", "service-instances": { "service-instance": [ @@ -1769,7 +1769,7 @@ }, { "service-instance-id": "0f2624ba-94cf-4ac5-b903-652d49002c97", - "service-instance-name": "vmee1", + "service-instance-name": "vgeraldine1", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -2219,7 +2219,7 @@ }, { "service-instance-id": "e089b589-5227-4a7c-aa19-92c99507f147", - "service-instance-name": "VIRTUAL USP_VSP_Service_DS_0906_01", + "service-instance-name": "Emanuel_VSP_Service_DS_0906_01", "service-type": "", "service-role": "", "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -2662,7 +2662,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -2698,7 +2698,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -6103,11 +6103,11 @@ "relationship": [ { "related-to": "project", - "related-link": "/aai/v11/business/projects/project/Nimbus", + "related-link": "/aai/v11/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -6421,7 +6421,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -6739,15 +6739,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "AAIAIC25" + "relationship-value": "JANET25" }, { "relationship-key": "tenant.tenant-id", @@ -6763,15 +6763,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6781,21 +6781,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-testgamma" + "property-value": "AIN Web Tool-15-D-testalexandria" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6811,15 +6811,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6835,15 +6835,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6859,15 +6859,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/de007636e25249238447264a988a927b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/de007636e25249238447264a988a927b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6883,15 +6883,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6907,15 +6907,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6931,15 +6931,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6955,15 +6955,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -6979,15 +6979,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8774659e425f479895ae091bb5d46560", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8774659e425f479895ae091bb5d46560", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7003,15 +7003,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/624eb554b0d147c19ff8885341760481", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/624eb554b0d147c19ff8885341760481", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7027,15 +7027,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/214f55f5fc414c678059c383b03e4962", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/214f55f5fc414c678059c383b03e4962", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7051,15 +7051,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7075,15 +7075,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7099,15 +7099,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7123,15 +7123,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7147,15 +7147,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7171,15 +7171,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7195,15 +7195,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/05b91bd5137f4929878edd965755c06d", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/05b91bd5137f4929878edd965755c06d", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7219,15 +7219,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7243,15 +7243,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7267,15 +7267,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7291,15 +7291,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7315,15 +7315,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7339,15 +7339,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7363,15 +7363,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7387,15 +7387,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7411,15 +7411,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ee633f87f1f04a19ab6cbc1ea5a587cb", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ee633f87f1f04a19ab6cbc1ea5a587cb", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7435,15 +7435,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f13c8d9b610543ea84f0a899baf73b8f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f13c8d9b610543ea84f0a899baf73b8f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7459,15 +7459,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7483,15 +7483,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4e9093be45ce4726ada0e37e9e08afba", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4e9093be45ce4726ada0e37e9e08afba", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7507,15 +7507,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f8f6102ace934888a8de767781abb1cc", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f8f6102ace934888a8de767781abb1cc", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7531,15 +7531,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/46cb27d3fd094299bfbc23b4d9c076e4", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/46cb27d3fd094299bfbc23b4d9c076e4", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7555,15 +7555,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f1b3db4ae6d44b4babaee96d3a834359", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f1b3db4ae6d44b4babaee96d3a834359", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7579,15 +7579,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7093a5b869ff4c4497647d4ed7b174eb", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7093a5b869ff4c4497647d4ed7b174eb", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7603,15 +7603,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/a0b9c25bc67a43f88de35b1a73b52c85", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a0b9c25bc67a43f88de35b1a73b52c85", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7627,15 +7627,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/783c60ec140642fab93be64a3b3da7bf", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/783c60ec140642fab93be64a3b3da7bf", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7651,15 +7651,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7675,15 +7675,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2562962934ef4bd0be04b4bc360c9fe9", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2562962934ef4bd0be04b4bc360c9fe9", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7699,15 +7699,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2950bb8e1d694bd18b33885e4f2a3be2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2950bb8e1d694bd18b33885e4f2a3be2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7723,15 +7723,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fe35e5251a0b4fad86a0dff188cf8ba1", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe35e5251a0b4fad86a0dff188cf8ba1", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7747,15 +7747,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/48a013ce6c21446ebd005a778407c636", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/48a013ce6c21446ebd005a778407c636", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7771,15 +7771,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1b63514d5fdc4ab5b78fc57dcbc24c5f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1b63514d5fdc4ab5b78fc57dcbc24c5f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7795,15 +7795,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4e6817f491e84ac3970f23ae6c68a2f5", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4e6817f491e84ac3970f23ae6c68a2f5", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7819,15 +7819,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7837,21 +7837,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "test-mtn6-09" + "property-value": "test-hvf6-09" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b58c4006dd4d493bba16084ee2d6d85a", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b58c4006dd4d493bba16084ee2d6d85a", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7867,15 +7867,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/baae77dcb56e4e71b0b885ee37c0f9ed", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/baae77dcb56e4e71b0b885ee37c0f9ed", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7891,15 +7891,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/10e135cf54aa40d0819e9807a05be9fd", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/10e135cf54aa40d0819e9807a05be9fd", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7915,15 +7915,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/09bcfa01149a416b9dbef57fe9ff4f38", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/09bcfa01149a416b9dbef57fe9ff4f38", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7939,15 +7939,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c9ef0e42793f473ca49e2a882415de63", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c9ef0e42793f473ca49e2a882415de63", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7963,15 +7963,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/985430bc6e444fd6a24ed307e16ee80f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/985430bc6e444fd6a24ed307e16ee80f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -7987,15 +7987,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/936f200c8a6344a1af038d05e37f6788", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/936f200c8a6344a1af038d05e37f6788", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8011,15 +8011,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2d66ce1949c64e64a892bf2a5e385a0d", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d66ce1949c64e64a892bf2a5e385a0d", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8035,15 +8035,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2175e8824a624b8fabb297b35b453147", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2175e8824a624b8fabb297b35b453147", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8059,15 +8059,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ccbe1427a5434619a7132bd7dd68e97b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ccbe1427a5434619a7132bd7dd68e97b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8083,15 +8083,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/45619c38a9ec4ce6836ec1cc54a2800b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/45619c38a9ec4ce6836ec1cc54a2800b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8107,15 +8107,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c1a1a7717bc142efa6573c2f12b1200c", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c1a1a7717bc142efa6573c2f12b1200c", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8131,15 +8131,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8155,15 +8155,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f3a68c2e5cf348af89411ca91bcf509e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f3a68c2e5cf348af89411ca91bcf509e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8179,15 +8179,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/661b60e06bf34a29a0474e1a8abcabb2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/661b60e06bf34a29a0474e1a8abcabb2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8203,15 +8203,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/afa69a3d2ae04ed5afea0c75a082ba10", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/afa69a3d2ae04ed5afea0c75a082ba10", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8227,15 +8227,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ad6bba93fa264b55be522600d6e3e47f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad6bba93fa264b55be522600d6e3e47f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8251,15 +8251,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb1c11460f0d47ebbf61343c351bd1d8", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb1c11460f0d47ebbf61343c351bd1d8", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8275,15 +8275,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/427f0797ee244a0baf04bd5699e78dbf", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/427f0797ee244a0baf04bd5699e78dbf", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8299,15 +8299,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/6e8aa8b2f8494cb09f62c4df56a1d68f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/6e8aa8b2f8494cb09f62c4df56a1d68f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8323,15 +8323,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ea3021aa27fd4838a95979a4538a25ff", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ea3021aa27fd4838a95979a4538a25ff", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8347,15 +8347,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d7b7097e78414423b9bedd8bdb7d1180", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d7b7097e78414423b9bedd8bdb7d1180", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8371,15 +8371,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7e6d83cc6dbc45e9b2d813e6d9951a0a", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7e6d83cc6dbc45e9b2d813e6d9951a0a", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8395,15 +8395,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/e3b312307aac45e5b67bf52225381486", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/e3b312307aac45e5b67bf52225381486", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -8421,7 +8421,7 @@ } }, { - "service-type": "HOSTED COMMUNICATIONS", + "service-type": "DARREN MCGEE", "resource-version": "1494001920845", "service-instances": { "service-instance": [ @@ -9111,15 +9111,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9135,15 +9135,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9159,15 +9159,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9183,15 +9183,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/16f1ec0207134560a8099bb46055943f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/16f1ec0207134560a8099bb46055943f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9207,15 +9207,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/9519f3c0d0654309bd0b2165be6b9bd5", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/9519f3c0d0654309bd0b2165be6b9bd5", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9413,15 +9413,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ece35e4a79d547d193451ac38d700046", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9437,15 +9437,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9461,15 +9461,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ded2432abb5a4100801331d07787afc2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9485,15 +9485,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9509,15 +9509,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8071dc66981c4294b05483a1cddac801", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9533,15 +9533,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9557,15 +9557,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -9586,4 +9586,2019 @@ } } } -}
\ No newline at end of file +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", + "queryParams": { + "depth": 1 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriber-name": "SILVIA ROBBINS", + "subscriber-type": "INFRA", + "resource-version": "1494001938080", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "TYLER SILVIA", + "resource-version": "1494001841964", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "JANET25" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "092eb9e8e4b7412e8787dd091bc58e86" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "USP-SIP-IC-24335-T-01" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "bae71557c5bb4d5aac6743a4e5f1d054" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-testalexandria" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "229bcdc6eaeb4ca59d55221141d01f8e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-STTest2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "1178612d2b394be4834ad77f567c0af2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-SSPtestcustome" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "19c5ade915eb461e8af52fb2fd8cd1f2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-UncheckedEcopm" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/de007636e25249238447264a988a927b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "de007636e25249238447264a988a927b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-dfsdf" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "62f29b3613634ca6a3065cbe0e020c44" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-Multiservices1" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "649289e30d3244e0b48098114d63c2aa" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-SSPST66" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "3f21eeea6c2c486bba31dab816c05a32" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-ASSPST47" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f60ce21d3ee6427586cff0d22b03b773" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg67246" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8774659e425f479895ae091bb5d46560", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "8774659e425f479895ae091bb5d46560" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg68359" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/624eb554b0d147c19ff8885341760481", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "624eb554b0d147c19ff8885341760481" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-iftach" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/214f55f5fc414c678059c383b03e4962", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "214f55f5fc414c678059c383b03e4962" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg612401" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c90666c291664841bb98e4d981ff1db5" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg621340" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ce5b6bc5c7b348e1bf4b91ac9a174278" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "sspjg621351cloned" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b386b768a3f24c8e953abbe0b3488c02" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-eteancomp" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "dc6c4dbfd225474e9deaadd34968646c" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-T-SPFET" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "02cb5030e9914aa4be120bd9ed1e19eb" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-eeweww" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f2f3830e4c984d45bcd00e1a04158a79" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-spjg61909" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/05b91bd5137f4929878edd965755c06d", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "05b91bd5137f4929878edd965755c06d" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-D-sspjg621512cloned" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "7002fbe8482d4a989ddf445b1ce336e0" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-vdr" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "4008522be43741dcb1f5422022a2aa0b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-ssasa" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f44e2e96a1b6476abfda2fa407b00169" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-D-PFNPT" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b69a52bec8a84669a37a1e8b72708be7" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-vdre" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fac7d9fd56154caeb9332202dcf2969f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-NONPODECOMP" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "1eddb590b7f04e9890bceeef9e591333" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "APP-C-DND" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2d34d8396e194eb49969fd61ffbff961" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "DN5242-Nov16-T5" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cb42a77ff45b48a8b8deb83bb64acc74" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T11" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ee633f87f1f04a19ab6cbc1ea5a587cb", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ee633f87f1f04a19ab6cbc1ea5a587cb" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-681419455" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f13c8d9b610543ea84f0a899baf73b8f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f13c8d9b610543ea84f0a899baf73b8f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-19" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fa45ca53c80b492fa8be5477cd84fc2b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T112" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4e9093be45ce4726ada0e37e9e08afba", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "4e9093be45ce4726ada0e37e9e08afba" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-40" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f8f6102ace934888a8de767781abb1cc", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f8f6102ace934888a8de767781abb1cc" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-43" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/46cb27d3fd094299bfbc23b4d9c076e4", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "46cb27d3fd094299bfbc23b4d9c076e4" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-50" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f1b3db4ae6d44b4babaee96d3a834359", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f1b3db4ae6d44b4babaee96d3a834359" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-delete2112017" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7093a5b869ff4c4497647d4ed7b174eb", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "7093a5b869ff4c4497647d4ed7b174eb" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1120249305" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a0b9c25bc67a43f88de35b1a73b52c85", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "a0b9c25bc67a43f88de35b1a73b52c85" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-51" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/783c60ec140642fab93be64a3b3da7bf", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "783c60ec140642fab93be64a3b3da7bf" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-34" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "4914ab0ab3a743e58f0eefdacc1dde77" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "DN5242-Nov21-T1" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2562962934ef4bd0be04b4bc360c9fe9", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2562962934ef4bd0be04b4bc360c9fe9" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1199103880" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2950bb8e1d694bd18b33885e4f2a3be2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2950bb8e1d694bd18b33885e4f2a3be2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-39722178" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe35e5251a0b4fad86a0dff188cf8ba1", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fe35e5251a0b4fad86a0dff188cf8ba1" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-574343681" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/48a013ce6c21446ebd005a778407c636", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "48a013ce6c21446ebd005a778407c636" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "DN5242-Nov23-Test1" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1b63514d5fdc4ab5b78fc57dcbc24c5f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "1b63514d5fdc4ab5b78fc57dcbc24c5f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-45" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/4e6817f491e84ac3970f23ae6c68a2f5", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "4e6817f491e84ac3970f23ae6c68a2f5" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-47" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d0a3e3f2964542259d155a81c41aadc3" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "test-hvf6-09" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/b58c4006dd4d493bba16084ee2d6d85a", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "b58c4006dd4d493bba16084ee2d6d85a" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1091981337" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/baae77dcb56e4e71b0b885ee37c0f9ed", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "baae77dcb56e4e71b0b885ee37c0f9ed" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1316723862" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/10e135cf54aa40d0819e9807a05be9fd", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "10e135cf54aa40d0819e9807a05be9fd" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-42" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/09bcfa01149a416b9dbef57fe9ff4f38", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "09bcfa01149a416b9dbef57fe9ff4f38" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-48" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c9ef0e42793f473ca49e2a882415de63", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c9ef0e42793f473ca49e2a882415de63" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-22" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/985430bc6e444fd6a24ed307e16ee80f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "985430bc6e444fd6a24ed307e16ee80f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1868857163" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/936f200c8a6344a1af038d05e37f6788", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "936f200c8a6344a1af038d05e37f6788" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-49" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2d66ce1949c64e64a892bf2a5e385a0d", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2d66ce1949c64e64a892bf2a5e385a0d" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-830984248" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2175e8824a624b8fabb297b35b453147", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2175e8824a624b8fabb297b35b453147" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-37" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ccbe1427a5434619a7132bd7dd68e97b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ccbe1427a5434619a7132bd7dd68e97b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-36" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/45619c38a9ec4ce6836ec1cc54a2800b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "45619c38a9ec4ce6836ec1cc54a2800b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-15" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c1a1a7717bc142efa6573c2f12b1200c", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c1a1a7717bc142efa6573c2f12b1200c" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1314828730" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cbb99fe4ada84631b7baf046b6fd2044" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "DN5242-Nov16-T3" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/f3a68c2e5cf348af89411ca91bcf509e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "f3a68c2e5cf348af89411ca91bcf509e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1114155455" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/661b60e06bf34a29a0474e1a8abcabb2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "661b60e06bf34a29a0474e1a8abcabb2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-594348189" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/afa69a3d2ae04ed5afea0c75a082ba10", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "afa69a3d2ae04ed5afea0c75a082ba10" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1055470287" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad6bba93fa264b55be522600d6e3e47f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ad6bba93fa264b55be522600d6e3e47f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-16" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb1c11460f0d47ebbf61343c351bd1d8", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cb1c11460f0d47ebbf61343c351bd1d8" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-21" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/427f0797ee244a0baf04bd5699e78dbf", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "427f0797ee244a0baf04bd5699e78dbf" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "tenant-siolaton-23" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/6e8aa8b2f8494cb09f62c4df56a1d68f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "6e8aa8b2f8494cb09f62c4df56a1d68f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-495087135" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ea3021aa27fd4838a95979a4538a25ff", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ea3021aa27fd4838a95979a4538a25ff" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-1427517907" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d7b7097e78414423b9bedd8bdb7d1180", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d7b7097e78414423b9bedd8bdb7d1180" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "Tenant_isolation-398794798" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/7e6d83cc6dbc45e9b2d813e6d9951a0a", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "7e6d83cc6dbc45e9b2d813e6d9951a0a" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-getestdsds" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/e3b312307aac45e5b67bf52225381486", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "e3b312307aac45e5b67bf52225381486" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-Ecomptenant" + } + ] + } + ] + } + }, + { + "service-type": "DARREN MCGEE", + "resource-version": "1494001920845", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "5a8dba3e75e7433185b8004e2f2c546e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-CheckEcomp" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "0ee101c4b53542f49cfc5e1e49d28f88" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-US608multising" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d0b6d63ca975464b9fc2c759a8b21270" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-noPOD41581Cloned" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/16f1ec0207134560a8099bb46055943f", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "16f1ec0207134560a8099bb46055943f" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-check11161022" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/9519f3c0d0654309bd0b2165be6b9bd5", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "9519f3c0d0654309bd0b2165be6b9bd5" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-CheckEcompMulti" + } + ] + } + ] + } + }, + { + "service-type": "TSBC", + "resource-version": "1494001891362", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ece35e4a79d547d193451ac38d700046" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-sspstMAIL" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "23cbbd1872864ea08aa53ade25d34172" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-rtertet" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ded2432abb5a4100801331d07787afc2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-SSPecompFlvr2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ad5aab08f5f7435e9983311af543f311" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMP" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "8071dc66981c4294b05483a1cddac801" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-ecompPODprivate" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "036f769581904ca08ead1415c22b9ec0" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMPCLONE" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2475a36c5e04f12a21593849ae83420" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-X-hope" + } + ] + } + ] + } + } + ] + } + } + } + } +]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_tenants_for_customer_CAR_2020_ER.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_tenants_for_customer_CAR_2020_ER.json new file mode 100644 index 000000000..bb14abccd --- /dev/null +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_tenants_for_customer_CAR_2020_ER.json @@ -0,0 +1,32 @@ +{ + "service-type": "TYLER SILVIA", + "resource-version": "1494001841964", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/CAR_2020_ER/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e66", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "CAR_2020_ER" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "092eb9e8e4b7412e8787dd091bc58e66" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "MSO_TENANT" + } + ] + } + ] + } +} diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/aai_get_aic_zones.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/aai_get_aic_zones.json index e0c5a219e..9863bc4c8 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/aai_get_aic_zones.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/aai_get_aic_zones.json @@ -708,8 +708,8 @@ "zone-name": "QWERTYUI-NUM1" }, { - "zone-id": "MTN32", - "zone-name": "MDTWNJ21-MTN32" + "zone-id": "hvf32", + "zone-name": "MDTWNJ21-hvf32" }, { "zone-id": "RTZ4", @@ -760,8 +760,8 @@ "zone-name": "ATLSECIA-ABC12" }, { - "zone-id": "MTN20", - "zone-name": "MDTWNJ21-MTN20" + "zone-id": "hvf20", + "zone-name": "MDTWNJ21-hvf20" }, { "zone-id": "ABC15", diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/get_sdc_catalog_services_1707vidnf.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/get_sdc_catalog_services_1707vidnf.json index ea2312fad..394f05c2f 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/get_sdc_catalog_services_1707vidnf.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/get_sdc_catalog_services_1707vidnf.json @@ -25,7 +25,7 @@ "name": "1707vidnf", "version": "9.0", "toscaModelURL": "./1707vidnf.zip", - "category": "Mobility", + "category": "Emanuel", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "ar1190", "lastUpdaterFullName": "ARIEL RUBINSTEIN", diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json index 9604cbeea..d4d253eb4 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/deploy/mso_create_svc_instance.json @@ -19,17 +19,17 @@ }, "requestParameters": { "userParams": [], - "subscriptionServiceType": "VIRTUAL USP", + "subscriptionServiceType": "TYLER SILVIA", "aLaCarte": true, - "testApi": "GR_API" + "testApi": "VNF_API" }, "subscriberInfo": { "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", - "subscriberName": "USP VOICE" + "subscriberName": "SILVIA ROBBINS" }, "owningEntity": { "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "MetroPacketCore" + "owningEntityName": "WayneHolland" }, "project": { "projectName": "x1" diff --git a/vid-automation/src/main/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json b/vid-automation/src/main/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json index a43092ef9..52b425bd8 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json +++ b/vid-automation/src/main/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json @@ -2,7 +2,27 @@ { "simulatorRequest": { "method": "GET", - "path": "/ecompportal_att/auxapi//getSessionSlotCheckInterval" + "path": "/ecompportal_att/auxapi//v3/getSessionSlotCheckInterval" + }, + "simulatorResponse": { + "responseCode": 200, + "body": "300000" + } + }, + { + "simulatorRequest": { + "method": "POST", + "path": "/ecompportal_att/auxapi/extendSessionTimeOuts" + }, + "simulatorResponse": { + "responseCode": 200, + "body": "300000" + } + }, + { + "simulatorRequest": { + "method": "GET", + "path": "/ecompportal_att/auxapi/v3/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, diff --git a/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json b/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json index b4fbc51a0..00bf8911f 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json +++ b/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json @@ -67,7 +67,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ECOMP", + "operational-environment-type": "ONAP", "operational-environment-status": "Activate", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -76,7 +76,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ECOMP", + "operational-environment-type": "ONAP", "operational-environment-status": "Activate", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", diff --git a/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json b/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json index 655133b80..1977e6b71 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json +++ b/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json @@ -67,7 +67,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ECOMP", + "operational-environment-type": "ONAP", "operational-environment-status": "Activate", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -76,7 +76,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ECOMP", + "operational-environment-type": "ONAP", "operational-environment-status": "Deactivate", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", diff --git a/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json b/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json index 4d95898ef..8d6cd4ad7 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json +++ b/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json @@ -67,7 +67,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ECOMP", + "operational-environment-type": "ONAP", "operational-environment-status": "Deactivate", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -76,7 +76,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ECOMP", + "operational-environment-type": "ONAP", "operational-environment-status": "Activate", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", diff --git a/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json b/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json index abe08ee4d..02938431c 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json +++ b/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json @@ -107,7 +107,7 @@ "method": "GET", "path": "/aai/v../cloud-infrastructure/operational-environments", "queryParams": { - "operational-environment-type": "ECOMP" + "operational-environment-type": "ONAP" } }, "simulatorResponse": { @@ -117,7 +117,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ECOMP", + "operational-environment-type": "ONAP", "operational-environment-status": "Activate", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", @@ -126,7 +126,7 @@ { "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ECOMP", + "operational-environment-type": "ONAP", "operational-environment-status": "Activate", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", diff --git a/vid-automation/src/main/resources/registration_to_simulator/pProbe/aai_get_service_instance_with_logical_links.json b/vid-automation/src/main/resources/registration_to_simulator/pProbe/aai_get_service_instance_with_logical_links.json index 30365d830..b7671c46b 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/pProbe/aai_get_service_instance_with_logical_links.json +++ b/vid-automation/src/main/resources/registration_to_simulator/pProbe/aai_get_service_instance_with_logical_links.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL.USP/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7b04f9d" + "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER.SILVIA/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7b04f9d" } , "simulatorResponse": { "responseCode": 200, diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_services.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_services.json index ef9725e40..7df5aaab4 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_services.json +++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_services.json @@ -9,17 +9,17 @@ "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" }, { @@ -28,18 +28,18 @@ "resource-version":"1494001980153" }, { - "service-id":"vRRaaS", - "service-description":"vRRaaS", + "service-id":"vTerrance", + "service-description":"vTerrance", "resource-version":"1484865266" }, { "service-id":"323d69d9-2efe-4r45-ay0a-89ea7ard4e6f", - "service-description":"vSCP", + "service-description":"vEsmeralda", "resource-version":"1494001903012" }, { "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "service-description":"Mobility", + "service-description":"Emanuel", "resource-version":"1503954056794" }, { @@ -49,7 +49,7 @@ }, { "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0", - "service-description":"FIRSTNET", + "service-description":"LINDSEY", "resource-version":"1490910095155" }, { @@ -58,18 +58,18 @@ "resource-version":"1494001863930" }, { - "service-id":"vHNGWaas", + "service-id":"vRosemarie", "service-description":"HNGATEWAY", "resource-version":"1501192849249" }, { "service-id":"vHNPaas", - "service-description":"HNPORTAL", + "service-description":"WILKINS", "resource-version":"1501192982895" }, { "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "service-description":"VIRTUAL USP", + "service-description":"TYLER SILVIA", "resource-version":"1494001802638" }, { @@ -78,18 +78,18 @@ "resource-version":"1492533254036" }, { - "service-id":"VIPRaaS", - "service-description":"vIPRaaS", + "service-id":"vMuriel", + "service-description":"vMuriel", "resource-version":"1490910058887" }, { "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" }, { @@ -98,23 +98,23 @@ "resource-version":"1506361785997" }, { - "service-id":"vVIGaaS", - "service-description":"vVIGaaS", + "service-id":"vSalvatore", + "service-description":"vSalvatore", "resource-version":"1494001900545" }, { "service-id":"d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4", - "service-description":"uCPE-VMS", + "service-description":"JOSEFINA", "resource-version":"1494001941772" }, { - "service-id":"vPEaaS", - "service-description":"vPEaaS", + "service-id":"vHubbard", + "service-description":"vHubbard", "resource-version":"1494001988229" }, { "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/resources/registration_to_simulator/sanity/aai_get_subscribers_for_customer.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_subscribers_for_customer.json deleted file mode 100644 index 1b9eaa8e9..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_subscribers_for_customer.json +++ /dev/null @@ -1,734 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "queryParams": { - "depth": 2 - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "global-customer-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name": "FIREWALL/MISC", - "subscriber-type": "INFRA", - "resource-version": "1494001772223", - "service-subscriptions": { - "service-subscription": [ - { - "service-type": "VDNS", - "resource-version": "1494001850040", - "service-instances": { - "service-instance": [ - { - "service-instance-id": "d69c6add-c114-4dd8-9bfc-bb51c7989e93", - "service-instance-name": "test123", - "model-invariant-id": "c73dd832-d1eb-4c3a-bd04-00353c032209", - "model-version-id": "f9253bf0-3b74-4f6b-a966-697bc599691c", - "resource-version": "1494002069377" - }, - { - "service-instance-id": "9caf5581-40ab-47be-b1f1-909a87724add", - "service-instance-name": "vidfirewallvdnstest", - "model-invariant-id": "732263bd-0655-428d-a347-d65676d1a949", - "resource-version": "1494002023060" - }, - { - "service-instance-id": "916538e5-91d2-45f2-a0b4-2b1804361262", - "service-instance-name": "test5645543454", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1499866361973", - "orchestration-status": "Active" - } - ] - } - }, - { - "service-type": "VNTPS", - "resource-version": "1494001936936", - "service-instances": { - "service-instance": [ - { - "service-instance-id": "99deef90-f034-438d-949c-069c22558657", - "service-instance-name": "Lital-S-1707094-VID", - "model-invariant-id": "331a194d-9248-4533-88bc-62c812ccb5c1", - "model-version-id": "171b3887-e73e-479d-8ef8-2690bf74f2aa", - "resource-version": "1500880984100", - "orchestration-status": "Active" - }, - { - "service-instance-id": "14cbb92e-1ba6-46a6-893c-05f817ea81ec", - "service-instance-name": "MobilityServer_Instance10-26", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "1e34a014-6fd9-4b1c-9038-b2b885b93143", - "model-version-id": "8a380513-8a3e-4603-8558-67c1c7231e66", - "resource-version": "1509049693156", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3215397d-435d-4892-8e4f-7321a4269a16", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3215397d-435d-4892-8e4f-7321a4269a16" - } - ] - } - ] - } - }, - { - "service-instance-id": "47e0d120-0b7f-412c-9e5b-e26cfdc3b656", - "service-instance-name": "Lital-Test-VID-Service", - "model-invariant-id": "41543dd0-43c5-4346-bc52-d9883566d9aa", - "model-version-id": "420731a2-72f2-4786-9ba1-fd94f19a81cf", - "resource-version": "1500795793085", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5d521981-33be-4bb5-bb20-5616a9c52a5a", - "service-instance-name": "dfgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "331a194d-9248-4533-88bc-62c812ccb5c1", - "model-version-id": "171b3887-e73e-479d-8ef8-2690bf74f2aa", - "resource-version": "1508832105498", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/Nimbus", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "Nimbus" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/4d4ecf59-41f1-40d4-818d-885234680a42", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "4d4ecf59-41f1-40d4-818d-885234680a42" - } - ] - } - ] - } - } - ] - } - }, - { - "service-type": "VCDN", - "resource-version": "1494001943182" - }, - { - "service-type": "MISVPN Transport", - "resource-version": "1505859178418", - "service-instances": { - "service-instance": [ - { - "service-instance-id": "4ea864f2-b946-473a-b51c-51a7c10b8391", - "service-instance-name": "shaniiiiiiiiiiiiiiiiiiiiiiiiiiiiiii", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508226188903", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/f160c875-ddd1-4ef5-84d8-d098784daa3a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "f160c875-ddd1-4ef5-84d8-d098784daa3a" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/a0032f81-53e1-41f6-bc1a-de91ce1009f3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "a0032f81-53e1-41f6-bc1a-de91ce1009f3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "adding_VNF" - } - ] - } - ] - } - }, - { - "service-instance-id": "8b1b8793-467d-4e5b-9ff4-06abb40ec841", - "service-instance-name": "fgghgyy_shani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1510817054514", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/2356a43d-ed56-43b6-aefc-8391b82588c9", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "2356a43d-ed56-43b6-aefc-8391b82588c9" - } - ] - } - ] - } - }, - { - "service-instance-id": "928d5560-4526-4721-8703-bcfc65177067", - "service-instance-name": "ServicePnf_30", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1510827189590", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/928d5560-4526-4721-8703-bcfc65177067/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "08a1a701-608f-4ac0-bc53-ba89dc2b06b2", - "service-instance-name": "ServicePnf_28", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1510673823477", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/08a1a701-608f-4ac0-bc53-ba89dc2b06b2/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "15477731-6cd4-417f-bcc3-f4ed63c2e452", - "service-instance-name": "s4anity", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509889804126", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/e8016bed-4740-4bd3-a591-96f8788766ae", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "e8016bed-4740-4bd3-a591-96f8788766ae" - } - ] - } - ] - } - }, - { - "service-instance-id": "fafbf383-a04c-4a70-93ea-901582ca199b", - "service-instance-name": "verten", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "87439333-fe61-4b09-8475-f2ced53d425b", - "resource-version": "1508995251487", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/4b65b294-1eb8-47ba-bd80-356004d4f0ed", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "4b65b294-1eb8-47ba-bd80-356004d4f0ed" - } - ] - } - ] - } - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/0c48431cea8c460c998f57ed91515293", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "0c48431cea8c460c998f57ed91515293" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "sanity_test_tenant-746626838" - } - ] - } - ] - } - }, - { - "service-type": "AIM Transport", - "resource-version": "1505859153563", - "service-instances": { - "service-instance": [ - { - "service-instance-id": "c4743f14-1738-4d16-8773-1cfbe0c76c9b", - "service-instance-name": "ShaniService2", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "713783d5-9e21-49c5-86f1-77dc331586a2", - "model-version-id": "a50a43bb-4ac8-410c-acf3-c30aa39dd109", - "resource-version": "1506438228686", - "orchestration-status": "Active" - }, - { - "service-instance-id": "000ef706-dc5b-4d3c-afc6-160b0474f2ef", - "service-instance-name": "version1", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "713783d5-9e21-49c5-86f1-77dc331586a2", - "model-version-id": "a50a43bb-4ac8-410c-acf3-c30aa39dd109", - "resource-version": "1506436202840", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f36f5734-e9df-4fbf-9f35-61be13f028a2", - "service-instance-name": "AIM_TRANSPORT_00014", - "service-type": "TRANSPORT", - "service-role": "AIM", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb", - "model-version-id": "b6614ae6-e52d-44ed-9932-aae697624543", - "resource-version": "1509397929011", - "orchestration-status": "Created", - "relationship-list": { - "relationship": [ - { - "related-to": "zone", - "related-link": "/aai/v11/network/zones/zone/ABC15", - "relationship-data": [ - { - "relationship-key": "zone.zone-id", - "relationship-value": "ABC15" - } - ], - "related-to-property": [ - { - "property-key": "zone.zone-name", - "property-value": "AAITESAN-ABC15" - } - ] - }, - { - "related-to": "logical-link", - "related-link": "/aai/v11/network/logical-links/logical-link/SANITY7656cce9%3ALAG2295%7CSANITY7686cce9%3ALAG2264", - "relationship-data": [ - { - "relationship-key": "logical-link.link-name", - "relationship-value": "SANITY7656cce9:LAG2295|SANITY7686cce9:LAG2264" - } - ] - } - ] - } - }, - { - "service-instance-id": "facfdfb3-174d-46a5-8a9f-8251f21ee5ea", - "service-instance-name": "AIM_TRANSPORT_00003", - "service-type": "TRANSPORT", - "service-role": "AIM", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb", - "model-version-id": "b6614ae6-e52d-44ed-9932-aae697624543", - "resource-version": "1509395666918", - "orchestration-status": "Created" - }, - { - "service-instance-id": "f36f5734-e9df-4fbf-9f35-61be13f028a1", - "service-instance-name": "AIM_TRANSPORT_00004", - "service-type": "TRANSPORT", - "service-role": "AIM", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb", - "model-version-id": "5c9e863f-2716-467b-8799-4a67f378dcaa", - "resource-version": "1508330555658", - "orchestration-status": "<ORCH_STATUS>", - "relationship-list": { - "relationship": [ - { - "related-to": "zone", - "related-link": "/aai/v11/network/zones/zone/ABC11", - "relationship-data": [ - { - "relationship-key": "zone.zone-id", - "relationship-value": "ABC11" - } - ], - "related-to-property": [ - { - "property-key": "zone.zone-name", - "property-value": "ATLSANAI-ABC11" - } - ] - }, - { - "related-to": "logical-link", - "related-link": "/aai/v11/network/logical-links/logical-link/SANITY6758cce9%3ALAG1992%7CSANITY6785cce9%3ALAG1961", - "relationship-data": [ - { - "relationship-key": "logical-link.link-name", - "relationship-value": "SANITY6758cce9:LAG1992|SANITY6785cce9:LAG1961" - } - ] - }, - { - "related-to": "logical-link", - "related-link": "/aai/v11/network/logical-links/logical-link/SANITY6757cce9%3ALAG1989%7CSANITY6785cce9%3ALAG1958", - "relationship-data": [ - { - "relationship-key": "logical-link.link-name", - "relationship-value": "SANITY6757cce9:LAG1989|SANITY6785cce9:LAG1958" - } - ] - } - ] - } - }, - { - "service-instance-id": "377f3202-e183-44a0-85e5-29a7e71603be", - "service-instance-name": "AIM_TRANSPORT_00002", - "service-type": "TRANSPORT", - "service-role": "AIM", - "model-invariant-id": "100cbe0e-ceb2-41e9-8918-eab9f7aa05bd", - "model-version-id": "32228134-a561-49ba-93af-735bc2d78e5e", - "resource-version": "1508448142346", - "orchestration-status": "PendingDelete" - }, - { - "service-instance-id": "f36f5734-e9df-4fbf-9f35-61be13f028a4", - "service-instance-name": "AIM_TRANSPORT_00015", - "service-type": "TRANSPORT", - "service-role": "AIM", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb", - "model-version-id": "b6614ae6-e52d-44ed-9932-aae697624543", - "resource-version": "1509470124946", - "orchestration-status": "Created" - }, - { - "service-instance-id": "f36f5734-e9df-4fbf-9f35-61be13f028a5", - "service-instance-name": "AIM_TRANSPORT_00017", - "service-type": "TRANSPORT", - "service-role": "AIM", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb", - "model-version-id": "b6614ae6-e52d-44ed-9932-aae697624543", - "resource-version": "1509470281154", - "orchestration-status": "Created", - "relationship-list": { - "relationship": [ - { - "related-to": "zone", - "related-link": "/aai/v11/network/zones/zone/ABC15", - "relationship-data": [ - { - "relationship-key": "zone.zone-id", - "relationship-value": "ABC15" - } - ], - "related-to-property": [ - { - "property-key": "zone.zone-name", - "property-value": "AAITESAN-ABC15" - } - ] - }, - { - "related-to": "logical-link", - "related-link": "/aai/v11/network/logical-links/logical-link/SANITY7658cce9%3ALAG2293%7CSANITY7685cce9%3ALAG2262", - "relationship-data": [ - { - "relationship-key": "logical-link.link-name", - "relationship-value": "SANITY7658cce9:LAG2293|SANITY7685cce9:LAG2262" - } - ] - } - ] - } - }, - { - "service-instance-id": "f36f5734-e9df-4fbf-9f35-61be13f028a7", - "service-instance-name": "AIM_TRANSPORT_00019", - "service-type": "TRANSPORT", - "service-role": "AIM", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb", - "model-version-id": "b6614ae6-e52d-44ed-9932-aae697624543", - "resource-version": "1509470436456", - "orchestration-status": "Created", - "relationship-list": { - "relationship": [ - { - "related-to": "zone", - "related-link": "/aai/v11/network/zones/zone/ABC15", - "relationship-data": [ - { - "relationship-key": "zone.zone-id", - "relationship-value": "ABC15" - } - ], - "related-to-property": [ - { - "property-key": "zone.zone-name", - "property-value": "AAITESAN-ABC15" - } - ] - }, - { - "related-to": "logical-link", - "related-link": "/aai/v11/network/logical-links/logical-link/SANITY7657cce9%3ALAG2289%7CSANITY7685cce9%3ALAG2258", - "relationship-data": [ - { - "relationship-key": "logical-link.link-name", - "relationship-value": "SANITY7657cce9:LAG2289|SANITY7685cce9:LAG2258" - } - ] - } - ] - } - }, - { - "service-instance-id": "f36f5734-e9df-4fbf-9f35-61be13f028a3", - "service-instance-name": "AIM_TRANSPORT_00015", - "service-type": "TRANSPORT", - "service-role": "AIM", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb", - "model-version-id": "b6614ae6-e52d-44ed-9932-aae697624543", - "resource-version": "1509399074465", - "orchestration-status": "Created", - "relationship-list": { - "relationship": [ - { - "related-to": "zone", - "related-link": "/aai/v11/network/zones/zone/ABC15", - "relationship-data": [ - { - "relationship-key": "zone.zone-id", - "relationship-value": "ABC15" - } - ], - "related-to-property": [ - { - "property-key": "zone.zone-name", - "property-value": "AAITESAN-ABC15" - } - ] - }, - { - "related-to": "logical-link", - "related-link": "/aai/v11/network/logical-links/logical-link/SANITY7656cce9%3ALAG2294%7CSANITY7686cce9%3ALAG2263", - "relationship-data": [ - { - "relationship-key": "logical-link.link-name", - "relationship-value": "SANITY7656cce9:LAG2294|SANITY7686cce9:LAG2263" - } - ] - } - ] - } - }, - { - "service-instance-id": "181edf1e-725d-47af-ab3f-6b4e297032ab", - "service-instance-name": "ServicePnf_26", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1510673032572", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/181edf1e-725d-47af-ab3f-6b4e297032ab/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "facfdfb3-174d-46a5-8a9f-8251f21zz5yz", - "service-instance-name": "AIM_TRANSPORT_00013", - "service-type": "TRANSPORT", - "service-role": "AIM", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb", - "model-version-id": "b6614ae6-e52d-44ed-9932-aae697624543", - "resource-version": "1509396039342", - "orchestration-status": "Created" - }, - { - "service-instance-id": "4759b4f0-3350-40b0-9e06-2bebdacb21d8", - "service-instance-name": "ServicePnf_27", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1510673651875", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/4759b4f0-3350-40b0-9e06-2bebdacb21d8/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1cc01b8b-7604-4fd3-8cb2-f01466407f76", - "service-instance-name": "ServicePnf_29", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1510826917947", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/1cc01b8b-7604-4fd3-8cb2-f01466407f76/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e67d0806-95c9-41a5-86a7-3920c1bdf69f", - "service-instance-name": "dfgfgg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1510817944682", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/Nimbus", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "Nimbus" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/ab18aa18-9644-441d-be6e-af6cadbc21ab", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "ab18aa18-9644-441d-be6e-af6cadbc21ab" - } - ] - } - ] - } - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/0c48431cea8c460c998f57ed91515293", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "0c48431cea8c460c998f57ed91515293" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "sanity_test_tenant-746626838" - } - ] - } - ] - } - } - ] - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_tenants.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_tenants.json index f0323958c..254c35e8f 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_tenants.json +++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_tenants.json @@ -6,21 +6,21 @@ "simulatorResponse": { "responseCode": 200, "body": { - "service-type": "VIRTUAL USP", + "service-type": "TYLER SILVIA", "resource-version": "1494001841964", "relationship-list": { "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "AAIAIC25" + "relationship-value": "JANET25" }, { "relationship-key": "tenant.tenant-id", @@ -36,15 +36,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -54,21 +54,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-testgamma" + "property-value": "AIN Web Tool-15-D-testalexandria" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -84,15 +84,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/1178612d2b394be4834ad77f567c0af2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/1178612d2b394be4834ad77f567c0af2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -108,15 +108,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -132,15 +132,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/de007636e25249238447264a988a927b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/de007636e25249238447264a988a927b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -156,15 +156,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -180,15 +180,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/649289e30d3244e0b48098114d63c2aa", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/649289e30d3244e0b48098114d63c2aa", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -204,15 +204,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -228,15 +228,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -252,15 +252,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/8774659e425f479895ae091bb5d46560", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/8774659e425f479895ae091bb5d46560", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -276,15 +276,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/624eb554b0d147c19ff8885341760481", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/624eb554b0d147c19ff8885341760481", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -300,15 +300,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/214f55f5fc414c678059c383b03e4962", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/214f55f5fc414c678059c383b03e4962", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -324,15 +324,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/c90666c291664841bb98e4d981ff1db5", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/c90666c291664841bb98e4d981ff1db5", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -348,15 +348,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -372,15 +372,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -396,15 +396,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -420,15 +420,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -444,15 +444,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -468,15 +468,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/05b91bd5137f4929878edd965755c06d", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/05b91bd5137f4929878edd965755c06d", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -492,15 +492,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -516,15 +516,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -540,15 +540,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -564,15 +564,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -588,15 +588,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -612,15 +612,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/2d34d8396e194eb49969fd61ffbff961", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -636,15 +636,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -660,15 +660,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -684,15 +684,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/4914ab0ab3a743e58f0eefdacc1dde77", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -708,15 +708,15 @@ }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/d0a3e3f2964542259d155a81c41aadc3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -726,21 +726,21 @@ "related-to-property": [ { "property-key": "tenant.tenant-name", - "property-value": "test-rdm3-09" + "property-value": "test-olson3-09" } ] }, { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/cbb99fe4ada84631b7baf046b6fd2044", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_named_query_for_view_edit.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_named_query_for_view_edit.json index 26bb3506c..7b8c8b312 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_named_query_for_view_edit.json +++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_named_query_for_view_edit.json @@ -41,11 +41,11 @@ "inventory-response-items":{ "inventory-response-item":[ { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"c015cc0f-0f37-4488-aabf-53795fd93cd3", "vnf-name":"fsd", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -134,11 +134,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"0846287b-65bf-45a6-88f6-6a1af4149fac", "vnf-name":"kjkjk", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -207,12 +207,12 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"9908b762-136f-4b1f-8eb4-ef670ef58bb4", "vnf-name":"uiui", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", - "service-id":"vHNGWaas", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", + "service-id":"vRosemarie", "prov-status":"PREPROV", "orchestration-status":"Created", "in-maint":false, @@ -231,11 +231,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"543931f5-e50e-45a2-a69f-ab727e4c7f2f", "vnf-name":"sdfsdfdsf", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"LRSI-OSPF", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -255,12 +255,12 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"25e84884-22d5-44c9-8212-cb459f63e0ba", "vnf-name":"sdada", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", - "service-id":"VIPRaaS", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", + "service-id":"vMuriel", "prov-status":"PREPROV", "orchestration-status":"Created", "in-maint":false, @@ -279,11 +279,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"013fb0ba-977b-496c-9faa-7f8e5f083eec", "vnf-name":"gvb", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -303,11 +303,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"06914296-cb46-4b62-9453-329a706a6cbb", "vnf-name":"lkllll", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -327,11 +327,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"c55da606-cf38-42c7-bc3c-be8e23b19299", "vnf-name":"ss", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -351,11 +351,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"27cc0914-70be-453e-b552-3df6b1d6cda9", "vnf-name":"yh", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0", "prov-status":"PREPROV", "orchestration-status":"Created", diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/browse_sdc_catalog_two_services.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/browse_sdc_catalog_two_services.json deleted file mode 100644 index 40e70b63e..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/browse_sdc_catalog_two_services.json +++ /dev/null @@ -1,74 +0,0 @@ -{ - "simulatorRequest": { - "method": "PUT", - "path": "/aai/v../query", - "body": "{\"start\" : \"service-design-and-creation\/models\/\", \"query\" : \"query\/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK\"}", - "queryParams": { - "format": [ - "resource" - ] - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "results": [ - { - "model": { - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-type": "resource", - "resource-version": "1500138206526", - "model-vers": { - "model-ver": [ - { - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "model-name": "vidmacrofalsenaming", - "model-version": "1.0", - "model-description": "lustre settler sideways volcanic eight cellular", - "resource-version": "1500137463984", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/l2-bridge-for-wan-connector-model-id-ps-02/model-vers/model-ver/l2-bridge-for-wan-connector-resource-id-ps-02/model-elements/model-element/e874da22-729d-47bd-8c08-d596fd9c213d/model-elements/model-element/ccbb65b8-2faf-4f5f-80d9-804bb50f1455", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "l2-bridge-for-wan-connector-model-id-ps-02" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "l2-bridge-for-wan-connector-resource-id-ps-02" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "get_sdc_catalog_services_2f80c596", - "model-type": "resource", - "resource-version": "1500138206526", - "model-vers": { - "model-ver": [ - { - "model-version-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "model-name": "not important", - "model-version": "1.0", - "model-description": "decontamination arm circus ammonia hump edge", - "resource-version": "1500137463984" - } - ] - } - } - } - ] - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_get_subscribers.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_get_subscribers.json deleted file mode 100644 index a5661c1a2..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_get_subscribers.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers", - "queryParams" : { - "subscriber-type": [ "INFRA" ], - "depth": [ "0" ] - } - } , - "simulatorResponse": { - "responseCode": 200, - "body": { - "customer":[ - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"FIREWALL/MISC", - "subscriber-type":"INFRA", - "resource-version":"1494254802147" - }, - { - "global-customer-id":"VidE2ETest", - "subscriber-name":"VidTest20161020", - "subscriber-type":"INFRA", - "resource-version":"1494254856862" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", - "subscriber-type":"INFRA", - "resource-version":"1494255056308" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"PACKET CORE", - "subscriber-type":"INFRA", - "resource-version":"1506548476111" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"USP VOICE", - "subscriber-type":"INFRA", - "resource-version":"1494254832007" - } - ] - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_instance_by_id.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_instance_by_id.json index 8daa20b4b..5552d11b8 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_instance_by_id.json +++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_instance_by_id.json @@ -10,7 +10,7 @@ "simulatorResponse": { "responseCode": 200, "body": { - "result-data":[{"resource-type":"service-instance","resource-link":"/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vMMSC/service-instances/service-instance/ec884145-dbe8-4228-8165-f0c4d7123f8b"}] + "result-data":[{"resource-type":"service-instance","resource-link":"/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vWINIFRED/service-instances/service-instance/ec884145-dbe8-4228-8165-f0c4d7123f8b"}] } } }
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_instance_by_name.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_instance_by_name.json index 5dc1f3b18..ec0ccac9a 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_instance_by_name.json +++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_instance_by_name.json @@ -4,13 +4,13 @@ "path": "/aai/v../search/nodes-query", "queryParams": { "search-node-type": "service-instance", - "filter": "service-instance-name:EQUALS:abc_mdns_2017_1011_IST_Service_CSI" + "filter": "service-instance-name:EQUALS:abc_CHARLOTTE_2017_1011_IST_Service_CSI" } }, "simulatorResponse": { "responseCode": 200, "body": { - "result-data":[{"resource-type":"service-instance","resource-link":"/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vMMSC/service-instances/service-instance/ec884145-dbe8-4228-8165-f0c4d7123f8b"}] + "result-data":[{"resource-type":"service-instance","resource-link":"/aai/v11/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vWINIFRED/service-instances/service-instance/ec884145-dbe8-4228-8165-f0c4d7123f8b"}] } } }
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_named_query.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_named_query.json index c7b78df86..10ec31b8f 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_named_query.json +++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_search_named_query.json @@ -6,7 +6,7 @@ "simulatorResponse": { "responseCode": 200, "body": { - "inventory-response-item":[{"model-name":"mdns_2017_1011_IST_Service","service-instance":{"service-instance-id":"ec884145-dbe8-4228-8165-f0c4d7123f8b","service-instance-name":"abc_mdns_2017_1011_IST_Service_CSI"},"extra-properties":{},"inventory-response-items":{"inventory-response-item":[{"model-name":"mdns_2017_1011_IST_Vf","generic-vnf":{"vnf-id":"e83e7a37-733a-4fbe-b015-67dbc8a6c1cc","vnf-name":"abc_mdns_2017_1011_IST_Service_CVNF","vnf-type":"mdns_2017_1011_IST_Service/mdns_2017_1011_IST_Vf 0","service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","prov-status":"PREPROV","orchestration-status":"Created","in-maint":false,"is-closed-loop-disabled":false,"resource-version":"1509987660553","model-invariant-id":"b22715a2-4ec1-4e2f-bf4f-d79fa9519707","model-version-id":"e54ac8ab-746b-494d-918a-efab23a50e0d","model-customization-id":"efa526df-e1f5-4fda-9e0d-475cb5e44e4f","nf-type":"null","nf-function":"null","nf-role":"null","nf-naming-code":"null"},"extra-properties":{}}]}}] + "inventory-response-item":[{"model-name":"CHARLOTTE_2017_1011_IST_Service","service-instance":{"service-instance-id":"ec884145-dbe8-4228-8165-f0c4d7123f8b","service-instance-name":"abc_CHARLOTTE_2017_1011_IST_Service_CSI"},"extra-properties":{},"inventory-response-items":{"inventory-response-item":[{"model-name":"CHARLOTTE_2017_1011_IST_Vf","generic-vnf":{"vnf-id":"e83e7a37-733a-4fbe-b015-67dbc8a6c1cc","vnf-name":"abc_CHARLOTTE_2017_1011_IST_Service_CVNF","vnf-type":"CHARLOTTE_2017_1011_IST_Service/CHARLOTTE_2017_1011_IST_Vf 0","service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","prov-status":"PREPROV","orchestration-status":"Created","in-maint":false,"is-closed-loop-disabled":false,"resource-version":"1509987660553","model-invariant-id":"b22715a2-4ec1-4e2f-bf4f-d79fa9519707","model-version-id":"e54ac8ab-746b-494d-918a-efab23a50e0d","model-customization-id":"efa526df-e1f5-4fda-9e0d-475cb5e44e4f","nf-type":"null","nf-function":"null","nf-role":"null","nf-naming-code":"null"},"extra-properties":{}}]}}] } } }
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_sub_details.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_sub_details.json index 53756daa1..940fa909e 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_sub_details.json +++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_aai_sub_details.json @@ -1,4 +1,5 @@ -{ +[ + { "simulatorRequest": { "method": "GET", "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -10,13 +11,13 @@ "responseCode": 200, "body": { "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", + "subscriber-name":"Emanuel", "subscriber-type":"INFRA", "resource-version":"1494001894192", "service-subscriptions":{ "service-subscription":[ { - "service-type":"vMMSC", + "service-type":"vWINIFRED", "resource-version":"1503958037264", "service-instances":{ "service-instance":[ @@ -54,8 +55,8 @@ }, { "service-instance-id":"ec884145-dbe8-4228-8165-f0c4d7123f8b", - "service-instance-name":"abc_mdns_2017_1011_IST_Service_CSI", - "service-type":"Mobility", + "service-instance-name":"abc_CHARLOTTE_2017_1011_IST_Service_CSI", + "service-type":"Emanuel", "service-role":"", "model-invariant-id":"c54c1178-ab4b-498c-aea0-52cc2043d44f", "model-version-id":"a1531622-4e08-43fa-9ffd-222090cab7d2", @@ -64,7 +65,7 @@ }, { "service-instance-id":"69f1abac-b1ac-45c4-b954-ff934fc35257", - "service-instance-name":"Mobility_VSP_Service_nb5443", + "service-instance-name":"Emanuel_VSP_Service_nb5443", "service-type":"", "service-role":"", "model-invariant-id":"f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -74,7 +75,7 @@ }, { "service-instance-id":"5161b8d5-659a-42b2-9faa-d000bdba6473", - "service-instance-name":"ServicevMMSCPID298109_ap947r_092217_03", + "service-instance-name":"ServicevWINIFREDPID298109_ap947r_092217_03", "service-type":"", "service-role":"", "model-invariant-id":"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -84,7 +85,7 @@ }, { "service-instance-id":"46c729a2-0003-4c6f-8deb-ccd7cb203681", - "service-instance-name":"vMMSC_MobReg__Svc_SB_0905_01", + "service-instance-name":"vWINIFRED_MobReg__Svc_SB_0905_01", "service-type":"", "service-role":"", "model-invariant-id":"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -105,7 +106,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"vMMSC_MobReg__Vnf_SB_0905_01" + "property-value":"vWINIFRED_MobReg__Vnf_SB_0905_01" } ] } @@ -202,7 +203,7 @@ }, { "service-instance-id":"4abb3bd4-75bf-488b-9185-dd6bfe493be9", - "service-instance-name":"RG_9-26_vmmsc", + "service-instance-name":"RG_9-26_vWINIFRED", "service-type":"", "service-role":"", "environment-context":"null", @@ -225,7 +226,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"RG_9-26_vmmsctest" + "property-value":"RG_9-26_vWINIFREDtest" } ] } @@ -234,7 +235,7 @@ }, { "service-instance-id":"2f4b57f9-c3bb-4734-b790-ceb57b02186a", - "service-instance-name":"PREIST_MDNS_mmscInstance", + "service-instance-name":"PREIST_CHARLOTTE_mmscInstance", "service-type":"", "service-role":"", "environment-context":"General_Revenue-Bearing", @@ -257,7 +258,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"PREIST_MDNS_VNFmmsc" + "property-value":"PREIST_CHARLOTTE_VNFmmsc" } ] } @@ -354,7 +355,7 @@ }, { "service-instance-id":"8473f088-30a0-453d-88fc-b29bda544d6e", - "service-instance-name":"Service_mdns_mobility_nb54433", + "service-instance-name":"Service_CHARLOTTE_emanuel_nb54433", "service-type":"", "service-role":"", "model-invariant-id":"b399ddef-4d8c-48c4-88c5-d4cb0f8b4678", @@ -375,7 +376,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"Service_mdns_mobility_nb54433_ds0928_vnf" + "property-value":"Service_CHARLOTTE_emanuel_nb54433_ds0928_vnf" } ] } @@ -384,7 +385,7 @@ }, { "service-instance-id":"035933b7-849c-4a83-a11c-73016fdf557a", - "service-instance-name":"Service_vMMSC_MobilityREG_sg_0911", + "service-instance-name":"Service_vWINIFRED_EmanuelREG_sg_0911", "service-type":"", "service-role":"", "model-invariant-id":"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -426,7 +427,7 @@ }, { "service-instance-id":"884233b8-771a-421a-a542-406bda5af2c3", - "service-instance-name":"Service_vMMSC_MobilityREG_sg_0913", + "service-instance-name":"Service_vWINIFRED_EmanuelREG_sg_0913", "service-type":"", "service-role":"", "model-invariant-id":"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -447,7 +448,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"Service_vMMSC_MobilityREG_sg_0913_Vnf" + "property-value":"Service_vWINIFRED_EmanuelREG_sg_0913_Vnf" } ] } @@ -568,7 +569,7 @@ }, { "service-instance-id":"01170b44-d74f-409f-bb84-dee5c6d9ccb8", - "service-instance-name":"Mobility_VSP_Service_nb", + "service-instance-name":"Emanuel_VSP_Service_nb", "service-type":"", "service-role":"", "model-invariant-id":"f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -578,7 +579,7 @@ }, { "service-instance-id":"2f9db809-58f6-4bf2-8759-8e304831bbb9", - "service-instance-name":"ServicevMMSCPID298109_ap947r_0926167_02", + "service-instance-name":"ServicevWINIFREDPID298109_ap947r_0926167_02", "service-type":"", "service-role":"", "environment-context":"null", @@ -736,7 +737,7 @@ }, { "service-instance-id":"ed5d1968-b896-4bd0-b978-4e29485b9086", - "service-instance-name":"Service_mdns_mobility_kk364s_927_1515", + "service-instance-name":"Service_CHARLOTTE_emanuel_kk364s_927_1515", "service-type":"", "service-role":"", "environment-context":"null", @@ -759,7 +760,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"CreateVNF_Service_mdns_mobility_kk364s_927_1515" + "property-value":"CreateVNF_Service_CHARLOTTE_emanuel_kk364s_927_1515" } ] } @@ -768,7 +769,7 @@ }, { "service-instance-id":"4f590065-d9ea-457b-bec6-3cdd95c993ab", - "service-instance-name":"RG_9-25_vMMSCVid", + "service-instance-name":"RG_9-25_vWINIFREDVid", "service-type":"", "service-role":"", "environment-context":"null", @@ -838,7 +839,7 @@ }, { "service-instance-id":"f6763efd-774f-469d-a90e-b736765144cd", - "service-instance-name":"Service_vMMSC_MobilityREG_sb_0912", + "service-instance-name":"Service_vWINIFRED_EmanuelREG_sb_0912", "service-type":"", "service-role":"", "model-invariant-id":"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -859,7 +860,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"Service_vMMSC_MobilityREG_sb_0912_Vnf" + "property-value":"Service_vWINIFRED_EmanuelREG_sb_0912_Vnf" } ] } @@ -868,7 +869,7 @@ }, { "service-instance-id":"3280694a-7fb1-4450-bee4-ad84abbd9971", - "service-instance-name":"vMMSC_MobReg__Svc_DS_0830_01", + "service-instance-name":"vWINIFRED_MobReg__Svc_DS_0830_01", "service-type":"", "service-role":"", "model-invariant-id":"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -922,7 +923,7 @@ }, { "service-instance-id":"2e1b88c0-cc5f-42ea-9a17-c21981107573", - "service-instance-name":"vMMSC_MobReg__Svc_DS_0901_01", + "service-instance-name":"vWINIFRED_MobReg__Svc_DS_0901_01", "service-type":"", "service-role":"", "model-invariant-id":"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -932,7 +933,7 @@ }, { "service-instance-id":"6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "service-instance-name":"vMMSC_MobReg__Svc_DS_0901_02", + "service-instance-name":"vWINIFRED_MobReg__Svc_DS_0901_02", "service-type":"", "service-role":"", "model-invariant-id":"a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -953,7 +954,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"vMMSC_MobReg__Vnf_DS_0901_02" + "property-value":"vWINIFRED_MobReg__Vnf_DS_0901_02" } ] } @@ -962,7 +963,7 @@ }, { "service-instance-id":"7377c571-be4c-445f-bf85-5e7c60d5b1c6", - "service-instance-name":"Service_mdns_01", + "service-instance-name":"Service_CHARLOTTE_01", "service-type":"", "service-role":"", "environment-context":"Critical_Non-Revenue", @@ -1107,7 +1108,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"ServicevMMSCVNF" + "property-value":"ServicevWINIFREDVNF" } ] } @@ -1146,15 +1147,15 @@ "relationship":[ { "related-to":"tenant", - "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", "relationship-data":[ { "relationship-key":"cloud-region.cloud-owner", - "relationship-value":"att-aic" + "relationship-value":"irma-aic" }, { "relationship-key":"cloud-region.cloud-region-id", - "relationship-value":"mtn6" + "relationship-value":"hvf6" }, { "relationship-key":"tenant.tenant-id", @@ -1170,15 +1171,15 @@ }, { "related-to":"tenant", - "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", "relationship-data":[ { "relationship-key":"cloud-region.cloud-owner", - "relationship-value":"att-aic" + "relationship-value":"irma-aic" }, { "relationship-key":"cloud-region.cloud-region-id", - "relationship-value":"mtn6" + "relationship-value":"hvf6" }, { "relationship-key":"tenant.tenant-id", @@ -1194,15 +1195,15 @@ }, { "related-to":"tenant", - "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", "relationship-data":[ { "relationship-key":"cloud-region.cloud-owner", - "relationship-value":"att-aic" + "relationship-value":"irma-aic" }, { "relationship-key":"cloud-region.cloud-region-id", - "relationship-value":"mtn6" + "relationship-value":"hvf6" }, { "relationship-key":"tenant.tenant-id", @@ -1247,11 +1248,11 @@ "relationship":[ { "related-to":"project", - "related-link":"/aai/v11/business/projects/project/Nimbus", + "related-link":"/aai/v11/business/projects/project/Kennedy", "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"Nimbus" + "relationship-value":"Kennedy" } ] }, @@ -1315,11 +1316,11 @@ "relationship":[ { "related-to":"project", - "related-link":"/aai/v11/business/projects/project/Nimbus", + "related-link":"/aai/v11/business/projects/project/Kennedy", "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"Nimbus" + "relationship-value":"Kennedy" } ] }, @@ -1438,15 +1439,15 @@ "relationship":[ { "related-to":"tenant", - "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", "relationship-data":[ { "relationship-key":"cloud-region.cloud-owner", - "relationship-value":"att-aic" + "relationship-value":"irma-aic" }, { "relationship-key":"cloud-region.cloud-region-id", - "relationship-value":"mtn6" + "relationship-value":"hvf6" }, { "relationship-key":"tenant.tenant-id", @@ -1462,15 +1463,15 @@ }, { "related-to":"tenant", - "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", "relationship-data":[ { "relationship-key":"cloud-region.cloud-owner", - "relationship-value":"att-aic" + "relationship-value":"irma-aic" }, { "relationship-key":"cloud-region.cloud-region-id", - "relationship-value":"mtn6" + "relationship-value":"hvf6" }, { "relationship-key":"tenant.tenant-id", @@ -1486,15 +1487,15 @@ }, { "related-to":"tenant", - "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", "relationship-data":[ { "relationship-key":"cloud-region.cloud-owner", - "relationship-value":"att-aic" + "relationship-value":"irma-aic" }, { "relationship-key":"cloud-region.cloud-region-id", - "relationship-value":"mtn6" + "relationship-value":"hvf6" }, { "relationship-key":"tenant.tenant-id", @@ -1562,7 +1563,7 @@ }, { "service-instance-id":"9f44e57f-243d-4e53-8ef8-5892c12f7ac2", - "service-instance-name":"Mobility_VSP_Service_01_PB", + "service-instance-name":"Emanuel_VSP_Service_01_PB", "service-type":"", "service-role":"", "model-invariant-id":"f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -1582,7 +1583,7 @@ } }, { - "service-type":"Mobility", + "service-type":"Emanuel", "resource-version":"1494001853297", "service-instances":{ "service-instance":[ @@ -1740,7 +1741,7 @@ }, { "service-instance-id":"4064aa68-f4db-4135-a78b-b79809416f80", - "service-instance-name":"vDBE_1208_oam_bb389n", + "service-instance-name":"vDOROTHEA_1208_oam_bb389n", "service-type":"", "service-role":"", "environment-context":"General_Revenue-Bearing", @@ -1844,7 +1845,7 @@ }, { "service-instance-id":"3e18ba93-f47d-41c9-9d4e-bd43b507c4d6", - "service-instance-name":"HNPortal_OAM_svc_lll_010917", + "service-instance-name":"WILKINS_OAM_svc_lll_010917", "model-invariant-id":"24c750cd-a827-4289-9714-b6d214f1bc6b", "resource-version":"1494001876432" }, @@ -1891,7 +1892,7 @@ }, { "service-instance-id":"a42eeb3b-ae92-44aa-9da7-2293c1dfa259", - "service-instance-name":"MobilityServer_294356_rs768f", + "service-instance-name":"EmanuelServer_294356_rs768f", "service-type":"", "service-role":"", "environment-context":"General_Revenue-Bearing", @@ -1904,11 +1905,11 @@ "relationship":[ { "related-to":"project", - "related-link":"/aai/v11/business/projects/project/Nimbus", + "related-link":"/aai/v11/business/projects/project/Kennedy", "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"Nimbus" + "relationship-value":"Kennedy" } ] }, @@ -1924,7 +1925,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"rs768f_MobilityServer_294356_vnf" + "property-value":"rs768f_EmanuelServer_294356_vnf" } ] }, @@ -1956,11 +1957,11 @@ "relationship":[ { "related-to":"project", - "related-link":"/aai/v11/business/projects/project/Nimbus", + "related-link":"/aai/v11/business/projects/project/Kennedy", "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"Nimbus" + "relationship-value":"Kennedy" } ] }, @@ -2052,7 +2053,7 @@ "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"DFW" + "relationship-value":"WATKINS" } ] }, @@ -2182,7 +2183,7 @@ "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"DFW" + "relationship-value":"WATKINS" } ] }, @@ -2243,7 +2244,7 @@ }, { "service-instance-id":"898cd344-8ec9-4e91-8e01-adc6a09b1822", - "service-instance-name":"Mobility_Server_294356", + "service-instance-name":"Emanuel_Server_294356", "service-type":"", "service-role":"", "environment-context":"General_Revenue-Bearing", @@ -2256,11 +2257,11 @@ "relationship":[ { "related-to":"project", - "related-link":"/aai/v11/business/projects/project/Nimbus", + "related-link":"/aai/v11/business/projects/project/Kennedy", "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"Nimbus" + "relationship-value":"Kennedy" } ] }, @@ -2276,7 +2277,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"zmtn6mobserver01" + "property-value":"zhvf6mobserver01" } ] }, @@ -2406,11 +2407,11 @@ "relationship":[ { "related-to":"project", - "related-link":"/aai/v11/business/projects/project/Nimbus", + "related-link":"/aai/v11/business/projects/project/Kennedy", "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"Nimbus" + "relationship-value":"Kennedy" } ] }, @@ -2426,7 +2427,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"zmtn6amdns04_PB" + "property-value":"zhvf6amdns04_PB" } ] }, @@ -2484,7 +2485,7 @@ }, { "service-instance-id":"58f993c0-c7b9-45fe-ae7a-2ad9a2341870", - "service-instance-name":"Mobility_VSP_Service_PB_02", + "service-instance-name":"Emanuel_VSP_Service_PB_02", "service-type":"", "service-role":"", "model-invariant-id":"f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -2505,7 +2506,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"Mobility_VSP_Service_PB_02_VF" + "property-value":"Emanuel_VSP_Service_PB_02_VF" } ] } @@ -2720,7 +2721,7 @@ }, { "service-instance-id":"5c766780-2e7b-47e6-b8a3-4bec3b1b0e71", - "service-instance-name":"Service_Test_PCRF_Test1707_02", + "service-instance-name":"Service_Test_RODERICK_Test1707_02", "resource-version":"1494002006171", "relationship-list":{ "relationship":[ @@ -2816,11 +2817,11 @@ "relationship":[ { "related-to":"project", - "related-link":"/aai/v11/business/projects/project/Nimbus", + "related-link":"/aai/v11/business/projects/project/Kennedy", "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"Nimbus" + "relationship-value":"Kennedy" } ] }, @@ -2900,7 +2901,7 @@ }, { "service-instance-id":"f7d5b93c-483c-4564-a524-1a1bbf5fdc0a", - "service-instance-name":"mdns_mobility_01", + "service-instance-name":"CHARLOTTE_emanuel_01", "service-type":"", "service-role":"", "environment-context":"Critical_Non-Revenue", @@ -2923,7 +2924,7 @@ "related-to-property":[ { "property-key":"generic-vnf.vnf-name", - "property-value":"zmtn6amdns02" + "property-value":"zhvf6amdns02" } ] } @@ -2945,11 +2946,11 @@ "relationship":[ { "related-to":"project", - "related-link":"/aai/v11/business/projects/project/Nimbus", + "related-link":"/aai/v11/business/projects/project/Kennedy", "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"Nimbus" + "relationship-value":"Kennedy" } ] }, @@ -3021,11 +3022,11 @@ "relationship":[ { "related-to":"project", - "related-link":"/aai/v11/business/projects/project/Nimbus", + "related-link":"/aai/v11/business/projects/project/Kennedy", "relationship-data":[ { "relationship-key":"project.project-name", - "relationship-value":"Nimbus" + "relationship-value":"Kennedy" } ] }, @@ -3065,7 +3066,7 @@ }, { "service-instance-id":"716df72e-d61e-45a4-8e50-8ea58d8ad2ac", - "service-instance-name":"lll_hngw_oam_net_020217", + "service-instance-name":"lll_Rosema_oam_net_020217", "model-invariant-id":"cc1db61e-1d9f-4b64-91ec-6844d922c584", "model-version-id":"374a0a81-cb42-4ed5-a5fb-5a0bec102f82", "resource-version":"1494001815150" @@ -3115,4 +3116,195 @@ } } } -}
\ No newline at end of file + }, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "queryParams" : { + "depth": [ "1" ] + } + } , + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "subscriber-name":"Emanuel", + "subscriber-type":"INFRA", + "resource-version":"1494001894192", + "service-subscriptions":{ + "service-subscription":[ + { + "service-type":"vWINIFRED", + "resource-version":"1503958037264", + "relationship-list":{ + "relationship":[ + { + "related-to":"tenant", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "relationship-data":[ + { + "relationship-key":"cloud-region.cloud-owner", + "relationship-value":"irma-aic" + }, + { + "relationship-key":"cloud-region.cloud-region-id", + "relationship-value":"hvf6" + }, + { + "relationship-key":"tenant.tenant-id", + "relationship-value":"c2609b7252b6484d89432611cfb2491b" + } + ], + "related-to-property":[ + { + "property-key":"tenant.tenant-name", + "property-value":"ECOM_Tenant_DND" + } + ] + }, + { + "related-to":"tenant", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "relationship-data":[ + { + "relationship-key":"cloud-region.cloud-owner", + "relationship-value":"irma-aic" + }, + { + "relationship-key":"cloud-region.cloud-region-id", + "relationship-value":"hvf6" + }, + { + "relationship-key":"tenant.tenant-id", + "relationship-value":"579d80c0cf754d1e9f1ddc2cdc1701e3" + } + ], + "related-to-property":[ + { + "property-key":"tenant.tenant-name", + "property-value":"ECOM_FirstNet1_DND" + } + ] + }, + { + "related-to":"tenant", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "relationship-data":[ + { + "relationship-key":"cloud-region.cloud-owner", + "relationship-value":"irma-aic" + }, + { + "relationship-key":"cloud-region.cloud-region-id", + "relationship-value":"hvf6" + }, + { + "relationship-key":"tenant.tenant-id", + "relationship-value":"2cd3ca9abd25492eb0c6a44bc95fe714" + } + ], + "related-to-property":[ + { + "property-key":"tenant.tenant-name", + "property-value":"ECOM_FirstNet2_DND" + } + ] + } + ] + } + }, + { + "service-type":"vMNS", + "resource-version":"1507044344705", + "relationship-list":{ + "relationship":[ + { + "related-to":"tenant", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "relationship-data":[ + { + "relationship-key":"cloud-region.cloud-owner", + "relationship-value":"irma-aic" + }, + { + "relationship-key":"cloud-region.cloud-region-id", + "relationship-value":"hvf6" + }, + { + "relationship-key":"tenant.tenant-id", + "relationship-value":"c2609b7252b6484d89432611cfb2491b" + } + ], + "related-to-property":[ + { + "property-key":"tenant.tenant-name", + "property-value":"ECOM_Tenant_DND" + } + ] + }, + { + "related-to":"tenant", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "relationship-data":[ + { + "relationship-key":"cloud-region.cloud-owner", + "relationship-value":"irma-aic" + }, + { + "relationship-key":"cloud-region.cloud-region-id", + "relationship-value":"hvf6" + }, + { + "relationship-key":"tenant.tenant-id", + "relationship-value":"579d80c0cf754d1e9f1ddc2cdc1701e3" + } + ], + "related-to-property":[ + { + "property-key":"tenant.tenant-name", + "property-value":"ECOM_FirstNet1_DND" + } + ] + }, + { + "related-to":"tenant", + "related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "relationship-data":[ + { + "relationship-key":"cloud-region.cloud-owner", + "relationship-value":"irma-aic" + }, + { + "relationship-key":"cloud-region.cloud-region-id", + "relationship-value":"hvf6" + }, + { + "relationship-key":"tenant.tenant-id", + "relationship-value":"2cd3ca9abd25492eb0c6a44bc95fe714" + } + ], + "related-to-property":[ + { + "property-key":"tenant.tenant-name", + "property-value":"ECOM_FirstNet2_DND" + } + ] + } + ] + } + }, + { + "service-type":"vVoiceMail", + "resource-version":"1494001916536" + }, + { + "service-type":"Emanuel", + "resource-version":"1494001853297" + } + ] + } + } + } + } +]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_a1531622.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_a1531622.json index 7e74421ff..516acde7a 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_a1531622.json +++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_a1531622.json @@ -22,18 +22,18 @@ "body": { "uuid":"a1531622-4e08-43fa-9ffd-222090cab7d2", "invariantUUID":"c54c1178-ab4b-498c-aea0-52cc2043d44f", - "name":"mdns_2017_1011_IST_Service", + "name":"CHARLOTTE_2017_1011_IST_Service", "version":"5.0", "toscaModelURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/toscaModel", - "category":"Mobility", + "category":"Emanuel", "lifecycleState":"CERTIFIED", "lastUpdaterUserId":"by5924", "distributionStatus":"DISTRIBUTED", "lastUpdaterFullName":"BAGESHRI YARAMWAR", "resources":[ { - "resourceInstanceName":"mdns_2017_1011_IST_Vf 0", - "resourceName":"mdns_2017_1011_IST_Vf", + "resourceInstanceName":"CHARLOTTE_2017_1011_IST_Vf 0", + "resourceName":"CHARLOTTE_2017_1011_IST_Vf", "resourceInvariantUUID":"b22715a2-4ec1-4e2f-bf4f-d79fa9519707", "resourceVersion":"4.0", "resoucreType":"VF", @@ -42,7 +42,7 @@ { "artifactName":"dns_nested_01.yaml", "artifactType":"HEAT_NESTED", - "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/mdns_2017_1011_ist_vf0/artifacts/b9ea0a90-9a52-4a19-ae30-d35c8cbd1a73", + "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/CHARLOTTE_2017_1011_ist_vf0/artifacts/b9ea0a90-9a52-4a19-ae30-d35c8cbd1a73", "artifactDescription":"created from csar", "artifactChecksum":"OTFhODY2YzMxYzg2NzNhMDdlNGU4MGI1MDAxOTk3YjY=", "artifactUUID":"b9ea0a90-9a52-4a19-ae30-d35c8cbd1a73", @@ -53,7 +53,7 @@ { "artifactName":"vf-license-model.xml", "artifactType":"VF_LICENSE", - "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/mdns_2017_1011_ist_vf0/artifacts/70fb7b62-53ca-4784-9409-a85d98cdc9ac", + "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/CHARLOTTE_2017_1011_ist_vf0/artifacts/70fb7b62-53ca-4784-9409-a85d98cdc9ac", "artifactDescription":"VF license file", "artifactChecksum":"N2I4YTBlYWI0MjIyOTgzNzIzYmNiZmQ3NWFhM2ZhN2Q=", "artifactUUID":"70fb7b62-53ca-4784-9409-a85d98cdc9ac", @@ -62,9 +62,9 @@ "artifactGroupType":"DEPLOYMENT" }, { - "artifactName":"mdns_2017_1011_ist_vf0_modules.json", + "artifactName":"CHARLOTTE_2017_1011_ist_vf0_modules.json", "artifactType":"VF_MODULES_METADATA", - "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/mdns_2017_1011_ist_vf0/artifacts/56912419-5619-4f6f-93f5-d2c0ac56ed53", + "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/CHARLOTTE_2017_1011_ist_vf0/artifacts/56912419-5619-4f6f-93f5-d2c0ac56ed53", "artifactDescription":"Auto-generated VF Modules information artifact", "artifactChecksum":"ZjI1ODQyZDdkMDFkYTNmODM5ODhkODMzYWFhNDFjMDM=", "artifactUUID":"56912419-5619-4f6f-93f5-d2c0ac56ed53", @@ -75,7 +75,7 @@ { "artifactName":"dns_az_01.yaml", "artifactType":"HEAT", - "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/mdns_2017_1011_ist_vf0/artifacts/895b1915-1f2b-467a-8071-2f07d01b2f65", + "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/CHARLOTTE_2017_1011_ist_vf0/artifacts/895b1915-1f2b-467a-8071-2f07d01b2f65", "artifactDescription":"created from csar", "artifactTimeout":60, "artifactChecksum":"YjRkYTMxNzNhMDJjZTkzOWJlMmFiNzZjNmNmNjEzZGI=", @@ -87,7 +87,7 @@ { "artifactName":"base_dns.yaml", "artifactType":"HEAT", - "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/mdns_2017_1011_ist_vf0/artifacts/479299e8-58ad-498b-82e5-a999922d388d", + "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/CHARLOTTE_2017_1011_ist_vf0/artifacts/479299e8-58ad-498b-82e5-a999922d388d", "artifactDescription":"created from csar", "artifactTimeout":60, "artifactChecksum":"NDU1MGM0YWE3Njc3NzJjYzIzNjY3OWFkNTQ2MDcxMjQ=", @@ -99,7 +99,7 @@ { "artifactName":"base_dns.env", "artifactType":"HEAT_ENV", - "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/mdns_2017_1011_ist_vf0/artifacts/6dbd09d7-1e76-4f99-9d6c-d6e9b9edcbf4", + "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/CHARLOTTE_2017_1011_ist_vf0/artifacts/6dbd09d7-1e76-4f99-9d6c-d6e9b9edcbf4", "artifactDescription":"Auto-generated HEAT Environment deployment artifact", "artifactChecksum":"OGM2MWIzZTA2OTc5YjQwNTM1NGVhODA0YTFkNzM4ZTg=", "artifactUUID":"6dbd09d7-1e76-4f99-9d6c-d6e9b9edcbf4", @@ -111,7 +111,7 @@ { "artifactName":"vendor-license-model.xml", "artifactType":"VENDOR_LICENSE", - "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/mdns_2017_1011_ist_vf0/artifacts/0cc7d6bb-6201-4b44-abd2-e53cb6a0964a", + "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/CHARLOTTE_2017_1011_ist_vf0/artifacts/0cc7d6bb-6201-4b44-abd2-e53cb6a0964a", "artifactDescription":" Vendor license file", "artifactChecksum":"ZWEyMDlkZDBhYWExYTMwNDUzOGRjMWRmMjFmYzYzZGQ=", "artifactUUID":"0cc7d6bb-6201-4b44-abd2-e53cb6a0964a", @@ -122,7 +122,7 @@ { "artifactName":"dns_az_01.env", "artifactType":"HEAT_ENV", - "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/mdns_2017_1011_ist_vf0/artifacts/b6375fa3-fecf-404d-b91c-873f9f4e2042", + "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/resourceInstances/CHARLOTTE_2017_1011_ist_vf0/artifacts/b6375fa3-fecf-404d-b91c-873f9f4e2042", "artifactDescription":"Auto-generated HEAT Environment deployment artifact", "artifactChecksum":"NDRjMmU0ZTJlMWYzNTI4YThmZTUzM2UyZGM3OWNhN2M=", "artifactUUID":"b6375fa3-fecf-404d-b91c-873f9f4e2042", @@ -136,7 +136,7 @@ ], "artifacts":[ { - "artifactName":"AAI-mdns_2017_1011_IST_Service-service-5.0.xml", + "artifactName":"AAI-CHARLOTTE_2017_1011_IST_Service-service-5.0.xml", "artifactType":"MODEL_INVENTORY_PROFILE", "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/artifacts/a166cb16-000b-4dff-b646-0fe014b32cae", "artifactDescription":"AAI Service Model", @@ -169,7 +169,7 @@ "artifactGroupType":"DEPLOYMENT" }, { - "artifactName":"AAI-mdns_2017_1011_IST_Vf-resource-4.0.xml", + "artifactName":"AAI-CHARLOTTE_2017_1011_IST_Vf-resource-4.0.xml", "artifactType":"MODEL_INVENTORY_PROFILE", "artifactURL":"/sdc/v1/catalog/services/a1531622-4e08-43fa-9ffd-222090cab7d2/artifacts/dc9b78c0-b200-4a16-bbe0-76ca19c97680", "artifactDescription":"AAI Resource Model", diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_aa2f8edc.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_aa2f8edc.json index 62511db5f..51fbc5c41 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_aa2f8edc.json +++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/get_sdc_catalog_services_aa2f8edc.json @@ -22,10 +22,10 @@ "body": { "uuid": "aa2f8e9c-9e47-4b15-a95c-4a93855ac61b", "invariantUUID": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", - "name": "ServicevMMSCPID298109", + "name": "ServicevWINIFREDPID298109", "version": "1.0", "toscaModelURL": "./2f80c596.zip", - "category": "Mobility", + "category": "Emanuel", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/post_mso_create_service_instance.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/post_mso_create_service_instance.json deleted file mode 100644 index a0cd61828..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/post_mso_create_service_instance.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/serviceInstances/v.", - "body": { - "requestDetails": { - "requestParameters": { - "testApi": "GR_API" - } - } - } - }, - "simulatorResponse": { - "responseCode": 202, - "body": {"requestReferences":{"instanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb","requestId":"c0011670-0e1a-4b74-945d-8bf5aede1d9c"}} - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/sanity/service_design_and_creation.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/service_design_and_creation.json deleted file mode 100644 index e0eca117f..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/sanity/service_design_and_creation.json +++ /dev/null @@ -1,367 +0,0 @@ -{ - "simulatorRequest": { - "method": "PUT", - "path": "/aai/v../query", - "body": "{\"start\" : \"service-design-and-creation\/models\/\", \"query\" : \"query\/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK\"}", - "queryParams": { - "format": [ - "resource" - ] - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "results": [ - { - "model": { - "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "model-type": "resource", - "resource-version": "1500138206526", - "model-vers": { - "model-ver": [ - { - "model-version-id": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", - "model-name": "action-data", - "model-version": "1.0", - "model-description": "lustre settler sideways volcanic eight cellular", - "resource-version": "1500137463984", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/l2-bridge-for-wan-connector-model-id-ps-02/model-vers/model-ver/l2-bridge-for-wan-connector-resource-id-ps-02/model-elements/model-element/e874da22-729d-47bd-8c08-d596fd9c213d/model-elements/model-element/ccbb65b8-2faf-4f5f-80d9-804bb50f1455", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "l2-bridge-for-wan-connector-model-id-ps-02" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "l2-bridge-for-wan-connector-resource-id-ps-02" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "e874da22-729d-47bd-8c08-d596fd9c213d" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "ccbb65b8-2faf-4f5f-80d9-804bb50f1455" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "00beb8f9-6d39-452f-816d-c709b9cbb87d", - "model-type": "resource", - "resource-version": "4076846985447", - "model-vers": { - "model-ver": [ - { - "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413", - "model-name": "action-data", - "model-version": "1.0", - "model-description": "honor immunity exile prong below misshapen", - "resource-version": "4076846985447" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "ea78c9e3-514d-4a0a-9162-13837fa54c35", - "model-type": "resource", - "resource-version": "1500137034452", - "model-vers": { - "model-ver": [ - { - "model-version-id": "666a06ee-4b57-46df-bacf-908da8f10c3f", - "model-name": "multicast-configuration", - "model-version": "1.0", - "model-description": "python bullwhip appointment computation ambidextrous heaving", - "resource-version": "1500136282691" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "78ca26d0-246d-11e7-93ae-92361f002671", - "model-type": "resource", - "resource-version": "1492627634298", - "model-vers": { - "model-ver": [ - { - "model-version-id": "20c4431c-246d-11e7-93ae-92361f002671", - "model-name": "vSAMP10aDEV::base::module-0", - "model-version": "2", - "model-description": "MSO aLaCarte VF vSAMP10aDEV Base", - "resource-version": "1492627634300" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "5b607929-6088-4614-97ef-cac817508e0e", - "model-type": "resource", - "resource-version": "1492814035001", - "model-vers": { - "model-ver": [ - { - "model-version-id": "797a6c41-0f80-4d35-a288-3920c4e06baa", - "model-name": "CONTRAIL30_L2NODHCP", - "model-version": "1.0", - "model-description": "contrail 3.0.x L2 network for AIC 3.x sites (and No DHCP).", - "resource-version": "1492814035003", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f/model-vers/model-ver/aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e/model-elements/model-element/2f622421-1c67-4142-be6e-cecad5242af6/model-elements/model-element/2add7556-a23b-46b8-b6b4-ad300b47ceab", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "52b49b5d-3086-4ffd-b5e6-1b1e5e7e062f" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "aed5a5b7-20d3-44f7-90a3-ddbd16f14d1e" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "2f622421-1c67-4142-be6e-cecad5242af6" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "2add7556-a23b-46b8-b6b4-ad300b47ceab" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "0143d57b-a517-4de9-a0a1-eb76db51f402", - "model-type": "resource", - "resource-version": "1497897268768", - "model-vers": { - "model-ver": [ - { - "model-version-id": "f1bde010-cc5f-4765-941f-75f15b24f9fc", - "model-name": "BkVmxAv061917..base_vPE_AV..module-0", - "model-version": "2", - "resource-version": "1497897268769", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/267ef491-3c1a-4c32-8e69-0e557bfb61e7/model-vers/model-ver/18655c7f-c846-4934-9e25-34378dfd33d6/model-elements/model-element/578492b2-36a4-47da-83dc-91b58c699ad1/model-elements/model-element/6b1fc7a5-fc01-4a9d-a87f-0ad0d8caa13f", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "267ef491-3c1a-4c32-8e69-0e557bfb61e7" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "18655c7f-c846-4934-9e25-34378dfd33d6" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "578492b2-36a4-47da-83dc-91b58c699ad1" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "6b1fc7a5-fc01-4a9d-a87f-0ad0d8caa13f" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "ipe-resource-id-ps-02", - "model-type": "resource", - "resource-version": "1493389430122", - "model-vers": { - "model-ver": [ - { - "model-version-id": "ipe-resource-id-ps-02", - "model-name": "abc", - "model-version": "v1.0", - "resource-version": "1493389520357", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/l2-bridge-for-wan-connector-model-id-ps-02/model-vers/model-ver/l2-bridge-for-wan-connector-resource-id-ps-02/model-elements/model-element/e874da22-729d-47bd-8c08-d596fd9c213d/model-elements/model-element/ccbb65b8-2faf-4f5f-80d9-804bb50f1455", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "l2-bridge-for-wan-connector-model-id-ps-02" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "l2-bridge-for-wan-connector-resource-id-ps-02" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "e874da22-729d-47bd-8c08-d596fd9c213d" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "ccbb65b8-2faf-4f5f-80d9-804bb50f1455" - } - ] - } - ] - } - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "lmoser410-connector-model-id", - "model-type": "widget", - "resource-version": "1493389512180", - "model-vers": { - "model-ver": [ - { - "model-version-id": "lmoser410-connector-model-version-id", - "model-name": "connector", - "model-version": "v1.0", - "resource-version": "1493389444766" - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "named-query-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/named-queries/named-query/lmoser410-named-query-uuid/named-query-elements/named-query-element/48278a7d-2b1e-454f-89e6-5c0ba145f486", - "relationship-data": [ - { - "relationship-key": "named-query.named-query-uuid", - "relationship-value": "lmoser410-named-query-uuid" - }, - { - "relationship-key": "named-query-element.named-query-element-uuid", - "relationship-value": "48278a7d-2b1e-454f-89e6-5c0ba145f486" - } - ] - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "3a97db99-c4bb-498a-a13a-38f65f1ced3d", - "model-type": "resource", - "resource-version": "1492630209768", - "model-vers": { - "model-ver": [ - { - "model-version-id": "ff2ae348-214a-11e7-93ae-92361f002673", - "model-name": "vSAMP10aDEV::base::module-0", - "model-version": "1.0", - "model-description": "MACRO_vSAMP_module", - "resource-version": "1492630209769" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "3c504d40-b847-424c-9d25-4fb7e0a3e994", - "model-type": "widget", - "resource-version": "1493389430124", - "model-vers": { - "model-ver": [ - { - "model-version-id": "204c641a-3494-48c8-979a-86856f5fd32a", - "model-name": "named-query-element", - "model-version": "1.0", - "resource-version": "1493389423212" - } - ] - } - } - }, - { - "model": { - "model-invariant-id": "93e56950-cb19-44e6-ace4-8b50f2d02e45", - "model-type": "resource", - "resource-version": "1497898974232", - "model-vers": { - "model-ver": [ - { - "model-version-id": "acba1f72-c6e0-477f-9426-ad190151e100", - "model-name": "RG_6-19_Test", - "model-version": "1.0", - "model-description": "RG_6-19_Test", - "resource-version": "1497898974233", - "relationship-list": { - "relationship": [ - { - "related-to": "model-element", - "relationship-label": "isA", - "related-link": "/aai/v12/service-design-and-creation/models/model/a07220ba-954e-422f-86b5-e8b95fe6b116/model-vers/model-ver/bf6dbd68-2c7d-4ba2-ade1-dfd4476aa505/model-elements/model-element/6e10fe2e-6d04-4198-9124-dd051a5ae65f/model-elements/model-element/cb3c22e1-9dc6-467f-9636-0a7aef10d5d0", - "relationship-data": [ - { - "relationship-key": "model.model-invariant-id", - "relationship-value": "a07220ba-954e-422f-86b5-e8b95fe6b116" - }, - { - "relationship-key": "model-ver.model-version-id", - "relationship-value": "bf6dbd68-2c7d-4ba2-ade1-dfd4476aa505" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "6e10fe2e-6d04-4198-9124-dd051a5ae65f" - }, - { - "relationship-key": "model-element.model-element-uuid", - "relationship-value": "cb3c22e1-9dc6-467f-9636-0a7aef10d5d0" - } - ] - } - ] - } - } - ] - } - } - } - ] - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_full_subscribers.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_full_subscribers.json deleted file mode 100644 index 225bb3670..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_full_subscribers.json +++ /dev/null @@ -1,108 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers", - "queryParams": { - "subscriber-type": "INFRA", - "depth": 0 - } - } , - "simulatorResponse": { - "responseCode": 200, - "body": { - "customer":[ - { - "global-customer-id":"MSO_1610_ST", - "subscriber-name":"MSO_1610_ST", - "subscriber-type":"INFRA", - "resource-version":"1494001902987" - }, - { - "global-customer-id":"21014aa2-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"PACKET CORE", - "subscriber-type":"INFRA", - "resource-version":"1494001776295" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-2", - "subscriber-name":"ICORE CORE", - "subscriber-type":"INFRA", - "resource-version":"1498751754450" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-1", - "subscriber-name":"PACKET1 CORE", - "subscriber-type":"INFRA", - "resource-version":"1498595633607" - }, - { - "global-customer-id":"jimmy-example", - "subscriber-name":"JimmyExampleCust-20161102", - "subscriber-type":"INFRA", - "resource-version":"1494001970063" - }, - { - "global-customer-id":"jimmy-example2", - "subscriber-name":"JimmyExampleCust-20161103", - "subscriber-type":"INFRA", - "resource-version":"1494001970225" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-102", - "subscriber-name":"DHV1802-TestSub-PWT-102", - "subscriber-type":"INFRA", - "resource-version":"1508852495058" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-101", - "subscriber-name":"DHV1802-TestSub-PWT-101", - "subscriber-type":"INFRA", - "resource-version":"1508179953733" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", - "subscriber-type":"INFRA", - "resource-version":"1494001894192" - }, - { - "global-customer-id":"DHV1802-Subscriber-4", - "subscriber-name":"DHV1802-Subscriber-5", - "subscriber-type":"INFRA", - "resource-version":"1509134064531" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-103", - "subscriber-name":"DHV1802-TestSub-PWT-103", - "subscriber-type":"INFRA", - "resource-version":"1509045503736" - }, - { - "global-customer-id":"DHV1802-Subscriber-2", - "subscriber-name":"DHV1802-Subscriber-2", - "subscriber-type":"INFRA", - "resource-version":"1509122065439" - }, - { - "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name":"USP VOICE", - "subscriber-type":"INFRA", - "resource-version":"1494001938080" - }, - { - "global-customer-id":"DHV1802-Subscriber-3", - "subscriber-name":"DHV1802-Subscriber-3", - "subscriber-type":"INFRA", - "resource-version":"1509122759407" - }, - { - "global-customer-id":"31739f3e-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"FIREWALL/MISC", - "subscriber-type":"INFRA", - "resource-version":"1494001772223" - } - ] - } - - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_services.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_services.json index ef9725e40..7df5aaab4 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_services.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_services.json @@ -9,17 +9,17 @@ "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" }, { @@ -28,18 +28,18 @@ "resource-version":"1494001980153" }, { - "service-id":"vRRaaS", - "service-description":"vRRaaS", + "service-id":"vTerrance", + "service-description":"vTerrance", "resource-version":"1484865266" }, { "service-id":"323d69d9-2efe-4r45-ay0a-89ea7ard4e6f", - "service-description":"vSCP", + "service-description":"vEsmeralda", "resource-version":"1494001903012" }, { "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "service-description":"Mobility", + "service-description":"Emanuel", "resource-version":"1503954056794" }, { @@ -49,7 +49,7 @@ }, { "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0", - "service-description":"FIRSTNET", + "service-description":"LINDSEY", "resource-version":"1490910095155" }, { @@ -58,18 +58,18 @@ "resource-version":"1494001863930" }, { - "service-id":"vHNGWaas", + "service-id":"vRosemarie", "service-description":"HNGATEWAY", "resource-version":"1501192849249" }, { "service-id":"vHNPaas", - "service-description":"HNPORTAL", + "service-description":"WILKINS", "resource-version":"1501192982895" }, { "service-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "service-description":"VIRTUAL USP", + "service-description":"TYLER SILVIA", "resource-version":"1494001802638" }, { @@ -78,18 +78,18 @@ "resource-version":"1492533254036" }, { - "service-id":"VIPRaaS", - "service-description":"vIPRaaS", + "service-id":"vMuriel", + "service-description":"vMuriel", "resource-version":"1490910058887" }, { "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" }, { @@ -98,23 +98,23 @@ "resource-version":"1506361785997" }, { - "service-id":"vVIGaaS", - "service-description":"vVIGaaS", + "service-id":"vSalvatore", + "service-description":"vSalvatore", "resource-version":"1494001900545" }, { "service-id":"d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4", - "service-description":"uCPE-VMS", + "service-description":"JOSEFINA", "resource-version":"1494001941772" }, { - "service-id":"vPEaaS", - "service-description":"vPEaaS", + "service-id":"vHubbard", + "service-description":"vHubbard", "resource-version":"1494001988229" }, { "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/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_FIREWALL-MISC.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_CRAIG-ROBERTS.json index 25b0ab5fe..2fa444105 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_FIREWALL-MISC.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_CRAIG-ROBERTS.json @@ -1,4 +1,4 @@ -{ +[{ "simulatorRequest": { "method": "GET", "path": "/aai/v../business/customers/customer/31739f3e-526b-11e6-beb8-9e71128cae77", @@ -10,7 +10,7 @@ "responseCode": 200, "body": { "global-customer-id": "31739f3e-526b-11e6-beb8-9e71128cae77", - "subscriber-name": "FIREWALL/MISC", + "subscriber-name": "CRAIG/ROBERTS", "subscriber-type": "INFRA", "resource-version": "1494001772223", "service-subscriptions": { @@ -59,7 +59,7 @@ }, { "service-instance-id": "14cbb92e-1ba6-46a6-893c-05f817ea81ec", - "service-instance-name": "MobilityServer_Instance10-26", + "service-instance-name": "EmanuelServer_Instance10-26", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -106,11 +106,11 @@ "relationship": [ { "related-to": "project", - "related-link": "/aai/v11/business/projects/project/Nimbus", + "related-link": "/aai/v11/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -301,15 +301,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/0c48431cea8c460c998f57ed91515293", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/0c48431cea8c460c998f57ed91515293", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -675,11 +675,11 @@ "relationship": [ { "related-to": "project", - "related-link": "/aai/v11/business/projects/project/Nimbus", + "related-link": "/aai/v11/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -702,15 +702,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/0c48431cea8c460c998f57ed91515293", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/0c48431cea8c460c998f57ed91515293", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -1076,11 +1076,11 @@ "relationship": [ { "related-to": "project", - "related-link": "/aai/v11/business/projects/project/Nimbus", + "related-link": "/aai/v11/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -1103,15 +1103,15 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/rdm3/tenants/tenant/0c48431cea8c460c998f57ed91515293", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/0c48431cea8c460c998f57ed91515293", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "rdm3" + "relationship-value": "olson3" }, { "relationship-key": "tenant.tenant-id", @@ -1132,4 +1132,134 @@ } } } -}
\ No newline at end of file +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/31739f3e-526b-11e6-beb8-9e71128cae77", + "queryParams": { + "depth": 1 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "31739f3e-526b-11e6-beb8-9e71128cae77", + "subscriber-name": "CRAIG/ROBERTS", + "subscriber-type": "INFRA", + "resource-version": "1494001772223", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "VDNS", + "resource-version": "1494001850040" + }, + { + "service-type": "VNTPS", + "resource-version": "1494001936936" + }, + { + "service-type": "VCDN", + "resource-version": "1494001943182" + }, + { + "service-type": "MISVPN Transport", + "resource-version": "1505859178418", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/0c48431cea8c460c998f57ed91515293", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "olson3" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "0c48431cea8c460c998f57ed91515293" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "sanity_test_tenant-746626838" + } + ] + } + ] + } + }, + { + "service-type": "AIM Transport", + "resource-version": "1505859153563", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/0c48431cea8c460c998f57ed91515293", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "olson3" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "0c48431cea8c460c998f57ed91515293" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "sanity_test_tenant-746626838" + } + ] + } + ] + } + }, + { + "service-type": "AIM Transport", + "resource-version": "1505859153563", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/0c48431cea8c460c998f57ed91515293", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "olson3" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "0c48431cea8c460c998f57ed91515293" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "sanity_test_tenant-746626838" + } + ] + } + ] + } + } + ] + } + } + } + }]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Mobility.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json index 26bf7b52b..897342b86 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Mobility.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json @@ -1,4 +1,4 @@ -{ +[{ "simulatorRequest": { "method": "GET", "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", @@ -10,13 +10,13 @@ "responseCode": 200, "body": { "global-customer-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name": "Mobility", + "subscriber-name": "Emanuel", "subscriber-type": "INFRA", "resource-version": "1494001894192", "service-subscriptions": { "service-subscription": [ { - "service-type": "vMMSC", + "service-type": "vWINIFRED", "resource-version": "1503958037264", "service-instances": { "service-instance": [ @@ -55,7 +55,7 @@ }, { "service-instance-id": "69f1abac-b1ac-45c4-b954-ff934fc35257", - "service-instance-name": "Mobility_VSP_Service_nb5443", + "service-instance-name": "Emanuel_VSP_Service_nb5443", "service-type": "", "service-role": "", "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -65,7 +65,7 @@ }, { "service-instance-id": "5161b8d5-659a-42b2-9faa-d000bdba6473", - "service-instance-name": "ServicevMMSCPID298109_ap947r_092217_03", + "service-instance-name": "ServicevWINIFREDPID298109_ap947r_092217_03", "service-type": "", "service-role": "", "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -75,7 +75,7 @@ }, { "service-instance-id": "46c729a2-0003-4c6f-8deb-ccd7cb203681", - "service-instance-name": "vMMSC_MobReg__Svc_SB_0905_01", + "service-instance-name": "vWINIFRED_MobReg__Svc_SB_0905_01", "service-type": "", "service-role": "", "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -97,7 +97,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "vMMSC_MobReg__Vnf_SB_0905_01" + "property-value": "vWINIFRED_MobReg__Vnf_SB_0905_01" } ] } @@ -197,7 +197,7 @@ }, { "service-instance-id": "4abb3bd4-75bf-488b-9185-dd6bfe493be9", - "service-instance-name": "RG_9-26_vmmsc", + "service-instance-name": "RG_9-26_vWINIFRED", "service-type": "", "service-role": "", "environment-context": "null", @@ -221,7 +221,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "RG_9-26_vmmsctest" + "property-value": "RG_9-26_vWINIFREDtest" } ] } @@ -230,7 +230,7 @@ }, { "service-instance-id": "2f4b57f9-c3bb-4734-b790-ceb57b02186a", - "service-instance-name": "PREIST_MDNS_mmscInstance", + "service-instance-name": "PREIST_CHARLOTTE_mmscInstance", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -254,7 +254,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "PREIST_MDNS_VNFmmsc" + "property-value": "PREIST_CHARLOTTE_VNFmmsc" } ] } @@ -354,7 +354,7 @@ }, { "service-instance-id": "8473f088-30a0-453d-88fc-b29bda544d6e", - "service-instance-name": "Service_mdns_mobility_nb54433", + "service-instance-name": "Service_CHARLOTTE_emanuel_nb54433", "service-type": "", "service-role": "", "model-invariant-id": "b399ddef-4d8c-48c4-88c5-d4cb0f8b4678", @@ -376,7 +376,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "Service_mdns_mobility_nb54433_ds0928_vnf" + "property-value": "Service_CHARLOTTE_emanuel_nb54433_ds0928_vnf" } ] } @@ -385,7 +385,7 @@ }, { "service-instance-id": "035933b7-849c-4a83-a11c-73016fdf557a", - "service-instance-name": "Service_vMMSC_MobilityREG_sg_0911", + "service-instance-name": "Service_vWINIFRED_EmanuelREG_sg_0911", "service-type": "", "service-role": "", "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -428,7 +428,7 @@ }, { "service-instance-id": "884233b8-771a-421a-a542-406bda5af2c3", - "service-instance-name": "Service_vMMSC_MobilityREG_sg_0913", + "service-instance-name": "Service_vWINIFRED_EmanuelREG_sg_0913", "service-type": "", "service-role": "", "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -450,7 +450,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "Service_vMMSC_MobilityREG_sg_0913_Vnf" + "property-value": "Service_vWINIFRED_EmanuelREG_sg_0913_Vnf" } ] } @@ -576,7 +576,7 @@ }, { "service-instance-id": "01170b44-d74f-409f-bb84-dee5c6d9ccb8", - "service-instance-name": "Mobility_VSP_Service_nb", + "service-instance-name": "Emanuel_VSP_Service_nb", "service-type": "", "service-role": "", "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -586,7 +586,7 @@ }, { "service-instance-id": "2f9db809-58f6-4bf2-8759-8e304831bbb9", - "service-instance-name": "ServicevMMSCPID298109_ap947r_0926167_02", + "service-instance-name": "ServicevWINIFREDPID298109_ap947r_0926167_02", "service-type": "", "service-role": "", "environment-context": "null", @@ -751,7 +751,7 @@ }, { "service-instance-id": "ed5d1968-b896-4bd0-b978-4e29485b9086", - "service-instance-name": "Service_mdns_mobility_kk364s_927_1515", + "service-instance-name": "Service_CHARLOTTE_emanuel_kk364s_927_1515", "service-type": "", "service-role": "", "environment-context": "null", @@ -775,7 +775,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "CreateVNF_Service_mdns_mobility_kk364s_927_1515" + "property-value": "CreateVNF_Service_CHARLOTTE_emanuel_kk364s_927_1515" } ] } @@ -784,7 +784,7 @@ }, { "service-instance-id": "4f590065-d9ea-457b-bec6-3cdd95c993ab", - "service-instance-name": "RG_9-25_vMMSCVid", + "service-instance-name": "RG_9-25_vWINIFREDVid", "service-type": "", "service-role": "", "environment-context": "null", @@ -856,7 +856,7 @@ }, { "service-instance-id": "f6763efd-774f-469d-a90e-b736765144cd", - "service-instance-name": "Service_vMMSC_MobilityREG_sb_0912", + "service-instance-name": "Service_vWINIFRED_EmanuelREG_sb_0912", "service-type": "", "service-role": "", "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -878,7 +878,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "Service_vMMSC_MobilityREG_sb_0912_Vnf" + "property-value": "Service_vWINIFRED_EmanuelREG_sb_0912_Vnf" } ] } @@ -887,7 +887,7 @@ }, { "service-instance-id": "3280694a-7fb1-4450-bee4-ad84abbd9971", - "service-instance-name": "vMMSC_MobReg__Svc_DS_0830_01", + "service-instance-name": "vWINIFRED_MobReg__Svc_DS_0830_01", "service-type": "", "service-role": "", "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -942,7 +942,7 @@ }, { "service-instance-id": "2e1b88c0-cc5f-42ea-9a17-c21981107573", - "service-instance-name": "vMMSC_MobReg__Svc_DS_0901_01", + "service-instance-name": "vWINIFRED_MobReg__Svc_DS_0901_01", "service-type": "", "service-role": "", "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -952,7 +952,7 @@ }, { "service-instance-id": "6dd0f8de-93c7-48a2-914b-1a8d58e0eb48", - "service-instance-name": "vMMSC_MobReg__Svc_DS_0901_02", + "service-instance-name": "vWINIFRED_MobReg__Svc_DS_0901_02", "service-type": "", "service-role": "", "model-invariant-id": "a8dcd72d-d44d-44f2-aa85-53aa9ca0c657", @@ -974,7 +974,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "vMMSC_MobReg__Vnf_DS_0901_02" + "property-value": "vWINIFRED_MobReg__Vnf_DS_0901_02" } ] } @@ -983,7 +983,7 @@ }, { "service-instance-id": "7377c571-be4c-445f-bf85-5e7c60d5b1c6", - "service-instance-name": "Service_mdns_01", + "service-instance-name": "Service_CHARLOTTE_01", "service-type": "", "service-role": "", "environment-context": "Critical_Non-Revenue", @@ -1134,7 +1134,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "ServicevMMSCVNF" + "property-value": "ServicevWINIFREDVNF" } ] } @@ -1175,15 +1175,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1200,15 +1200,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1225,15 +1225,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1279,11 +1279,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -1350,11 +1350,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -1478,15 +1478,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1503,15 +1503,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1528,15 +1528,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -1605,7 +1605,7 @@ }, { "service-instance-id": "9f44e57f-243d-4e53-8ef8-5892c12f7ac2", - "service-instance-name": "Mobility_VSP_Service_01_PB", + "service-instance-name": "Emanuel_VSP_Service_01_PB", "service-type": "", "service-role": "", "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -1625,7 +1625,7 @@ } }, { - "service-type": "Mobility", + "service-type": "Emanuel", "resource-version": "1494001853297", "service-instances": { "service-instance": [ @@ -1787,7 +1787,7 @@ }, { "service-instance-id": "4064aa68-f4db-4135-a78b-b79809416f80", - "service-instance-name": "vDBE_1208_oam_bb389n", + "service-instance-name": "vDOROTHEA_1208_oam_bb389n", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -1896,7 +1896,7 @@ }, { "service-instance-id": "3e18ba93-f47d-41c9-9d4e-bd43b507c4d6", - "service-instance-name": "HNPortal_OAM_svc_lll_010917", + "service-instance-name": "WILKINS_OAM_svc_lll_010917", "model-invariant-id": "24c750cd-a827-4289-9714-b6d214f1bc6b", "resource-version": "1494001876432" }, @@ -1944,7 +1944,7 @@ }, { "service-instance-id": "a42eeb3b-ae92-44aa-9da7-2293c1dfa259", - "service-instance-name": "MobilityServer_294356_rs768f", + "service-instance-name": "EmanuelServer_294356_rs768f", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -1958,11 +1958,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -1979,7 +1979,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "rs768f_MobilityServer_294356_vnf" + "property-value": "rs768f_EmanuelServer_294356_vnf" } ] }, @@ -2013,11 +2013,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -2113,7 +2113,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -2250,7 +2250,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -2314,7 +2314,7 @@ }, { "service-instance-id": "898cd344-8ec9-4e91-8e01-adc6a09b1822", - "service-instance-name": "Mobility_Server_294356", + "service-instance-name": "Emanuel_Server_294356", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -2328,11 +2328,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -2349,7 +2349,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6mobserver01" + "property-value": "zhvf6mobserver01" } ] }, @@ -2485,11 +2485,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -2506,7 +2506,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns04_PB" + "property-value": "zhvf6amdns04_PB" } ] }, @@ -2566,7 +2566,7 @@ }, { "service-instance-id": "58f993c0-c7b9-45fe-ae7a-2ad9a2341870", - "service-instance-name": "Mobility_VSP_Service_PB_02", + "service-instance-name": "Emanuel_VSP_Service_PB_02", "service-type": "", "service-role": "", "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -2588,7 +2588,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "Mobility_VSP_Service_PB_02_VF" + "property-value": "Emanuel_VSP_Service_PB_02_VF" } ] } @@ -2815,7 +2815,7 @@ }, { "service-instance-id": "5c766780-2e7b-47e6-b8a3-4bec3b1b0e71", - "service-instance-name": "Service_Test_PCRF_Test1707_02", + "service-instance-name": "Service_Test_RODERICK_Test1707_02", "resource-version": "1494002006171", "relationship-list": { "relationship": [ @@ -2914,11 +2914,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -3001,7 +3001,7 @@ }, { "service-instance-id": "f7d5b93c-483c-4564-a524-1a1bbf5fdc0a", - "service-instance-name": "mdns_mobility_01", + "service-instance-name": "CHARLOTTE_emanuel_01", "service-type": "", "service-role": "", "environment-context": "Critical_Non-Revenue", @@ -3025,7 +3025,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02" + "property-value": "zhvf6amdns02" } ] } @@ -3048,11 +3048,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -3127,11 +3127,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -3173,7 +3173,7 @@ }, { "service-instance-id": "716df72e-d61e-45a4-8e50-8ea58d8ad2ac", - "service-instance-name": "lll_hngw_oam_net_020217", + "service-instance-name": "lll_Rosema_oam_net_020217", "model-invariant-id": "cc1db61e-1d9f-4b64-91ec-6844d922c584", "model-version-id": "374a0a81-cb42-4ed5-a5fb-5a0bec102f82", "resource-version": "1494001815150" @@ -3226,7 +3226,7 @@ }, { "service-instance-id": "8da44332-8b5b-4f7c-983a-f78fecd39ef6", - "service-instance-name": "mdns_2017_1011_IST_Service_trial1", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_trial1", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -3250,7 +3250,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_un_05" + "property-value": "zhvf6amdns02_un_05" } ] }, @@ -3633,11 +3633,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -3693,11 +3693,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -3818,11 +3818,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -3947,7 +3947,7 @@ }, { "service-instance-id": "5d4d06c7-0843-4515-853f-73a9240f0c00", - "service-instance-name": "VID_Test_PCRF_05", + "service-instance-name": "VID_Test_RODERICK_05", "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", "resource-version": "1496864225405", @@ -3972,7 +3972,7 @@ }, { "service-instance-id": "b388cd75-81f4-46c9-8a67-e2b9d89b9ff5", - "service-instance-name": "mdns_2017_1011_IST_Service_kk364s_1021_0244", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_kk364s_1021_0244", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -4233,7 +4233,7 @@ }, { "service-instance-id": "515e6c9b-1076-4317-bb4a-482af901c2e4", - "service-instance-name": "mDNS_296115b_01", + "service-instance-name": "CHARLOTTE_296115b_01", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -4257,7 +4257,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns04_rk" + "property-value": "zhvf6amdns04_rk" } ] }, @@ -4301,7 +4301,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_rk_06" + "property-value": "zhvf6amdns02_rk_06" } ] }, @@ -4563,7 +4563,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -4590,7 +4590,7 @@ }, { "service-instance-id": "7368a2c6-4769-4e07-b79a-69c00f544f20", - "service-instance-name": "PreIST_MDNS_9-29-v3_Inst", + "service-instance-name": "PreIST_CHARLOTTE_9-29-v3_Inst", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -4625,7 +4625,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "MDNS_9-28_RG_Inst" + "property-value": "CHARLOTTE_9-28_RG_Inst" } ] }, @@ -4935,7 +4935,7 @@ }, { "service-instance-id": "31ebdedd-fa79-4cb9-afb1-797643b49f08", - "service-instance-name": "Mobility_VSP_Service_07", + "service-instance-name": "Emanuel_VSP_Service_07", "service-type": "", "service-role": "", "environment-context": "null", @@ -4959,7 +4959,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns01_module_4" + "property-value": "zhvf6amdns01_module_4" } ] } @@ -5110,7 +5110,7 @@ }, { "service-instance-id": "51437314-63a1-4679-bcbd-417a7f892823", - "service-instance-name": "lll_HNGW_OAM_net_svc_010917", + "service-instance-name": "lll_Rosema_OAM_net_svc_010917", "model-invariant-id": "eebacd18-8a9b-4364-a2f6-14c71ab291e3", "resource-version": "1494001998003" }, @@ -5313,11 +5313,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -5361,7 +5361,7 @@ }, { "service-instance-id": "7f75d367-a88f-409a-a0e9-028f4b54958e", - "service-instance-name": "mdns_2017_1011_IST_Service_rs", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_rs", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -5592,7 +5592,7 @@ }, { "service-instance-id": "f4592a90-42a3-4694-b51c-e533db0d82c5", - "service-instance-name": "Service_PCRF_01", + "service-instance-name": "Service_RODERICK_01", "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", "model-version-id": "8ad706d7-1c16-4b64-a6c4-3ee57d7370c3", "resource-version": "1494881053230", @@ -5600,7 +5600,7 @@ }, { "service-instance-id": "77c03459-39b7-4503-8180-775c83f841b5", - "service-instance-name": "zmtn6_apn_dns_294356_kk364_1010", + "service-instance-name": "zhvf6_apn_dns_294356_kk364_1010", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -5790,7 +5790,7 @@ }, { "service-instance-id": "a8ab3d9f-9772-4c2e-a1f6-fe2d46097f91", - "service-instance-name": "Service_PCRF_DD_05", + "service-instance-name": "Service_RODERICK_DD_05", "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", "model-version-id": "8ad706d7-1c16-4b64-a6c4-3ee57d7370c3", "resource-version": "1495026907287", @@ -5825,7 +5825,7 @@ }, { "service-instance-id": "19347f45-b8bf-471f-915a-108153eba904", - "service-instance-name": "Service_PCRF_10_17_1610_Test04", + "service-instance-name": "Service_RODERICK_10_17_1610_Test04", "model-invariant-id": "103e2e96-97fa-4f9d-8969-f56cc6be9871", "model-version-id": "5ab337b0-49cf-4a93-a123-9dc3b35b2ce1", "resource-version": "1494002071896", @@ -5844,7 +5844,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "VNF_PCRF_10_17_Test_06" + "property-value": "VNF_RODERICK_10_17_Test_06" } ] } @@ -5853,7 +5853,7 @@ }, { "service-instance-id": "4c583916-9920-48d9-8cde-0db270ef567d", - "service-instance-name": "qw_mdns_2017_1011_IST_Service_CSI", + "service-instance-name": "qw_CHARLOTTE_2017_1011_IST_Service_CSI", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -5888,7 +5888,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "qw_mdns_2017_1011_IST_Service_CVNF" + "property-value": "qw_CHARLOTTE_2017_1011_IST_Service_CVNF" } ] }, @@ -5964,11 +5964,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -6073,7 +6073,7 @@ }, { "service-instance-id": "c41a5729-4fe7-4a9d-836f-6fca0839b2ec", - "service-instance-name": "SI_HNPortal_00119", + "service-instance-name": "SI_WILKINS_00119", "model-invariant-id": "5860f54e-020e-4466-80d6-972aef91e524", "model-version-id": "36f05b78-8dad-4fb8-8620-db46fd6ada54", "resource-version": "1494002069267" @@ -6104,7 +6104,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_rk_17" + "property-value": "zhvf6amdns02_rk_17" } ] }, @@ -6132,7 +6132,7 @@ }, { "service-instance-id": "b2684da0-5e17-4988-a21e-ea0e03b3f323", - "service-instance-name": "mdns_2017_1011_IST_Service_kk364s_1021", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_kk364s_1021", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -6156,7 +6156,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_1011_IST_Service_vnf" + "property-value": "CHARLOTTE_2017_1011_IST_Service_vnf" } ] }, @@ -6259,11 +6259,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -6444,11 +6444,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -6465,7 +6465,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aapndns01_PB" + "property-value": "zhvf6aapndns01_PB" } ] }, @@ -6515,11 +6515,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -6539,7 +6539,7 @@ }, { "service-instance-id": "fbdbb9f6-f287-4d97-bdab-aeaf23212d22", - "service-instance-name": "SI_Test_PCRF_04", + "service-instance-name": "SI_Test_RODERICK_04", "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", "resource-version": "1497464045652", @@ -6704,7 +6704,7 @@ }, { "service-instance-id": "5f3ea460-50db-4f10-8328-2b90aa9b62e4", - "service-instance-name": "PreIST_MDNS_9-29-Inst", + "service-instance-name": "PreIST_CHARLOTTE_9-29-Inst", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -6739,7 +6739,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "MDNS_9-28_RG-Inst" + "property-value": "CHARLOTTE_9-28_RG-Inst" } ] }, @@ -6921,7 +6921,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -6958,7 +6958,7 @@ }, { "service-instance-id": "4b6718e0-6f56-4005-9145-a705fff610b9", - "service-instance-name": "sanity8_vmee", + "service-instance-name": "sanity8_vgeraldine", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -6982,7 +6982,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "SANITY8VMEE" + "property-value": "SANITY8VGERALDINE" } ] }, @@ -7016,11 +7016,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -7168,11 +7168,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -7304,7 +7304,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "VNF_Test1707_PCRF_01" + "property-value": "VNF_Test1707_RODERICK_01" } ] } @@ -7327,11 +7327,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -7419,7 +7419,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -7516,11 +7516,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -7537,7 +7537,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6avepdg02_pb" + "property-value": "zhvf6avepdg02_pb" } ] }, @@ -7786,11 +7786,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -7807,7 +7807,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6vepdg_01" + "property-value": "zhvf6vepdg_01" } ] }, @@ -8044,7 +8044,7 @@ }, { "service-instance-id": "b93b8567-1c0e-4b76-8262-3f3c29026615", - "service-instance-name": "Mobility_mdn_01", + "service-instance-name": "Emanuel_mdn_01", "service-type": "", "service-role": "", "environment-context": "Critical_Non-Revenue", @@ -8083,7 +8083,7 @@ }, { "service-instance-id": "6db2dd7c-5936-42f2-a72d-5f6233ccceb2", - "service-instance-name": "i_mdns_2017_1011_IST_Service_CSI", + "service-instance-name": "i_CHARLOTTE_2017_1011_IST_Service_CSI", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -8118,7 +8118,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "i_mdns_2017_1011_IST_Service_CVNF" + "property-value": "i_CHARLOTTE_2017_1011_IST_Service_CVNF" } ] }, @@ -8285,7 +8285,7 @@ }, { "service-instance-id": "de8b4d93-f37c-4cd2-9710-c375a3197fc4", - "service-instance-name": "HNGWaas_IST1", + "service-instance-name": "Rosemaaas_IST1", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -8354,7 +8354,7 @@ }, { "service-instance-id": "9a32e5ab-7c59-45a7-af44-e9f5abcce125", - "service-instance-name": "Mobility_Server_294356_ds4493_1016", + "service-instance-name": "Emanuel_Server_294356_ds4493_1016", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -8366,7 +8366,7 @@ }, { "service-instance-id": "8b5e21c0-6466-4ac5-919f-6469b2a65fe5", - "service-instance-name": "VIK_test_VDBE", + "service-instance-name": "VIK_test_vDOROTHEA", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -8664,11 +8664,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -8685,7 +8685,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afpdg02_pj" + "property-value": "zhvf6afpdg02_pj" } ] }, @@ -9025,7 +9025,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6affad01_qwe_02" + "property-value": "zhvf6affad01_qwe_02" } ] }, @@ -9138,7 +9138,7 @@ }, { "service-instance-id": "2b626ee1-43ab-4417-a23e-615b926a4a48", - "service-instance-name": "MDNS_SERVICE_PJ_1030_01", + "service-instance-name": "CHARLOTTE_SERVICE_PJ_1030_01", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -9152,11 +9152,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -9173,7 +9173,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns01_pj_03" + "property-value": "zhvf6amdns01_pj_03" } ] }, @@ -9449,11 +9449,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -9782,11 +9782,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -9803,7 +9803,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6vProbesback" + "property-value": "zhvf6vProbesback" } ] }, @@ -9874,11 +9874,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -9955,7 +9955,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_pb_140" + "property-value": "zhvf6aepdg01_pb_140" } ] }, @@ -9972,7 +9972,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_901" + "property-value": "zhvf6aepdg01_un_901" } ] }, @@ -9998,7 +9998,7 @@ }, { "service-instance-id": "05970851-84de-4f37-ab0a-b91c9009f79e", - "service-instance-name": "Service_PCRF_Test_DD_03", + "service-instance-name": "Service_RODERICK_Test_DD_03", "resource-version": "1494002022309", "relationship-list": { "relationship": [ @@ -10235,7 +10235,7 @@ }, { "service-instance-id": "8852fcdb-0bd8-402d-9eda-57d225107c94", - "service-instance-name": "HNPortalOAM_service_03", + "service-instance-name": "WILKINSOAM_service_03", "model-invariant-id": "5860f54e-020e-4466-80d6-972aef91e524", "resource-version": "1494001898192" }, @@ -10349,7 +10349,7 @@ }, { "service-instance-id": "59a71f5e-df36-4694-b6e8-cfc6933cbeca", - "service-instance-name": "Service_HNGW_AIC_05", + "service-instance-name": "Service_Rosema_AIC_05", "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a", "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561", "resource-version": "1494001899083" @@ -10605,7 +10605,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -10714,7 +10714,7 @@ }, { "service-instance-id": "cefa8919-4df3-413a-9536-969387dafedf", - "service-instance-name": "new_mdns_2017_1011_IST_Service_CSI", + "service-instance-name": "new_CHARLOTTE_2017_1011_IST_Service_CSI", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -10749,7 +10749,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "new_mdns_2017_1011_IST_Service_CVNF" + "property-value": "new_CHARLOTTE_2017_1011_IST_Service_CVNF" } ] }, @@ -10851,7 +10851,7 @@ }, { "service-instance-id": "3114a6b5-b9e2-433b-bc2b-b32ce0a23aaf", - "service-instance-name": "HNGW_Service_Test_OAM_NET_01", + "service-instance-name": "Rosema_Service_Test_OAM_NET_01", "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a", "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561", "resource-version": "1494001898897" @@ -10894,7 +10894,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_rk_20" + "property-value": "zhvf6amdns02_rk_20" } ] }, @@ -11068,7 +11068,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amobility_Server_rk_02" + "property-value": "zhvf6aemanuel_Server_rk_02" } ] }, @@ -11360,11 +11360,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -11512,7 +11512,7 @@ }, { "service-instance-id": "d514603d-47dc-43ed-bcd6-a690413e4c90", - "service-instance-name": "Service_Idan_vSCP_AIC3.0_1610_Test03", + "service-instance-name": "Service_Idan_vEsmeralda_AIC3.0_1610_Test03", "model-invariant-id": "36523af8-18fa-4b75-9280-4f533c7da260", "resource-version": "1494001999449", "relationship-list": { @@ -11530,7 +11530,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "VNF_vSCP_AIC_Test_04" + "property-value": "VNF_vEsmeralda_AIC_Test_04" } ] }, @@ -11547,7 +11547,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "VNF_vSCP_AIC_Test_05" + "property-value": "VNF_vEsmeralda_AIC_Test_05" } ] } @@ -11574,7 +11574,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -11626,7 +11626,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_pb_128" + "property-value": "zhvf6aepdg01_pb_128" } ] }, @@ -11677,7 +11677,7 @@ }, { "service-instance-id": "e4816bd8-bead-4fb6-83dd-0d12611921b9", - "service-instance-name": "mDNS_Preload_1102_un", + "service-instance-name": "CHARLOTTE_Preload_1102_un", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -11701,7 +11701,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_un_17" + "property-value": "zhvf6amdns02_un_17" } ] }, @@ -11718,7 +11718,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_module_14_un" + "property-value": "zhvf6amdns02_module_14_un" } ] }, @@ -11746,7 +11746,7 @@ }, { "service-instance-id": "f39b13e8-5544-4771-af88-f04af5ba1957", - "service-instance-name": "mdns_2017_1011_IST_Service_PB", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_PB", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -11760,11 +11760,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -11781,7 +11781,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns01_PB" + "property-value": "zhvf6amdns01_PB" } ] }, @@ -11897,7 +11897,7 @@ }, { "service-instance-id": "c44c48d4-2ec1-449b-888d-4eaea6fab0cf", - "service-instance-name": "Service_mdns_mobility_vf", + "service-instance-name": "Service_CHARLOTTE_emanuel_vf", "service-type": "", "service-role": "", "environment-context": "Critical_Non-Revenue", @@ -11921,7 +11921,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "Service_mdns_mobility_vnf" + "property-value": "Service_CHARLOTTE_emanuel_vnf" } ] } @@ -12202,7 +12202,7 @@ }, { "service-instance-id": "13701874-38b2-46c4-8a9b-72e9a1b37989", - "service-instance-name": "xa_mdns_2017_1011_IST_Service_CSI", + "service-instance-name": "xa_CHARLOTTE_2017_1011_IST_Service_CSI", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -12237,7 +12237,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "xa_mdns_2017_1011_IST_Service_CVNF" + "property-value": "xa_CHARLOTTE_2017_1011_IST_Service_CVNF" } ] }, @@ -12281,7 +12281,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_pb_111" + "property-value": "zhvf6aepdg01_pb_111" } ] }, @@ -12389,7 +12389,7 @@ }, { "service-instance-id": "7deb1deb-004d-47fc-bb7b-5eb0f216690e", - "service-instance-name": "mobilityyyyyy", + "service-instance-name": "emanuelyyyyy", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -12407,7 +12407,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -12444,7 +12444,7 @@ }, { "service-instance-id": "b305e0a5-79e1-46b5-8610-f3a0bc47d7ed", - "service-instance-name": "mdns_1103_service_pj", + "service-instance-name": "CHARLOTTE_1103_service_pj", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -12458,11 +12458,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -12479,7 +12479,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns03_pj" + "property-value": "zhvf6amdns03_pj" } ] }, @@ -12884,7 +12884,7 @@ }, { "service-instance-id": "f7f03302-42d1-444a-ab4c-8957879804e0", - "service-instance-name": "Mobility_Server_294356_ds4493_1017", + "service-instance-name": "Emanuel_Server_294356_ds4493_1017", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -13438,11 +13438,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -13486,7 +13486,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amobility_Server_rk_01" + "property-value": "zhvf6aemanuel_Server_rk_01" } ] }, @@ -13608,7 +13608,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_rk" + "property-value": "zhvf6amdns02_rk" } ] }, @@ -13652,11 +13652,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -13711,7 +13711,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -13836,7 +13836,7 @@ }, { "service-instance-id": "06c3f2e6-91da-4dba-aca0-136dc0e6c3c5", - "service-instance-name": "Mobility_VPS_01", + "service-instance-name": "Emanuel_VPS_01", "service-type": "vVoicemail", "service-role": "", "environment-context": "null", @@ -13989,7 +13989,7 @@ { "service-instance-id": "0b909dec-a0e4-4941-a292-b66c37980578", "service-instance-name": "fghfhfgh", - "service-type": "ADIOD", + "service-type": "PASQUALE", "service-role": "", "environment-context": "null", "workload-context": "null", @@ -14241,7 +14241,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_rk_05" + "property-value": "zhvf6amdns02_rk_05" } ] }, @@ -14378,7 +14378,7 @@ }, { "service-instance-id": "b521eb11-2819-4b37-a83d-506d98f9fb2d", - "service-instance-name": "Service_HNGW_AIM_3", + "service-instance-name": "Service_Rosema_AIM_3", "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a", "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561", "resource-version": "1494002005218" @@ -14598,7 +14598,7 @@ }, { "service-instance-id": "59d325de-2c5c-41d8-8595-fad8041d4b5e", - "service-instance-name": "HNPortal_Network13", + "service-instance-name": "WILKINS_Network13", "model-invariant-id": "5860f54e-020e-4466-80d6-972aef91e524", "resource-version": "1494002004126" }, @@ -14642,7 +14642,7 @@ }, { "service-instance-id": "f89dfcf9-292c-4be6-beb0-dd546b0a0b16", - "service-instance-name": "Mobility_VSP_Service", + "service-instance-name": "Emanuel_VSP_Service", "service-type": "vVoicemail", "service-role": "", "environment-context": "null", @@ -14666,7 +14666,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns01_module_0" + "property-value": "zhvf6amdns01_module_0" } ] } @@ -14914,7 +14914,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6avepdg01" + "property-value": "zhvf6avepdg01" } ] } @@ -15066,7 +15066,7 @@ }, { "service-instance-id": "2af5e227-b7ed-4209-a32d-eff478f02a1c", - "service-instance-name": "xx_mdns_2017_1011_IST_Service_CreateServiceInstance", + "service-instance-name": "xx_CHARLOTTE_2017_1011_IST_Service_CreateServiceInstance", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -15101,7 +15101,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "xx_mdns_2017_1011_IST_Service_CreateVNF" + "property-value": "xx_CHARLOTTE_2017_1011_IST_Service_CreateVNF" } ] }, @@ -15165,7 +15165,7 @@ }, { "service-instance-id": "1f3cbe01-c74c-4975-a5a2-f4f022a85b48", - "service-instance-name": "Service_PCRF_Test1707_01", + "service-instance-name": "Service_RODERICK_Test1707_01", "resource-version": "1494002022306", "relationship-list": { "relationship": [ @@ -15182,7 +15182,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "VNF_PCRF_Test1707_01" + "property-value": "VNF_RODERICK_Test1707_01" } ] } @@ -15300,7 +15300,7 @@ }, { "service-instance-id": "66b13cb4-b575-449f-aa45-ffbfe005c7b1", - "service-instance-name": "mDNS_preload_1710_0914", + "service-instance-name": "CHARLOTTE_preload_1710_0914", "service-type": "", "service-role": "", "model-invariant-id": "d03a321a-01b2-4d79-95f4-df10d8214fba", @@ -15321,7 +15321,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02test" + "property-value": "zhvf6amdns02test" } ] } @@ -15471,7 +15471,7 @@ }, { "service-instance-id": "c7123d4f-7739-43e1-922a-f9393054b7bf", - "service-instance-name": "mdns_E1802_Service_PJ", + "service-instance-name": "CHARLOTTE_E1802_Service_PJ", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -15485,11 +15485,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -15506,7 +15506,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns01_pj_01" + "property-value": "zhvf6amdns01_pj_01" } ] }, @@ -15677,7 +15677,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -15703,7 +15703,7 @@ }, { "service-instance-id": "932c5fb3-7642-414d-8257-5575984bfe4f", - "service-instance-name": "x_mdns_2017_1011_IST_Service_CserviceInstance", + "service-instance-name": "x_CHARLOTTE_2017_1011_IST_Service_CserviceInstance", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -15755,7 +15755,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "x_mdns_2017_1011_IST_Service_CvirtualNF" + "property-value": "x_CHARLOTTE_2017_1011_IST_Service_CvirtualNF" } ] }, @@ -15960,7 +15960,7 @@ }, { "service-instance-id": "7201f7a5-f4c7-45f0-b773-180e822c81e2", - "service-instance-name": "mDNS_Preload_10-19", + "service-instance-name": "CHARLOTTE_Preload_10-19", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -15974,11 +15974,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -15995,7 +15995,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mDNS_Preload_VNF" + "property-value": "CHARLOTTE_Preload_VNF" } ] }, @@ -16208,7 +16208,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "VNF_Test_PCRF_02" + "property-value": "VNF_Test_RODERICK_02" } ] } @@ -16332,7 +16332,7 @@ }, { "service-instance-id": "42dab67f-560c-409b-896d-1a9786ed4cf6", - "service-instance-name": "mdns_mobility", + "service-instance-name": "CHARLOTTE_emanuel", "service-type": "", "service-role": "", "environment-context": "Critical_Non-Revenue", @@ -16356,7 +16356,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns01" + "property-value": "zhvf6amdns01" } ] } @@ -16389,7 +16389,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "vnf_mobility" + "property-value": "vnf_emanuel" } ] }, @@ -16484,7 +16484,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6epdg01" + "property-value": "zhvf6epdg01" } ] }, @@ -16501,7 +16501,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_pb_141" + "property-value": "zhvf6aepdg01_pb_141" } ] }, @@ -16518,7 +16518,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_pb_131" + "property-value": "zhvf6aepdg01_pb_131" } ] }, @@ -16535,7 +16535,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_pb_142" + "property-value": "zhvf6aepdg01_pb_142" } ] }, @@ -16708,7 +16708,7 @@ }, { "service-instance-id": "18bbb764-e510-470f-bf79-daeb2a19164f", - "service-instance-name": "Instance_MobilityServer_294356", + "service-instance-name": "Instance_EmanuelServer_294356", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -16825,11 +16825,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -16863,11 +16863,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -16904,7 +16904,7 @@ }, { "service-instance-id": "cfc38218-a288-4ada-a75d-c227d2d9d2c9", - "service-instance-name": "HNGW_prov_net_svc_lll_010917", + "service-instance-name": "Rosema_prov_net_svc_lll_010917", "model-invariant-id": "8f6faa7a-7fd5-4874-9312-b5b194a2e482", "resource-version": "1494001793238" }, @@ -16929,7 +16929,7 @@ "related-to-property": [ { "property-key": "l3-network.network-name", - "property-value": "HNGW_OAM_NET_AIC_30_02" + "property-value": "Rosema_OAM_NET_AIC_30_02" } ] } @@ -16938,7 +16938,7 @@ }, { "service-instance-id": "ea08d0f5-6fae-4e25-9eae-11bf4dc6c321", - "service-instance-name": "Service_Test1702_HNGWOAMNETVTO_001", + "service-instance-name": "Service_Test1702_RosemaOAMNETVTO_001", "model-invariant-id": "edcff8c1-05a7-4954-9d99-1a71a2ff6536", "model-version-id": "b29dc510-99ec-465d-9e20-734e521f3d8b", "resource-version": "1494001895673" @@ -17225,7 +17225,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aFMBT01_296115b" + "property-value": "zhvf6aFMBT01_296115b" } ] }, @@ -17259,11 +17259,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -17311,7 +17311,7 @@ }, { "service-instance-id": "02d8c68e-8a98-48e9-a1a0-4fc999ec26e5", - "service-instance-name": "SI_PCRF_Test_vnf_01", + "service-instance-name": "SI_RODERICK_Test_vnf_01", "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", "resource-version": "1497460522960", @@ -17343,7 +17343,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01" + "property-value": "zhvf6aepdg01" } ] }, @@ -17434,7 +17434,7 @@ }, { "service-instance-id": "89ea3938-8b7e-4103-ae23-dd5a55e14bf2", - "service-instance-name": "Service_PCRF_10_17_1610_Test03", + "service-instance-name": "Service_RODERICK_10_17_1610_Test03", "model-invariant-id": "103e2e96-97fa-4f9d-8969-f56cc6be9871", "model-version-id": "5ab337b0-49cf-4a93-a123-9dc3b35b2ce1", "resource-version": "1494002071522", @@ -17453,7 +17453,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "VNF_PCRF_10_17_Test_05" + "property-value": "VNF_RODERICK_10_17_Test_05" } ] } @@ -17476,11 +17476,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -17541,7 +17541,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aFMBT01_rs" + "property-value": "zhvf6aFMBT01_rs" } ] }, @@ -17725,7 +17725,7 @@ }, { "service-instance-id": "10865c41-8423-4ccd-ae24-07dcd5da621c", - "service-instance-name": "SI_PCRF_Test_02", + "service-instance-name": "SI_RODERICK_Test_02", "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", "resource-version": "1496839043578", @@ -18202,14 +18202,14 @@ }, { "service-instance-id": "886c4464-3f36-47bc-9743-eaf1f1ebc748", - "service-instance-name": "HNGW_AIC_Service_01", + "service-instance-name": "Rosema_AIC_Service_01", "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a", "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561", "resource-version": "1494001974066" }, { "service-instance-id": "8d31a1d9-8977-41c9-937a-dc768450f63a", - "service-instance-name": "Mobility_OEY_Project_Nimbus", + "service-instance-name": "Emanuel_OEY_Project_Kennedy", "service-type": "", "service-role": "", "environment-context": "null", @@ -18223,11 +18223,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -18287,7 +18287,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afapn01dns01_module_1" + "property-value": "zhvf6afapn01dns01_module_1" } ] } @@ -18343,7 +18343,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6vprobe01" + "property-value": "zhvf6vprobe01" } ] }, @@ -18408,7 +18408,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6affad01_qwe_03" + "property-value": "zhvf6affad01_qwe_03" } ] }, @@ -18878,7 +18878,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_rk_16" + "property-value": "zhvf6amdns02_rk_16" } ] }, @@ -18898,7 +18898,7 @@ }, { "service-instance-id": "74608b03-fe0b-4539-ac66-7236e7d2f0cf", - "service-instance-name": "Service_HNGW_Test1702_01", + "service-instance-name": "Service_Rosema_Test1702_01", "model-invariant-id": "cc1db61e-1d9f-4b64-91ec-6844d922c584", "model-version-id": "374a0a81-cb42-4ed5-a5fb-5a0bec102f82", "resource-version": "1494001769907", @@ -18917,7 +18917,7 @@ "related-to-property": [ { "property-key": "l3-network.network-name", - "property-value": "HNGW_OAM_NET_VTO_30_01" + "property-value": "Rosema_OAM_NET_VTO_30_01" } ] } @@ -18938,7 +18938,7 @@ }, { "service-instance-id": "fcca3de3-609d-4796-a488-811243d29345", - "service-instance-name": "Mobility_VSP", + "service-instance-name": "Emanuel_VSP", "service-type": "vVoicemail", "service-role": "", "environment-context": "null", @@ -18993,7 +18993,7 @@ }, { "service-instance-id": "d7cd586c-457f-4e49-93fe-71e923b0f1fb", - "service-instance-name": "RG_5-16_vMMSC_Srvc_DS_0614_01", + "service-instance-name": "RG_5-16_vWINIFRED_Srvc_DS_0614_01", "model-invariant-id": "fd0ee2a5-2596-4d7b-97a1-b2932a6498be", "model-version-id": "d6b5e8ca-4db3-433f-8eba-414019a2989c", "resource-version": "1497463580269", @@ -19007,7 +19007,7 @@ }, { "service-instance-id": "8da51d4e-5fa6-4e45-b828-11807e6dad49", - "service-instance-name": "mdns_2017_1011_IST_Service_realMSO", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_realMSO", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -19034,7 +19034,7 @@ }, { "service-instance-id": "a3816027-6d74-490b-8f4e-303e6cb929c3", - "service-instance-name": "mdns_2017_1011_IST_Service_CSI", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_CSI", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -19069,7 +19069,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_1011_IST_Service_CVNF" + "property-value": "CHARLOTTE_2017_1011_IST_Service_CVNF" } ] }, @@ -19138,7 +19138,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -19185,7 +19185,7 @@ }, { "service-instance-id": "6b547a48-e745-42ee-92f0-b049b733a001", - "service-instance-name": "HNPortalOAM_service", + "service-instance-name": "WILKINSOAM_service", "model-invariant-id": "5860f54e-020e-4466-80d6-972aef91e524", "resource-version": "1494001992133" }, @@ -19270,7 +19270,7 @@ }, { "service-instance-id": "c0531062-0f58-4ffd-9b32-f4eb84687ab1", - "service-instance-name": "Mobility_Server_294356_115b_rk_01", + "service-instance-name": "Emanuel_Server_294356_115b_rk_01", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -19294,7 +19294,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amobility_Server_115b_rk_01" + "property-value": "zhvf6aemanuel_Server_115b_rk_01" } ] }, @@ -19359,7 +19359,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -19393,11 +19393,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -19513,7 +19513,7 @@ }, { "service-instance-id": "1f7a317b-119c-4814-8856-094732ae50aa", - "service-instance-name": "Mobility_VSP_Service_PB", + "service-instance-name": "Emanuel_VSP_Service_PB", "service-type": "", "service-role": "", "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -19535,7 +19535,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "Mobility_VSP_Service_PB_01_VnF" + "property-value": "Emanuel_VSP_Service_PB_01_VnF" } ] }, @@ -19552,7 +19552,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "Mobility_VSP_Service_PB_2" + "property-value": "Emanuel_VSP_Service_PB_2" } ] } @@ -19637,7 +19637,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6abfprb01" + "property-value": "zhvf6abfprb01" } ] }, @@ -19664,7 +19664,7 @@ }, { "service-instance-id": "f1fd6c38-7844-45bc-afe6-f4c7912d2e67", - "service-instance-name": "Service_HNGW_OAM_NET_AIC_30_Test1702", + "service-instance-name": "Service_Rosema_OAM_NET_AIC_30_Test1702", "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a", "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561", "resource-version": "1494002012869" @@ -19695,7 +19695,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_601" + "property-value": "zhvf6aepdg01_un_601" } ] }, @@ -19781,7 +19781,7 @@ }, { "service-instance-id": "ece338b0-05ae-481d-bbe0-1fd1aea1fa10", - "service-instance-name": "mDNS_1206_pmtest_v3", + "service-instance-name": "CHARLOTTE_1206_pmtest_v3", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -19881,7 +19881,7 @@ }, { "service-instance-id": "8d58adb8-764e-492f-9d9f-5ff6a5614e77", - "service-instance-name": "Mobility_Server_294356_Pb", + "service-instance-name": "Emanuel_Server_294356_Pb", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -19895,11 +19895,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -19916,7 +19916,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amts001" + "property-value": "zhvf6amts001" } ] }, @@ -19958,11 +19958,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -20017,7 +20017,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -20283,7 +20283,7 @@ }, { "service-instance-id": "dc1f1b7f-64a2-4b8c-ae92-4de8d6c02efe", - "service-instance-name": "Mobility_VSP_Service_01", + "service-instance-name": "Emanuel_VSP_Service_01", "service-type": "vVoicemail", "service-role": "", "environment-context": "null", @@ -20616,7 +20616,7 @@ }, { "service-instance-id": "e9f63a01-0615-4a4d-9998-a34b8832fcd4", - "service-instance-name": "z_mdns_2017_1011_IST_Service_CSInstance", + "service-instance-name": "z_CHARLOTTE_2017_1011_IST_Service_CSInstance", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -20651,7 +20651,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "z_mdns_2017_1011_IST_Service_CVNFunction" + "property-value": "z_CHARLOTTE_2017_1011_IST_Service_CVNFunction" } ] }, @@ -20706,7 +20706,7 @@ }, { "service-instance-id": "ec884145-dbe8-4228-8165-f0c4d7123f8b", - "service-instance-name": "abc_mdns_2017_1011_IST_Service_CSI", + "service-instance-name": "abc_CHARLOTTE_2017_1011_IST_Service_CSI", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -20741,7 +20741,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "abc_mdns_2017_1011_IST_Service_CVNF" + "property-value": "abc_CHARLOTTE_2017_1011_IST_Service_CVNF" } ] }, @@ -20794,7 +20794,7 @@ }, { "service-instance-id": "d3156836-aca9-4f46-9324-7cb85ef31126", - "service-instance-name": "q_mdns_2017_1011_IST_Service_CSI", + "service-instance-name": "q_CHARLOTTE_2017_1011_IST_Service_CSI", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -20829,7 +20829,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "q_mdns_2017_1011_IST_Service_CVNF" + "property-value": "q_CHARLOTTE_2017_1011_IST_Service_CVNF" } ] }, @@ -20893,7 +20893,7 @@ }, { "service-instance-id": "5b098953-0820-4080-bcba-cbd6906ea8ac", - "service-instance-name": "Service_Idan_vSCP_AIC3.0_1610-9-23_Test-1", + "service-instance-name": "Service_Idan_vEsmeralda_AIC3.0_1610-9-23_Test-1", "model-invariant-id": "36523af8-18fa-4b75-9280-4f533c7da260", "resource-version": "1494002005482" }, @@ -20988,11 +20988,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -21009,7 +21009,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afprb02_pj" + "property-value": "zhvf6afprb02_pj" } ] }, @@ -21067,7 +21067,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -21472,11 +21472,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -21576,11 +21576,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -21663,7 +21663,7 @@ }, { "service-instance-id": "554fe72b-0874-4816-a83d-b3e8f2458fba", - "service-instance-name": "Service_Robot_Test_HNGW_01", + "service-instance-name": "Service_Robot_Test_Rosema_01", "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a", "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561", "resource-version": "1494001815772" @@ -21706,7 +21706,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_pb_123" + "property-value": "zhvf6aepdg01_pb_123" } ] }, @@ -22023,7 +22023,7 @@ }, { "service-instance-id": "6c5ae371-d8de-49fa-8fdd-79b782dfd896", - "service-instance-name": "PREIST_MDNS_ServiceInstance", + "service-instance-name": "PREIST_CHARLOTTE_ServiceInstance", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -22047,7 +22047,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "PREIST_MDNS_VNFInstance" + "property-value": "PREIST_CHARLOTTE_VNFInstance" } ] } @@ -22083,7 +22083,7 @@ }, { "service-instance-id": "3afa7504-be8c-4fb1-b6c2-071f78faee18", - "service-instance-name": "mDNS_preload_1710_0914_01", + "service-instance-name": "CHARLOTTE_preload_1710_0914_01", "service-type": "", "service-role": "", "model-invariant-id": "d03a321a-01b2-4d79-95f4-df10d8214fba", @@ -22104,7 +22104,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mDNS_preload_1710_0914_01" + "property-value": "CHARLOTTE_preload_1710_0914_01" } ] } @@ -22176,7 +22176,7 @@ }, { "service-instance-id": "fff595a8-747a-4157-8d16-309411c9594b", - "service-instance-name": "mdns_2017_1011_IST_Service_01", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_01", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -22200,7 +22200,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_un_01" + "property-value": "zhvf6amdns02_un_01" } ] }, @@ -22654,7 +22654,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_rk_01" + "property-value": "zhvf6amdns02_rk_01" } ] }, @@ -22848,7 +22848,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6affad01_un_01" + "property-value": "zhvf6affad01_un_01" } ] }, @@ -22875,7 +22875,7 @@ }, { "service-instance-id": "0f77ec28-2e63-4045-8ac4-0ce399a91fbd", - "service-instance-name": "Service_mdns_mobility", + "service-instance-name": "Service_CHARLOTTE_emanuel", "service-type": "", "service-role": "", "environment-context": "General_Non-Revenue", @@ -23139,7 +23139,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mobilityyyyyy" + "property-value": "emanuelyyyyy" } ] }, @@ -23181,11 +23181,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -23275,7 +23275,7 @@ }, { "service-instance-id": "381ea672-599e-4919-b3c8-e1b9a2fc0a25", - "service-instance-name": "Service_HNGW_AIC_4", + "service-instance-name": "Service_Rosema_AIC_4", "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a", "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561", "resource-version": "1494001975016" @@ -23341,11 +23341,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -23419,11 +23419,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -23440,7 +23440,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6fprb01" + "property-value": "zhvf6fprb01" } ] }, @@ -23489,7 +23489,7 @@ }, { "service-instance-id": "d3a60493-3b46-4c49-be6f-2ea2a5d371d7", - "service-instance-name": "SI_PCRF_Test1707_11", + "service-instance-name": "SI_RODERICK_Test1707_11", "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", "resource-version": "1498141423646", @@ -23546,11 +23546,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -23863,7 +23863,7 @@ }, { "service-instance-id": "0d2a39c5-fc33-42b7-a7be-49740cfd411b", - "service-instance-name": "Steph_Preload_Demo_Service_for_mDNS_05_07", + "service-instance-name": "Steph_Preload_Demo_Service_for_CHARLOTTE_05_07", "model-invariant-id": "2c39974c-7cbf-4f61-aec6-b43e26e3e199", "model-version-id": "a58640fd-d419-410c-b023-ff7081d4d8d3", "resource-version": "1499286765483", @@ -23905,7 +23905,7 @@ }, { "service-instance-id": "7c8df66e-b8e1-470f-9e22-1e20cbc28c4c", - "service-instance-name": "Service_mdns_mobility_PB_01", + "service-instance-name": "Service_CHARLOTTE_emanuel_PB_01", "service-type": "", "service-role": "", "model-invariant-id": "b399ddef-4d8c-48c4-88c5-d4cb0f8b4678", @@ -23927,7 +23927,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "Service_mdns_mobility_PB_01_VNF" + "property-value": "Service_CHARLOTTE_emanuel_PB_01_VNF" } ] } @@ -24123,11 +24123,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -24144,7 +24144,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afprb01_pj" + "property-value": "zhvf6afprb01_pj" } ] }, @@ -24215,7 +24215,7 @@ }, { "service-instance-id": "bbe206af-c2cb-4575-897a-8090b22b6d8c", - "service-instance-name": "Service_Test_HNGWOAM_02", + "service-instance-name": "Service_Test_RosemaOAM_02", "model-invariant-id": "cc1db61e-1d9f-4b64-91ec-6844d922c584", "model-version-id": "374a0a81-cb42-4ed5-a5fb-5a0bec102f82", "resource-version": "1494001983344" @@ -24363,7 +24363,7 @@ }, { "service-instance-id": "d57c2641-472b-4840-a51f-f8ce12e162b3", - "service-instance-name": "mobility_vid_test_789", + "service-instance-name": "emanuel_vid_test_789", "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", "resource-version": "1500399147743", @@ -24418,7 +24418,7 @@ }, { "service-instance-id": "73f7512d-1497-49c1-a41d-76f198dd0207", - "service-instance-name": "Service_Test1702_HNGWOAMNETAIC30_01", + "service-instance-name": "Service_Test1702_RosemaOAMNETAIC30_01", "model-invariant-id": "85a1d941-a353-46fc-afee-73a70e019c8a", "model-version-id": "d885f626-0a61-45fd-8546-04daa2198561", "resource-version": "1494001918414" @@ -24504,11 +24504,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -24631,7 +24631,7 @@ }, { "service-instance-id": "fdc8e231-12a5-4f7a-a9fe-b372f1c40d83", - "service-instance-name": "mdns_2017_1011_IST_Service_createInstance", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_createInstance", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -24666,7 +24666,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_1011_IST_Service_createVNF" + "property-value": "CHARLOTTE_2017_1011_IST_Service_createVNF" } ] }, @@ -24721,7 +24721,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6abfprb02" + "property-value": "zhvf6abfprb02" } ] }, @@ -24768,11 +24768,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -24835,7 +24835,7 @@ }, { "service-instance-id": "e688ac1d-8b10-48ac-8b57-80f18a57fdb2", - "service-instance-name": "HNPortalOAMnet_2", + "service-instance-name": "WILKINSOAMnet_2", "model-invariant-id": "5860f54e-020e-4466-80d6-972aef91e524", "resource-version": "1494001767696" }, @@ -24855,11 +24855,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -25231,7 +25231,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_rk_23" + "property-value": "zhvf6amdns02_rk_23" } ] }, @@ -25363,7 +25363,7 @@ }, { "service-instance-id": "744b9082-7419-4b6f-99f9-cf1302ce5fe3", - "service-instance-name": "Mobility_ProjectName_OE_Name_DFW_oe40", + "service-instance-name": "Emanuel_ProjectName_OE_Name_DFW_oe40", "service-type": "", "service-role": "", "environment-context": "null", @@ -25381,7 +25381,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -25433,7 +25433,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_rk_15" + "property-value": "zhvf6amdns02_rk_15" } ] }, @@ -25504,13 +25504,13 @@ }, { "service-instance-id": "61c9d61c-3588-4b11-8495-c11c0ac1319f", - "service-instance-name": "Service_Idan_vSCP_AIC3.0_1610_Test01", + "service-instance-name": "Service_Idan_vEsmeralda_AIC3.0_1610_Test01", "model-invariant-id": "36523af8-18fa-4b75-9280-4f533c7da260", "resource-version": "1494001977459" }, { "service-instance-id": "53a26982-5f2b-4985-a3c9-ffe41a887336", - "service-instance-name": "Service_Test_1707_PCRF_01", + "service-instance-name": "Service_Test_1707_RODERICK_01", "model-version-id": "a609e05a-fbf0-4850-b03b-75d50f9232e4", "resource-version": "1494001920123", "relationship-list": { @@ -25528,7 +25528,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "VNF_Test_PCRF_01" + "property-value": "VNF_Test_RODERICK_01" } ] }, @@ -25571,7 +25571,7 @@ }, { "service-instance-id": "db553133-d8f1-441a-b86c-84b5ff0b6e9f", - "service-instance-name": "SI_PCRF_Test_mso_01", + "service-instance-name": "SI_RODERICK_Test_mso_01", "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637", "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2", "resource-version": "1497633595024", @@ -25634,7 +25634,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_rk_22" + "property-value": "zhvf6amdns02_rk_22" } ] }, @@ -25983,11 +25983,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -26103,7 +26103,7 @@ }, { "service-instance-id": "24566aea-f633-4032-82b3-7158b3db8f05", - "service-instance-name": "pr_mdns_2017_1011_IST_Service_CSI", + "service-instance-name": "pr_CHARLOTTE_2017_1011_IST_Service_CSI", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -26138,7 +26138,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "pr_mdns_2017_1011_IST_Service_CVNF" + "property-value": "pr_CHARLOTTE_2017_1011_IST_Service_CVNF" } ] }, @@ -26331,7 +26331,7 @@ }, { "service-instance-id": "04f7dfd3-12a7-479d-94be-c5da2fd8e96f", - "service-instance-name": "mdns_2017_1011_IST_Service_2410", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_2410", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -26355,7 +26355,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_un_02" + "property-value": "zhvf6amdns02_un_02" } ] }, @@ -26413,7 +26413,7 @@ }, { "service-instance-id": "3266e8c0-70bd-43c7-8c00-377be595f60c", - "service-instance-name": "Mobility_VSP_Service_04", + "service-instance-name": "Emanuel_VSP_Service_04", "service-type": "vVoicemail", "service-role": "", "environment-context": "null", @@ -26437,7 +26437,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns01_module_3" + "property-value": "zhvf6amdns01_module_3" } ] } @@ -26556,15 +26556,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -26581,15 +26581,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -26606,15 +26606,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn16" + "relationship-value": "hvf16" }, { "relationship-key": "tenant.tenant-id", @@ -26681,15 +26681,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -26731,15 +26731,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -26756,15 +26756,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -26781,15 +26781,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -26905,7 +26905,7 @@ } }, { - "service-type": "vSCP", + "service-type": "vEsmeralda", "resource-version": "1494001943181", "service-instances": { "service-instance": [ @@ -27034,7 +27034,7 @@ }, { "service-instance-id": "4b4bb55a-c31d-47ef-a502-10b8cb515f84", - "service-instance-name": "vmee-mor-test-34949", + "service-instance-name": "vgeraldine-mor-test-34949", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -27058,7 +27058,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "vmee-vnf-test-9868" + "property-value": "vgeraldine-vnf-test-9868" } ] } @@ -27085,7 +27085,7 @@ }, { "service-instance-id": "f416d2f3-92c1-43e3-8d36-2adb10e180bc", - "service-instance-name": "oren-adiod", + "service-instance-name": "oren-PASQUALE", "service-type": "", "service-role": "", "environment-context": "null", @@ -27167,7 +27167,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -27327,7 +27327,7 @@ }, { "service-instance-id": "c3831b9d-40be-4421-b5b8-d516041b45c6", - "service-instance-name": "ShaniMobility", + "service-instance-name": "ShaniEmanuel", "service-type": "", "service-role": "", "environment-context": "null", @@ -27392,11 +27392,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -27416,7 +27416,7 @@ }, { "service-instance-id": "b38e1a8a-894c-408c-a91c-fc1c54901636", - "service-instance-name": "Viv+IST+vMMSC", + "service-instance-name": "Viv+IST+vWINIFRED", "model-invariant-id": "e6f1d393-6432-4820-ab86-7a10ba4b31ac", "resource-version": "1494001800547" }, @@ -27595,7 +27595,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "RG_1707vidnf_PCRF" + "property-value": "RG_1707vidnf_RODERICK" } ] } @@ -28505,7 +28505,7 @@ }, { "service-instance-id": "f9ece995-9b70-48df-83ad-2c358ef650c8", - "service-instance-name": "Lital_PXTC-1", + "service-instance-name": "Lital_GRANVILLE-1", "service-type": "", "service-role": "", "model-invariant-id": "33447249-7870-4536-a7ea-f827b375222c", @@ -28628,7 +28628,7 @@ }, { "service-instance-id": "01633eba-947c-457c-8d37-3c763027d392", - "service-instance-name": "Mobility_VSP_Service_DS_0915_01", + "service-instance-name": "Emanuel_VSP_Service_DS_0915_01", "service-type": "", "service-role": "", "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", @@ -28650,7 +28650,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "Mobility_VSP_Vnf_DS_0915_01" + "property-value": "Emanuel_VSP_Vnf_DS_0915_01" } ] } @@ -28697,7 +28697,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -28731,11 +28731,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -28840,15 +28840,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -28865,15 +28865,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -28890,15 +28890,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn16" + "relationship-value": "hvf16" }, { "relationship-key": "tenant.tenant-id", @@ -28916,7 +28916,7 @@ } }, { - "service-type": "vBNG", + "service-type": "vJamie", "resource-version": "1494002017973", "service-instances": { "service-instance": [ @@ -29037,13 +29037,13 @@ } }, { - "service-type": "Nimbus", + "service-type": "Kennedy", "resource-version": "1507044117208", "service-instances": { "service-instance": [ { "service-instance-id": "a8ca34fc-44f4-433c-9935-2254fe1fc0c9", - "service-instance-name": "mDNS_Preload_1710_10-19_2810_11", + "service-instance-name": "CHARLOTTE_Preload_1710_10-19_2810_11", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -29162,7 +29162,7 @@ }, { "service-instance-id": "c28ad9ff-80ed-487e-a111-5dee381d7313", - "service-instance-name": "mdns_2017_111701_su249t", + "service-instance-name": "CHARLOTTE_2017_111701_su249t", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -29186,7 +29186,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_111701_vnf" + "property-value": "CHARLOTTE_2017_111701_vnf" } ] }, @@ -29220,11 +29220,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -29275,11 +29275,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -29299,7 +29299,7 @@ }, { "service-instance-id": "702bb528-579c-4440-b190-91676a2a8628", - "service-instance-name": "mdns_2017_1011_hk096q_svc_v4", + "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc_v4", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -29323,7 +29323,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_1011_hk096q_svc_vnf_v4" + "property-value": "CHARLOTTE_2017_1011_hk096q_svc_vnf_v4" } ] }, @@ -29367,7 +29367,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_105" + "property-value": "zhvf6aepdg01_un_105" } ] }, @@ -29449,7 +29449,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_102" + "property-value": "zhvf6aepdg01_un_102" } ] }, @@ -29548,11 +29548,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -29569,7 +29569,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6fapn01dns01" + "property-value": "zhvf6fapn01dns01" } ] }, @@ -29603,11 +29603,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -29641,11 +29641,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -29798,7 +29798,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afapn02" + "property-value": "zhvf6afapn02" } ] } @@ -29845,7 +29845,7 @@ }, { "service-instance-id": "bad8e354-5ce5-4732-af13-100105b1c02b", - "service-instance-name": "mdns_2017_1011_hk096q_svc_v5", + "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc_v5", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -29869,7 +29869,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_1011_hk096q_svc_vnf_v5" + "property-value": "CHARLOTTE_2017_1011_hk096q_svc_vnf_v5" } ] }, @@ -29987,7 +29987,7 @@ }, { "service-instance-id": "629e0f59-f966-449b-ac90-8be904a51b55", - "service-instance-name": "mdns_2017_1011_hk096q_svc_v5_2", + "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc_v5_2", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -30011,7 +30011,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_1011_hk096q_svc_v5_2" + "property-value": "CHARLOTTE_2017_1011_hk096q_svc_v5_2" } ] }, @@ -30045,11 +30045,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -30066,7 +30066,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afnso01_nso_pj_01" + "property-value": "zhvf6afnso01_nso_pj_01" } ] }, @@ -30110,7 +30110,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6affad01_qwe_04" + "property-value": "zhvf6affad01_qwe_04" } ] }, @@ -30190,7 +30190,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_308" + "property-value": "zhvf6aepdg01_un_308" } ] }, @@ -30207,7 +30207,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_306" + "property-value": "zhvf6aepdg01_un_306" } ] }, @@ -30224,7 +30224,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_307" + "property-value": "zhvf6aepdg01_un_307" } ] }, @@ -30339,7 +30339,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afprb01" + "property-value": "zhvf6afprb01" } ] }, @@ -30377,7 +30377,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -30438,7 +30438,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_316" + "property-value": "zhvf6aepdg01_un_316" } ] }, @@ -30455,7 +30455,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_317" + "property-value": "zhvf6aepdg01_un_317" } ] }, @@ -30472,7 +30472,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_318" + "property-value": "zhvf6aepdg01_un_318" } ] }, @@ -30489,7 +30489,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_315" + "property-value": "zhvf6aepdg01_un_315" } ] }, @@ -30533,7 +30533,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_577h" + "property-value": "zhvf6aepdg01_577h" } ] }, @@ -30588,7 +30588,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6apndns_v6_01" + "property-value": "zhvf6apndns_v6_01" } ] }, @@ -30632,7 +30632,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6vAPNDNS01_vnf" + "property-value": "zhvf6vAPNDNS01_vnf" } ] }, @@ -30703,7 +30703,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_313" + "property-value": "zhvf6aepdg01_un_313" } ] }, @@ -30720,7 +30720,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_312" + "property-value": "zhvf6aepdg01_un_312" } ] }, @@ -30737,7 +30737,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_310" + "property-value": "zhvf6aepdg01_un_310" } ] }, @@ -30754,7 +30754,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_311" + "property-value": "zhvf6aepdg01_un_311" } ] }, @@ -30771,7 +30771,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_309" + "property-value": "zhvf6aepdg01_un_309" } ] }, @@ -30859,7 +30859,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6affad01" + "property-value": "zhvf6affad01" } ] }, @@ -31011,7 +31011,7 @@ }, { "service-instance-id": "f325bbef-10fd-40d1-9887-9383731b81d1", - "service-instance-name": "mdns_2017_1117_su249t", + "service-instance-name": "CHARLOTTE_2017_1117_su249t", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -31035,7 +31035,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_1117_vnf01" + "property-value": "CHARLOTTE_2017_1117_vnf01" } ] }, @@ -31133,7 +31133,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_pb_1121" + "property-value": "zhvf6aepdg01_pb_1121" } ] }, @@ -31303,11 +31303,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -31405,7 +31405,7 @@ }, { "service-instance-id": "be85c437-1efe-4779-9557-11dffbbd98af", - "service-instance-name": "shani_pm_test_Subsciber_mobility_ServiceType_Nimbus", + "service-instance-name": "shani_pm_test_Subsciber_emanuel_ServiceType_Kennedy", "service-type": "service_type_shani", "service-role": "service_role_shani", "environment-context": "General_Revenue-Bearing", @@ -31588,11 +31588,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -31666,7 +31666,7 @@ }, { "service-instance-id": "d1c8daf5-69f1-4d2a-ac2f-5b0cd09338b8", - "service-instance-name": "mdns_2017_1011_IST_Service_un_try1", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service_un_try1", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -31707,11 +31707,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -31745,11 +31745,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -31766,7 +31766,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afnso03_pj" + "property-value": "zhvf6afnso03_pj" } ] }, @@ -31800,11 +31800,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -31838,11 +31838,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -31862,7 +31862,7 @@ }, { "service-instance-id": "501264ad-950f-49ab-90e4-f4d08348f5ce", - "service-instance-name": "mdns_2017_1011_IST_1029", + "service-instance-name": "CHARLOTTE_2017_1011_IST_1029", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -31876,11 +31876,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -31924,7 +31924,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afapn01" + "property-value": "zhvf6afapn01" } ] } @@ -31947,11 +31947,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -31995,7 +31995,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afprb01_un" + "property-value": "zhvf6afprb01_un" } ] }, @@ -32033,7 +32033,7 @@ "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "DFW" + "relationship-value": "WATKINS" } ] }, @@ -32067,11 +32067,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -32091,7 +32091,7 @@ }, { "service-instance-id": "62da6f45-cbcb-4bc0-9c02-7750234f8d3a", - "service-instance-name": "mDNS_Preload_1102_un_01", + "service-instance-name": "CHARLOTTE_Preload_1102_un_01", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -32115,7 +32115,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_un_557h" + "property-value": "zhvf6amdns02_un_557h" } ] }, @@ -32135,7 +32135,7 @@ }, { "service-instance-id": "e248f8c6-7c08-4502-b27b-08bc20fa0789", - "service-instance-name": "Mobility_Server_294356_Pause", + "service-instance-name": "Emanuel_Server_294356_Pause", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -32149,11 +32149,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -32170,7 +32170,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6mobpause1" + "property-value": "zhvf6mobpause1" } ] }, @@ -32225,7 +32225,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6apndns_v8_01" + "property-value": "zhvf6apndns_v8_01" } ] }, @@ -32259,11 +32259,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -32283,7 +32283,7 @@ }, { "service-instance-id": "54606e01-b3a5-464d-8299-ed519d967efb", - "service-instance-name": "mdns_2017_1011_hk096q_svc_v2", + "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc_v2", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -32327,7 +32327,7 @@ }, { "service-instance-id": "b1bb2d22-ebbb-4a8f-8ded-33d12856025f", - "service-instance-name": "mDNS_Preload_1710_10-19_2810_trial02", + "service-instance-name": "CHARLOTTE_Preload_1710_10-19_2810_trial02", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -32368,11 +32368,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -32423,11 +32423,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -32509,7 +32509,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6affad01_un" + "property-value": "zhvf6affad01_un" } ] }, @@ -32622,7 +32622,7 @@ }, { "service-instance-id": "9fe54eb3-db98-42bf-92cb-2ae298d787e2", - "service-instance-name": "mDNS_Preload_1710_10-19_2810_03", + "service-instance-name": "CHARLOTTE_Preload_1710_10-19_2810_03", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -32663,11 +32663,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -32684,7 +32684,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6fapndns01" + "property-value": "zhvf6fapndns01" } ] }, @@ -32704,7 +32704,7 @@ }, { "service-instance-id": "48d2b51b-cab9-445f-8270-834daccde28b", - "service-instance-name": "mdns_2017_1011_hk096q_svc", + "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -32728,7 +32728,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_1011_hk096q_svc" + "property-value": "CHARLOTTE_2017_1011_hk096q_svc" } ] }, @@ -32772,7 +32772,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_701" + "property-value": "zhvf6aepdg01_un_701" } ] }, @@ -32827,7 +32827,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6vprobe_sk_01" + "property-value": "zhvf6vprobe_sk_01" } ] }, @@ -32871,7 +32871,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_605" + "property-value": "zhvf6aepdg01_un_605" } ] }, @@ -33046,7 +33046,7 @@ }, { "service-instance-id": "69bf7bfc-9d20-40f4-8589-d8177209edfc", - "service-instance-name": "service_mdns_instance", + "service-instance-name": "service_CHARLOTTE_instance", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -33060,11 +33060,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -33081,7 +33081,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "vnf_mdns_instance" + "property-value": "vnf_CHARLOTTE_instance" } ] }, @@ -33148,11 +33148,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -33230,11 +33230,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -33251,7 +33251,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_PB" + "property-value": "zhvf6aepdg01_PB" } ] }, @@ -33295,7 +33295,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_106" + "property-value": "zhvf6aepdg01_un_106" } ] }, @@ -33315,7 +33315,7 @@ }, { "service-instance-id": "3a4b0451-77c7-4537-b866-0d8bda745fd0", - "service-instance-name": "INT_FW_DNS_MDNS", + "service-instance-name": "INT_FW_DNS_CHARLOTTE", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -33329,11 +33329,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -33493,11 +33493,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -33534,7 +33534,7 @@ }, { "service-instance-id": "d07719dd-e7a6-4c60-87fe-3294b1d10653", - "service-instance-name": "mDNS_Preload_E1802", + "service-instance-name": "CHARLOTTE_Preload_E1802", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -33548,11 +33548,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -33569,7 +33569,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6mdns_01" + "property-value": "zhvf6mdns_01" } ] }, @@ -33613,7 +33613,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_101" + "property-value": "zhvf6aepdg01_un_101" } ] }, @@ -33647,11 +33647,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -33750,7 +33750,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6vprobefe_sk_1111" + "property-value": "zhvf6vprobefe_sk_1111" } ] }, @@ -33811,11 +33811,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -33887,7 +33887,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afdns01" + "property-value": "zhvf6afdns01" } ] } @@ -33931,7 +33931,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6apndns1117" + "property-value": "zhvf6apndns1117" } ] }, @@ -34013,7 +34013,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_303" + "property-value": "zhvf6aepdg01_un_303" } ] }, @@ -34030,7 +34030,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_304" + "property-value": "zhvf6aepdg01_un_304" } ] }, @@ -34085,7 +34085,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6vepdg01" + "property-value": "zhvf6vepdg01" } ] }, @@ -34129,7 +34129,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_pb_122" + "property-value": "zhvf6aepdg01_pb_122" } ] }, @@ -34190,11 +34190,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -34258,7 +34258,7 @@ }, { "service-instance-id": "38cb4717-9a3f-4212-8521-268a2f1aa07b", - "service-instance-name": "mdns_2017_1011_hk096q_svc_v3", + "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc_v3", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -34282,7 +34282,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_1011_hk096q_svc_v3" + "property-value": "CHARLOTTE_2017_1011_hk096q_svc_v3" } ] }, @@ -34447,7 +34447,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mtn6aepdg01" + "property-value": "hvf6aepdg01" } ] }, @@ -34508,11 +34508,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -34529,7 +34529,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6apndns_v10_01" + "property-value": "zhvf6apndns_v10_01" } ] }, @@ -34620,7 +34620,7 @@ }, { "service-instance-id": "60877585-731b-4a9b-ac0c-1dc77a919582", - "service-instance-name": "mdns_2017_1011_hk096q_svc12", + "service-instance-name": "CHARLOTTE_2017_1011_hk096q_svc12", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -34716,7 +34716,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afprb01_un_01" + "property-value": "zhvf6afprb01_un_01" } ] }, @@ -34760,7 +34760,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_1122" + "property-value": "zhvf6aepdg01_un_1122" } ] }, @@ -34859,11 +34859,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -34880,7 +34880,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6vEPDG01_pb" + "property-value": "zhvf6vEPDG01_pb" } ] }, @@ -34914,11 +34914,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -34935,7 +34935,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6vprobe_01" + "property-value": "zhvf6vprobe_01" } ] }, @@ -34979,7 +34979,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_501" + "property-value": "zhvf6aepdg01_un_501" } ] }, @@ -35016,7 +35016,7 @@ }, { "service-instance-id": "eca2bb8a-cdd2-4caf-bd87-cf0d9516cee3", - "service-instance-name": "mdns_2017_1127_IST_su249t", + "service-instance-name": "CHARLOTTE_2017_1127_IST_su249t", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -35051,7 +35051,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_2017_1127_IST_vNF_su249t" + "property-value": "CHARLOTTE_2017_1127_IST_vNF_su249t" } ] }, @@ -35085,11 +35085,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -35144,7 +35144,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "ZMTN6APNDNS_V4" + "property-value": "Zhvf6APNDNS_V4" } ] }, @@ -35215,7 +35215,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_117" + "property-value": "zhvf6aepdg01_un_117" } ] }, @@ -35232,7 +35232,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_117" + "property-value": "zhvf6aepdg01_un_117" } ] }, @@ -35252,7 +35252,7 @@ }, { "service-instance-id": "080a47f6-d124-4944-a032-d575b236ac0b", - "service-instance-name": "mDNS_Preload_1107_un", + "service-instance-name": "CHARLOTTE_Preload_1107_un", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -35276,7 +35276,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_un_577h" + "property-value": "zhvf6amdns02_un_577h" } ] }, @@ -35354,11 +35354,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -35419,7 +35419,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_02" + "property-value": "zhvf6aepdg01_un_02" } ] }, @@ -35439,7 +35439,7 @@ }, { "service-instance-id": "83d40e54-55b1-40b0-a79d-966d37cb0c10", - "service-instance-name": "mDNS_Preload_577h_01", + "service-instance-name": "CHARLOTTE_Preload_577h_01", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -35463,7 +35463,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns02_un_577h_15" + "property-value": "zhvf6amdns02_un_577h_15" } ] }, @@ -35540,7 +35540,7 @@ }, { "service-instance-id": "9c59f7df-f4c2-4107-bcbc-08b40514064d", - "service-instance-name": "Service_mdns_mobility_pb", + "service-instance-name": "Service_CHARLOTTE_emanuel_pb", "service-type": "", "service-role": "", "environment-context": "Critical_Non-Revenue", @@ -35564,7 +35564,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "Service_mdns_mobility_pb_vnf" + "property-value": "Service_CHARLOTTE_emanuel_pb_vnf" } ] } @@ -35597,7 +35597,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_104" + "property-value": "zhvf6aepdg01_un_104" } ] }, @@ -35661,7 +35661,7 @@ }, { "service-instance-id": "76241370-d42d-444b-8c01-85f38c97dc61", - "service-instance-name": "mdns_2017_1011_IST_Service", + "service-instance-name": "CHARLOTTE_2017_1011_IST_Service", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -35696,7 +35696,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_vnf_uk182r" + "property-value": "CHARLOTTE_vnf_uk182r" } ] }, @@ -35740,7 +35740,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_103" + "property-value": "zhvf6aepdg01_un_103" } ] }, @@ -35878,7 +35878,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_pb_101" + "property-value": "zhvf6aepdg01_pb_101" } ] }, @@ -35933,7 +35933,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6apndns_v5_01" + "property-value": "zhvf6apndns_v5_01" } ] }, @@ -35953,7 +35953,7 @@ }, { "service-instance-id": "c0e9ab1e-a8a0-43ac-a900-ab458a214a7d", - "service-instance-name": "mDNS_1206_pmtest", + "service-instance-name": "CHARLOTTE_1206_pmtest", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -35977,7 +35977,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mDNS_1206_pmtest" + "property-value": "CHARLOTTE_1206_pmtest" } ] }, @@ -36059,7 +36059,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afapn01dns01" + "property-value": "zhvf6afapn01dns01" } ] } @@ -36092,7 +36092,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_109" + "property-value": "zhvf6aepdg01_un_109" } ] }, @@ -36109,7 +36109,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_116" + "property-value": "zhvf6aepdg01_un_116" } ] }, @@ -36153,7 +36153,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_603" + "property-value": "zhvf6aepdg01_un_603" } ] }, @@ -36173,7 +36173,7 @@ }, { "service-instance-id": "2648b61d-62fe-4a26-a15c-6cbe0bfde0b7", - "service-instance-name": "mdns_1106_service_pj", + "service-instance-name": "CHARLOTTE_1106_service_pj", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -36187,11 +36187,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -36208,7 +36208,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6amdns04_pj" + "property-value": "zhvf6amdns04_pj" } ] }, @@ -36307,7 +36307,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6affad01_qwe_01" + "property-value": "zhvf6affad01_qwe_01" } ] }, @@ -36327,7 +36327,7 @@ }, { "service-instance-id": "5ae69a18-3993-4e15-92a4-907644d42501", - "service-instance-name": "zrdm5b_1802_svc_ssc_vibc_appc", + "service-instance-name": "zolson5b_1802_svc_ssc_vibc_appc", "service-type": "", "service-role": "", "environment-context": "null", @@ -36835,7 +36835,7 @@ }, { "service-instance-id": "7b653fa4-52b5-4067-a04f-0f439610fd14", - "service-instance-name": "mtn6_mdns_2017_1011_IST_Service_kk364", + "service-instance-name": "hvf6_CHARLOTTE_2017_1011_IST_Service_kk364", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -36870,7 +36870,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "mdns_vnf" + "property-value": "CHARLOTTE_vnf" } ] }, @@ -36904,11 +36904,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -36925,7 +36925,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6fapndns_01" + "property-value": "zhvf6fapndns_01" } ] }, @@ -37199,7 +37199,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6affad01_bm_01" + "property-value": "zhvf6affad01_bm_01" } ] }, @@ -37361,7 +37361,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6vprobe_v2_01" + "property-value": "zhvf6vprobe_v2_01" } ] }, @@ -37493,7 +37493,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_903" + "property-value": "zhvf6aepdg01_un_903" } ] }, @@ -37510,7 +37510,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6aepdg01_un_902" + "property-value": "zhvf6aepdg01_un_902" } ] }, @@ -37718,11 +37718,11 @@ { "related-to": "project", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/business/projects/project/Nimbus", + "related-link": "/aai/v12/business/projects/project/Kennedy", "relationship-data": [ { "relationship-key": "project.project-name", - "relationship-value": "Nimbus" + "relationship-value": "Kennedy" } ] }, @@ -37739,7 +37739,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6afnso01_pj" + "property-value": "zhvf6afnso01_pj" } ] }, @@ -37759,7 +37759,7 @@ }, { "service-instance-id": "64ec9f6a-bc90-4d3c-8372-74433c2bfc59", - "service-instance-name": "zrdm5b_1802_svc_ssc_VLBC_APPC", + "service-instance-name": "zolson5b_1802_svc_ssc_VLBC_APPC", "service-type": "", "service-role": "", "environment-context": "null", @@ -37832,7 +37832,7 @@ "related-to-property": [ { "property-key": "generic-vnf.vnf-name", - "property-value": "zmtn6apndns_01" + "property-value": "zhvf6apndns_01" } ] }, @@ -37885,15 +37885,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -37910,15 +37910,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -37935,15 +37935,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -37960,15 +37960,15 @@ { "related-to": "tenant", "relationship-label": "org.onap.relationships.inventory.Uses", - "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" + "relationship-value": "irma-aic" }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" + "relationship-value": "hvf6" }, { "relationship-key": "tenant.tenant-id", @@ -37989,4 +37989,654 @@ } } } -}
\ No newline at end of file +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "queryParams": { + "depth": 1 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "subscriber-name": "Emanuel", + "subscriber-type": "INFRA", + "resource-version": "1494001894192", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "vWINIFRED", + "resource-version": "1503958037264", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2609b7252b6484d89432611cfb2491b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_Tenant_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "579d80c0cf754d1e9f1ddc2cdc1701e3" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_FirstNet1_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2cd3ca9abd25492eb0c6a44bc95fe714" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_FirstNet2_DND" + } + ] + } + ] + } + }, + { + "service-type": "vMNS", + "resource-version": "1507044344705", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2609b7252b6484d89432611cfb2491b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_Tenant_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "579d80c0cf754d1e9f1ddc2cdc1701e3" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_FirstNet1_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2cd3ca9abd25492eb0c6a44bc95fe714" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_FirstNet2_DND" + } + ] + } + ] + } + }, + { + "service-type": "vVoiceMail", + "resource-version": "1494001916536" + }, + { + "service-type": "Emanuel", + "resource-version": "1494001853297", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fe4400a8e96e4caa85ccdca8a850255b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "IST_Automation_AAI_updated" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "a259ae7b7c3f493cb3d91f95a7c18149" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "IST_VID_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf16" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "a259ae7b7c3f493cb3d91f95a7c18149" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "IST_VID_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/fusion/Two/tenants/tenant/d3b49834f7164cbe831bfbfa35ef649b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "fusion" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "Two" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d3b49834f7164cbe831bfbfa35ef649b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "fusion-admin-mitaka" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/fusion/One/tenants/tenant/c630e297a3ae486497d63eacec1d7c14", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "fusion" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "One" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c630e297a3ae486497d63eacec1d7c14" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "fusion-admin-icehouse" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2609b7252b6484d89432611cfb2491b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_Tenant_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/fusion/One/tenants/tenant/d3b49834f7164cbe831bfbfa35ef649b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "fusion" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "One" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d3b49834f7164cbe831bfbfa35ef649b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "fusion-admin-mitaka" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "1eddb590b7f04e9890bceeef9e591333" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "APP-C-DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "579d80c0cf754d1e9f1ddc2cdc1701e3" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_FirstNet1_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2cd3ca9abd25492eb0c6a44bc95fe714" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_FirstNet2_DND" + } + ] + } + ] + } + }, + { + "service-type": "vMOG", + "resource-version": "1494001922173" + }, + { + "service-type": "vEsmeralda", + "resource-version": "1494001943181", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fe4400a8e96e4caa85ccdca8a850255b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fe4400a8e96e4caa85ccdca8a850255b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "IST_Automation_AAI_updated" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "a259ae7b7c3f493cb3d91f95a7c18149" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "IST_VID_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf16/tenants/tenant/a259ae7b7c3f493cb3d91f95a7c18149", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf16" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "a259ae7b7c3f493cb3d91f95a7c18149" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "IST_VID_DND" + } + ] + } + ] + } + }, + { + "service-type": "vJamie", + "resource-version": "1494002017973" + }, + { + "service-type": "Kennedy", + "resource-version": "1507044117208", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2609b7252b6484d89432611cfb2491b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2609b7252b6484d89432611cfb2491b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_Tenant_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/1eddb590b7f04e9890bceeef9e591333", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "1eddb590b7f04e9890bceeef9e591333" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "APP-C-DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/579d80c0cf754d1e9f1ddc2cdc1701e3", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "579d80c0cf754d1e9f1ddc2cdc1701e3" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_FirstNet1_DND" + } + ] + }, + { + "related-to": "tenant", + "relationship-label": "org.onap.relationships.inventory.Uses", + "related-link": "/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/2cd3ca9abd25492eb0c6a44bc95fe714", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "2cd3ca9abd25492eb0c6a44bc95fe714" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ECOM_FirstNet2_DND" + } + ] + } + ] + } + } + ] + } + } + } + } + ]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json new file mode 100644 index 000000000..daf7d59f9 --- /dev/null +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json @@ -0,0 +1,2197 @@ +[{ + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", + "queryParams": { + "depth": 2 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriber-name": "SILVIA ROBBINS", + "subscriber-type": "INFRA", + "resource-version": "1494001938080", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "DARREN MCGEE", + "resource-version": "1494001920845", + "service-instances": { + "service-instance": [ + { + "service-instance-id": "67aba9ab-f745-442e-a37b-2040a17ec9c7", + "service-instance-name": "test_948473", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", + "resource-version": "1501137356564", + "orchestration-status": "Active" + }, + { + "service-instance-id": "328e117c-8f27-4a59-beea-3b3c36e4652f", + "service-instance-name": "test_inputs_002", + "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", + "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", + "resource-version": "1501142919029", + "orchestration-status": "Active" + }, + { + "service-instance-id": "66608fd9-a786-4f60-ae7b-c18d030c499b", + "service-instance-name": "testtt", + "service-type": "", + "service-role": "", + "model-invariant-id": "1cc41b64-5c12-4d51-bac9-448e963bd81d", + "model-version-id": "91f79100-6450-4078-80d7-531427b4fe74", + "resource-version": "1503224667654", + "orchestration-status": "Active" + }, + { + "service-instance-id": "9d29dcf2-7742-4384-bca0-a38f6c296a79", + "service-instance-name": "test_9sdfkdfj", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", + "resource-version": "1500813552431", + "orchestration-status": "Active" + }, + { + "service-instance-id": "e10414d0-692b-4e8e-b56e-9fdc5ef24059", + "service-instance-name": "test_04598485", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", + "resource-version": "1501144603052", + "orchestration-status": "Active" + }, + { + "service-instance-id": "25a5cc93-73df-4c9c-9cc5-e2df9a72f3b7", + "service-instance-name": "test_inputs_values1", + "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339", + "model-version-id": "59f3ea84-313a-4670-b7c2-8997e5749864", + "resource-version": "1501412516301", + "orchestration-status": "Active" + }, + { + "service-instance-id": "9cfcd777-7f14-425c-80bf-a562fba03cfa", + "service-instance-name": "test_vl_inputs01", + "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", + "model-version-id": "f263c8f6-b52f-4b6c-9ed9-0c83ad098697", + "resource-version": "1501421232100", + "orchestration-status": "Active" + }, + { + "service-instance-id": "4173d5da-df33-474e-a4ef-c93be61a1355", + "service-instance-name": "test_instance_vl_01", + "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", + "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", + "resource-version": "1500966394803", + "orchestration-status": "Active" + }, + { + "service-instance-id": "1753f7eb-85db-498c-aa6a-c68a06fc77db", + "service-instance-name": "sdfjdfj", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", + "resource-version": "1500991399818", + "orchestration-status": "Active" + }, + { + "service-instance-id": "5d5520c7-dcbc-4287-bed2-50ff57c41a6f", + "service-instance-name": "tesy_jsdjjdj", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1501400257544", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/65a76ad1-2d53-4709-88e7-858655f55039", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "65a76ad1-2d53-4709-88e7-858655f55039" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test_jddjf" + } + ] + } + ] + } + }, + { + "service-instance-id": "1ab8ad18-1445-412a-81f2-671b936ab650", + "service-instance-name": "Test_098765", + "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", + "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", + "resource-version": "1500562034054", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2ae575e4-5103-4f5e-afd9-cc5f4bbae217", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "2ae575e4-5103-4f5e-afd9-cc5f4bbae217" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test-0234574785" + } + ] + } + ] + } + }, + { + "service-instance-id": "a1427609-254d-4637-906f-8f0f6f6d4711", + "service-instance-name": "test343445", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", + "resource-version": "1502111792531", + "orchestration-status": "Active" + }, + { + "service-instance-id": "f87c0dbe-2658-4971-8014-ad5da1f9df51", + "service-instance-name": "test_03494595", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1502006858511", + "orchestration-status": "Active" + }, + { + "service-instance-id": "7a8dea9f-5f67-4755-9344-ec3736240b9e", + "service-instance-name": "test_045045", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", + "resource-version": "1502111390681", + "orchestration-status": "Active" + }, + { + "service-instance-id": "8d0f4c13-a564-43ec-b756-c0017161dee2", + "service-instance-name": "testkjhjjj", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", + "resource-version": "1500553831697", + "orchestration-status": "Active" + }, + { + "service-instance-id": "27535e2a-785e-47e8-a482-16f4d019033a", + "service-instance-name": "test765766", + "service-type": "", + "service-role": "", + "model-invariant-id": "452538c0-ef1e-4d65-9939-697f6ed58934", + "model-version-id": "f430728a-4530-42be-a577-1206b9484cef", + "resource-version": "1502109495302", + "orchestration-status": "Active" + }, + { + "service-instance-id": "9601d34e-d3f9-4108-932c-fc52312c260a", + "service-instance-name": "test_9459495", + "service-type": "", + "service-role": "", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1502028721334", + "orchestration-status": "Active" + }, + { + "service-instance-id": "e65ae593-afdd-4f31-8192-ba7606a026e4", + "service-instance-name": "test_84574854", + "service-type": "", + "service-role": "", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1502026481024", + "orchestration-status": "Active" + }, + { + "service-instance-id": "29e210af-9fa5-44ae-940c-acca84b1b287", + "service-instance-name": "testjkdfkdf", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", + "resource-version": "1502114664500", + "orchestration-status": "Active" + }, + { + "service-instance-id": "c1a81ab3-2bc6-4b6f-b04f-d358e67c1d01", + "service-instance-name": "test499494", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", + "resource-version": "1500552497782", + "orchestration-status": "Active" + }, + { + "service-instance-id": "01834681-686a-4258-aff0-6eea448deddd", + "service-instance-name": "tesr_iii_999", + "service-type": "", + "service-role": "", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1502019889568", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e4c23f76-53a0-46e2-b005-59503e55c832", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "e4c23f76-53a0-46e2-b005-59503e55c832" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "tesu_ooo_000" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4a7b7099-4d38-4ba4-aff8-1598bba0e704", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "4a7b7099-4d38-4ba4-aff8-1598bba0e704" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test_000988_ooo" + } + ] + } + ] + } + }, + { + "service-instance-id": "266008e8-04f9-440a-90e9-d9299821ec08", + "model-invariant-id": "", + "resource-version": "1494001993349", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0011v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bnfm0011v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bnfm0011v" + } + ] + } + ] + } + }, + { + "service-instance-id": "6c3a22e9-6b04-49d2-b1fa-1e49103971ca", + "model-invariant-id": "", + "resource-version": "1494001986409", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0006v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bdbl0006v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bdbl0006v" + } + ] + } + ] + } + }, + { + "service-instance-id": "918085fc-29cf-41c2-acc8-15878c0d58b3", + "model-invariant-id": "", + "resource-version": "1494001986411", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0010v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bnfm0010v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bnfm0010v" + } + ] + } + ] + } + }, + { + "service-instance-id": "1c464a9d-eff7-4d29-8e97-ed1e9e3c8458", + "model-invariant-id": "", + "resource-version": "1494001953169", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0012v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bnfm0012v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bnfm0012v" + } + ] + } + ] + } + }, + { + "service-instance-id": "bb2f563f-6db7-46ec-b521-fc6ee07e4f3e", + "model-invariant-id": "", + "resource-version": "1494002002228", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0004v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bdbl0004v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bdbl0004v" + } + ] + } + ] + } + }, + { + "service-instance-id": "4cf94a42-85b8-414f-8fb4-a43b1dac1d2f", + "model-invariant-id": "", + "resource-version": "1494001834026", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0005v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bdbl0005v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bdbl0005v" + } + ] + } + ] + } + }, + { + "service-instance-id": "ed7c0d8e-de81-408f-b695-47b9dd6b2ca0", + "model-invariant-id": "", + "resource-version": "1494001986403", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0003v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bdbl0003v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bdbl0003v" + } + ] + } + ] + } + }, + { + "service-instance-id": "8bf34b89-1648-4a41-a21f-9b752833bd4b", + "service-instance-name": "test-gkmf546g", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", + "resource-version": "1500377885652", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e0994c94-fa19-472f-a5b7-ae7388105db2", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "e0994c94-fa19-472f-a5b7-ae7388105db2" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test-elftoerkk56" + } + ] + } + ] + } + }, + { + "service-instance-id": "082c606c-60d7-4d9a-87c7-1370de6e56ba", + "service-instance-name": "test123456", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1500375305701", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fac2ab99-7c5a-4f1e-aad8-d396f26ba7c4", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "fac2ab99-7c5a-4f1e-aad8-d396f26ba7c4" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test12345" + } + ] + } + ] + } + }, + { + "service-instance-id": "c4707aae-9b16-49b4-8b52-cbeb8c4129ab", + "service-instance-name": "test_sdfdlfldl", + "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "model-version-id": "cad9f2eb-39f7-4692-90c2-8726bb594610", + "resource-version": "1500376318829", + "orchestration-status": "Active" + }, + { + "service-instance-id": "86ab6048-9037-4367-ac01-f2e5881e8034", + "service-instance-name": "test1234456", + "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637", + "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2", + "resource-version": "1500369079277", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/329f3b0e-4e03-4dc0-8e56-e786ef392984", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "329f3b0e-4e03-4dc0-8e56-e786ef392984" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test567" + } + ] + } + ] + } + }, + { + "service-instance-id": "a5e3b6ae-7b4c-4247-b975-1cd46c3b3e9a", + "service-instance-name": "pavel_usp_voice", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", + "resource-version": "1506931067790", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/7aeacd8e-5d7c-496d-9ec7-1163cb809810", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "7aeacd8e-5d7c-496d-9ec7-1163cb809810" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "pavel_ucp_voice_vnf" + } + ] + } + ] + } + }, + { + "service-instance-id": "c9fb03a4-8c21-444a-84ee-a6f969698d9c", + "service-instance-name": "test_0e459495945kg", + "service-type": "", + "service-role": "", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1502021459612", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/983823ce-2482-4943-9081-11d33be3c5f4", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "983823ce-2482-4943-9081-11d33be3c5f4" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test_045495945" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/39acee2f-590e-4e42-8317-f4c624f5bd96", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "39acee2f-590e-4e42-8317-f4c624f5bd96" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test_0e934834" + } + ] + } + ] + } + }, + { + "service-instance-id": "4fd55324-bc4d-4acf-8f76-2e1eb01ae6a5", + "service-instance-name": "test_0w459495", + "service-type": "", + "service-role": "", + "model-invariant-id": "e3ee9d25-2c6b-4734-8a8c-b6e0dee11ca9", + "model-version-id": "159cc54d-a6be-4c3b-bea3-3214181ebb5d", + "resource-version": "1502019352627", + "orchestration-status": "Active" + }, + { + "service-instance-id": "bbccd5cf-f641-4082-8411-7ae123530d92", + "service-instance-name": "kkk", + "service-type": "", + "service-role": "", + "model-invariant-id": "331a194d-9248-4533-88bc-62c812ccb5c1", + "model-version-id": "171b3887-e73e-479d-8ef8-2690bf74f2aa", + "resource-version": "1502087710872", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/36110437-6ae0-466d-a3fb-992e90cd1f49", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "36110437-6ae0-466d-a3fb-992e90cd1f49" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "ooo" + } + ] + } + ] + } + }, + { + "service-instance-id": "4c263e04-260e-434a-8ac2-b0335a02f30b", + "model-invariant-id": "", + "resource-version": "1494001791264", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0002v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bdbl0002v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bdbl0002v" + } + ] + } + ] + } + }, + { + "service-instance-id": "e4feb759-e4a9-4614-b2d2-985848ba3b9f", + "service-instance-name": "test345345342334f", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1499869396079", + "orchestration-status": "Active" + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "5a8dba3e75e7433185b8004e2f2c546e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-CheckEcomp" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "0ee101c4b53542f49cfc5e1e49d28f88" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-US608multising" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d0b6d63ca975464b9fc2c759a8b21270" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-noPOD41581Cloned" + } + ] + } + ] + } + }, + { + "service-type": "TYLER SILVIA", + "resource-version": "1494001841964", + "service-instances": { + "service-instance": [ + { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f6", + "service-instance-name": "test_sssdad", + "service-type": "", + "service-role": "", + "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", + "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "resource-version": "1503919915499", + "orchestration-status": "<ORCH_STATUS>", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8715ea55-6fcf-45b5-b42b-2ca37ec3cb39", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "8715ea55-6fcf-45b5-b42b-2ca37ec3cb39" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "sedawsdsda" + } + ] + } + ] + } + }, + { + "service-instance-id": "9929cdf2-1b2d-4530-b5a4-ae9a716c12cc", + "service-instance-name": "xcvxcvxcv", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", + "resource-version": "1503842185188", + "orchestration-status": "Active" + }, + { + "service-instance-id": "4572aed2-f09d-4a34-9b20-34d8625ed4c6", + "service-instance-name": "dsdsfdfd334", + "service-type": "", + "service-role": "", + "model-invariant-id": "2f801573-11c6-4040-aa8c-d5548ef07b53", + "model-version-id": "80d68407-7b2c-48a4-96fc-4fe89c424cbe", + "resource-version": "1503920297893", + "orchestration-status": "Active" + }, + { + "service-instance-id": "037629ea-fd18-4b2f-9f19-27cb45799a41", + "service-instance-name": "iokooik", + "service-type": "", + "service-role": "", + "model-invariant-id": "caed4dbb-922a-4942-be87-1f99d56d426a", + "model-version-id": "b77dae3c-ac5b-459c-8df5-1f1de6c59737", + "resource-version": "1503920445391", + "orchestration-status": "Active" + }, + { + "service-instance-id": "c9bbcc94-e27a-46ff-a292-29805358348c", + "service-instance-name": "iuiuiuoi", + "service-type": "", + "service-role": "", + "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", + "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", + "resource-version": "1503919829011", + "orchestration-status": "Active" + }, + { + "service-instance-id": "8ad6dc32-5ea9-46be-9a70-924a620dca58", + "service-instance-name": "dfgdfgdfg", + "service-type": "", + "service-role": "", + "model-invariant-id": "4c35d46f-de47-4bbc-bcda-0d46caeddf09", + "model-version-id": "9014b6b1-33c1-4092-87ab-62c230c74d74", + "resource-version": "1503920088993", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/acba27e0-18b5-4a9b-a8b5-c0e6a3d36769", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "acba27e0-18b5-4a9b-a8b5-c0e6a3d36769" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "sdfdsfdf334" + } + ] + } + ] + } + }, + { + "service-instance-id": "7bdaca06-8242-48bc-a20e-b882426a1cd2", + "service-instance-name": "test_jhgjhghh5", + "service-type": "", + "service-role": "", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1503843741682", + "orchestration-status": "Active" + }, + { + "service-instance-id": "ff42af8d-9815-4bcd-bda1-8fdde723a1c9", + "service-instance-name": "awereware", + "service-type": "", + "service-role": "", + "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", + "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "resource-version": "1503919051810", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/1df3da26-b22a-4d01-b024-8e2250599b55", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "1df3da26-b22a-4d01-b024-8e2250599b55" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "fgdssafg" + } + ] + } + ] + } + }, + { + "service-instance-id": "0fc0441b-92a8-4964-b80d-7df5c3f6bbcd", + "service-instance-name": "asdsdsdsd", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", + "resource-version": "1503919005027", + "orchestration-status": "Active" + }, + { + "service-instance-id": "b8db1779-52d6-41ff-823c-671e7ccb1dea", + "service-instance-name": "sdfsdfdf", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1503919113722", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/385a533f-c355-4891-ac26-056b76be21e1", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "385a533f-c355-4891-ac26-056b76be21e1" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "ewrdsdf" + } + ] + } + ] + } + }, + { + "service-instance-id": "13bee70f-40c8-4b4f-a691-9d36a661e22f", + "service-instance-name": "rtrtreert", + "service-type": "", + "service-role": "", + "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", + "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", + "resource-version": "1503919611730", + "orchestration-status": "Active" + }, + { + "service-instance-id": "b1891b75-b45a-4862-8f4d-bc41b68b9760", + "service-instance-name": "svc", + "service-type": "", + "service-role": "", + "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", + "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", + "resource-version": "1503909634453", + "orchestration-status": "Active" + }, + { + "service-instance-id": "c290be7e-4cae-4cfb-859e-7694849699ed", + "service-instance-name": "iioopi", + "service-type": "", + "service-role": "", + "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", + "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "resource-version": "1503918640292", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ba1855f1-6e1a-4f32-a8d4-36163e650a64", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "ba1855f1-6e1a-4f32-a8d4-36163e650a64" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "ertrtrtrt" + } + ] + } + ] + } + }, + { + "service-instance-id": "debaf16c-b0e0-4d1d-a1e6-a13434dd83e9", + "service-instance-name": "aaaqqq", + "service-type": "", + "service-role": "", + "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", + "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", + "resource-version": "1503909401143", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/641b6bf5-b3fa-437d-af35-03a6f4127716", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "641b6bf5-b3fa-437d-af35-03a6f4127716" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test_865654787" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/0efd35bc-0ea3-4b87-9a26-2fb20a3028e3", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "0efd35bc-0ea3-4b87-9a26-2fb20a3028e3" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "sfdgdfgdfr55" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/075559bf-49b5-4b21-8ea6-1f96d7d2d7ce", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "075559bf-49b5-4b21-8ea6-1f96d7d2d7ce" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "dfgyhfghfg" + } + ] + } + ] + } + }, + { + "service-instance-id": "d86088ce-5bd0-4c05-94c9-96557f70d2e6", + "service-instance-name": "vid-test-789", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1500892617605", + "orchestration-status": "Active" + }, + { + "service-instance-id": "9ac85e73-9444-4fd7-b771-0bc2706cadb1", + "service-instance-name": "vid-test-888", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1500892257855", + "orchestration-status": "Active" + }, + { + "service-instance-id": "51cddedb-68a1-47fb-97b9-63f1b7aff086", + "service-instance-name": "vid-test-112", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1500896366569", + "orchestration-status": "Active" + }, + { + "service-instance-id": "e2cd68c8-c807-4176-a39c-c44d99418f78", + "service-instance-name": "vid-test-443", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1500895145213", + "orchestration-status": "Active" + }, + { + "service-instance-id": "3f93c7cb-2fd0-4557-9514-e189b7b04f9d", + "service-instance-name": "vid-test-444", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1500789244673", + "orchestration-status": "<ORCH_STATUS>", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c015cc0f-0f37-4488-aabf-53795fd93cd3", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "c015cc0f-0f37-4488-aabf-53795fd93cd3" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "fsd" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/0846287b-65bf-45a6-88f6-6a1af4149fac", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "0846287b-65bf-45a6-88f6-6a1af4149fac" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "kjkjk" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9908b762-136f-4b1f-8eb4-ef670ef58bb4", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "9908b762-136f-4b1f-8eb4-ef670ef58bb4" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "uiui" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/543931f5-e50e-45a2-a69f-ab727e4c7f2f", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "543931f5-e50e-45a2-a69f-ab727e4c7f2f" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "sdfsdfdsf" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/25e84884-22d5-44c9-8212-cb459f63e0ba", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "25e84884-22d5-44c9-8212-cb459f63e0ba" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "sdada" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/013fb0ba-977b-496c-9faa-7f8e5f083eec", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "013fb0ba-977b-496c-9faa-7f8e5f083eec" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "gvb" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/06914296-cb46-4b62-9453-329a706a6cbb", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "06914296-cb46-4b62-9453-329a706a6cbb" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "lkllll" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c55da606-cf38-42c7-bc3c-be8e23b19299", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "c55da606-cf38-42c7-bc3c-be8e23b19299" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "ss" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/27cc0914-70be-453e-b552-3df6b1d6cda9", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "27cc0914-70be-453e-b552-3df6b1d6cda9" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "yh" + } + ] + } + ] + } + }, + { + "service-instance-id": "0f2624ba-94cf-4ac5-b903-652d49002c97", + "service-instance-name": "vgeraldine1", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", + "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", + "resource-version": "1509362054136", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "owning-entity", + "related-link": "/aai/v11/business/owning-entities/owning-entity/80bb7c9e-4e3d-4b10-8291-7e85a1347370", + "relationship-data": [ + { + "relationship-key": "owning-entity.owning-entity-id", + "relationship-value": "80bb7c9e-4e3d-4b10-8291-7e85a1347370" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ce792805-a5f3-4bfe-8209-86553e097d91", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "ce792805-a5f3-4bfe-8209-86553e097d91" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "ssssssssssssssss" + } + ] + } + ] + } + }, + { + "service-instance-id": "c505ba4c-6333-4911-ac60-5736f36ff036", + "service-instance-name": "SlowAAI", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", + "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", + "resource-version": "1509613326963", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "project", + "related-link": "/aai/v11/business/projects/project/p80", + "relationship-data": [ + { + "relationship-key": "project.project-name", + "relationship-value": "p80" + } + ] + }, + { + "related-to": "owning-entity", + "related-link": "/aai/v11/business/owning-entities/owning-entity/73185f03-5531-444d-bc03-fa13f924d66a", + "relationship-data": [ + { + "relationship-key": "owning-entity.owning-entity-id", + "relationship-value": "73185f03-5531-444d-bc03-fa13f924d66a" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "JANET25" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "092eb9e8e4b7412e8787dd091bc58e86" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "USP-SIP-IC-24335-T-01" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "bae71557c5bb4d5aac6743a4e5f1d054" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-testalexandria" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "229bcdc6eaeb4ca59d55221141d01f8e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-STTest2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cb42a77ff45b48a8b8deb83bb64acc74" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T11" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fa45ca53c80b492fa8be5477cd84fc2b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T112" + } + ] + } + ] + } + }, + { + "service-type": "TSBC", + "resource-version": "1494001891362", + "service-instances": { + "service-instance": [ + { + "service-instance-id": "c0edefb0-2505-4a34-85cc-96c4cd5a121d", + "service-instance-name": "test-343432", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1500370094198", + "orchestration-status": "Active" + }, + { + "service-instance-id": "7cb54908-f3fb-46b9-b547-d1e670ea95b2", + "service-instance-name": "test765445g", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", + "resource-version": "1499868690949", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fbb52a16-2c57-4212-802f-32dbba2204f2", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "fbb52a16-2c57-4212-802f-32dbba2204f2" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "fdfdfdf" + } + ] + } + ] + } + }, + { + "service-instance-id": "8e953267-4cd8-45ec-ae7f-bdeb018656c0", + "service-instance-name": "a1", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1509355912484", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "owning-entity", + "related-link": "/aai/v11/business/owning-entities/owning-entity/2356a43d-ed56-43b6-aefc-8391b82588c9", + "relationship-data": [ + { + "relationship-key": "owning-entity.owning-entity-id", + "relationship-value": "2356a43d-ed56-43b6-aefc-8391b82588c9" + } + ] + } + ] + } + }, + { + "service-instance-id": "e2ecfd33-b5d3-4a7b-85ba-1a709b26b66c", + "service-instance-name": "a3", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", + "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", + "resource-version": "1509356358573", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "owning-entity", + "related-link": "/aai/v11/business/owning-entities/owning-entity/589fe0db-26c4-45e5-9f4e-a246c74fce76", + "relationship-data": [ + { + "relationship-key": "owning-entity.owning-entity-id", + "relationship-value": "589fe0db-26c4-45e5-9f4e-a246c74fce76" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9c925d7e-1a94-4784-a45b-408c8cc96fa8", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "9c925d7e-1a94-4784-a45b-408c8cc96fa8" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "dfdsfds" + } + ] + } + ] + } + }, + { + "service-instance-id": "7dfef88f-fec0-421f-90d4-91eea35a5813", + "service-instance-name": "shanitest", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", + "model-version-id": "44671b15-83dd-4db7-a36e-dfada3eaa2f9", + "resource-version": "1508144995828", + "orchestration-status": "Active" + }, + { + "service-instance-id": "a46ca55c-e9bd-4e68-9c49-c98933240218", + "service-instance-name": "si_failtest", + "model-invariant-id": "732263bd-0655-428d-a347-d65676d1a949", + "resource-version": "1494001997513" + }, + { + "service-instance-id": "e165f1af-a3cf-4323-8cd2-607acb55baa9", + "service-instance-name": "first_macro_shani", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", + "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", + "resource-version": "1508071197869", + "orchestration-status": "Active" + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ece35e4a79d547d193451ac38d700046" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-sspstMAIL" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "23cbbd1872864ea08aa53ade25d34172" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-rtertet" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ded2432abb5a4100801331d07787afc2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-SSPecompFlvr2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ad5aab08f5f7435e9983311af543f311" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMP" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "8071dc66981c4294b05483a1cddac801" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-ecompPODprivate" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "036f769581904ca08ead1415c22b9ec0" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMPCLONE" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2475a36c5e04f12a21593849ae83420" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-X-hope" + } + ] + } + ] + } + } + ] + } + } + } +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", + "queryParams": { + "depth": 1 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriber-name": "SILVIA ROBBINS", + "subscriber-type": "INFRA", + "resource-version": "1494001938080", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "DARREN MCGEE", + "resource-version": "1494001920845", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "5a8dba3e75e7433185b8004e2f2c546e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-CheckEcomp" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "0ee101c4b53542f49cfc5e1e49d28f88" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-US608multising" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d0b6d63ca975464b9fc2c759a8b21270" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-noPOD41581Cloned" + } + ] + } + ] + } + }, + { + "service-type": "TYLER SILVIA", + "resource-version": "1494001841964", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "JANET25" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "092eb9e8e4b7412e8787dd091bc58e86" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "USP-SIP-IC-24335-T-01" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "bae71557c5bb4d5aac6743a4e5f1d054" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-testalexandria" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "229bcdc6eaeb4ca59d55221141d01f8e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-STTest2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cb42a77ff45b48a8b8deb83bb64acc74" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T11" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fa45ca53c80b492fa8be5477cd84fc2b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T112" + } + ] + } + ] + } + }, + { + "service-type": "TSBC", + "resource-version": "1494001891362", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ece35e4a79d547d193451ac38d700046" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-sspstMAIL" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "23cbbd1872864ea08aa53ade25d34172" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-rtertet" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ded2432abb5a4100801331d07787afc2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-SSPecompFlvr2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ad5aab08f5f7435e9983311af543f311" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMP" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "8071dc66981c4294b05483a1cddac801" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-ecompPODprivate" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "036f769581904ca08ead1415c22b9ec0" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMPCLONE" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2475a36c5e04f12a21593849ae83420" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-X-hope" + } + ] + } + ] + } + } + ] + } + } + } + } +] diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS_cr.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS_cr.json new file mode 100644 index 000000000..5708e6d09 --- /dev/null +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS_cr.json @@ -0,0 +1,2197 @@ +[{ + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", + "queryParams": { + "depth": 2 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriber-name": "SILVIA ROBBINS", + "subscriber-type": "INFRA", + "resource-version": "1494001938080", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "DARREN MCGEE", + "resource-version": "1494001920845", + "service-instances": { + "service-instance": [ + { + "service-instance-id": "67aba9ab-f745-442e-a37b-2040a17ec9c7", + "service-instance-name": "test_948473", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", + "resource-version": "1501137356564", + "orchestration-status": "Active" + }, + { + "service-instance-id": "328e117c-8f27-4a59-beea-3b3c36e4652f", + "service-instance-name": "test_inputs_002", + "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", + "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", + "resource-version": "1501142919029", + "orchestration-status": "Active" + }, + { + "service-instance-id": "66608fd9-a786-4f60-ae7b-c18d030c499b", + "service-instance-name": "testtt", + "service-type": "", + "service-role": "", + "model-invariant-id": "1cc41b64-5c12-4d51-bac9-448e963bd81d", + "model-version-id": "91f79100-6450-4078-80d7-531427b4fe74", + "resource-version": "1503224667654", + "orchestration-status": "Active" + }, + { + "service-instance-id": "9d29dcf2-7742-4384-bca0-a38f6c296a79", + "service-instance-name": "test_9sdfkdfj", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", + "resource-version": "1500813552431", + "orchestration-status": "Active" + }, + { + "service-instance-id": "e10414d0-692b-4e8e-b56e-9fdc5ef24059", + "service-instance-name": "test_04598485", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", + "resource-version": "1501144603052", + "orchestration-status": "Active" + }, + { + "service-instance-id": "25a5cc93-73df-4c9c-9cc5-e2df9a72f3b7", + "service-instance-name": "test_inputs_values1", + "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339", + "model-version-id": "59f3ea84-313a-4670-b7c2-8997e5749864", + "resource-version": "1501412516301", + "orchestration-status": "Active" + }, + { + "service-instance-id": "9cfcd777-7f14-425c-80bf-a562fba03cfa", + "service-instance-name": "test_vl_inputs01", + "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", + "model-version-id": "f263c8f6-b52f-4b6c-9ed9-0c83ad098697", + "resource-version": "1501421232100", + "orchestration-status": "Active" + }, + { + "service-instance-id": "4173d5da-df33-474e-a4ef-c93be61a1355", + "service-instance-name": "test_instance_vl_01", + "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", + "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", + "resource-version": "1500966394803", + "orchestration-status": "Active" + }, + { + "service-instance-id": "1753f7eb-85db-498c-aa6a-c68a06fc77db", + "service-instance-name": "sdfjdfj", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", + "resource-version": "1500991399818", + "orchestration-status": "Active" + }, + { + "service-instance-id": "5d5520c7-dcbc-4287-bed2-50ff57c41a6f", + "service-instance-name": "tesy_jsdjjdj", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1501400257544", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/65a76ad1-2d53-4709-88e7-858655f55039", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "65a76ad1-2d53-4709-88e7-858655f55039" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test_jddjf" + } + ] + } + ] + } + }, + { + "service-instance-id": "1ab8ad18-1445-412a-81f2-671b936ab650", + "service-instance-name": "Test_098765", + "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", + "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", + "resource-version": "1500562034054", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2ae575e4-5103-4f5e-afd9-cc5f4bbae217", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "2ae575e4-5103-4f5e-afd9-cc5f4bbae217" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test-0234574785" + } + ] + } + ] + } + }, + { + "service-instance-id": "a1427609-254d-4637-906f-8f0f6f6d4711", + "service-instance-name": "test343445", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", + "resource-version": "1502111792531", + "orchestration-status": "Active" + }, + { + "service-instance-id": "f87c0dbe-2658-4971-8014-ad5da1f9df51", + "service-instance-name": "test_03494595", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1502006858511", + "orchestration-status": "Active" + }, + { + "service-instance-id": "7a8dea9f-5f67-4755-9344-ec3736240b9e", + "service-instance-name": "test_045045", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", + "resource-version": "1502111390681", + "orchestration-status": "Active" + }, + { + "service-instance-id": "8d0f4c13-a564-43ec-b756-c0017161dee2", + "service-instance-name": "testkjhjjj", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", + "resource-version": "1500553831697", + "orchestration-status": "Active" + }, + { + "service-instance-id": "27535e2a-785e-47e8-a482-16f4d019033a", + "service-instance-name": "test765766", + "service-type": "", + "service-role": "", + "model-invariant-id": "452538c0-ef1e-4d65-9939-697f6ed58934", + "model-version-id": "f430728a-4530-42be-a577-1206b9484cef", + "resource-version": "1502109495302", + "orchestration-status": "Active" + }, + { + "service-instance-id": "9601d34e-d3f9-4108-932c-fc52312c260a", + "service-instance-name": "test_9459495", + "service-type": "", + "service-role": "", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1502028721334", + "orchestration-status": "Active" + }, + { + "service-instance-id": "e65ae593-afdd-4f31-8192-ba7606a026e4", + "service-instance-name": "test_84574854", + "service-type": "", + "service-role": "", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1502026481024", + "orchestration-status": "Active" + }, + { + "service-instance-id": "29e210af-9fa5-44ae-940c-acca84b1b287", + "service-instance-name": "testjkdfkdf", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", + "resource-version": "1502114664500", + "orchestration-status": "Active" + }, + { + "service-instance-id": "c1a81ab3-2bc6-4b6f-b04f-d358e67c1d01", + "service-instance-name": "test499494", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", + "resource-version": "1500552497782", + "orchestration-status": "Active" + }, + { + "service-instance-id": "01834681-686a-4258-aff0-6eea448deddd", + "service-instance-name": "tesr_iii_999", + "service-type": "", + "service-role": "", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1502019889568", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e4c23f76-53a0-46e2-b005-59503e55c832", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "e4c23f76-53a0-46e2-b005-59503e55c832" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "tesu_ooo_000" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4a7b7099-4d38-4ba4-aff8-1598bba0e704", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "4a7b7099-4d38-4ba4-aff8-1598bba0e704" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test_000988_ooo" + } + ] + } + ] + } + }, + { + "service-instance-id": "266008e8-04f9-440a-90e9-d9299821ec08", + "model-invariant-id": "", + "resource-version": "1494001993349", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0011v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bnfm0011v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bnfm0011v" + } + ] + } + ] + } + }, + { + "service-instance-id": "6c3a22e9-6b04-49d2-b1fa-1e49103971ca", + "model-invariant-id": "", + "resource-version": "1494001986409", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0006v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bdbl0006v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bdbl0006v" + } + ] + } + ] + } + }, + { + "service-instance-id": "918085fc-29cf-41c2-acc8-15878c0d58b3", + "model-invariant-id": "", + "resource-version": "1494001986411", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0010v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bnfm0010v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bnfm0010v" + } + ] + } + ] + } + }, + { + "service-instance-id": "1c464a9d-eff7-4d29-8e97-ed1e9e3c8458", + "model-invariant-id": "", + "resource-version": "1494001953169", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0012v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bnfm0012v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bnfm0012v" + } + ] + } + ] + } + }, + { + "service-instance-id": "bb2f563f-6db7-46ec-b521-fc6ee07e4f3e", + "model-invariant-id": "", + "resource-version": "1494002002228", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0004v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bdbl0004v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bdbl0004v" + } + ] + } + ] + } + }, + { + "service-instance-id": "4cf94a42-85b8-414f-8fb4-a43b1dac1d2f", + "model-invariant-id": "", + "resource-version": "1494001834026", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0005v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bdbl0005v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bdbl0005v" + } + ] + } + ] + } + }, + { + "service-instance-id": "ed7c0d8e-de81-408f-b695-47b9dd6b2ca0", + "model-invariant-id": "", + "resource-version": "1494001986403", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0003v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bdbl0003v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bdbl0003v" + } + ] + } + ] + } + }, + { + "service-instance-id": "8bf34b89-1648-4a41-a21f-9b752833bd4b", + "service-instance-name": "test-gkmf546g", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", + "resource-version": "1500377885652", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e0994c94-fa19-472f-a5b7-ae7388105db2", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "e0994c94-fa19-472f-a5b7-ae7388105db2" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test-elftoerkk56" + } + ] + } + ] + } + }, + { + "service-instance-id": "082c606c-60d7-4d9a-87c7-1370de6e56ba", + "service-instance-name": "test123456", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1500375305701", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fac2ab99-7c5a-4f1e-aad8-d396f26ba7c4", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "fac2ab99-7c5a-4f1e-aad8-d396f26ba7c4" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test12345" + } + ] + } + ] + } + }, + { + "service-instance-id": "c4707aae-9b16-49b4-8b52-cbeb8c4129ab", + "service-instance-name": "test_sdfdlfldl", + "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "model-version-id": "cad9f2eb-39f7-4692-90c2-8726bb594610", + "resource-version": "1500376318829", + "orchestration-status": "Active" + }, + { + "service-instance-id": "86ab6048-9037-4367-ac01-f2e5881e8034", + "service-instance-name": "test1234456", + "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637", + "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2", + "resource-version": "1500369079277", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/329f3b0e-4e03-4dc0-8e56-e786ef392984", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "329f3b0e-4e03-4dc0-8e56-e786ef392984" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test567" + } + ] + } + ] + } + }, + { + "service-instance-id": "a5e3b6ae-7b4c-4247-b975-1cd46c3b3e9a", + "service-instance-name": "pavel_usp_voice", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", + "resource-version": "1506931067790", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/7aeacd8e-5d7c-496d-9ec7-1163cb809810", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "7aeacd8e-5d7c-496d-9ec7-1163cb809810" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "pavel_ucp_voice_vnf" + } + ] + } + ] + } + }, + { + "service-instance-id": "c9fb03a4-8c21-444a-84ee-a6f969698d9c", + "service-instance-name": "test_0e459495945kg", + "service-type": "", + "service-role": "", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1502021459612", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/983823ce-2482-4943-9081-11d33be3c5f4", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "983823ce-2482-4943-9081-11d33be3c5f4" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test_045495945" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/39acee2f-590e-4e42-8317-f4c624f5bd96", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "39acee2f-590e-4e42-8317-f4c624f5bd96" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test_0e934834" + } + ] + } + ] + } + }, + { + "service-instance-id": "4fd55324-bc4d-4acf-8f76-2e1eb01ae6a5", + "service-instance-name": "test_0w459495", + "service-type": "", + "service-role": "", + "model-invariant-id": "e3ee9d25-2c6b-4734-8a8c-b6e0dee11ca9", + "model-version-id": "159cc54d-a6be-4c3b-bea3-3214181ebb5d", + "resource-version": "1502019352627", + "orchestration-status": "Active" + }, + { + "service-instance-id": "bbccd5cf-f641-4082-8411-7ae123530d92", + "service-instance-name": "kkk", + "service-type": "", + "service-role": "", + "model-invariant-id": "331a194d-9248-4533-88bc-62c812ccb5c1", + "model-version-id": "171b3887-e73e-479d-8ef8-2690bf74f2aa", + "resource-version": "1502087710872", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/36110437-6ae0-466d-a3fb-992e90cd1f49", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "36110437-6ae0-466d-a3fb-992e90cd1f49" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "ooo" + } + ] + } + ] + } + }, + { + "service-instance-id": "4c263e04-260e-434a-8ac2-b0335a02f30b", + "model-invariant-id": "", + "resource-version": "1494001791264", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0002v", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "bdbl0002v" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "bdbl0002v" + } + ] + } + ] + } + }, + { + "service-instance-id": "e4feb759-e4a9-4614-b2d2-985848ba3b9f", + "service-instance-name": "test345345342334f", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1499869396079", + "orchestration-status": "Active" + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "5a8dba3e75e7433185b8004e2f2c546e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-CheckEcomp" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "0ee101c4b53542f49cfc5e1e49d28f88" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-US608multising" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d0b6d63ca975464b9fc2c759a8b21270" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-noPOD41581Cloned" + } + ] + } + ] + } + }, + { + "service-type": "TYLER SILVIA", + "resource-version": "1494001841964", + "service-instances": { + "service-instance": [ + { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f6", + "service-instance-name": "test_sssdad", + "service-type": "", + "service-role": "", + "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", + "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "resource-version": "1503919915499", + "orchestration-status": "<ORCH_STATUS>", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8715ea55-6fcf-45b5-b42b-2ca37ec3cb39", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "8715ea55-6fcf-45b5-b42b-2ca37ec3cb39" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "sedawsdsda" + } + ] + } + ] + } + }, + { + "service-instance-id": "9929cdf2-1b2d-4530-b5a4-ae9a716c12cc", + "service-instance-name": "xcvxcvxcv", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", + "resource-version": "1503842185188", + "orchestration-status": "Active" + }, + { + "service-instance-id": "4572aed2-f09d-4a34-9b20-34d8625ed4c6", + "service-instance-name": "dsdsfdfd334", + "service-type": "", + "service-role": "", + "model-invariant-id": "2f801573-11c6-4040-aa8c-d5548ef07b53", + "model-version-id": "80d68407-7b2c-48a4-96fc-4fe89c424cbe", + "resource-version": "1503920297893", + "orchestration-status": "Active" + }, + { + "service-instance-id": "037629ea-fd18-4b2f-9f19-27cb45799a41", + "service-instance-name": "iokooik", + "service-type": "", + "service-role": "", + "model-invariant-id": "caed4dbb-922a-4942-be87-1f99d56d426a", + "model-version-id": "b77dae3c-ac5b-459c-8df5-1f1de6c59737", + "resource-version": "1503920445391", + "orchestration-status": "Active" + }, + { + "service-instance-id": "c9bbcc94-e27a-46ff-a292-29805358348c", + "service-instance-name": "iuiuiuoi", + "service-type": "", + "service-role": "", + "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", + "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", + "resource-version": "1503919829011", + "orchestration-status": "Active" + }, + { + "service-instance-id": "8ad6dc32-5ea9-46be-9a70-924a620dca58", + "service-instance-name": "dfgdfgdfg", + "service-type": "", + "service-role": "", + "model-invariant-id": "4c35d46f-de47-4bbc-bcda-0d46caeddf09", + "model-version-id": "9014b6b1-33c1-4092-87ab-62c230c74d74", + "resource-version": "1503920088993", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/acba27e0-18b5-4a9b-a8b5-c0e6a3d36769", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "acba27e0-18b5-4a9b-a8b5-c0e6a3d36769" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "sdfdsfdf334" + } + ] + } + ] + } + }, + { + "service-instance-id": "7bdaca06-8242-48bc-a20e-b882426a1cd2", + "service-instance-name": "test_jhgjhghh5", + "service-type": "", + "service-role": "", + "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", + "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", + "resource-version": "1503843741682", + "orchestration-status": "Active" + }, + { + "service-instance-id": "ff42af8d-9815-4bcd-bda1-8fdde723a1c9", + "service-instance-name": "awereware", + "service-type": "", + "service-role": "", + "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", + "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "resource-version": "1503919051810", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/1df3da26-b22a-4d01-b024-8e2250599b55", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "1df3da26-b22a-4d01-b024-8e2250599b55" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "fgdssafg" + } + ] + } + ] + } + }, + { + "service-instance-id": "0fc0441b-92a8-4964-b80d-7df5c3f6bbcd", + "service-instance-name": "asdsdsdsd", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", + "resource-version": "1503919005027", + "orchestration-status": "Active" + }, + { + "service-instance-id": "b8db1779-52d6-41ff-823c-671e7ccb1dea", + "service-instance-name": "sdfsdfdf", + "service-type": "", + "service-role": "", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1503919113722", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/385a533f-c355-4891-ac26-056b76be21e1", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "385a533f-c355-4891-ac26-056b76be21e1" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "ewrdsdf" + } + ] + } + ] + } + }, + { + "service-instance-id": "13bee70f-40c8-4b4f-a691-9d36a661e22f", + "service-instance-name": "rtrtreert", + "service-type": "", + "service-role": "", + "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", + "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", + "resource-version": "1503919611730", + "orchestration-status": "Active" + }, + { + "service-instance-id": "b1891b75-b45a-4862-8f4d-bc41b68b9760", + "service-instance-name": "svc", + "service-type": "", + "service-role": "", + "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", + "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", + "resource-version": "1503909634453", + "orchestration-status": "Active" + }, + { + "service-instance-id": "c290be7e-4cae-4cfb-859e-7694849699ed", + "service-instance-name": "iioopi", + "service-type": "", + "service-role": "", + "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", + "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "resource-version": "1503918640292", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ba1855f1-6e1a-4f32-a8d4-36163e650a64", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "ba1855f1-6e1a-4f32-a8d4-36163e650a64" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "ertrtrtrt" + } + ] + } + ] + } + }, + { + "service-instance-id": "debaf16c-b0e0-4d1d-a1e6-a13434dd83e9", + "service-instance-name": "aaaqqq", + "service-type": "", + "service-role": "", + "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", + "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", + "resource-version": "1503909401143", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/641b6bf5-b3fa-437d-af35-03a6f4127716", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "641b6bf5-b3fa-437d-af35-03a6f4127716" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "test_865654787" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/0efd35bc-0ea3-4b87-9a26-2fb20a3028e3", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "0efd35bc-0ea3-4b87-9a26-2fb20a3028e3" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "sfdgdfgdfr55" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/075559bf-49b5-4b21-8ea6-1f96d7d2d7ce", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "075559bf-49b5-4b21-8ea6-1f96d7d2d7ce" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "dfgyhfghfg" + } + ] + } + ] + } + }, + { + "service-instance-id": "d86088ce-5bd0-4c05-94c9-96557f70d2e6", + "service-instance-name": "vid-test-789", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1500892617605", + "orchestration-status": "Active" + }, + { + "service-instance-id": "9ac85e73-9444-4fd7-b771-0bc2706cadb1", + "service-instance-name": "vid-test-888", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1500892257855", + "orchestration-status": "Active" + }, + { + "service-instance-id": "51cddedb-68a1-47fb-97b9-63f1b7aff086", + "service-instance-name": "vid-test-112", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1500896366569", + "orchestration-status": "Active" + }, + { + "service-instance-id": "e2cd68c8-c807-4176-a39c-c44d99418f78", + "service-instance-name": "vid-test-443", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1500895145213", + "orchestration-status": "Active" + }, + { + "service-instance-id": "3f93c7cb-2fd0-4557-9514-e189b7testCR", + "service-instance-name": "vid-test-444", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1500789244673", + "orchestration-status": "<ORCH_STATUS>", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c015cc0f-0f37-4488-aabf-53795fd93cd3", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "c015cc0f-0f37-4488-aabf-53795fd93cd3" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "fsd" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/0846287b-65bf-45a6-88f6-6a1af4149fac", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "0846287b-65bf-45a6-88f6-6a1af4149fac" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "kjkjk" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9908b762-136f-4b1f-8eb4-ef670ef58bb4", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "9908b762-136f-4b1f-8eb4-ef670ef58bb4" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "uiui" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/543931f5-e50e-45a2-a69f-ab727e4c7f2f", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "543931f5-e50e-45a2-a69f-ab727e4c7f2f" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "sdfsdfdsf" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/25e84884-22d5-44c9-8212-cb459f63e0ba", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "25e84884-22d5-44c9-8212-cb459f63e0ba" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "sdada" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/013fb0ba-977b-496c-9faa-7f8e5f083eec", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "013fb0ba-977b-496c-9faa-7f8e5f083eec" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "gvb" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/06914296-cb46-4b62-9453-329a706a6cbb", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "06914296-cb46-4b62-9453-329a706a6cbb" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "lkllll" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c55da606-cf38-42c7-bc3c-be8e23b19299", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "c55da606-cf38-42c7-bc3c-be8e23b19299" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "ss" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/27cc0914-70be-453e-b552-3df6b1d6cda9", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "27cc0914-70be-453e-b552-3df6b1d6cda9" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "yh" + } + ] + } + ] + } + }, + { + "service-instance-id": "0f2624ba-94cf-4ac5-b903-652d49002c97", + "service-instance-name": "vgeraldine1", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", + "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", + "resource-version": "1509362054136", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "owning-entity", + "related-link": "/aai/v11/business/owning-entities/owning-entity/80bb7c9e-4e3d-4b10-8291-7e85a1347370", + "relationship-data": [ + { + "relationship-key": "owning-entity.owning-entity-id", + "relationship-value": "80bb7c9e-4e3d-4b10-8291-7e85a1347370" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ce792805-a5f3-4bfe-8209-86553e097d91", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "ce792805-a5f3-4bfe-8209-86553e097d91" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "ssssssssssssssss" + } + ] + } + ] + } + }, + { + "service-instance-id": "c505ba4c-6333-4911-ac60-5736f36ff036", + "service-instance-name": "SlowAAI", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", + "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", + "resource-version": "1509613326963", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "project", + "related-link": "/aai/v11/business/projects/project/p80", + "relationship-data": [ + { + "relationship-key": "project.project-name", + "relationship-value": "p80" + } + ] + }, + { + "related-to": "owning-entity", + "related-link": "/aai/v11/business/owning-entities/owning-entity/73185f03-5531-444d-bc03-fa13f924d66a", + "relationship-data": [ + { + "relationship-key": "owning-entity.owning-entity-id", + "relationship-value": "73185f03-5531-444d-bc03-fa13f924d66a" + } + ] + } + ] + } + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "JANET25" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "092eb9e8e4b7412e8787dd091bc58e86" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "USP-SIP-IC-24335-T-01" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "bae71557c5bb4d5aac6743a4e5f1d054" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-testalexandria" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "229bcdc6eaeb4ca59d55221141d01f8e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-STTest2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cb42a77ff45b48a8b8deb83bb64acc74" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T11" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fa45ca53c80b492fa8be5477cd84fc2b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T112" + } + ] + } + ] + } + }, + { + "service-type": "TSBC", + "resource-version": "1494001891362", + "service-instances": { + "service-instance": [ + { + "service-instance-id": "c0edefb0-2505-4a34-85cc-96c4cd5a121d", + "service-instance-name": "test-343432", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1500370094198", + "orchestration-status": "Active" + }, + { + "service-instance-id": "7cb54908-f3fb-46b9-b547-d1e670ea95b2", + "service-instance-name": "test765445g", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", + "resource-version": "1499868690949", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fbb52a16-2c57-4212-802f-32dbba2204f2", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "fbb52a16-2c57-4212-802f-32dbba2204f2" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "fdfdfdf" + } + ] + } + ] + } + }, + { + "service-instance-id": "8e953267-4cd8-45ec-ae7f-bdeb018656c0", + "service-instance-name": "a1", + "service-type": "service_type_shani", + "service-role": "service_role_shani", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", + "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", + "resource-version": "1509355912484", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "owning-entity", + "related-link": "/aai/v11/business/owning-entities/owning-entity/2356a43d-ed56-43b6-aefc-8391b82588c9", + "relationship-data": [ + { + "relationship-key": "owning-entity.owning-entity-id", + "relationship-value": "2356a43d-ed56-43b6-aefc-8391b82588c9" + } + ] + } + ] + } + }, + { + "service-instance-id": "e2ecfd33-b5d3-4a7b-85ba-1a709b26b66c", + "service-instance-name": "a3", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", + "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", + "resource-version": "1509356358573", + "orchestration-status": "Active", + "relationship-list": { + "relationship": [ + { + "related-to": "owning-entity", + "related-link": "/aai/v11/business/owning-entities/owning-entity/589fe0db-26c4-45e5-9f4e-a246c74fce76", + "relationship-data": [ + { + "relationship-key": "owning-entity.owning-entity-id", + "relationship-value": "589fe0db-26c4-45e5-9f4e-a246c74fce76" + } + ] + }, + { + "related-to": "generic-vnf", + "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9c925d7e-1a94-4784-a45b-408c8cc96fa8", + "relationship-data": [ + { + "relationship-key": "generic-vnf.vnf-id", + "relationship-value": "9c925d7e-1a94-4784-a45b-408c8cc96fa8" + } + ], + "related-to-property": [ + { + "property-key": "generic-vnf.vnf-name", + "property-value": "dfdsfds" + } + ] + } + ] + } + }, + { + "service-instance-id": "7dfef88f-fec0-421f-90d4-91eea35a5813", + "service-instance-name": "shanitest", + "service-type": "", + "service-role": "", + "environment-context": "null", + "workload-context": "null", + "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", + "model-version-id": "44671b15-83dd-4db7-a36e-dfada3eaa2f9", + "resource-version": "1508144995828", + "orchestration-status": "Active" + }, + { + "service-instance-id": "a46ca55c-e9bd-4e68-9c49-c98933240218", + "service-instance-name": "si_failtest", + "model-invariant-id": "732263bd-0655-428d-a347-d65676d1a949", + "resource-version": "1494001997513" + }, + { + "service-instance-id": "e165f1af-a3cf-4323-8cd2-607acb55baa9", + "service-instance-name": "first_macro_shani", + "service-type": "", + "service-role": "", + "environment-context": "General_Revenue-Bearing", + "workload-context": "Production", + "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", + "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", + "resource-version": "1508071197869", + "orchestration-status": "Active" + } + ] + }, + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ece35e4a79d547d193451ac38d700046" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-sspstMAIL" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "23cbbd1872864ea08aa53ade25d34172" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-rtertet" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ded2432abb5a4100801331d07787afc2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-SSPecompFlvr2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ad5aab08f5f7435e9983311af543f311" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMP" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "8071dc66981c4294b05483a1cddac801" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-ecompPODprivate" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "036f769581904ca08ead1415c22b9ec0" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMPCLONE" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2475a36c5e04f12a21593849ae83420" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-X-hope" + } + ] + } + ] + } + } + ] + } + } + } +}, + { + "simulatorRequest": { + "method": "GET", + "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", + "queryParams": { + "depth": 1 + } + }, + "simulatorResponse": { + "responseCode": 200, + "body": { + "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriber-name": "SILVIA ROBBINS", + "subscriber-type": "INFRA", + "resource-version": "1494001938080", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "DARREN MCGEE", + "resource-version": "1494001920845", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "5a8dba3e75e7433185b8004e2f2c546e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-CheckEcomp" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "0ee101c4b53542f49cfc5e1e49d28f88" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-US608multising" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "d0b6d63ca975464b9fc2c759a8b21270" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-noPOD41581Cloned" + } + ] + } + ] + } + }, + { + "service-type": "TYLER SILVIA", + "resource-version": "1494001841964", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "JANET25" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "092eb9e8e4b7412e8787dd091bc58e86" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "USP-SIP-IC-24335-T-01" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "bae71557c5bb4d5aac6743a4e5f1d054" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-testalexandria" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "229bcdc6eaeb4ca59d55221141d01f8e" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-STTest2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "cb42a77ff45b48a8b8deb83bb64acc74" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T11" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "fa45ca53c80b492fa8be5477cd84fc2b" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "ro-T112" + } + ] + } + ] + } + }, + { + "service-type": "TSBC", + "resource-version": "1494001891362", + "relationship-list": { + "relationship": [ + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ece35e4a79d547d193451ac38d700046", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ece35e4a79d547d193451ac38d700046" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-sspstMAIL" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "23cbbd1872864ea08aa53ade25d34172" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN Web Tool-15-D-rtertet" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ded2432abb5a4100801331d07787afc2", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ded2432abb5a4100801331d07787afc2" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-D-SSPecompFlvr2" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "ad5aab08f5f7435e9983311af543f311" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMP" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/8071dc66981c4294b05483a1cddac801", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "8071dc66981c4294b05483a1cddac801" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "CESAR-100-X-ecompPODprivate" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "036f769581904ca08ead1415c22b9ec0" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AINWebTool-15-X-PODECOMPCLONE" + } + ] + }, + { + "related-to": "tenant", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/hvf6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", + "relationship-data": [ + { + "relationship-key": "cloud-region.cloud-owner", + "relationship-value": "irma-aic" + }, + { + "relationship-key": "cloud-region.cloud-region-id", + "relationship-value": "hvf6" + }, + { + "relationship-key": "tenant.tenant-id", + "relationship-value": "c2475a36c5e04f12a21593849ae83420" + } + ], + "related-to-property": [ + { + "property-key": "tenant.tenant-name", + "property-value": "AIN/SMS-16-X-hope" + } + ] + } + ] + } + } + ] + } + } + } + } +]
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_USP-VOICE.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_USP-VOICE.json deleted file mode 100644 index 5cf0957d0..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_USP-VOICE.json +++ /dev/null @@ -1,8289 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", - "queryParams": { - "depth": 2 - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name": "USP VOICE", - "subscriber-type": "INFRA", - "resource-version": "1494001938080", - "service-subscriptions": { - "service-subscription": [ - { - "service-type": "HOSTED COMMUNICATIONS", - "resource-version": "1494001920845", - "service-instances": { - "service-instance": [ - { - "service-instance-id": "67aba9ab-f745-442e-a37b-2040a17ec9c7", - "service-instance-name": "test_948473", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1501137356564", - "orchestration-status": "Active" - }, - { - "service-instance-id": "328e117c-8f27-4a59-beea-3b3c36e4652f", - "service-instance-name": "test_inputs_002", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1501142919029", - "orchestration-status": "Active" - }, - { - "service-instance-id": "66608fd9-a786-4f60-ae7b-c18d030c499b", - "service-instance-name": "testtt", - "service-type": "", - "service-role": "", - "model-invariant-id": "1cc41b64-5c12-4d51-bac9-448e963bd81d", - "model-version-id": "91f79100-6450-4078-80d7-531427b4fe74", - "resource-version": "1503224667654", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9d29dcf2-7742-4384-bca0-a38f6c296a79", - "service-instance-name": "test_9sdfkdfj", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1500813552431", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e10414d0-692b-4e8e-b56e-9fdc5ef24059", - "service-instance-name": "test_04598485", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1501144603052", - "orchestration-status": "Active" - }, - { - "service-instance-id": "25a5cc93-73df-4c9c-9cc5-e2df9a72f3b7", - "service-instance-name": "test_inputs_values1", - "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339", - "model-version-id": "59f3ea84-313a-4670-b7c2-8997e5749864", - "resource-version": "1501412516301", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9cfcd777-7f14-425c-80bf-a562fba03cfa", - "service-instance-name": "test_vl_inputs01", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "f263c8f6-b52f-4b6c-9ed9-0c83ad098697", - "resource-version": "1501421232100", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4173d5da-df33-474e-a4ef-c93be61a1355", - "service-instance-name": "test_instance_vl_01", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1500966394803", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1753f7eb-85db-498c-aa6a-c68a06fc77db", - "service-instance-name": "sdfjdfj", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500991399818", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5d5520c7-dcbc-4287-bed2-50ff57c41a6f", - "service-instance-name": "tesy_jsdjjdj", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501400257544", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/65a76ad1-2d53-4709-88e7-858655f55039", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "65a76ad1-2d53-4709-88e7-858655f55039" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_jddjf" - } - ] - } - ] - } - }, - { - "service-instance-id": "1ab8ad18-1445-412a-81f2-671b936ab650", - "service-instance-name": "Test_098765", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1500562034054", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2ae575e4-5103-4f5e-afd9-cc5f4bbae217", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "2ae575e4-5103-4f5e-afd9-cc5f4bbae217" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test-0234574785" - } - ] - } - ] - } - }, - { - "service-instance-id": "a1427609-254d-4637-906f-8f0f6f6d4711", - "service-instance-name": "test343445", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502111792531", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f87c0dbe-2658-4971-8014-ad5da1f9df51", - "service-instance-name": "test_03494595", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1502006858511", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7a8dea9f-5f67-4755-9344-ec3736240b9e", - "service-instance-name": "test_045045", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502111390681", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8d0f4c13-a564-43ec-b756-c0017161dee2", - "service-instance-name": "testkjhjjj", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1500553831697", - "orchestration-status": "Active" - }, - { - "service-instance-id": "27535e2a-785e-47e8-a482-16f4d019033a", - "service-instance-name": "test765766", - "service-type": "", - "service-role": "", - "model-invariant-id": "452538c0-ef1e-4d65-9939-697f6ed58934", - "model-version-id": "f430728a-4530-42be-a577-1206b9484cef", - "resource-version": "1502109495302", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9601d34e-d3f9-4108-932c-fc52312c260a", - "service-instance-name": "test_9459495", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502028721334", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e65ae593-afdd-4f31-8192-ba7606a026e4", - "service-instance-name": "test_84574854", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502026481024", - "orchestration-status": "Active" - }, - { - "service-instance-id": "29e210af-9fa5-44ae-940c-acca84b1b287", - "service-instance-name": "testjkdfkdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502114664500", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c1a81ab3-2bc6-4b6f-b04f-d358e67c1d01", - "service-instance-name": "test499494", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500552497782", - "orchestration-status": "Active" - }, - { - "service-instance-id": "01834681-686a-4258-aff0-6eea448deddd", - "service-instance-name": "tesr_iii_999", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502019889568", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e4c23f76-53a0-46e2-b005-59503e55c832", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "e4c23f76-53a0-46e2-b005-59503e55c832" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "tesu_ooo_000" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4a7b7099-4d38-4ba4-aff8-1598bba0e704", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "4a7b7099-4d38-4ba4-aff8-1598bba0e704" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_000988_ooo" - } - ] - } - ] - } - }, - { - "service-instance-id": "266008e8-04f9-440a-90e9-d9299821ec08", - "model-invariant-id": "", - "resource-version": "1494001993349", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0011v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bnfm0011v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bnfm0011v" - } - ] - } - ] - } - }, - { - "service-instance-id": "6c3a22e9-6b04-49d2-b1fa-1e49103971ca", - "model-invariant-id": "", - "resource-version": "1494001986409", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0006v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bdbl0006v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bdbl0006v" - } - ] - } - ] - } - }, - { - "service-instance-id": "918085fc-29cf-41c2-acc8-15878c0d58b3", - "model-invariant-id": "", - "resource-version": "1494001986411", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0010v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bnfm0010v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bnfm0010v" - } - ] - } - ] - } - }, - { - "service-instance-id": "1c464a9d-eff7-4d29-8e97-ed1e9e3c8458", - "model-invariant-id": "", - "resource-version": "1494001953169", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0012v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bnfm0012v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bnfm0012v" - } - ] - } - ] - } - }, - { - "service-instance-id": "bb2f563f-6db7-46ec-b521-fc6ee07e4f3e", - "model-invariant-id": "", - "resource-version": "1494002002228", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0004v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bdbl0004v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bdbl0004v" - } - ] - } - ] - } - }, - { - "service-instance-id": "4cf94a42-85b8-414f-8fb4-a43b1dac1d2f", - "model-invariant-id": "", - "resource-version": "1494001834026", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0005v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bdbl0005v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bdbl0005v" - } - ] - } - ] - } - }, - { - "service-instance-id": "ed7c0d8e-de81-408f-b695-47b9dd6b2ca0", - "model-invariant-id": "", - "resource-version": "1494001986403", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0003v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bdbl0003v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bdbl0003v" - } - ] - } - ] - } - }, - { - "service-instance-id": "8bf34b89-1648-4a41-a21f-9b752833bd4b", - "service-instance-name": "test-gkmf546g", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500377885652", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e0994c94-fa19-472f-a5b7-ae7388105db2", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "e0994c94-fa19-472f-a5b7-ae7388105db2" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test-elftoerkk56" - } - ] - } - ] - } - }, - { - "service-instance-id": "082c606c-60d7-4d9a-87c7-1370de6e56ba", - "service-instance-name": "test123456", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1500375305701", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fac2ab99-7c5a-4f1e-aad8-d396f26ba7c4", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "fac2ab99-7c5a-4f1e-aad8-d396f26ba7c4" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test12345" - } - ] - } - ] - } - }, - { - "service-instance-id": "c4707aae-9b16-49b4-8b52-cbeb8c4129ab", - "service-instance-name": "test_sdfdlfldl", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "cad9f2eb-39f7-4692-90c2-8726bb594610", - "resource-version": "1500376318829", - "orchestration-status": "Active" - }, - { - "service-instance-id": "86ab6048-9037-4367-ac01-f2e5881e8034", - "service-instance-name": "test1234456", - "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637", - "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2", - "resource-version": "1500369079277", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/329f3b0e-4e03-4dc0-8e56-e786ef392984", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "329f3b0e-4e03-4dc0-8e56-e786ef392984" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test567" - } - ] - } - ] - } - }, - { - "service-instance-id": "a5e3b6ae-7b4c-4247-b975-1cd46c3b3e9a", - "service-instance-name": "pavel_usp_voice", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1506931067790", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/7aeacd8e-5d7c-496d-9ec7-1163cb809810", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "7aeacd8e-5d7c-496d-9ec7-1163cb809810" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "pavel_ucp_voice_vnf" - } - ] - } - ] - } - }, - { - "service-instance-id": "c9fb03a4-8c21-444a-84ee-a6f969698d9c", - "service-instance-name": "test_0e459495945kg", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502021459612", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/983823ce-2482-4943-9081-11d33be3c5f4", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "983823ce-2482-4943-9081-11d33be3c5f4" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_045495945" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/39acee2f-590e-4e42-8317-f4c624f5bd96", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "39acee2f-590e-4e42-8317-f4c624f5bd96" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_0e934834" - } - ] - } - ] - } - }, - { - "service-instance-id": "4fd55324-bc4d-4acf-8f76-2e1eb01ae6a5", - "service-instance-name": "test_0w459495", - "service-type": "", - "service-role": "", - "model-invariant-id": "e3ee9d25-2c6b-4734-8a8c-b6e0dee11ca9", - "model-version-id": "159cc54d-a6be-4c3b-bea3-3214181ebb5d", - "resource-version": "1502019352627", - "orchestration-status": "Active" - }, - { - "service-instance-id": "bbccd5cf-f641-4082-8411-7ae123530d92", - "service-instance-name": "kkk", - "service-type": "", - "service-role": "", - "model-invariant-id": "331a194d-9248-4533-88bc-62c812ccb5c1", - "model-version-id": "171b3887-e73e-479d-8ef8-2690bf74f2aa", - "resource-version": "1502087710872", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/36110437-6ae0-466d-a3fb-992e90cd1f49", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "36110437-6ae0-466d-a3fb-992e90cd1f49" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ooo" - } - ] - } - ] - } - }, - { - "service-instance-id": "4c263e04-260e-434a-8ac2-b0335a02f30b", - "model-invariant-id": "", - "resource-version": "1494001791264", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0002v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bdbl0002v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bdbl0002v" - } - ] - } - ] - } - }, - { - "service-instance-id": "e4feb759-e4a9-4614-b2d2-985848ba3b9f", - "service-instance-name": "test345345342334f", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1499869396079", - "orchestration-status": "Active" - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "5a8dba3e75e7433185b8004e2f2c546e" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN/SMS-16-D-CheckEcomp" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "0ee101c4b53542f49cfc5e1e49d28f88" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-US608multising" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "d0b6d63ca975464b9fc2c759a8b21270" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-X-noPOD41581Cloned" - } - ] - } - ] - } - }, - { - "service-type": "VIRTUAL USP", - "resource-version": "1494001841964", - "service-instances": { - "service-instance": [ - { - "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "service-instance-name": "test_sssdad", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503919915499", - "orchestration-status": "<ORCH_STATUS>", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8715ea55-6fcf-45b5-b42b-2ca37ec3cb39", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "8715ea55-6fcf-45b5-b42b-2ca37ec3cb39" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sedawsdsda" - } - ] - } - ] - } - }, - { - "service-instance-id": "9929cdf2-1b2d-4530-b5a4-ae9a716c12cc", - "service-instance-name": "xcvxcvxcv", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503842185188", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4572aed2-f09d-4a34-9b20-34d8625ed4c6", - "service-instance-name": "dsdsfdfd334", - "service-type": "", - "service-role": "", - "model-invariant-id": "2f801573-11c6-4040-aa8c-d5548ef07b53", - "model-version-id": "80d68407-7b2c-48a4-96fc-4fe89c424cbe", - "resource-version": "1503920297893", - "orchestration-status": "Active" - }, - { - "service-instance-id": "037629ea-fd18-4b2f-9f19-27cb45799a41", - "service-instance-name": "iokooik", - "service-type": "", - "service-role": "", - "model-invariant-id": "caed4dbb-922a-4942-be87-1f99d56d426a", - "model-version-id": "b77dae3c-ac5b-459c-8df5-1f1de6c59737", - "resource-version": "1503920445391", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c9bbcc94-e27a-46ff-a292-29805358348c", - "service-instance-name": "iuiuiuoi", - "service-type": "", - "service-role": "", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1503919829011", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8ad6dc32-5ea9-46be-9a70-924a620dca58", - "service-instance-name": "dfgdfgdfg", - "service-type": "", - "service-role": "", - "model-invariant-id": "4c35d46f-de47-4bbc-bcda-0d46caeddf09", - "model-version-id": "9014b6b1-33c1-4092-87ab-62c230c74d74", - "resource-version": "1503920088993", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/acba27e0-18b5-4a9b-a8b5-c0e6a3d36769", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "acba27e0-18b5-4a9b-a8b5-c0e6a3d36769" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfdsfdf334" - } - ] - } - ] - } - }, - { - "service-instance-id": "7bdaca06-8242-48bc-a20e-b882426a1cd2", - "service-instance-name": "test_jhgjhghh5", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1503843741682", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ff42af8d-9815-4bcd-bda1-8fdde723a1c9", - "service-instance-name": "awereware", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503919051810", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/1df3da26-b22a-4d01-b024-8e2250599b55", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "1df3da26-b22a-4d01-b024-8e2250599b55" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fgdssafg" - } - ] - } - ] - } - }, - { - "service-instance-id": "0fc0441b-92a8-4964-b80d-7df5c3f6bbcd", - "service-instance-name": "asdsdsdsd", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503919005027", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b8db1779-52d6-41ff-823c-671e7ccb1dea", - "service-instance-name": "sdfsdfdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1503919113722", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/385a533f-c355-4891-ac26-056b76be21e1", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "385a533f-c355-4891-ac26-056b76be21e1" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ewrdsdf" - } - ] - } - ] - } - }, - { - "service-instance-id": "13bee70f-40c8-4b4f-a691-9d36a661e22f", - "service-instance-name": "rtrtreert", - "service-type": "", - "service-role": "", - "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", - "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", - "resource-version": "1503919611730", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b1891b75-b45a-4862-8f4d-bc41b68b9760", - "service-instance-name": "svc", - "service-type": "", - "service-role": "", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1503909634453", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c290be7e-4cae-4cfb-859e-7694849699ed", - "service-instance-name": "iioopi", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503918640292", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ba1855f1-6e1a-4f32-a8d4-36163e650a64", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ba1855f1-6e1a-4f32-a8d4-36163e650a64" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ertrtrtrt" - } - ] - } - ] - } - }, - { - "service-instance-id": "debaf16c-b0e0-4d1d-a1e6-a13434dd83e9", - "service-instance-name": "aaaqqq", - "service-type": "", - "service-role": "", - "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", - "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", - "resource-version": "1503909401143", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/641b6bf5-b3fa-437d-af35-03a6f4127716", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "641b6bf5-b3fa-437d-af35-03a6f4127716" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_865654787" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/0efd35bc-0ea3-4b87-9a26-2fb20a3028e3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "0efd35bc-0ea3-4b87-9a26-2fb20a3028e3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sfdgdfgdfr55" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/075559bf-49b5-4b21-8ea6-1f96d7d2d7ce", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "075559bf-49b5-4b21-8ea6-1f96d7d2d7ce" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dfgyhfghfg" - } - ] - } - ] - } - }, - { - "service-instance-id": "b1af7026-5c58-4f81-beef-7fbe28a40d8b", - "service-instance-name": "sddsfsdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1503844024814", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a77c74e9-7571-4f99-af53-4f7016a28418", - "service-instance-name": "dsdfdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503842375992", - "orchestration-status": "Active" - }, - { - "service-instance-id": "18479d32-e495-4610-b484-238a0c8af022", - "service-instance-name": "ddffeee", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503919781252", - "orchestration-status": "Active" - }, - { - "service-instance-id": "27b005b5-d631-43a6-8913-0a014277b1c7", - "service-instance-name": "test76546454565", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339", - "model-version-id": "a5b89224-c03d-4142-b4ce-8b8e8b8de54a", - "resource-version": "1506843154174", - "orchestration-status": "Active" - }, - { - "service-instance-id": "61bd4009-86ce-4603-842a-a3c872e327c2", - "service-instance-name": "litalamichai", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "ceab97cd-ca68-41a6-9b34-d571b2dd05ed", - "model-version-id": "1a6ae314-7a89-408b-93e5-6d8b8ee4c28a", - "resource-version": "1506856240745", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/70d82ea3-28b1-44c9-8cdd-7c0431b1a76e", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "70d82ea3-28b1-44c9-8cdd-7c0431b1a76e" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "litalamichai1" - } - ] - } - ] - } - }, - { - "service-instance-id": "afeb67ac-0777-4f49-855e-cc84700382ed", - "service-instance-name": "test_0409e4569", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1507013953885", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c42940b2-ce05-4305-a92c-6ab6139f34db", - "service-instance-name": "test4346565532", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1507015242425", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5bf5afb9-68fd-4df6-b7cd-d7a72c2ebb6e", - "service-instance-name": "test_9876545566", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1507015455080", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/aceec6c9-3b3d-4c88-8b24-8fcf7aa5183f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "aceec6c9-3b3d-4c88-8b24-8fcf7aa5183f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "testvnf4436554656" - } - ] - } - ] - } - }, - { - "service-instance-id": "3b89aadb-354c-4557-8f38-9267efe73340", - "service-instance-name": "testvgroupavila111", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1507467637750", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9c073cff-5e87-49b8-be54-552717eb85a7", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9c073cff-5e87-49b8-be54-552717eb85a7" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fggert44w" - } - ] - } - ] - } - }, - { - "service-instance-id": "ea4434fe-b52f-4a4b-8cac-570fda09915e", - "service-instance-name": "tester34445", - "service-type": "test", - "service-role": "test", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", - "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", - "resource-version": "1507547071064", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a00c370-9aa6-4a66-a219-a63cac864f87", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "8a00c370-9aa6-4a66-a219-a63cac864f87" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "testvnfff888" - } - ] - } - ] - } - }, - { - "service-instance-id": "8041258e-db6c-4aa4-8ea1-daa049bb4bcd", - "service-instance-name": "macroinstancenamingfalse", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1507466261065", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8b90a65c-cf97-4425-b0f9-cedeb66be73b", - "service-instance-name": "ServicePnf_15", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1507463828320", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/8b90a65c-cf97-4425-b0f9-cedeb66be73b/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "0bba7c99-b04d-4f7d-be83-64d677d938a7", - "service-instance-name": "test_094894934", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1507468724856", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c2586a1a-7ffb-470d-b280-580cd3832855", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "c2586a1a-7ffb-470d-b280-580cd3832855" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfsdfsdf" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/88e8a1a2-26ee-4b64-8cfd-516567c6e085", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "88e8a1a2-26ee-4b64-8cfd-516567c6e085" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfsdf" - } - ] - } - ] - } - }, - { - "service-instance-id": "f50fe353-f93f-42bf-881e-11afa56bc197", - "service-instance-name": "test_input01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339", - "model-version-id": "a5b89224-c03d-4142-b4ce-8b8e8b8de54a", - "resource-version": "1506438016276", - "orchestration-status": "Active" - }, - { - "service-instance-id": "aefde1b5-f4fe-4294-8d24-7981fa0ebfc5", - "service-instance-name": "test_vf_vgroup001", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "ceab97cd-ca68-41a6-9b34-d571b2dd05ed", - "model-version-id": "1a6ae314-7a89-408b-93e5-6d8b8ee4c28a", - "resource-version": "1506428004236", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f42766e6-c15a-415d-8da9-44546787aa60", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f42766e6-c15a-415d-8da9-44546787aa60" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_9883458" - } - ] - } - ] - } - }, - { - "service-instance-id": "dc010843-43d2-442f-87ea-5a33129e820c", - "service-instance-name": "test034598459509345", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1506431351311", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e77db2e8-6e92-451c-bd9b-52f7edd12e34", - "service-instance-name": "ServicePnf_3", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1506431257301", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/e77db2e8-6e92-451c-bd9b-52f7edd12e34/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "27508166-a325-435f-9be5-e0f9c6525e0d", - "service-instance-name": "test_04587465", - "service-type": "", - "service-role": "", - "model-invariant-id": "0ab97204-7036-494b-bffc-d0dcf51221a6", - "model-version-id": "236624dc-0682-4f58-a20a-105b035b87cd", - "resource-version": "1505401406581", - "orchestration-status": "Active" - }, - { - "service-instance-id": "795b711c-41ce-4e31-a572-a898dc5a047e", - "service-instance-name": "vid-test-555", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505382167563", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7a18c22a-6ffc-409e-a904-731919a4d8bc", - "service-instance-name": "fghjSHANI", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509624542659", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/96208579-2839-442d-bcd7-46902fb5b108", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "96208579-2839-442d-bcd7-46902fb5b108" - } - ] - } - ] - } - }, - { - "service-instance-id": "4f18b4a3-681d-4db2-be2f-f5721625db50", - "service-instance-name": "kmkl", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500324503096", - "orchestration-status": "Active" - }, - { - "service-instance-id": "bcfc991c-f757-4aac-afd6-6a6ce2ee3a10", - "service-instance-name": "ijo", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500325226519", - "orchestration-status": "Active" - }, - { - "service-instance-id": "71c228f8-8737-4759-8ff5-756c61b6c6cc", - "service-instance-name": "sdasd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500328608207", - "orchestration-status": "Active" - }, - { - "service-instance-id": "fd10def6-838c-4caa-89f8-023d8c352d64", - "service-instance-name": "b", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500323167586", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8352d30d-7f79-4a92-bb07-d41482602f91", - "service-instance-name": "drg", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500310144871", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ff0ed1a9-c498-4fa3-9cc1-d1baea101b1a", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ff0ed1a9-c498-4fa3-9cc1-d1baea101b1a" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfd" - } - ] - } - ] - } - }, - { - "service-instance-id": "f53eeb76-3011-4745-8bd4-fb725ee54e8b", - "service-instance-name": "bcvbcvc", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1500312834903", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9b47dc09-c938-4058-8f4e-b1b97575f01c", - "service-instance-name": "fg", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1500314405338", - "orchestration-status": "Active" - }, - { - "service-instance-id": "da3e0037-145d-4003-ba9c-bf7e160d0c76", - "service-instance-name": "hi", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500308632846", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a5a0c1c5-87e6-4b41-8a1d-fc217ea7afb5", - "service-instance-name": "dfh", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500313821530", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e10cf33f-9733-400e-b641-df6e025b7015", - "service-instance-name": "dsf", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1500314537419", - "orchestration-status": "Active" - }, - { - "service-instance-id": "fdf609c7-c6b9-4d61-9dd1-ecf260b1df24", - "service-instance-name": "DS-vUSP_0804_Svc_01", - "service-type": "", - "service-role": "", - "model-invariant-id": "e4f8b794-8057-4b1c-acf8-39cdcbc07dae", - "model-version-id": "79572855-8d8c-47db-a5fa-29cb28058f88", - "resource-version": "1501867289436", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ef204722-f283-40f2-aae3-2039a93b0677", - "service-instance-name": "vid-e2e-test_aai_service_2017-08-08_14-01-39-901", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502190103332", - "orchestration-status": "Active" - }, - { - "service-instance-id": "3dd30ee9-afd9-4c67-aecc-38025205ae1d", - "service-instance-name": "ppp", - "service-type": "", - "service-role": "", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1502087647947", - "orchestration-status": "Active" - }, - { - "service-instance-id": "064983e9-89b8-4e21-a5a6-ca446422de16", - "service-instance-name": "litaltest", - "service-type": "", - "service-role": "", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1502087037035", - "orchestration-status": "Active" - }, - { - "service-instance-id": "db1ef13e-e434-4614-a5e4-ccdbf9ff4f37", - "service-instance-name": "vid-test-4442222331", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502088709341", - "orchestration-status": "Active" - }, - { - "service-instance-id": "757ea8da-ca9d-48a0-8782-8eff90d90532", - "service-instance-name": "vid-e2e-test_aai_service_2017-08-08_14-40-54-152", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502192457669", - "orchestration-status": "Active" - }, - { - "service-instance-id": "83cca0d1-0090-4e08-9221-d0db78e8ba20", - "service-instance-name": "TEST-TEST", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502006816430", - "orchestration-status": "Active" - }, - { - "service-instance-id": "912b54ba-53b7-49ea-851b-a5af84787b61", - "service-instance-name": "vid-test-aaaa222", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502004264219", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2ac3e9ef-30f1-449c-ac41-4b3a4649bad9", - "service-instance-name": "test834884", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1502109623756", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1f9c366c-c3c2-4c7b-8f31-fa1ed8f440ad", - "service-instance-name": "", - "service-type": "null", - "service-role": "null", - "model-invariant-id": "5c3bb706-95fc-4589-b40f-ed024673246a", - "model-version-id": "873e3f27-6561-47a6-80b0-0cd048d5cdfb", - "resource-version": "1502170650437", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f778648a-1db5-4fd2-9d6d-1c3e9dc810c9", - "service-instance-name": "test_0er50405", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502180550390", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/680873ba-2ac2-4139-a40d-5085b978b737", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "680873ba-2ac2-4139-a40d-5085b978b737" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_0450405" - } - ] - } - ] - } - }, - { - "service-instance-id": "eec0b93e-fc84-4f87-badf-6e15becf7604", - "service-instance-name": "test_0e0r045", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502201260530", - "orchestration-status": "Active" - }, - { - "service-instance-id": "aaf93978-0d81-4089-ac91-4d800b0924b1", - "service-instance-name": "vid-e2e-test_service_2017-08-08_14-48-37-562", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502192927130", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b063c325-2c5f-4383-ac35-4f4a5fd75a64", - "service-instance-name": "shayservice4", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1501774259023", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4bdc43ad-ebe5-4a4f-ad33-cf4bb9439a3a", - "service-instance-name": "vid-test-service-456", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500463859730", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ef7ee58d-9ef3-478d-b80e-79c6f31038e2", - "service-instance-name": "test_9045845", - "service-type": "", - "service-role": "", - "model-invariant-id": "6269c77a-a285-473a-be32-9e34a735ae68", - "model-version-id": "de762949-453c-43bd-8610-93eca50b0681", - "resource-version": "1502802546204", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/38b85642-5eae-4e85-9f47-7f9e8772e3d8", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "38b85642-5eae-4e85-9f47-7f9e8772e3d8" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_34342345" - } - ] - } - ] - } - }, - { - "service-instance-id": "771ccd96-61e5-413b-9442-494e1fc12689", - "service-instance-name": "inputest_555", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1509004425083", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/464482f0-fec7-4171-af0e-96363f93f908", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "464482f0-fec7-4171-af0e-96363f93f908" - } - ] - } - ] - } - }, - { - "service-instance-id": "c92f4753-7997-492d-8bdb-a456d2a966eb", - "service-instance-name": "inpu_04504050", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "e3ee9d25-2c6b-4734-8a8c-b6e0dee11ca9", - "model-version-id": "97128a5f-e7e4-4ddd-b1eb-83a611ae1acb", - "resource-version": "1508945168572", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - } - ] - } - }, - { - "service-instance-id": "e3cc78f6-2fa8-43e4-8b9a-84b0bb705199", - "service-instance-name": "vl_inputs001", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509006292295", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/DFW", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "DFW" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/f160c875-ddd1-4ef5-84d8-d098784daa3a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "f160c875-ddd1-4ef5-84d8-d098784daa3a" - } - ] - } - ] - } - }, - { - "service-instance-id": "98948904-a2bb-459a-8442-3d6ac72cf3bb", - "service-instance-name": "test_ppo_999", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1509007469372", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/DFW", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "DFW" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/464482f0-fec7-4171-af0e-96363f93f908", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "464482f0-fec7-4171-af0e-96363f93f908" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f5a633ef-c7ac-4e28-8b62-85495888607e", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f5a633ef-c7ac-4e28-8b62-85495888607e" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfgdfg" - } - ] - } - ] - } - }, - { - "service-instance-id": "0ba9557d-b952-4621-844a-077af0e55147", - "service-instance-name": "testvl_555", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "144aec31-9232-4d9c-ba3a-ee052b4ea0a5", - "model-version-id": "1dbe2b4e-07df-4d41-b49e-881a07fab831", - "resource-version": "1509002554353", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/2811e2fb-005e-40de-990b-c0794f362399", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "2811e2fb-005e-40de-990b-c0794f362399" - } - ] - } - ] - } - }, - { - "service-instance-id": "0673b4d2-c7cb-453e-bd0b-0a6a9c093f0f", - "service-instance-name": "vid-e2e-test_2017-07-18_17-31-16-723", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500388282464", - "orchestration-status": "Active" - }, - { - "service-instance-id": "25abbd6c-a394-44a0-9378-a49374e5fc1b", - "service-instance-name": "vid-e2e-test_2017-07-18_17-54-01-298", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500389647052", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ce7eca35-ea2c-44dd-adb3-941298e0d194", - "service-instance-name": "asdv", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500380792111", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5e5d85a4-106b-4f25-81dc-2756d69b8160", - "service-instance-name": "vid-e2e-test_2017-07-18_17-38-15-572", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500388700897", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4141f288-4070-44fd-bc0b-1289fabc81b7", - "service-instance-name": "vid-e2e-test_2017-07-18_15-43-17-176", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500381802606", - "orchestration-status": "Active" - }, - { - "service-instance-id": "da3ac66a-fdcb-44b8-bef5-16bc0603acfc", - "service-instance-name": "dfhmg", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1500379560690", - "orchestration-status": "Active" - }, - { - "service-instance-id": "16e582ed-e183-413b-ba57-8d1a037eadbc", - "service-instance-name": "vid-e2e-test_2017-07-18_15-25-35-906", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500380741572", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8584c715-181a-40b8-bb77-8f521be498aa", - "service-instance-name": "dsadsdfdsfsdfsd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500377785124", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ed2349b1-fde2-4740-9b6a-92923c0f3564", - "service-instance-name": "vid-e2e-test_2017-07-18_18-08-55-715", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500390542619", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b6482709-2833-4805-9779-d0bb0d422f62", - "service-instance-name": "vid-e2e-test_2017-07-18_18-04-26-432", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500390272714", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a8e88919-9650-44d7-8f9f-e8b73555cf82", - "service-instance-name": "pickpikcpickkc", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500354472092", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2c3e0fc8-215e-461f-8e83-84bbfe4c9aa4", - "service-instance-name": "dsdasdas", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500354946673", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9e98302a-8803-4e4c-bf3b-e46ebc911c7e", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9e98302a-8803-4e4c-bf3b-e46ebc911c7e" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fds" - } - ] - } - ] - } - }, - { - "service-instance-id": "5909c1e6-bd22-4c98-8ed5-ef214751a563", - "service-instance-name": "vid-e2e-test_2017-07-18_08-24-24-224", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500355470123", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f4a5c51d-3ddd-457e-a293-840713d23a19", - "service-instance-name": "fs", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500354782019", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9281d7e0-720e-42a9-b5f9-f135af176099", - "service-instance-name": "jfghh", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1500367011291", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/365525ee-4a1f-4947-91be-c067a9f81a61", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "365525ee-4a1f-4947-91be-c067a9f81a61" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "mkmlk" - } - ] - } - ] - } - }, - { - "service-instance-id": "dd86dd0e-99c1-4567-87e9-d3fa20799b75", - "service-instance-name": "vod-test-666", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500566282895", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8cccc36b-977a-4e58-9e93-ae313d7380d9", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "8cccc36b-977a-4e58-9e93-ae313d7380d9" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-test-vnf-222" - } - ] - } - ] - } - }, - { - "service-instance-id": "a092e48d-44af-40e4-b088-d36b6a637033", - "service-instance-name": "vid-e2e-test_service_2017-07-20_16-40-40-845", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500558051198", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c589d78f-5178-4f9a-ba9d-cec36e19708e", - "service-instance-name": "vid-test-543", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500551310098", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a20b223f-7533-44dc-9deb-c2e627bd3701", - "service-instance-name": "vid-test-432", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500550662376", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/5dc6598f-6da4-468e-92ed-1b45b595f1d8", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "5dc6598f-6da4-468e-92ed-1b45b595f1d8" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-test-vnf-432" - } - ] - } - ] - } - }, - { - "service-instance-id": "43be2af0-014f-470f-9bf3-bcaba534e89e", - "service-instance-name": "test_945994fz", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509272926060", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9b38641c-55ec-48c1-9bf6-3dfedb2d6109", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9b38641c-55ec-48c1-9bf6-3dfedb2d6109" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "hgfdsaafgh" - } - ] - } - ] - } - }, - { - "service-instance-id": "901c9394-e3f7-48fc-bf9d-0e48b26cb7f5", - "service-instance-name": "vid-test-t", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500896893668", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e7158335-42ef-42cc-9bad-9c6b794dcb2b", - "service-instance-name": "vl_usp001", - "service-type": "", - "service-role": "", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1506351703022", - "orchestration-status": "Active" - }, - { - "service-instance-id": "54705472-6522-4d55-a6b8-091a3173f5dd", - "service-instance-name": "test_9934585345", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1506349848890", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b430262c-7a04-48e1-a656-4ff19c60fbae", - "service-instance-name": "test_09459934", - "service-type": "", - "service-role": "", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1506350033897", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e6e9488d-0621-4585-b955-1a768d38f156", - "service-instance-name": "vid-test-556", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500892871481", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f9a4be8b-09c0-4860-bd26-8384a2752e13", - "service-instance-name": "vid-test-887", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500892738430", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d86088ce-5bd0-4c05-94c9-96557f70d2e6", - "service-instance-name": "vid-test-789", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500892617605", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9ac85e73-9444-4fd7-b771-0bc2706cadb1", - "service-instance-name": "vid-test-888", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500892257855", - "orchestration-status": "Active" - }, - { - "service-instance-id": "51cddedb-68a1-47fb-97b9-63f1b7aff086", - "service-instance-name": "vid-test-112", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500896366569", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e2cd68c8-c807-4176-a39c-c44d99418f78", - "service-instance-name": "vid-test-443", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500895145213", - "orchestration-status": "Active" - }, - { - "service-instance-id": "3f93c7cb-2fd0-4557-9514-e189b7b04f9d", - "service-instance-name": "vid-test-444", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500789244673", - "orchestration-status": "<ORCH_STATUS>", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c015cc0f-0f37-4488-aabf-53795fd93cd3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "c015cc0f-0f37-4488-aabf-53795fd93cd3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fsd" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/0846287b-65bf-45a6-88f6-6a1af4149fac", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "0846287b-65bf-45a6-88f6-6a1af4149fac" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "kjkjk" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9908b762-136f-4b1f-8eb4-ef670ef58bb4", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9908b762-136f-4b1f-8eb4-ef670ef58bb4" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "uiui" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/543931f5-e50e-45a2-a69f-ab727e4c7f2f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "543931f5-e50e-45a2-a69f-ab727e4c7f2f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfsdfdsf" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/25e84884-22d5-44c9-8212-cb459f63e0ba", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "25e84884-22d5-44c9-8212-cb459f63e0ba" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdada" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/013fb0ba-977b-496c-9faa-7f8e5f083eec", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "013fb0ba-977b-496c-9faa-7f8e5f083eec" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gvb" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/06914296-cb46-4b62-9453-329a706a6cbb", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "06914296-cb46-4b62-9453-329a706a6cbb" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "lkllll" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c55da606-cf38-42c7-bc3c-be8e23b19299", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "c55da606-cf38-42c7-bc3c-be8e23b19299" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ss" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/27cc0914-70be-453e-b552-3df6b1d6cda9", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "27cc0914-70be-453e-b552-3df6b1d6cda9" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "yh" - } - ] - } - ] - } - }, - { - "service-instance-id": "0f2624ba-94cf-4ac5-b903-652d49002c97", - "service-instance-name": "vmee1", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1509362054136", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/80bb7c9e-4e3d-4b10-8291-7e85a1347370", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "80bb7c9e-4e3d-4b10-8291-7e85a1347370" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ce792805-a5f3-4bfe-8209-86553e097d91", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ce792805-a5f3-4bfe-8209-86553e097d91" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ssssssssssssssss" - } - ] - } - ] - } - }, - { - "service-instance-id": "43d8a0e6-34b6-42b9-b393-13a870b2a313", - "service-instance-name": "Serviceaimpnf_3", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "306caa85-74c7-48a9-aa22-7e3a564b957a", - "model-version-id": "ecd470eb-05ce-44c9-990f-4b80ac0d922d", - "resource-version": "1509367097941", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/43d8a0e6-34b6-42b9-b393-13a870b2a313/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "3c3f53a2-1cbc-48f4-bb1c-a3b071ab567c", - "service-instance-name": "service_instance_test_123456", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d51048df-47a8-4038-b981-c1cd23dada55", - "model-version-id": "ae93d743-5dca-4f8c-bc8f-16edb87c8fa2", - "resource-version": "1509550565847", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p80", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p80" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4f35c7db-e3e0-4140-a3a2-f8fa7fcc22c7", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "4f35c7db-e3e0-4140-a3a2-f8fa7fcc22c7" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vnf_instance_test_1234567" - } - ] - } - ] - } - }, - { - "service-instance-id": "48b064cd-aeb7-48c0-ae50-3ead0bd7f7a8", - "service-instance-name": "vid-test-4422", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500897698349", - "orchestration-status": "Active" - }, - { - "service-instance-id": "cb062e05-25d0-43f6-89a4-784abb39256e", - "service-instance-name": "ServicePnf_24", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1509377126770", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/cb062e05-25d0-43f6-89a4-784abb39256e/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f363b54e-ed50-4c7b-b404-b54291da2f25", - "service-instance-name": "test0450450", - "service-type": "", - "service-role": "", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1502293720068", - "orchestration-status": "Active" - }, - { - "service-instance-id": "45ae5259-949e-4163-ae40-61e564eb04ba", - "service-instance-name": "dfgbdfbgdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502276519000", - "orchestration-status": "Active" - }, - { - "service-instance-id": "643e277d-7dfe-4ff2-8894-a1ad18860d95", - "service-instance-name": "test_045004", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502279862680", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/68abca17-1fd7-4fe3-8d36-df853ce884e9", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "68abca17-1fd7-4fe3-8d36-df853ce884e9" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_405045" - } - ] - } - ] - } - }, - { - "service-instance-id": "1d439d6d-5867-4522-a730-528256378011", - "service-instance-name": "test_84584", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502293183245", - "orchestration-status": "Active" - }, - { - "service-instance-id": "de850f30-2bb0-43e9-bbb5-07250a435165", - "service-instance-name": "testmacr4050405", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508677320783", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/96208579-2839-442d-bcd7-46902fb5b108", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "96208579-2839-442d-bcd7-46902fb5b108" - } - ] - } - ] - } - }, - { - "service-instance-id": "6f442a1d-3163-4448-ad47-cd0311c8b84c", - "service-instance-name": "macr_03455949594", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508853484814", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/2811e2fb-005e-40de-990b-c0794f362399", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "2811e2fb-005e-40de-990b-c0794f362399" - } - ] - } - ] - } - }, - { - "service-instance-id": "8b1034a6-966d-4534-9622-665d0be9cb5b", - "service-instance-name": "ghjgjhg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508688088252", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p10", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p10" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - } - ] - } - }, - { - "service-instance-id": "42240602-42d9-4914-a87a-45ab88864a01", - "service-instance-name": "testint5464", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1508754951438", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p8", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p8" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d566b9bf-f383-4ee2-8856-271605fe3267", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "d566b9bf-f383-4ee2-8856-271605fe3267" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfdsf" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/429b4e95-6fb3-4f04-9ffb-795b4a3289c3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "429b4e95-6fb3-4f04-9ffb-795b4a3289c3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "oliuyt" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e53c3b6c-9013-4749-9648-f7fb43a60375", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "e53c3b6c-9013-4749-9648-f7fb43a60375" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dfgdfd" - } - ] - } - ] - } - }, - { - "service-instance-id": "88e657dc-e4be-4be8-be34-1396836e9798", - "service-instance-name": "fghfghfghf", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508854622716", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/ab18aa18-9644-441d-be6e-af6cadbc21ab", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "ab18aa18-9644-441d-be6e-af6cadbc21ab" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/def4032e-72ae-4002-a08f-b9457a4be106", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "def4032e-72ae-4002-a08f-b9457a4be106" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "hjhjkhjk" - } - ] - } - ] - } - }, - { - "service-instance-id": "1030f826-3fa5-4057-abb1-18e72ce7e2a1", - "service-instance-name": "vid-test-999", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500892169774", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d578122d-278c-42b2-bee0-2ec441ceeaac", - "service-instance-name": "vid-testt", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500893055281", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4d9c564d-9e83-4fa4-a4c0-41ca93fc9f64", - "service-instance-name": "vid-test-332", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500896543492", - "orchestration-status": "Active" - }, - { - "service-instance-id": "42774ab2-d3e1-46ec-84ff-3db53a18e135", - "service-instance-name": "vid-test-1122", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500897486657", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2fac24c8-13fa-42db-bb2f-529683531fa8", - "service-instance-name": "vid-test-11112", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500897969508", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c0de2bc1-f32a-4cea-a9b0-88571d6b33bf", - "service-instance-name": "vid-testtt", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500893827977", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c13177ec-38b3-4e12-8482-97b0f016247a", - "service-instance-name": "vid-test-221", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500895647987", - "orchestration-status": "Active" - }, - { - "service-instance-id": "412e3b4c-071b-4c58-b314-7fbd176222ff", - "service-instance-name": "vid-e2e-test_service_2017-07-19_16-05-40-066", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500469550619", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/45fe4c3d-c30e-4800-8b68-54b4dea1c248", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "45fe4c3d-c30e-4800-8b68-54b4dea1c248" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test_vnf_2017-07-19_16-06-13-603" - } - ] - } - ] - } - }, - { - "service-instance-id": "635903e5-74ee-4470-be25-53cc730b34bd", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-39-54-357", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500468002639", - "orchestration-status": "Active" - }, - { - "service-instance-id": "0474ac6f-7eb2-4aaf-8cb1-5abd12df2253", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-44-24-952", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500468273196", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b4ff72ff-00e5-42d8-914e-1cbe67a7eb58", - "service-instance-name": "test_werfdzkdkskd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500813475847", - "orchestration-status": "Active" - }, - { - "service-instance-id": "43a08d84-d5d5-4b5e-be2b-2300b474dc70", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-42-55-550", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500468183570", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5390755c-1606-47d9-8b83-da14738067da", - "service-instance-name": "vid-e2e-test_aai_service_2017-07-19_16-13-57-138", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500470041251", - "orchestration-status": "Active" - }, - { - "service-instance-id": "3707ec3b-af13-49ea-b9ff-018b758da115", - "service-instance-name": "vid-e2e-test_2017-07-18_17-17-30-920", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500387456666", - "orchestration-status": "Active" - }, - { - "service-instance-id": "28378666-89cd-47df-8ed9-fc1839a4b265", - "service-instance-name": "test_rt945klol4", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1500377140106", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1d7edacb-8e79-4f6d-936b-93114a974935", - "service-instance-name": "vid-e2e-test_2017-07-18_15-28-31-981", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500380917229", - "orchestration-status": "Active" - }, - { - "service-instance-id": "da51b100-5b39-4c15-b3ea-f23df4473a83", - "service-instance-name": "vfdv", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1500371981705", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ef0a68da-cc95-4e3c-a1d3-3f7f9cb6ee82", - "service-instance-name": "vid-e2e-test_2017-07-18_18-12-22-369", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500390748046", - "orchestration-status": "Active" - }, - { - "service-instance-id": "eff96af1-70ea-4aab-98c5-32306da946ad", - "service-instance-name": "vid-e2e-test_2017-07-18_17-48-39-643", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500389325953", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8718ad9e-a3c4-49d1-a708-a90ba42b9d03", - "service-instance-name": "vid-e2e-test_2017-07-18_18-14-04-926", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500390850156", - "orchestration-status": "Active" - }, - { - "service-instance-id": "16a09e81-4450-4cb2-8391-5890b6f64721", - "service-instance-name": "vid-e2e-test_2017-07-18_17-50-33-811", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500389439126", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5f3fb647-edfb-473c-99a9-3f04603478c1", - "service-instance-name": "vid-e2e-test_2017-07-18_17-52-15-859", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500389541445", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c6af9564-9043-4f65-8bf2-1c7bc56fd43e", - "service-instance-name": "fsdfsdsd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500412901425", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c9213809-2c50-41f7-b73a-22c1ff189bf0", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "c9213809-2c50-41f7-b73a-22c1ff189bf0" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fdsd" - } - ] - } - ] - } - }, - { - "service-instance-id": "8ab3917e-581f-4de3-b0e3-4e06660e8793", - "service-instance-name": "dfghn", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500449579549", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9b6079c3-9442-4480-9c6d-dd03eeee9c82", - "service-instance-name": "hjoi", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500308091305", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5fd59464-ddcf-4589-8f91-3d8b07c115f9", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-16-56-647", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500466624414", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2081af5c-8229-441c-8a0c-701699f5cf49", - "service-instance-name": "sfd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500312534078", - "orchestration-status": "Active" - }, - { - "service-instance-id": "86d60652-b114-4775-8bec-331dd78f4741", - "service-instance-name": "x", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500312034997", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ae6e8ace-a065-432e-930e-c6111bd27932", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-20-00-628", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500466809739", - "orchestration-status": "Active" - }, - { - "service-instance-id": "19faafcb-47a4-45e5-8ee4-d3375c695d7e", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-27-14-135", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500467243388", - "orchestration-status": "Active" - }, - { - "service-instance-id": "aa4fc03e-1ba3-48d1-b5cc-ec8dfec15a4c", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-06-51-198", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500466021989", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4089b9d7-8c02-4a71-b15a-e29082e38c45", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-12-07-616", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500466335699", - "orchestration-status": "Active" - }, - { - "service-instance-id": "45b11aa5-5747-45a6-a58e-bada5d052465", - "service-instance-name": "fgd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1500309212526", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9f90bb18-d879-4d6e-97fd-ba5964bdfeb7", - "service-instance-name": "hjk", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500311877345", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9f0b62d4-0305-43aa-b2b3-0c22edc7e01c", - "service-instance-name": "q", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500313981483", - "orchestration-status": "Active" - }, - { - "service-instance-id": "19bddbc0-3014-4541-9f9e-c1400daff5c0", - "service-instance-name": "gdf", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500312620055", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b352c6e4-087b-4408-b794-142f1d9e2309", - "service-instance-name": "dcs", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500325142163", - "orchestration-status": "Active" - }, - { - "service-instance-id": "57cdd7bd-ab17-47bb-8b53-9e424d6cf2b2", - "service-instance-name": "fsd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500323619398", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e305fc65-2120-4cc8-8bf1-bbc8aa302f34", - "service-instance-name": "a", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500314310430", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/82667331-a973-49e5-b3f2-9bd9e07be7eb", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "82667331-a973-49e5-b3f2-9bd9e07be7eb" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vnf3" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/aa879f1f-a88c-41c6-9f54-4a4cfd92d261", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "aa879f1f-a88c-41c6-9f54-4a4cfd92d261" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test0123456" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/7c15cc9b-f09e-4d7b-911a-fce928dbec0f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "7c15cc9b-f09e-4d7b-911a-fce928dbec0f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "addingVNF" - } - ] - } - ] - } - }, - { - "service-instance-id": "a43d04ad-7cc5-48d1-bd44-316979763294", - "service-instance-name": "test_123432", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500372271553", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/feb4e66e-a178-418c-bc2a-b4b09dd82d98", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "feb4e66e-a178-418c-bc2a-b4b09dd82d98" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vf" - } - ] - } - ] - } - }, - { - "service-instance-id": "7a17082d-ea92-4b55-b49d-083f9599b18d", - "service-instance-name": "iosksfnsdkfnsdkjfnskdj", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500369295852", - "orchestration-status": "Active" - }, - { - "service-instance-id": "88fb29c3-8836-4f86-a27a-53a688cae680", - "service-instance-name": "test-sddasfds", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500373378767", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/aa2f42a3-ff1b-4508-9a0c-b256df6208aa", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "aa2f42a3-ff1b-4508-9a0c-b256df6208aa" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "erttert" - } - ] - } - ] - } - }, - { - "service-instance-id": "7dd2ad7d-3056-4d91-bc3c-97c488ae23fb", - "service-instance-name": "kml", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500362405883", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d953154d-584a-4a4a-9bd7-83df8e46c354", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "d953154d-584a-4a4a-9bd7-83df8e46c354" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "nkknkjnkn" - } - ] - } - ] - } - }, - { - "service-instance-id": "5448357b-b1c4-475d-ac0c-a42528e1d51b", - "service-instance-name": "test2", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500323768299", - "orchestration-status": "Active" - }, - { - "service-instance-id": "84bd20e2-91cc-4a59-be62-e3cf4a762322", - "service-instance-name": "test-321312", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500370664268", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c4c1592b-afc1-4555-9902-5089caa95a64", - "service-instance-name": "fds", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500324250120", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6759becb-9878-4c70-abe7-f2886dd6c990", - "service-instance-name": "vid-e2e-test_2017-07-18_17-25-58-170", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500387968056", - "orchestration-status": "Active" - }, - { - "service-instance-id": "39f096ce-eab4-49ec-94f1-701f7df5a483", - "service-instance-name": "adrg", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500388978731", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/07126b2b-ac8c-4821-a85b-d86e302b408e", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "07126b2b-ac8c-4821-a85b-d86e302b408e" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ghfergf" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/6415f997-8fe7-45da-8ec2-e1b12b790354", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "6415f997-8fe7-45da-8ec2-e1b12b790354" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ukyjthrgef55" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2d34f74b-e7e7-4f92-87e7-8e4a4321b48b", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "2d34f74b-e7e7-4f92-87e7-8e4a4321b48b" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfdfd" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d754a995-7473-4b94-bf84-0f2734d2924f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "d754a995-7473-4b94-bf84-0f2734d2924f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dsfefg" - } - ] - } - ] - } - }, - { - "service-instance-id": "9f8cdcb0-6ffd-4adc-b245-f7f4fc9752e3", - "service-instance-name": "vid-e2e-test_2017-07-18_17-36-23-097", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500388589551", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7644e248-d2d9-4c61-a087-148beff228ac", - "service-instance-name": "vid-e2e-test_2017-07-18_16-44-33-073", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500385478551", - "orchestration-status": "Active" - }, - { - "service-instance-id": "509a2624-3dae-41ad-9a5a-e62078161e21", - "service-instance-name": "vid-e2e-test_2017-07-18_17-14-27-661", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500387274357", - "orchestration-status": "Active" - }, - { - "service-instance-id": "83e740ef-a293-4840-b04e-efff59c72463", - "service-instance-name": "eqrv", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500385603218", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6fde03e3-46dc-4fff-8daf-078530d560f2", - "service-instance-name": "sdfvsdfvsdf", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500387907127", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c8e49850-6722-49ea-950c-9ad62a7f889d", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "c8e49850-6722-49ea-950c-9ad62a7f889d" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "adsv" - } - ] - } - ] - } - }, - { - "service-instance-id": "269bf5ae-6698-4303-b074-be51ad7d28c1", - "service-instance-name": "vid-e2e-test_2017-07-18_18-07-11-310", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500390438483", - "orchestration-status": "Active" - }, - { - "service-instance-id": "587fbd75-3379-412b-b54a-e995e4ffcae4", - "service-instance-name": "forlynn", - "service-type": "", - "service-role": "", - "model-invariant-id": "f627ac4b-6a4f-4406-b409-a986fb0d1d1c", - "model-version-id": "2e057e90-068f-478a-a9d2-9fb7f36ff3c2", - "resource-version": "1504188707424", - "orchestration-status": "Active" - }, - { - "service-instance-id": "62eb3798-b90d-4bc0-9635-c70473a49ae3", - "resource-version": "1506724389470", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/rarf0002v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "rarf0002v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "rarf0002v" - } - ] - } - ] - } - }, - { - "service-instance-id": "27d4ab06-faed-41f4-80f2-2158e62e5861", - "service-instance-name": "vid-test-33333332", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501675131575", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1a127f0b-dc72-471b-bb9d-c15397520b8f", - "service-instance-name": "vid-test-55522", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1501661285161", - "orchestration-status": "Active" - }, - { - "service-instance-id": "fe1786d1-be3f-4c1b-8d71-540df4f4c916", - "service-instance-name": "vid-test-333322255533", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1501665788566", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ea53aeec-470c-4e85-9396-0ea6f7316cef", - "service-instance-name": "hmgnfbdsa55", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509025602402", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p10", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p10" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - } - ] - } - }, - { - "service-instance-id": "267d6f47-387d-4e7e-86aa-8d08a86488b1", - "service-instance-name": "trgfeerg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508944715647", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3f592a6f-459b-435e-b0d4-59959ab1d385", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3f592a6f-459b-435e-b0d4-59959ab1d385" - } - ] - } - ] - } - }, - { - "service-instance-id": "7e06da45-07a8-4b85-857f-7a798b558c54", - "service-instance-name": "test_045900034f", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508942442342", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/96208579-2839-442d-bcd7-46902fb5b108", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "96208579-2839-442d-bcd7-46902fb5b108" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/36c2848d-6b5f-42a9-8d68-0314048614a3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "36c2848d-6b5f-42a9-8d68-0314048614a3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ngfdsa434" - } - ] - } - ] - } - }, - { - "service-instance-id": "e84137bb-a982-4aaa-bdfe-e83997c6b93d", - "service-instance-name": "test_4050345034", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509021634347", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/464482f0-fec7-4171-af0e-96363f93f908", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "464482f0-fec7-4171-af0e-96363f93f908" - } - ] - } - ] - } - }, - { - "service-instance-id": "aebe3df8-a734-4dc9-b210-1b47444c19f6", - "service-instance-name": "thfgdf443", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508942117530", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - } - ] - } - }, - { - "service-instance-id": "89d03dd6-fe60-4106-b9e1-3a9c66a7561d", - "service-instance-name": "jhgrfedse44", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1509026377891", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p3", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p3" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/c934f26c-30f8-419b-9e54-31b10d08b29a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "c934f26c-30f8-419b-9e54-31b10d08b29a" - } - ] - } - ] - } - }, - { - "service-instance-id": "761cd4c2-8f65-42a0-8d6e-155c99181c80", - "service-instance-name": "dgfgddfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1509032006604", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/73185f03-5531-444d-bc03-fa13f924d66a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "73185f03-5531-444d-bc03-fa13f924d66a" - } - ] - } - ] - } - }, - { - "service-instance-id": "b1707910-718c-488c-841e-fe6166b288d7", - "service-instance-name": "ins_vl_inputs1", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a4ae0698-161d-4e3d-aabb-f94183c733e4", - "model-version-id": "eaa0de99-6407-4bf6-8579-31499dcf21eb", - "resource-version": "1509013009292", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/464482f0-fec7-4171-af0e-96363f93f908", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "464482f0-fec7-4171-af0e-96363f93f908" - } - ] - } - ] - } - }, - { - "service-instance-id": "31ebd5ed-d522-42bd-8b1b-ca8807541b33", - "service-instance-name": "vnftest0987", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509017207771", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/6e9179b0-864a-40ba-80ba-c51a69384653", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "6e9179b0-864a-40ba-80ba-c51a69384653" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2804acda-dbd1-413f-a731-47f0978ab9dd", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "2804acda-dbd1-413f-a731-47f0978ab9dd" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "hgcfdfff22" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d0b3c921-3bd6-43ec-bf71-3edbb7af5bc7", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "d0b3c921-3bd6-43ec-bf71-3edbb7af5bc7" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bvfvdsfsdf" - } - ] - } - ] - } - }, - { - "service-instance-id": "915c7d5a-c359-475f-bda7-67761c92b029", - "service-instance-name": "aritest000999", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1509026720877", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p80", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p80" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3f592a6f-459b-435e-b0d4-59959ab1d385", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3f592a6f-459b-435e-b0d4-59959ab1d385" - } - ] - } - ] - } - }, - { - "service-instance-id": "4790f1a6-eb5b-4176-95bc-fdb0909e4d87", - "service-instance-name": "ngfdvfg", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1509032932831", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p3", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p3" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - } - ] - } - }, - { - "service-instance-id": "3af158f2-202f-40a8-a749-f508bdb8a4ce", - "service-instance-name": "kdsfhud556", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1509033824516", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p3", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p3" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/c934f26c-30f8-419b-9e54-31b10d08b29a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "c934f26c-30f8-419b-9e54-31b10d08b29a" - } - ] - } - ] - } - }, - { - "service-instance-id": "13dec3b0-ab57-4359-b4ec-4db0811256fc", - "service-instance-name": "newadio", - "service-type": "", - "service-role": "", - "model-invariant-id": "135cf95b-2863-477a-8879-d980474d67f0", - "model-version-id": "32d08699-790f-4460-ba1b-0b7bb4576296", - "resource-version": "1504290530566", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d171c71b-695e-4f9f-84a7-9febf20a7a5e", - "service-instance-name": "AIMinstance", - "service-type": "", - "service-role": "", - "model-invariant-id": "9e060f0b-1b8e-4b91-86f7-f3d5208fb852", - "model-version-id": "6fa842b2-8eca-416b-8b99-d8691f1ad11e", - "resource-version": "1504289007353", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c9407d5f-0227-4335-b1b2-9148a5a27c0e", - "service-instance-name": "ready", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1504200919802", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/693ac78b-a1c2-4267-bb35-cb05b8c1fc2c", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "693ac78b-a1c2-4267-bb35-cb05b8c1fc2c" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fre" - } - ] - } - ] - } - }, - { - "service-instance-id": "d712579c-75fd-4a8f-9378-bfb9bf3aaf58", - "service-instance-name": "demolynn", - "service-type": "", - "service-role": "", - "model-invariant-id": "a7c72b5d-d498-4164-a3a5-2e0fdf5ff1b5", - "model-version-id": "5a5b1d22-f37a-4f85-9ec8-e84a6e196648", - "resource-version": "1504200602108", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ccc21ec4-dd82-4db8-ad42-88f88f3ee980", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ccc21ec4-dd82-4db8-ad42-88f88f3ee980" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "demo8" - } - ] - } - ] - } - }, - { - "service-instance-id": "3ea4acb0-a62f-4e6e-8750-2920b16ab8f0", - "service-instance-name": "mog1", - "service-type": "", - "service-role": "", - "model-invariant-id": "a8b53380-76bd-4d52-b102-165947fbc46a", - "model-version-id": "b1b0c302-fd06-4612-ad50-f9931bd8dde1", - "resource-version": "1504202136745", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6c426e93-8df1-40fd-89c2-ba7e934ab7db", - "service-instance-name": "RGAlina831", - "service-type": "", - "service-role": "", - "model-invariant-id": "ceab97cd-ca68-41a6-9b34-d571b2dd05ed", - "model-version-id": "1a6ae314-7a89-408b-93e5-6d8b8ee4c28a", - "resource-version": "1504211427501", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ed132599-77d3-4a7d-9e14-8e5068b95a6b", - "service-instance-name": "newone", - "service-type": "", - "service-role": "", - "model-invariant-id": "f627ac4b-6a4f-4406-b409-a986fb0d1d1c", - "model-version-id": "2e057e90-068f-478a-a9d2-9fb7f36ff3c2", - "resource-version": "1504200211471", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/3aac4d15-567c-4022-8161-2a73d2c465ba", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "3aac4d15-567c-4022-8161-2a73d2c465ba" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "demo3" - } - ] - } - ] - } - }, - { - "service-instance-id": "3e505763-319c-4ef9-a17c-5ac561abcd44", - "service-instance-name": "lynn", - "service-type": "", - "service-role": "", - "model-invariant-id": "f627ac4b-6a4f-4406-b409-a986fb0d1d1c", - "model-version-id": "2e057e90-068f-478a-a9d2-9fb7f36ff3c2", - "resource-version": "1504198364611", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fee940c1-4f94-4550-be75-193473be1df5", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "fee940c1-4f94-4550-be75-193473be1df5" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "demo" - } - ] - } - ] - } - }, - { - "service-instance-id": "5164a1ed-d7ba-4e33-b82d-3a5f90543c47", - "service-instance-name": "Lital39887395", - "service-type": "", - "service-role": "", - "model-invariant-id": "452538c0-ef1e-4d65-9939-697f6ed58934", - "model-version-id": "f430728a-4530-42be-a577-1206b9484cef", - "resource-version": "1504111659807", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f05c9247-58c0-4558-872d-f9edc6b0e27b", - "service-instance-name": "TestCM", - "service-type": "", - "service-role": "", - "model-invariant-id": "cf3fa46a-e026-4171-9496-56f5e5184b38", - "model-version-id": "e03239af-b20e-4966-aeb8-b558ef4203b6", - "resource-version": "1506257529884", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/95fffe54-d351-42aa-8612-6fed2690b702", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "95fffe54-d351-42aa-8612-6fed2690b702" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "TestCM" - } - ] - } - ] - } - }, - { - "service-instance-id": "0f4f9378-14c6-4fc0-bf8c-53e8b94fc24b", - "service-instance-name": "TestCM1", - "service-type": "", - "service-role": "", - "model-invariant-id": "cf3fa46a-e026-4171-9496-56f5e5184b38", - "model-version-id": "e03239af-b20e-4966-aeb8-b558ef4203b6", - "resource-version": "1506257972911", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ba916d69-3558-4f8d-aded-fc1f4658697f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ba916d69-3558-4f8d-aded-fc1f4658697f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "TestCM1" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f94e2cdb-a731-4703-984f-6db7958673a6", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f94e2cdb-a731-4703-984f-6db7958673a6" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "lital" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/3349b4ae-e9af-447a-9ef6-751233243669", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "3349b4ae-e9af-447a-9ef6-751233243669" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "lyttj" - } - ] - } - ] - } - }, - { - "service-instance-id": "6532a860-334d-4277-aab0-dfc3c0275722", - "service-instance-name": "almog-test-009", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1503328232583", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6f1658ae-09f8-4146-8e99-c618a513b96e", - "service-instance-name": "TestBeforTenantIsolation", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502873224732", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5febf311-cfe5-488d-9480-4e300f44e83b", - "service-instance-name": "test-s-s-s-s-s", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503313229112", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a41ea412-135c-44bd-a999-8771f950e4c0", - "service-instance-name": "vid-e2e-test_aai_service_2017-08-21_15-11-13-501", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503317477669", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4e4cb086-9d47-4c35-a787-7663eef5cd1f", - "service-instance-name": "test-484784jf", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503386331370", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e90d3fbf-c3f4-4439-9984-b2fa9a48f085", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "e90d3fbf-c3f4-4439-9984-b2fa9a48f085" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fff" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f62913a4-ee21-45ed-9b6a-9bd81ef6d4a3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f62913a4-ee21-45ed-9b6a-9bd81ef6d4a3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dujhdu-444f" - } - ] - } - ] - } - }, - { - "service-instance-id": "864c3974-fc7b-4438-bd1a-9b05bf7b0415", - "service-instance-name": "vid-e2e-test_aai_service_2017-08-21_14-36-39-376", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503315402724", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4da12453-b237-4b4b-abef-52e519db1061", - "service-instance-name": "gfdsfgh45656", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503393201982", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c9b5ce8a-a50c-4bb3-950a-ee0c8e8cd8a8", - "service-instance-name": "vid-test-444333222", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502821470362", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c9275c14-e391-4205-bf23-1667df357535", - "service-instance-name": "PnfTest", - "service-type": "", - "service-role": "", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1502865576535", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9e7f2be3-916d-4bc9-92df-3fce042c1458", - "service-instance-name": "test111", - "service-type": "", - "service-role": "", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1502867371993", - "orchestration-status": "Active" - }, - { - "service-instance-id": "913c5278-ede0-4d85-a24e-a208ce84aef2", - "service-instance-name": "almog-test-007", - "service-type": "", - "service-role": "", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1503328159784", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7b66fff7-15e3-4421-8e80-695ce78e9a40", - "service-instance-name": "test865555665", - "service-type": "", - "service-role": "", - "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637", - "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2", - "resource-version": "1504532289220", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b9769e8f-70aa-4b05-8988-64044aa63498", - "service-instance-name": "TestCharlie", - "model-invariant-id": "4af418a9-c2f5-4fae-a577-b69d6341eee8", - "model-version-id": "745d1bf1-9ed1-413f-8111-f1e984ad63fb", - "resource-version": "1494002070115", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/91124690-bc03-4387-bd6d-96c492a26e47", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "91124690-bc03-4387-bd6d-96c492a26e47" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "TestCharlie" - } - ] - } - ] - } - }, - { - "service-instance-id": "69779f8f-e3d1-4957-b092-4c1e0fa2d962", - "service-instance-name": "test_934584858784", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508313166228", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/43b8a85a-0421-4265-9069-117dd6526b8a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "43b8a85a-0421-4265-9069-117dd6526b8a" - } - ] - } - ] - } - }, - { - "service-instance-id": "687ca9ab-0cbc-49f3-8693-953d4d6b61fe", - "service-instance-name": "te554433", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1508331792032", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/96208579-2839-442d-bcd7-46902fb5b108", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "96208579-2839-442d-bcd7-46902fb5b108" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4d1c9027-05a6-4144-bf9e-9a190b3ec4cd", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "4d1c9027-05a6-4144-bf9e-9a190b3ec4cd" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "mhghg66" - } - ] - } - ] - } - }, - { - "service-instance-id": "8eebe164-928e-4a02-b09a-1d3e85baa553", - "service-instance-name": "tertop009", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508331429003", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p10", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p10" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/73185f03-5531-444d-bc03-fa13f924d66a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "73185f03-5531-444d-bc03-fa13f924d66a" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/353fac93-f9f7-46d6-becb-68f10aae2815", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "353fac93-f9f7-46d6-becb-68f10aae2815" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfhddft" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fbc588a0-70aa-4fdf-bff4-a0fb7037b65a", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "fbc588a0-70aa-4fdf-bff4-a0fb7037b65a" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfddfd5655" - } - ] - } - ] - } - }, - { - "service-instance-id": "3ed5a776-9aab-4fe3-9231-853db3657f5e", - "service-instance-name": "vid-e2e-test_service_2017-07-26_17-06-11-407", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501077979892", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/493e1f9e-03fd-461d-9c43-371e22fc9edd", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "493e1f9e-03fd-461d-9c43-371e22fc9edd" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test_vnf_2017-07-26_17-06-40-404" - } - ] - } - ] - } - }, - { - "service-instance-id": "0471bff5-ceb1-474c-a9da-c877bf21ae9b", - "service-instance-name": "vid-e2e-test_service_2017-07-26_22-41-09-352", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501098077533", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d2c3b450-f8c4-4d7b-8099-f031be9a1bde", - "service-instance-name": "Ser_VID_Lital--1707097", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1501147094625", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f4c7ecc7-9847-4047-8776-1a5bf5e3ea45", - "service-instance-name": "vid-e2e-test_service_2017-07-26_22-50-59-847", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501098666381", - "orchestration-status": "Active" - }, - { - "service-instance-id": "99d31873-a6e5-4f16-861c-6e3b8d3fe8c7", - "service-instance-name": "vid-e2e-test_service_2017-07-26_23-04-22-351", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501099468895", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/aa3d70b1-743a-4492-93b4-3472395bb887", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "aa3d70b1-743a-4492-93b4-3472395bb887" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test-vnf_2017-07-26_23-04-55-822" - } - ] - } - ] - } - }, - { - "service-instance-id": "5a78742a-60ec-4377-88df-746442c7c680", - "service-instance-name": "teat90494848", - "model-invariant-id": "6fe9ad6f-6fa9-4b96-a91e-866a7f3c55a9", - "model-version-id": "be753bed-13e8-4e50-b431-b90dfd0f31b7", - "resource-version": "1499849060540", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7230d7d5-68e6-4772-95c6-59b6edb58f9f", - "service-instance-name": "vid-e2e-test_service_2017-10-15_17-53-59-886", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508079214580", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/z1", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "z1" - } - ] - } - ] - } - }, - { - "service-instance-id": "bb58b58a-2b64-41d5-8d56-3ac95b32b99e", - "service-instance-name": "vid-test-12321", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508143950703", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/z1", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "z1" - } - ] - } - ] - } - }, - { - "service-instance-id": "4ba3e63d-71dc-4912-891d-e0eed048a0a5", - "service-instance-name": "SI_vid894_01", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "d9522f74-c0a9-444e-8b8f-3623da145007", - "resource-version": "1495823285290", - "orchestration-status": "Active" - }, - { - "service-instance-id": "92e1553e-24f7-49ba-94b4-f1538487da52", - "service-instance-name": "lll052617D", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "d9522f74-c0a9-444e-8b8f-3623da145007", - "resource-version": "1495836523699", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7c569714-4174-4d91-9fd0-14051794c3d2", - "service-instance-name": "sdfsdfdsf", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1503842487837", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e25c1753-d5f7-4b5e-880e-cdad5c2f74f7", - "service-instance-name": "lll052617B", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1495815608024", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d8f23bb5-5822-4374-8ece-964c0af90d60", - "service-instance-name": "lll052617A", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1495814776103", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c870081f-b09a-411e-8e2e-fb0e4ba60992", - "service-instance-name": "test-ksdjsd7", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503843463767", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f4770c11-039e-44d2-83a1-ee38c74ffea8", - "service-instance-name": "dsfdsfds", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503906371181", - "orchestration-status": "Active" - }, - { - "service-instance-id": "22e5c795-5747-428f-b997-23e355a3c3b6", - "service-instance-name": "asdasdasd", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503906872840", - "orchestration-status": "Active" - }, - { - "service-instance-id": "66eb9285-edb6-4149-a4fd-4ace1725486e", - "service-instance-name": "asdasdvdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503906293988", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e089b589-5227-4a7c-aa19-92c99507f147", - "service-instance-name": "Mobility_VSP_Service_DS_0906_01", - "service-type": "", - "service-role": "", - "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", - "model-version-id": "0497a6ff-455b-4713-b5de-3e1d4d172b8c", - "resource-version": "1504709046592", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c436daa1-63b5-40e6-892a-1ca67c390ea1", - "service-instance-name": "test_04594959", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503820500390", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/50d111b5-134f-4415-b097-5c061a5072ab", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "50d111b5-134f-4415-b097-5c061a5072ab" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_045845w" - } - ] - } - ] - } - }, - { - "service-instance-id": "6eeb541a-2976-4ae2-986f-1e34c7927983", - "service-instance-name": "test_lfgfjdf7", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1503819918168", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8ed80bb9-7548-4305-baef-660453777afa", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "8ed80bb9-7548-4305-baef-660453777afa" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_0459495d" - } - ] - } - ] - } - }, - { - "service-instance-id": "45a68dc7-6d41-47b1-b123-5c958abe49e3", - "service-instance-name": "test_jhjhjjh", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1503844473215", - "orchestration-status": "Active" - }, - { - "service-instance-id": "0ae4ff8e-7848-448e-9b4b-bcc43859dda8", - "service-instance-name": "test045453", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502111666406", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5bfa3a21-65b3-4047-8455-69af6e8451f2", - "service-instance-name": "HHHKJKJKJKJKJ", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502006983390", - "orchestration-status": "Active" - }, - { - "service-instance-id": "54515abc-20c2-4852-9f79-f54530b1c17b", - "service-instance-name": "XSXSXXSX", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502007073155", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/75e79664-98f1-4a77-bdce-4666d1151896", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "75e79664-98f1-4a77-bdce-4666d1151896" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "DFVDXVXBG" - } - ] - } - ] - } - }, - { - "service-instance-id": "12a73cfd-bf36-48fc-8a05-db90ea8d2218", - "service-instance-name": "vid-test-usp-1111", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502006502927", - "orchestration-status": "Active" - }, - { - "service-instance-id": "cca9ce39-80f7-432f-929b-497cc31448e8", - "service-instance-name": "test_0459495", - "service-type": "", - "service-role": "", - "model-invariant-id": "caed4dbb-922a-4942-be87-1f99d56d426a", - "model-version-id": "b77dae3c-ac5b-459c-8df5-1f1de6c59737", - "resource-version": "1502180467964", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7fa929ef-fe96-4515-bb77-f67b99492cc8", - "service-instance-name": "vid-test-111555333222", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502093359964", - "orchestration-status": "Active" - }, - { - "service-instance-id": "145dc127-918e-46dc-beca-fe07cc00c62b", - "service-instance-name": "", - "service-type": "null", - "service-role": "null", - "model-invariant-id": "5c3bb706-95fc-4589-b40f-ed024673246a", - "model-version-id": "873e3f27-6561-47a6-80b0-0cd048d5cdfb", - "resource-version": "1502170966884", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ad57a79b-6078-4831-bdb0-fe59d49d83f6", - "service-instance-name": "vid-e2e-test_aai_service_2017-08-08_14-32-57-249", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502191981359", - "orchestration-status": "Active" - }, - { - "service-instance-id": "288bc6d7-03e6-45ee-b795-a419207fab73", - "service-instance-name": "shaytestvid2", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1502009457141", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7eaf20e0-b629-4d2c-bc12-b50128537550", - "service-instance-name": "vid-test-4422119955", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502093302607", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8c27adcf-343f-42c0-ace5-d4cab15517a8", - "service-instance-name": "DS-vUSP_08042017_Svc_01", - "service-type": "", - "service-role": "", - "model-invariant-id": "e4f8b794-8057-4b1c-acf8-39cdcbc07dae", - "model-version-id": "79572855-8d8c-47db-a5fa-29cb28058f88", - "resource-version": "1501867425306", - "orchestration-status": "Active" - }, - { - "service-instance-id": "56c010cf-13e9-4436-9b95-25c90349bf3b", - "service-instance-name": "vid-test-22-5", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502093787135", - "orchestration-status": "Active" - }, - { - "service-instance-id": "17a94393-ec25-4080-b0f2-e79690c68edb", - "service-instance-name": "test_034034", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502112253718", - "orchestration-status": "Active" - }, - { - "service-instance-id": "0141fb08-f2e3-4a99-9541-e507060d88c0", - "service-instance-name": "test0450405", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502111949341", - "orchestration-status": "Active" - }, - { - "service-instance-id": "cb059250-e6b2-4080-8c3f-dd1a03038d89", - "service-instance-name": "test_0450450", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502783136139", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/829834f1-9d55-4da5-9cf2-c39a54569cc9", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "829834f1-9d55-4da5-9cf2-c39a54569cc9" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vnf_ar_112345" - } - ] - } - ] - } - }, - { - "service-instance-id": "fc73584c-b77a-4ba8-9ddf-c75fd7f2d4ae", - "service-instance-name": "test_9459945", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502805435726", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6f4b830c-e2b7-453c-b900-045fdd66db4e", - "service-instance-name": "vid-test-44444", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501436355937", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2f59588b-5423-4505-bb2c-b8505551f95a", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "2f59588b-5423-4505-bb2c-b8505551f95a" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-test-vnf-44444" - } - ] - } - ] - } - }, - { - "service-instance-id": "362433ab-c1d2-4c99-af62-9421361870bc", - "service-instance-name": "lital3532", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505140621032", - "orchestration-status": "Active" - }, - { - "service-instance-id": "57aba319-3f37-4d9b-9101-ccfac8eed6ca", - "service-instance-name": "eylon1", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505139462227", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a6715839-446e-46f0-9ab3-e90580f21a13", - "service-instance-name": "eylon2", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505140170371", - "orchestration-status": "Active" - }, - { - "service-instance-id": "427229ed-b60f-4d77-8f14-62c4278d30ff", - "service-instance-name": "test_098765432", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505137712759", - "orchestration-status": "Active" - }, - { - "service-instance-id": "bde46fed-f9f2-4e75-83ba-3b3c8830d5da", - "service-instance-name": "dfghgfgfgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1507031926132", - "orchestration-status": "Active" - }, - { - "service-instance-id": "951c09ef-3369-49b3-a23b-14d70e86330b", - "service-instance-name": "shanitets27", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1507546827502", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e8d9e0e3-7acc-4dba-8f16-e14437c416a6", - "service-instance-name": "CreateINstance_Service_VOIP_297772_nb5443_0610", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "5cfb7e85-6855-4227-ba36-6a52494e57e3", - "model-version-id": "aaeb9f9d-3e29-4ad9-9fb0-0478d53ad7fd", - "resource-version": "1507238826056", - "orchestration-status": "Active" - }, - { - "service-instance-id": "09e219ad-f71d-4dfa-bec3-f139a85c183b", - "service-instance-name": "ServicePnf_16", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1507470982716", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/09e219ad-f71d-4dfa-bec3-f139a85c183b/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "fc110d0d-72e0-4286-b2be-982b34dc6b29", - "service-instance-name": "jhhh88", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1507462936971", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ae3e6c21-8463-456e-a746-d9932c467e79", - "service-instance-name": "mdnsinstance", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "3987a2eb-5f35-45c1-b09a-74149b16bc50", - "model-version-id": "2ec43e3c-e287-47bb-9201-ad0c725f390a", - "resource-version": "1506527808858", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/6960a4f9-878b-4566-a24a-cbae1f2a1943", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "6960a4f9-878b-4566-a24a-cbae1f2a1943" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "instance" - } - ] - } - ] - } - }, - { - "service-instance-id": "4495bf72-1126-4e9f-8bc9-4f91debe632c", - "service-instance-name": "test_0999239459", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1506429664785", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f526e0c5-7dd0-4ff6-8e0d-e34513108c72", - "service-instance-name": "test_09990234446", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1506429789282", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2be69fe5-9e97-4382-8f40-f2a0feb9aa18", - "service-instance-name": "testoron8765", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1506430488921", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8446f630-0aa4-45b1-9192-9d22968fcc1c", - "service-instance-name": "inputmap_instance001", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "e3ee9d25-2c6b-4734-8a8c-b6e0dee11ca9", - "model-version-id": "97128a5f-e7e4-4ddd-b1eb-83a611ae1acb", - "resource-version": "1506518606738", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6d644284-8e45-43aa-8b7a-3a657eda552a", - "service-instance-name": "ServicePnf_7", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1506588010642", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/6d644284-8e45-43aa-8b7a-3a657eda552a/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "29f814ec-a2b8-41aa-b57c-e50d67bbcb45", - "service-instance-name": "test_02349394", - "service-type": "", - "service-role": "", - "model-invariant-id": "6fe9ad6f-6fa9-4b96-a91e-866a7f3c55a9", - "model-version-id": "be753bed-13e8-4e50-b431-b90dfd0f31b7", - "resource-version": "1505386639581", - "orchestration-status": "Active" - }, - { - "service-instance-id": "dcd856f5-69ea-42df-a8aa-d460a9aefe3e", - "service-instance-name": "hfhdgdgf", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505386037801", - "orchestration-status": "Active" - }, - { - "service-instance-id": "69235f15-bef1-4a6a-9689-bf41a332068c", - "service-instance-name": "ffwfdwedewd", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505385896496", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e720e20f-9997-4e42-a959-a5e4f20135fd", - "service-instance-name": "hjgfdsfrg", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1505387270709", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2ee1ce2c-1284-426c-817f-2c94a366f298", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "2ee1ce2c-1284-426c-817f-2c94a366f298" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gsdsdfdff" - } - ] - } - ] - } - }, - { - "service-instance-id": "78c57f7f-9568-48e8-9308-4c1badc0a493", - "service-instance-name": "test_0458478576", - "service-type": "", - "service-role": "", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1505387592406", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9f521dd1-9dda-4340-8f34-5295154904eb", - "service-instance-name": "nf-role-ariel", - "service-type": "", - "service-role": "", - "model-invariant-id": "7325761d-fa5a-4a52-9a07-8bcf64d693ed", - "model-version-id": "8786e50b-84f9-4942-83ed-fd3624baacae", - "resource-version": "1505388118278", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4d3d8367-955e-4907-8e39-d4fee5150622", - "service-instance-name": "jfdsghgtrg", - "service-type": "", - "service-role": "", - "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", - "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", - "resource-version": "1505387180101", - "orchestration-status": "Active" - }, - { - "service-instance-id": "11d946a3-8fea-4ea1-9776-cc7be5be2f67", - "service-instance-name": "int_nfrole_01", - "service-type": "", - "service-role": "", - "model-invariant-id": "cf3fa46a-e026-4171-9496-56f5e5184b38", - "model-version-id": "38ee5ebe-b9b8-4cc1-bd98-36db01bfc589", - "resource-version": "1505389411007", - "orchestration-status": "Active" - }, - { - "service-instance-id": "09e1de12-2b12-431c-abbe-cb786fba1d3e", - "service-instance-name": "test03490348", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1505389785708", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f415422d-5930-4f67-b51e-aafd3ccd92cd", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f415422d-5930-4f67-b51e-aafd3ccd92cd" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfdfgdfg" - } - ] - } - ] - } - }, - { - "service-instance-id": "52eb8cee-e55b-4af7-b5cc-42dd5ef93ea1", - "service-instance-name": "nf_instanse1", - "service-type": "", - "service-role": "", - "model-invariant-id": "7325761d-fa5a-4a52-9a07-8bcf64d693ed", - "model-version-id": "8786e50b-84f9-4942-83ed-fd3624baacae", - "resource-version": "1505388525396", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2c9939cd-1f42-4915-b8f8-a453ad0aa266", - "service-instance-name": "test_832438475", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505397144463", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5449cf97-53f8-44cc-b2c7-7c7d82491457", - "service-instance-name": "Eylon10", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505390455607", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ed820473-cc95-4f58-8d1f-50ee2892d88c", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ed820473-cc95-4f58-8d1f-50ee2892d88c" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "asf" - } - ] - } - ] - } - }, - { - "service-instance-id": "48488113-37bb-4f6f-9a34-cf181c4d24f5", - "service-instance-name": "qweqwewq", - "service-type": "", - "service-role": "", - "model-invariant-id": "6269c77a-a285-473a-be32-9e34a735ae68", - "model-version-id": "de762949-453c-43bd-8610-93eca50b0681", - "resource-version": "1505397289921", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ab418d45-067c-48d6-b5a5-d2be160bda8e", - "service-instance-name": "LitalZil", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505372137288", - "orchestration-status": "Active" - }, - { - "service-instance-id": "600c34b5-3e24-4672-bc6f-a5629cac5881", - "service-instance-name": "fsdfsdfsd", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505333533674", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d0451b90-7539-41ce-bc02-9726e07663e1", - "service-instance-name": "gfdgfdgdfgdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505386116614", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9f6d1a31-8968-4409-a19e-5a4c5eb46a6e", - "service-instance-name": "testyw3445456", - "service-type": "", - "service-role": "", - "model-invariant-id": "fb3ab6f5-f776-46cd-93af-9f9ad71fc00e", - "model-version-id": "86e9e15f-9fe9-4817-b31f-5db74d131a2a", - "resource-version": "1505401600662", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e49cb1f8-c016-4502-8e59-87cb8bd5df35", - "service-instance-name": "gfdgdfgfd", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505386202387", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ce7c3c47-e047-47a0-a19f-7811d36860e9", - "service-instance-name": "almog-test-008", - "service-type": "", - "service-role": "", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1503328194596", - "orchestration-status": "Active" - }, - { - "service-instance-id": "33d6f055-e2fb-4d14-9d66-64e99145e4ec", - "service-instance-name": "almog-test-006", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503328121547", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a71c5896-ae3b-4684-9fe0-0841e81eed3e", - "service-instance-name": "vid-test-666555444", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502823842315", - "orchestration-status": "Active" - }, - { - "service-instance-id": "dcd45af2-6336-469e-8636-9349bffbc350", - "service-instance-name": "test009877654336", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1503227771684", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/1fb26a31-60ea-4d3b-9c0a-f0d24ebf2604", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "1fb26a31-60ea-4d3b-9c0a-f0d24ebf2604" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test7765584" - } - ] - } - ] - } - }, - { - "service-instance-id": "a2a9e86a-2639-4d3d-8aae-24736c0aa5ac", - "service-instance-name": "test_94589485", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502954795174", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8330708c-8d75-466a-9a95-4dd4c4b56863", - "service-instance-name": "almog-test-003", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1503327995951", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/33d676dc-285f-4e0c-b8b7-4b3f51c63fce", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "33d676dc-285f-4e0c-b8b7-4b3f51c63fce" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "niin" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9b589699-f43a-4777-97ed-1e374965c3d6", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9b589699-f43a-4777-97ed-1e374965c3d6" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fsdfcsdfsdsd" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/20783cde-b631-47b3-bb90-e47022bf1f34", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "20783cde-b631-47b3-bb90-e47022bf1f34" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dsfsdfsdfsdfsdf" - } - ] - } - ] - } - }, - { - "service-instance-id": "ed710dba-0d3d-4278-a30a-b73da2a64ff9", - "service-instance-name": "vid-e2e-test_service_2017-08-21_19-35-51-585", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503333361349", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b1112b0b-c915-46c3-b060-c3c511081e4c", - "service-instance-name": "test-almog-2", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503325628895", - "orchestration-status": "Active" - }, - { - "service-instance-id": "535af37d-da02-48f4-abc5-00a6cd830d4e", - "service-instance-name": "LitalS", - "service-type": "", - "service-role": "", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1503326460122", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/68db93ea-d1be-4de4-98a8-0188d162feba", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "68db93ea-d1be-4de4-98a8-0188d162feba" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "LitalVNF" - } - ] - } - ] - } - }, - { - "service-instance-id": "dad637e9-d7b3-4889-a5c6-b55b3ee60640", - "service-instance-name": "tet-8765367", - "service-type": "", - "service-role": "", - "model-invariant-id": "1cc41b64-5c12-4d51-bac9-448e963bd81d", - "model-version-id": "91f79100-6450-4078-80d7-531427b4fe74", - "resource-version": "1503224652570", - "orchestration-status": "Active" - }, - { - "service-instance-id": "bc2300a4-bc3d-4bca-95ac-e34c1885bc44", - "service-instance-name": "rrrrrrrrr", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1503229518489", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/1c9fe7ac-e24e-4f81-ac9a-cf77e16f6222", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "1c9fe7ac-e24e-4f81-ac9a-cf77e16f6222" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "eeeee" - } - ] - } - ] - } - }, - { - "service-instance-id": "9d164ebb-60ee-4d1e-b46a-7769309e5922", - "service-instance-name": "testvnf098655", - "service-type": "", - "service-role": "", - "model-invariant-id": "1cc41b64-5c12-4d51-bac9-448e963bd81d", - "model-version-id": "91f79100-6450-4078-80d7-531427b4fe74", - "resource-version": "1503225090431", - "orchestration-status": "Active" - }, - { - "service-instance-id": "eb4b08b2-6893-4c45-a0a4-5310e2b840e6", - "service-instance-name": "test-almog", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1503241565609", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/68681da7-0847-4a07-b4e6-e7db863513d8", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "68681da7-0847-4a07-b4e6-e7db863513d8" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "almog" - } - ] - } - ] - } - }, - { - "service-instance-id": "f5406f25-02d5-4857-b781-25a17f3889b3", - "service-instance-name": "Service_VOIP_297772_DS_0822_01", - "service-type": "", - "service-role": "", - "model-invariant-id": "5cfb7e85-6855-4227-ba36-6a52494e57e3", - "model-version-id": "aaeb9f9d-3e29-4ad9-9fb0-0478d53ad7fd", - "resource-version": "1503424302015", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c1996c46-4853-45a1-b14d-9d92fb3907c7", - "service-instance-name": "test9459459", - "service-type": "", - "service-role": "", - "model-invariant-id": "75eddbdd-9c15-4778-a058-e4e6129ef2f6", - "model-version-id": "42221f38-7795-4692-8876-082c2fe32ca9", - "resource-version": "1502291939948", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/269cc52e-aafa-4d29-917d-9a7ea03ad311", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "269cc52e-aafa-4d29-917d-9a7ea03ad311" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_03403402" - } - ] - } - ] - } - }, - { - "service-instance-id": "5d523308-d5e1-4cfc-baba-ea7df1f37e25", - "service-instance-name": "uhik", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502291344737", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6f9f86b0-ef30-45a6-b92b-df246a5c6168", - "service-instance-name": "mnbkjhgfddsa", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502275995518", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/7c57a376-ac2e-4411-9015-58efd27621e7", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "7c57a376-ac2e-4411-9015-58efd27621e7" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "poiouuycgf" - } - ] - } - ] - } - }, - { - "service-instance-id": "627f59fe-9e7a-4794-a227-2c2ce8f4cf27", - "service-instance-name": "vid-test-4321", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502291742644", - "orchestration-status": "Active" - }, - { - "service-instance-id": "361bb8aa-e5c7-4c6c-938f-4ea61cd07ed3", - "service-instance-name": "ghfghfgh", - "service-type": "", - "service-role": "", - "model-invariant-id": "caed4dbb-922a-4942-be87-1f99d56d426a", - "model-version-id": "b77dae3c-ac5b-459c-8df5-1f1de6c59737", - "resource-version": "1502293787925", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a5ae7dcf-ca04-4f47-8084-94e7a1b126fd", - "service-instance-name": "dfgndfgnsdfgbns", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502276464647", - "orchestration-status": "Active" - }, - { - "service-instance-id": "634bc44e-f64f-4c0f-ade3-8990be885183", - "service-instance-name": "test_03403", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502290081344", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b8453503-d826-47d1-8a23-332dbb058ee0", - "service-instance-name": "ertherht", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502357187720", - "orchestration-status": "Active" - }, - { - "service-instance-id": "12094723-866e-450f-9825-8d0e114d1cc4", - "service-instance-name": "test_958886", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1502356939859", - "orchestration-status": "Active" - }, - { - "service-instance-id": "bd510a5f-bbd0-4d06-b427-4d0230b4def7", - "service-instance-name": "test_Vl_instance1", - "service-type": "", - "service-role": "", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1502288021617", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e62bf002-1de0-4efb-9b5a-7f48ec5400f3", - "service-instance-name": "test_056056", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502280371418", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f0b5d0a8-0fd4-4965-9c59-9eee67024945", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f0b5d0a8-0fd4-4965-9c59-9eee67024945" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_0404505" - } - ] - } - ] - } - }, - { - "service-instance-id": "16626bff-21ad-4a2b-820e-1894d06be31c", - "service-instance-name": "test0560560", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502293923490", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6d11dba9-8817-425a-b379-ce55e28ff63a", - "service-instance-name": "newserviceshay2", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8072abd2-2ef6-475f-91a1-000121d37f7b", - "resource-version": "1502294644240", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f001f409-8cd7-4e5a-b104-a193d0e596ab", - "service-instance-name": "test_0450450777", - "service-type": "", - "service-role": "", - "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637", - "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2", - "resource-version": "1502294904445", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5979493f-1712-445b-953b-7f9b9a99a314", - "service-instance-name": "mnb", - "service-type": "", - "service-role": "", - "model-invariant-id": "caed4dbb-922a-4942-be87-1f99d56d426a", - "model-version-id": "b77dae3c-ac5b-459c-8df5-1f1de6c59737", - "resource-version": "1502278737864", - "orchestration-status": "Active" - }, - { - "service-instance-id": "47f70a06-7846-44ff-9488-2d60536baf72", - "service-instance-name": "dfghdfghsdfg", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502278659676", - "orchestration-status": "Active" - }, - { - "service-instance-id": "59eb28d6-ad0e-43d3-976d-e3b36c95c073", - "service-instance-name": "jhgfegt", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508758028801", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/73185f03-5531-444d-bc03-fa13f924d66a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "73185f03-5531-444d-bc03-fa13f924d66a" - } - ] - } - ] - } - }, - { - "service-instance-id": "828696d8-1cc6-4d81-b744-d18d6fa7430a", - "service-instance-name": "test04350495", - "service-type": "test", - "service-role": "test", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", - "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", - "resource-version": "1508676546378", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - } - ] - } - }, - { - "service-instance-id": "8b19fe19-65a6-4f0a-9362-54caf7b130c8", - "service-instance-name": "trewtr", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", - "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", - "resource-version": "1508656964072", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/5dbe5092-65fb-453d-87f6-e8715668692f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "5dbe5092-65fb-453d-87f6-e8715668692f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bgtrfv" - } - ] - } - ] - } - }, - { - "service-instance-id": "96a61cec-fec3-4e23-b370-707f74aa7025", - "service-instance-name": "testyyyo", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508676983145", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/b8a07f26-7a5e-428e-9132-eaaef4377e7a", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "b8a07f26-7a5e-428e-9132-eaaef4377e7a" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dfgdfytr" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/edefbdbc-5d41-44ca-a518-10ade7d0d7a8", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "edefbdbc-5d41-44ca-a518-10ade7d0d7a8" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfdsf55" - } - ] - } - ] - } - }, - { - "service-instance-id": "ab4148e7-ad48-424f-b3ba-c60620f572e2", - "service-instance-name": "liz", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "db09cb43-cc92-4070-8187-f2812bdf6676", - "model-version-id": "827e118a-e9e0-4d8e-85ed-72cf22bd0ca8", - "resource-version": "1508674141999", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p10", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p10" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - } - ] - } - }, - { - "service-instance-id": "b6fbe7c9-0acb-46f0-9cef-157c30d55e07", - "service-instance-name": "dfasf", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", - "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", - "resource-version": "1508656225209", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fce90274-4d29-41ad-a559-e88e12b2c177", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "fce90274-4d29-41ad-a559-e88e12b2c177" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "kjhgfd87" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a5fee10-994c-4dfa-a416-79a58c62bd80", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "8a5fee10-994c-4dfa-a416-79a58c62bd80" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "testou00096" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/aef9b371-3efa-48c2-918b-05c9e3ac4aec", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "aef9b371-3efa-48c2-918b-05c9e3ac4aec" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_04594959ccv" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4a2db0c5-db7e-4f25-9623-9d52d5e457d1", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "4a2db0c5-db7e-4f25-9623-9d52d5e457d1" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ghfd_test_045" - } - ] - } - ] - } - }, - { - "service-instance-id": "bd3321bb-3ad6-4222-8520-4eb9c2112c70", - "service-instance-name": "ytititi", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1508673680395", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p80", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p80" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f0aac2f3-2840-48ad-9d35-905416c6eea3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f0aac2f3-2840-48ad-9d35-905416c6eea3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "xdgsdg" - } - ] - } - ] - } - }, - { - "service-instance-id": "8854e480-565c-4533-8b49-9844c55974ef", - "service-instance-name": "test_0234354", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508838123102", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/80bb7c9e-4e3d-4b10-8291-7e85a1347370", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "80bb7c9e-4e3d-4b10-8291-7e85a1347370" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f59bce13-0ba9-4996-a5f2-0ab5001f7915", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f59bce13-0ba9-4996-a5f2-0ab5001f7915" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_03403030dk" - } - ] - } - ] - } - }, - { - "service-instance-id": "f3891ad3-dfc2-48d9-ad79-d3afcb14e499", - "service-instance-name": "testservinputs098", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1508835067923", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/DFW", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "DFW" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc" - } - ] - } - ] - } - }, - { - "service-instance-id": "82d046fb-036c-412a-8926-07c16622288f", - "service-instance-name": "vid-e2e-test_service_2017-07-26_11-00-33-208", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501056046040", - "orchestration-status": "Active" - }, - { - "service-instance-id": "28adfa51-6d7f-4463-a975-f69e9bc9c3fa", - "service-instance-name": "vid-e2e-test_service_2017-07-26_16-56-30-658", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501077401209", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b368869f-9e69-418a-be61-9c53b33d09e8", - "service-instance-name": "vid-e2e-test_service_2017-07-26_21-55-13-231", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501095318054", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/22c1b09c-4828-4029-9da3-75c0b815a681", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "22c1b09c-4828-4029-9da3-75c0b815a681" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test-vnf_2017-07-26_21-55-43-391" - } - ] - } - ] - } - }, - { - "service-instance-id": "f11e491f-31a4-4fce-9a98-37cc93253249", - "service-instance-name": "vid-e2e-test_service_2017-07-26_22-00-54-093", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501095660896", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d8b18065-f378-4801-85f0-a263c66e9148", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "d8b18065-f378-4801-85f0-a263c66e9148" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test-vnf_2017-07-26_22-01-26-312" - } - ] - } - ] - } - }, - { - "service-instance-id": "30603d2b-570a-4ed3-8146-c5ff5608b430", - "service-instance-name": "vid-e2e-test_service_2017-07-26_16-58-52-390", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501077541635", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/a1a76b1d-1c3a-4239-8341-257958944dce", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "a1a76b1d-1c3a-4239-8341-257958944dce" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test_vnf_2017-07-26_16-59-23-041" - } - ] - } - ] - } - }, - { - "service-instance-id": "37d6cde5-f7b7-446e-b161-b835a7acc9a5", - "service-instance-name": "vid-e2e-test_service_2017-07-26_22-12-38-071", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501096370654", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ac25d056-e0ee-4d8e-b3d3-f26640562384", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ac25d056-e0ee-4d8e-b3d3-f26640562384" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test-vnf_2017-07-26_22-13-18-804" - } - ] - } - ] - } - }, - { - "service-instance-id": "65fa3122-5000-4aa1-9707-696825cf6bee", - "service-instance-name": "vid-e2e-test_service_2017-07-26_23-01-31-327", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501099298353", - "orchestration-status": "Active" - }, - { - "service-instance-id": "599b2af1-92bc-4c99-be63-0f027897b643", - "service-instance-name": "vid-e2e-test_service_2017-07-26_21-03-28-542", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501092216356", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/a4401c1c-505d-4287-a0cb-d2f079bcca4a", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "a4401c1c-505d-4287-a0cb-d2f079bcca4a" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test_vnf_2017-07-26_21-04-00-755" - } - ] - } - ] - } - }, - { - "service-instance-id": "649b92a1-d599-4abb-ae22-9d79ab15d39d", - "service-instance-name": "testrttert", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1499866339532", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c64642d2-d014-47bc-83f1-4e4854a20fb5", - "service-instance-name": "test675refg", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1499868496430", - "orchestration-status": "Active" - }, - { - "service-instance-id": "935400cb-3055-41e6-bea9-6fa25c470fe8", - "service-instance-name": "vid-e2e-test_service_2017-09-10_10-39-59-713", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505029212112", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1d61b1be-a7a5-4f01-b980-d83702cb1c81", - "service-instance-name": "vid-e2e-test_aai_service_2017-09-10_11-33-40-608", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505032423917", - "orchestration-status": "Active" - }, - { - "service-instance-id": "cfd3bc73-45b6-486e-89ed-ecd77d6c28d4", - "service-instance-name": "rtyrtyu", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1504686208504", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b5c0cf11-5cd5-4ac0-9cf3-f794b7d2e9e7", - "service-instance-name": "eylonTest2", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a6a00927-7b10-48ed-bed4-0c9f5cf3fe1b", - "model-version-id": "775fdee6-22a9-4243-9a35-573a67df5fa4", - "resource-version": "1509264230953", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p3", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p3" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/f8494620-44a3-464b-b577-7a2a1113390d", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "f8494620-44a3-464b-b577-7a2a1113390d" - } - ] - } - ] - } - }, - { - "service-instance-id": "e96c6246-59b8-44f1-992a-00dcc9715403", - "service-instance-name": "eylonTest1", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a6a00927-7b10-48ed-bed4-0c9f5cf3fe1b", - "model-version-id": "775fdee6-22a9-4243-9a35-573a67df5fa4", - "resource-version": "1509264071228", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p6", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p6" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/f8494620-44a3-464b-b577-7a2a1113390d", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "f8494620-44a3-464b-b577-7a2a1113390d" - } - ] - } - ] - } - }, - { - "service-instance-id": "3b271daa-7dae-4e7e-8b7c-d4938752d53c", - "service-instance-name": "vik_flexware", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "951fd067-b3c1-41e4-8d1d-54223e37caa6", - "model-version-id": "5b20f93d-042f-4b44-ba8a-8428877975d0", - "resource-version": "1510067918641", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/Nimbus", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "Nimbus" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/2356a43d-ed56-43b6-aefc-8391b82588c9", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "2356a43d-ed56-43b6-aefc-8391b82588c9" - } - ] - } - ] - } - }, - { - "service-instance-id": "037157ae-4edb-4885-af7a-57ae1087e4f0", - "service-instance-name": "ServicePnf_25", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1509378462768", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/037157ae-4edb-4885-af7a-57ae1087e4f0/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c363d78f-2cfd-4095-a90e-c5412133e46f", - "service-instance-name": "test_034599599sdv", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508411127918", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3f592a6f-459b-435e-b0d4-59959ab1d385", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3f592a6f-459b-435e-b0d4-59959ab1d385" - } - ] - } - ] - } - }, - { - "service-instance-id": "f04f45fe-0563-4b41-affe-4f71591f330a", - "service-instance-name": "testmac_0345095", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508413319691", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - } - ] - } - }, - { - "service-instance-id": "e6f32432-c7a7-4d84-8596-13b931bebed9", - "service-instance-name": "Bracha1234", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508418034736", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3f592a6f-459b-435e-b0d4-59959ab1d385", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3f592a6f-459b-435e-b0d4-59959ab1d385" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/edfccd7f-a8d6-4b2d-b87a-4344d868e53c", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "edfccd7f-a8d6-4b2d-b87a-4344d868e53c" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "portal" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4d73cfb9-3122-47c2-b3dc-9f944bea9134", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "4d73cfb9-3122-47c2-b3dc-9f944bea9134" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bracha12345" - } - ] - } - ] - } - }, - { - "service-instance-id": "f5e4918e-a0d7-4c50-9474-240edf63bd1d", - "service-instance-name": "triusyt7584", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a6a00927-7b10-48ed-bed4-0c9f5cf3fe1b", - "model-version-id": "775fdee6-22a9-4243-9a35-573a67df5fa4", - "resource-version": "1508412580537", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p80", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p80" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3f592a6f-459b-435e-b0d4-59959ab1d385", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3f592a6f-459b-435e-b0d4-59959ab1d385" - } - ] - } - ] - } - }, - { - "service-instance-id": "0a222d51-2d02-4d19-8926-0cc04b023212", - "service-instance-name": "ServicePnf_17", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1508076064866", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/0a222d51-2d02-4d19-8926-0cc04b023212/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "867f48cb-f5fa-499c-b84d-f33533b2978d", - "service-instance-name": "fffssssaaaeeeewww", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508078868301", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/x1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "x1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/z1", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "z1" - } - ] - } - ] - } - }, - { - "service-instance-id": "257feb6b-ad89-4001-bb9d-54cfe8add8f6", - "service-instance-name": "vid-e2e-test_service_2017-10-15_17-42-19-283", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508078514218", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/x1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "x1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/z1", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "z1" - } - ] - } - ] - } - }, - { - "service-instance-id": "153635ac-4bbb-4c12-8f54-b23c29f1af01", - "service-instance-name": "vid-test-2224443", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1501674964224", - "orchestration-status": "Active" - }, - { - "service-instance-id": "145d3863-b44c-40cf-addd-45f42a9522ad", - "service-instance-name": "vid-test-444333322", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501665641034", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6798f1fa-fb5c-4638-b1ff-b7b66052e71d", - "service-instance-name": "vid-test-creation-3333", - "service-type": "", - "service-role": "", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1501672969683", - "orchestration-status": "Active" - }, - { - "service-instance-id": "67b2bb65-fbee-44dc-a144-88a8b5084d35", - "service-instance-name": "vid-test-333222", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1501663697504", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7a9fc646-39a4-4f18-afc8-1be9560d4535", - "service-instance-name": "vid-test-3333222", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1501675189009", - "orchestration-status": "Active" - }, - { - "service-instance-id": "101e3ef2-8650-11e6-ae22-56b6b6499611", - "resource-version": "1494001848458", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ctpx0001v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ctpx0001v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ctpx0001v" - } - ] - } - ] - } - }, - { - "service-instance-id": "c505ba4c-6333-4911-ac60-5736f36ff036", - "service-instance-name": "SlowAAI", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509613326963", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p80", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p80" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/73185f03-5531-444d-bc03-fa13f924d66a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "73185f03-5531-444d-bc03-fa13f924d66a" - } - ] - } - ] - } - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "AAIAIC25" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "092eb9e8e4b7412e8787dd091bc58e86" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "USP-SIP-IC-24335-T-01" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "bae71557c5bb4d5aac6743a4e5f1d054" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-testgamma" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "229bcdc6eaeb4ca59d55221141d01f8e" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-STTest2" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "1178612d2b394be4834ad77f567c0af2" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-SSPtestcustome" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "19c5ade915eb461e8af52fb2fd8cd1f2" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-UncheckedEcopm" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/de007636e25249238447264a988a927b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "de007636e25249238447264a988a927b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-dfsdf" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "62f29b3613634ca6a3065cbe0e020c44" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN/SMS-16-D-Multiservices1" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "649289e30d3244e0b48098114d63c2aa" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-SSPST66" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "3f21eeea6c2c486bba31dab816c05a32" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-ASSPST47" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "f60ce21d3ee6427586cff0d22b03b773" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg67246" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8774659e425f479895ae091bb5d46560", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "8774659e425f479895ae091bb5d46560" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg68359" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/624eb554b0d147c19ff8885341760481", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "624eb554b0d147c19ff8885341760481" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-iftach" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/214f55f5fc414c678059c383b03e4962", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "214f55f5fc414c678059c383b03e4962" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg612401" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "c90666c291664841bb98e4d981ff1db5" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg621340" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "ce5b6bc5c7b348e1bf4b91ac9a174278" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "sspjg621351cloned" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "b386b768a3f24c8e953abbe0b3488c02" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-eteancomp" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "dc6c4dbfd225474e9deaadd34968646c" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-T-SPFET" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "02cb5030e9914aa4be120bd9ed1e19eb" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-eeweww" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "f2f3830e4c984d45bcd00e1a04158a79" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-spjg61909" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/05b91bd5137f4929878edd965755c06d", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "05b91bd5137f4929878edd965755c06d" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg621512cloned" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "7002fbe8482d4a989ddf445b1ce336e0" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-vdr" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "4008522be43741dcb1f5422022a2aa0b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-ssasa" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "f44e2e96a1b6476abfda2fa407b00169" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-PFNPT" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "b69a52bec8a84669a37a1e8b72708be7" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-vdre" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "fac7d9fd56154caeb9332202dcf2969f" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-NONPODECOMP" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "cb42a77ff45b48a8b8deb83bb64acc74" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "ro-T11" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "fa45ca53c80b492fa8be5477cd84fc2b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "ro-T112" - } - ] - } - ] - } - }, - { - "service-type": "TSBC", - "resource-version": "1494001891362", - "service-instances": { - "service-instance": [ - { - "service-instance-id": "c0edefb0-2505-4a34-85cc-96c4cd5a121d", - "service-instance-name": "test-343432", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1500370094198", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7cb54908-f3fb-46b9-b547-d1e670ea95b2", - "service-instance-name": "test765445g", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "240376de-870e-48df-915a-31f140eedd2c", - "resource-version": "1499868690949", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fbb52a16-2c57-4212-802f-32dbba2204f2", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "fbb52a16-2c57-4212-802f-32dbba2204f2" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fdfdfdf" - } - ] - } - ] - } - }, - { - "service-instance-id": "8e953267-4cd8-45ec-ae7f-bdeb018656c0", - "service-instance-name": "a1", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509355912484", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/2356a43d-ed56-43b6-aefc-8391b82588c9", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "2356a43d-ed56-43b6-aefc-8391b82588c9" - } - ] - } - ] - } - }, - { - "service-instance-id": "e2ecfd33-b5d3-4a7b-85ba-1a709b26b66c", - "service-instance-name": "a3", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1509356358573", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/589fe0db-26c4-45e5-9f4e-a246c74fce76", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "589fe0db-26c4-45e5-9f4e-a246c74fce76" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9c925d7e-1a94-4784-a45b-408c8cc96fa8", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9c925d7e-1a94-4784-a45b-408c8cc96fa8" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dfdsfds" - } - ] - } - ] - } - }, - { - "service-instance-id": "7dfef88f-fec0-421f-90d4-91eea35a5813", - "service-instance-name": "shanitest", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", - "model-version-id": "44671b15-83dd-4db7-a36e-dfada3eaa2f9", - "resource-version": "1508144995828", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a46ca55c-e9bd-4e68-9c49-c98933240218", - "service-instance-name": "si_failtest", - "model-invariant-id": "732263bd-0655-428d-a347-d65676d1a949", - "resource-version": "1494001997513" - }, - { - "service-instance-id": "e165f1af-a3cf-4323-8cd2-607acb55baa9", - "service-instance-name": "first_macro_shani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1508071197869", - "orchestration-status": "Active" - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ece35e4a79d547d193451ac38d700046", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "ece35e4a79d547d193451ac38d700046" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-sspstMAIL" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "23cbbd1872864ea08aa53ade25d34172" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-rtertet" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ded2432abb5a4100801331d07787afc2", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "ded2432abb5a4100801331d07787afc2" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN/SMS-16-D-SSPecompFlvr2" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "ad5aab08f5f7435e9983311af543f311" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-PODECOMP" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8071dc66981c4294b05483a1cddac801", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "8071dc66981c4294b05483a1cddac801" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-X-ecompPODprivate" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "036f769581904ca08ead1415c22b9ec0" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-PODECOMPCLONE" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "c2475a36c5e04f12a21593849ae83420" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN/SMS-16-X-hope" - } - ] - } - ] - } - } - ] - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_USP-VOICE_cr.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_USP-VOICE_cr.json deleted file mode 100644 index b79eca764..000000000 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_USP-VOICE_cr.json +++ /dev/null @@ -1,8289 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89", - "queryParams": { - "depth": 2 - } - }, - "simulatorResponse": { - "responseCode": 200, - "body": { - "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name": "USP VOICE", - "subscriber-type": "INFRA", - "resource-version": "1494001938080", - "service-subscriptions": { - "service-subscription": [ - { - "service-type": "HOSTED COMMUNICATIONS", - "resource-version": "1494001920845", - "service-instances": { - "service-instance": [ - { - "service-instance-id": "67aba9ab-f745-442e-a37b-2040a17ec9c7", - "service-instance-name": "test_948473", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1501137356564", - "orchestration-status": "Active" - }, - { - "service-instance-id": "328e117c-8f27-4a59-beea-3b3c36e4652f", - "service-instance-name": "test_inputs_002", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1501142919029", - "orchestration-status": "Active" - }, - { - "service-instance-id": "66608fd9-a786-4f60-ae7b-c18d030c499b", - "service-instance-name": "testtt", - "service-type": "", - "service-role": "", - "model-invariant-id": "1cc41b64-5c12-4d51-bac9-448e963bd81d", - "model-version-id": "91f79100-6450-4078-80d7-531427b4fe74", - "resource-version": "1503224667654", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9d29dcf2-7742-4384-bca0-a38f6c296a79", - "service-instance-name": "test_9sdfkdfj", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1500813552431", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e10414d0-692b-4e8e-b56e-9fdc5ef24059", - "service-instance-name": "test_04598485", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1501144603052", - "orchestration-status": "Active" - }, - { - "service-instance-id": "25a5cc93-73df-4c9c-9cc5-e2df9a72f3b7", - "service-instance-name": "test_inputs_values1", - "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339", - "model-version-id": "59f3ea84-313a-4670-b7c2-8997e5749864", - "resource-version": "1501412516301", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9cfcd777-7f14-425c-80bf-a562fba03cfa", - "service-instance-name": "test_vl_inputs01", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "f263c8f6-b52f-4b6c-9ed9-0c83ad098697", - "resource-version": "1501421232100", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4173d5da-df33-474e-a4ef-c93be61a1355", - "service-instance-name": "test_instance_vl_01", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1500966394803", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1753f7eb-85db-498c-aa6a-c68a06fc77db", - "service-instance-name": "sdfjdfj", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500991399818", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5d5520c7-dcbc-4287-bed2-50ff57c41a6f", - "service-instance-name": "tesy_jsdjjdj", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501400257544", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/65a76ad1-2d53-4709-88e7-858655f55039", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "65a76ad1-2d53-4709-88e7-858655f55039" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_jddjf" - } - ] - } - ] - } - }, - { - "service-instance-id": "1ab8ad18-1445-412a-81f2-671b936ab650", - "service-instance-name": "Test_098765", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1500562034054", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2ae575e4-5103-4f5e-afd9-cc5f4bbae217", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "2ae575e4-5103-4f5e-afd9-cc5f4bbae217" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test-0234574785" - } - ] - } - ] - } - }, - { - "service-instance-id": "a1427609-254d-4637-906f-8f0f6f6d4711", - "service-instance-name": "test343445", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502111792531", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f87c0dbe-2658-4971-8014-ad5da1f9df51", - "service-instance-name": "test_03494595", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1502006858511", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7a8dea9f-5f67-4755-9344-ec3736240b9e", - "service-instance-name": "test_045045", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502111390681", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8d0f4c13-a564-43ec-b756-c0017161dee2", - "service-instance-name": "testkjhjjj", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1500553831697", - "orchestration-status": "Active" - }, - { - "service-instance-id": "27535e2a-785e-47e8-a482-16f4d019033a", - "service-instance-name": "test765766", - "service-type": "", - "service-role": "", - "model-invariant-id": "452538c0-ef1e-4d65-9939-697f6ed58934", - "model-version-id": "f430728a-4530-42be-a577-1206b9484cef", - "resource-version": "1502109495302", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9601d34e-d3f9-4108-932c-fc52312c260a", - "service-instance-name": "test_9459495", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502028721334", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e65ae593-afdd-4f31-8192-ba7606a026e4", - "service-instance-name": "test_84574854", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502026481024", - "orchestration-status": "Active" - }, - { - "service-instance-id": "29e210af-9fa5-44ae-940c-acca84b1b287", - "service-instance-name": "testjkdfkdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502114664500", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c1a81ab3-2bc6-4b6f-b04f-d358e67c1d01", - "service-instance-name": "test499494", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500552497782", - "orchestration-status": "Active" - }, - { - "service-instance-id": "01834681-686a-4258-aff0-6eea448deddd", - "service-instance-name": "tesr_iii_999", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502019889568", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e4c23f76-53a0-46e2-b005-59503e55c832", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "e4c23f76-53a0-46e2-b005-59503e55c832" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "tesu_ooo_000" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4a7b7099-4d38-4ba4-aff8-1598bba0e704", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "4a7b7099-4d38-4ba4-aff8-1598bba0e704" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_000988_ooo" - } - ] - } - ] - } - }, - { - "service-instance-id": "266008e8-04f9-440a-90e9-d9299821ec08", - "model-invariant-id": "", - "resource-version": "1494001993349", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0011v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bnfm0011v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bnfm0011v" - } - ] - } - ] - } - }, - { - "service-instance-id": "6c3a22e9-6b04-49d2-b1fa-1e49103971ca", - "model-invariant-id": "", - "resource-version": "1494001986409", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0006v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bdbl0006v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bdbl0006v" - } - ] - } - ] - } - }, - { - "service-instance-id": "918085fc-29cf-41c2-acc8-15878c0d58b3", - "model-invariant-id": "", - "resource-version": "1494001986411", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0010v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bnfm0010v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bnfm0010v" - } - ] - } - ] - } - }, - { - "service-instance-id": "1c464a9d-eff7-4d29-8e97-ed1e9e3c8458", - "model-invariant-id": "", - "resource-version": "1494001953169", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bnfm0012v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bnfm0012v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bnfm0012v" - } - ] - } - ] - } - }, - { - "service-instance-id": "bb2f563f-6db7-46ec-b521-fc6ee07e4f3e", - "model-invariant-id": "", - "resource-version": "1494002002228", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0004v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bdbl0004v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bdbl0004v" - } - ] - } - ] - } - }, - { - "service-instance-id": "4cf94a42-85b8-414f-8fb4-a43b1dac1d2f", - "model-invariant-id": "", - "resource-version": "1494001834026", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0005v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bdbl0005v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bdbl0005v" - } - ] - } - ] - } - }, - { - "service-instance-id": "ed7c0d8e-de81-408f-b695-47b9dd6b2ca0", - "model-invariant-id": "", - "resource-version": "1494001986403", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0003v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bdbl0003v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bdbl0003v" - } - ] - } - ] - } - }, - { - "service-instance-id": "8bf34b89-1648-4a41-a21f-9b752833bd4b", - "service-instance-name": "test-gkmf546g", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500377885652", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e0994c94-fa19-472f-a5b7-ae7388105db2", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "e0994c94-fa19-472f-a5b7-ae7388105db2" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test-elftoerkk56" - } - ] - } - ] - } - }, - { - "service-instance-id": "082c606c-60d7-4d9a-87c7-1370de6e56ba", - "service-instance-name": "test123456", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1500375305701", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fac2ab99-7c5a-4f1e-aad8-d396f26ba7c4", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "fac2ab99-7c5a-4f1e-aad8-d396f26ba7c4" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test12345" - } - ] - } - ] - } - }, - { - "service-instance-id": "c4707aae-9b16-49b4-8b52-cbeb8c4129ab", - "service-instance-name": "test_sdfdlfldl", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "cad9f2eb-39f7-4692-90c2-8726bb594610", - "resource-version": "1500376318829", - "orchestration-status": "Active" - }, - { - "service-instance-id": "86ab6048-9037-4367-ac01-f2e5881e8034", - "service-instance-name": "test1234456", - "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637", - "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2", - "resource-version": "1500369079277", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/329f3b0e-4e03-4dc0-8e56-e786ef392984", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "329f3b0e-4e03-4dc0-8e56-e786ef392984" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test567" - } - ] - } - ] - } - }, - { - "service-instance-id": "a5e3b6ae-7b4c-4247-b975-1cd46c3b3e9a", - "service-instance-name": "pavel_usp_voice", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1506931067790", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/7aeacd8e-5d7c-496d-9ec7-1163cb809810", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "7aeacd8e-5d7c-496d-9ec7-1163cb809810" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "pavel_ucp_voice_vnf" - } - ] - } - ] - } - }, - { - "service-instance-id": "c9fb03a4-8c21-444a-84ee-a6f969698d9c", - "service-instance-name": "test_0e459495945kg", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502021459612", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/983823ce-2482-4943-9081-11d33be3c5f4", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "983823ce-2482-4943-9081-11d33be3c5f4" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_045495945" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/39acee2f-590e-4e42-8317-f4c624f5bd96", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "39acee2f-590e-4e42-8317-f4c624f5bd96" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_0e934834" - } - ] - } - ] - } - }, - { - "service-instance-id": "4fd55324-bc4d-4acf-8f76-2e1eb01ae6a5", - "service-instance-name": "test_0w459495", - "service-type": "", - "service-role": "", - "model-invariant-id": "e3ee9d25-2c6b-4734-8a8c-b6e0dee11ca9", - "model-version-id": "159cc54d-a6be-4c3b-bea3-3214181ebb5d", - "resource-version": "1502019352627", - "orchestration-status": "Active" - }, - { - "service-instance-id": "bbccd5cf-f641-4082-8411-7ae123530d92", - "service-instance-name": "kkk", - "service-type": "", - "service-role": "", - "model-invariant-id": "331a194d-9248-4533-88bc-62c812ccb5c1", - "model-version-id": "171b3887-e73e-479d-8ef8-2690bf74f2aa", - "resource-version": "1502087710872", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/36110437-6ae0-466d-a3fb-992e90cd1f49", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "36110437-6ae0-466d-a3fb-992e90cd1f49" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ooo" - } - ] - } - ] - } - }, - { - "service-instance-id": "4c263e04-260e-434a-8ac2-b0335a02f30b", - "model-invariant-id": "", - "resource-version": "1494001791264", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/bdbl0002v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "bdbl0002v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bdbl0002v" - } - ] - } - ] - } - }, - { - "service-instance-id": "e4feb759-e4a9-4614-b2d2-985848ba3b9f", - "service-instance-name": "test345345342334f", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1499869396079", - "orchestration-status": "Active" - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/5a8dba3e75e7433185b8004e2f2c546e", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "5a8dba3e75e7433185b8004e2f2c546e" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN/SMS-16-D-CheckEcomp" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/0ee101c4b53542f49cfc5e1e49d28f88", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "0ee101c4b53542f49cfc5e1e49d28f88" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-US608multising" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/d0b6d63ca975464b9fc2c759a8b21270", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "d0b6d63ca975464b9fc2c759a8b21270" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-X-noPOD41581Cloned" - } - ] - } - ] - } - }, - { - "service-type": "VIRTUAL USP", - "resource-version": "1494001841964", - "service-instances": { - "service-instance": [ - { - "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f6", - "service-instance-name": "test_sssdad", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503919915499", - "orchestration-status": "<ORCH_STATUS>", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8715ea55-6fcf-45b5-b42b-2ca37ec3cb39", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "8715ea55-6fcf-45b5-b42b-2ca37ec3cb39" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sedawsdsda" - } - ] - } - ] - } - }, - { - "service-instance-id": "9929cdf2-1b2d-4530-b5a4-ae9a716c12cc", - "service-instance-name": "xcvxcvxcv", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503842185188", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4572aed2-f09d-4a34-9b20-34d8625ed4c6", - "service-instance-name": "dsdsfdfd334", - "service-type": "", - "service-role": "", - "model-invariant-id": "2f801573-11c6-4040-aa8c-d5548ef07b53", - "model-version-id": "80d68407-7b2c-48a4-96fc-4fe89c424cbe", - "resource-version": "1503920297893", - "orchestration-status": "Active" - }, - { - "service-instance-id": "037629ea-fd18-4b2f-9f19-27cb45799a41", - "service-instance-name": "iokooik", - "service-type": "", - "service-role": "", - "model-invariant-id": "caed4dbb-922a-4942-be87-1f99d56d426a", - "model-version-id": "b77dae3c-ac5b-459c-8df5-1f1de6c59737", - "resource-version": "1503920445391", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c9bbcc94-e27a-46ff-a292-29805358348c", - "service-instance-name": "iuiuiuoi", - "service-type": "", - "service-role": "", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1503919829011", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8ad6dc32-5ea9-46be-9a70-924a620dca58", - "service-instance-name": "dfgdfgdfg", - "service-type": "", - "service-role": "", - "model-invariant-id": "4c35d46f-de47-4bbc-bcda-0d46caeddf09", - "model-version-id": "9014b6b1-33c1-4092-87ab-62c230c74d74", - "resource-version": "1503920088993", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/acba27e0-18b5-4a9b-a8b5-c0e6a3d36769", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "acba27e0-18b5-4a9b-a8b5-c0e6a3d36769" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfdsfdf334" - } - ] - } - ] - } - }, - { - "service-instance-id": "7bdaca06-8242-48bc-a20e-b882426a1cd2", - "service-instance-name": "test_jhgjhghh5", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1503843741682", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ff42af8d-9815-4bcd-bda1-8fdde723a1c9", - "service-instance-name": "awereware", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503919051810", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/1df3da26-b22a-4d01-b024-8e2250599b55", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "1df3da26-b22a-4d01-b024-8e2250599b55" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fgdssafg" - } - ] - } - ] - } - }, - { - "service-instance-id": "0fc0441b-92a8-4964-b80d-7df5c3f6bbcd", - "service-instance-name": "asdsdsdsd", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503919005027", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b8db1779-52d6-41ff-823c-671e7ccb1dea", - "service-instance-name": "sdfsdfdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1503919113722", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/385a533f-c355-4891-ac26-056b76be21e1", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "385a533f-c355-4891-ac26-056b76be21e1" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ewrdsdf" - } - ] - } - ] - } - }, - { - "service-instance-id": "13bee70f-40c8-4b4f-a691-9d36a661e22f", - "service-instance-name": "rtrtreert", - "service-type": "", - "service-role": "", - "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", - "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", - "resource-version": "1503919611730", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b1891b75-b45a-4862-8f4d-bc41b68b9760", - "service-instance-name": "svc", - "service-type": "", - "service-role": "", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1503909634453", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c290be7e-4cae-4cfb-859e-7694849699ed", - "service-instance-name": "iioopi", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503918640292", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ba1855f1-6e1a-4f32-a8d4-36163e650a64", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ba1855f1-6e1a-4f32-a8d4-36163e650a64" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ertrtrtrt" - } - ] - } - ] - } - }, - { - "service-instance-id": "debaf16c-b0e0-4d1d-a1e6-a13434dd83e9", - "service-instance-name": "aaaqqq", - "service-type": "", - "service-role": "", - "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", - "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", - "resource-version": "1503909401143", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/641b6bf5-b3fa-437d-af35-03a6f4127716", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "641b6bf5-b3fa-437d-af35-03a6f4127716" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_865654787" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/0efd35bc-0ea3-4b87-9a26-2fb20a3028e3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "0efd35bc-0ea3-4b87-9a26-2fb20a3028e3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sfdgdfgdfr55" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/075559bf-49b5-4b21-8ea6-1f96d7d2d7ce", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "075559bf-49b5-4b21-8ea6-1f96d7d2d7ce" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dfgyhfghfg" - } - ] - } - ] - } - }, - { - "service-instance-id": "b1af7026-5c58-4f81-beef-7fbe28a40d8b", - "service-instance-name": "sddsfsdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1503844024814", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a77c74e9-7571-4f99-af53-4f7016a28418", - "service-instance-name": "dsdfdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503842375992", - "orchestration-status": "Active" - }, - { - "service-instance-id": "18479d32-e495-4610-b484-238a0c8af022", - "service-instance-name": "ddffeee", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503919781252", - "orchestration-status": "Active" - }, - { - "service-instance-id": "27b005b5-d631-43a6-8913-0a014277b1c7", - "service-instance-name": "test76546454565", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339", - "model-version-id": "a5b89224-c03d-4142-b4ce-8b8e8b8de54a", - "resource-version": "1506843154174", - "orchestration-status": "Active" - }, - { - "service-instance-id": "61bd4009-86ce-4603-842a-a3c872e327c2", - "service-instance-name": "litalamichai", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "ceab97cd-ca68-41a6-9b34-d571b2dd05ed", - "model-version-id": "1a6ae314-7a89-408b-93e5-6d8b8ee4c28a", - "resource-version": "1506856240745", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/70d82ea3-28b1-44c9-8cdd-7c0431b1a76e", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "70d82ea3-28b1-44c9-8cdd-7c0431b1a76e" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "litalamichai1" - } - ] - } - ] - } - }, - { - "service-instance-id": "afeb67ac-0777-4f49-855e-cc84700382ed", - "service-instance-name": "test_0409e4569", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1507013953885", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c42940b2-ce05-4305-a92c-6ab6139f34db", - "service-instance-name": "test4346565532", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1507015242425", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5bf5afb9-68fd-4df6-b7cd-d7a72c2ebb6e", - "service-instance-name": "test_9876545566", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1507015455080", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/aceec6c9-3b3d-4c88-8b24-8fcf7aa5183f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "aceec6c9-3b3d-4c88-8b24-8fcf7aa5183f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "testvnf4436554656" - } - ] - } - ] - } - }, - { - "service-instance-id": "3b89aadb-354c-4557-8f38-9267efe73340", - "service-instance-name": "testvgroupavila111", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1507467637750", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9c073cff-5e87-49b8-be54-552717eb85a7", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9c073cff-5e87-49b8-be54-552717eb85a7" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fggert44w" - } - ] - } - ] - } - }, - { - "service-instance-id": "ea4434fe-b52f-4a4b-8cac-570fda09915e", - "service-instance-name": "tester34445", - "service-type": "test", - "service-role": "test", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", - "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", - "resource-version": "1507547071064", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a00c370-9aa6-4a66-a219-a63cac864f87", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "8a00c370-9aa6-4a66-a219-a63cac864f87" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "testvnfff888" - } - ] - } - ] - } - }, - { - "service-instance-id": "8041258e-db6c-4aa4-8ea1-daa049bb4bcd", - "service-instance-name": "macroinstancenamingfalse", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1507466261065", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8b90a65c-cf97-4425-b0f9-cedeb66be73b", - "service-instance-name": "ServicePnf_15", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1507463828320", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/8b90a65c-cf97-4425-b0f9-cedeb66be73b/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "0bba7c99-b04d-4f7d-be83-64d677d938a7", - "service-instance-name": "test_094894934", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1507468724856", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c2586a1a-7ffb-470d-b280-580cd3832855", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "c2586a1a-7ffb-470d-b280-580cd3832855" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfsdfsdf" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/88e8a1a2-26ee-4b64-8cfd-516567c6e085", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "88e8a1a2-26ee-4b64-8cfd-516567c6e085" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfsdf" - } - ] - } - ] - } - }, - { - "service-instance-id": "f50fe353-f93f-42bf-881e-11afa56bc197", - "service-instance-name": "test_input01", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "b594a6ec-94e0-4c95-826f-4c3d3af56339", - "model-version-id": "a5b89224-c03d-4142-b4ce-8b8e8b8de54a", - "resource-version": "1506438016276", - "orchestration-status": "Active" - }, - { - "service-instance-id": "aefde1b5-f4fe-4294-8d24-7981fa0ebfc5", - "service-instance-name": "test_vf_vgroup001", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "ceab97cd-ca68-41a6-9b34-d571b2dd05ed", - "model-version-id": "1a6ae314-7a89-408b-93e5-6d8b8ee4c28a", - "resource-version": "1506428004236", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f42766e6-c15a-415d-8da9-44546787aa60", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f42766e6-c15a-415d-8da9-44546787aa60" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_9883458" - } - ] - } - ] - } - }, - { - "service-instance-id": "dc010843-43d2-442f-87ea-5a33129e820c", - "service-instance-name": "test034598459509345", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1506431351311", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e77db2e8-6e92-451c-bd9b-52f7edd12e34", - "service-instance-name": "ServicePnf_3", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1506431257301", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/e77db2e8-6e92-451c-bd9b-52f7edd12e34/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "27508166-a325-435f-9be5-e0f9c6525e0d", - "service-instance-name": "test_04587465", - "service-type": "", - "service-role": "", - "model-invariant-id": "0ab97204-7036-494b-bffc-d0dcf51221a6", - "model-version-id": "236624dc-0682-4f58-a20a-105b035b87cd", - "resource-version": "1505401406581", - "orchestration-status": "Active" - }, - { - "service-instance-id": "795b711c-41ce-4e31-a572-a898dc5a047e", - "service-instance-name": "vid-test-555", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505382167563", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7a18c22a-6ffc-409e-a904-731919a4d8bc", - "service-instance-name": "fghjSHANI", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509624542659", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/96208579-2839-442d-bcd7-46902fb5b108", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "96208579-2839-442d-bcd7-46902fb5b108" - } - ] - } - ] - } - }, - { - "service-instance-id": "4f18b4a3-681d-4db2-be2f-f5721625db50", - "service-instance-name": "kmkl", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500324503096", - "orchestration-status": "Active" - }, - { - "service-instance-id": "bcfc991c-f757-4aac-afd6-6a6ce2ee3a10", - "service-instance-name": "ijo", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500325226519", - "orchestration-status": "Active" - }, - { - "service-instance-id": "71c228f8-8737-4759-8ff5-756c61b6c6cc", - "service-instance-name": "sdasd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500328608207", - "orchestration-status": "Active" - }, - { - "service-instance-id": "fd10def6-838c-4caa-89f8-023d8c352d64", - "service-instance-name": "b", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500323167586", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8352d30d-7f79-4a92-bb07-d41482602f91", - "service-instance-name": "drg", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500310144871", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ff0ed1a9-c498-4fa3-9cc1-d1baea101b1a", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ff0ed1a9-c498-4fa3-9cc1-d1baea101b1a" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfd" - } - ] - } - ] - } - }, - { - "service-instance-id": "f53eeb76-3011-4745-8bd4-fb725ee54e8b", - "service-instance-name": "bcvbcvc", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1500312834903", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9b47dc09-c938-4058-8f4e-b1b97575f01c", - "service-instance-name": "fg", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1500314405338", - "orchestration-status": "Active" - }, - { - "service-instance-id": "da3e0037-145d-4003-ba9c-bf7e160d0c76", - "service-instance-name": "hi", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500308632846", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a5a0c1c5-87e6-4b41-8a1d-fc217ea7afb5", - "service-instance-name": "dfh", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500313821530", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e10cf33f-9733-400e-b641-df6e025b7015", - "service-instance-name": "dsf", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1500314537419", - "orchestration-status": "Active" - }, - { - "service-instance-id": "fdf609c7-c6b9-4d61-9dd1-ecf260b1df24", - "service-instance-name": "DS-vUSP_0804_Svc_01", - "service-type": "", - "service-role": "", - "model-invariant-id": "e4f8b794-8057-4b1c-acf8-39cdcbc07dae", - "model-version-id": "79572855-8d8c-47db-a5fa-29cb28058f88", - "resource-version": "1501867289436", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ef204722-f283-40f2-aae3-2039a93b0677", - "service-instance-name": "vid-e2e-test_aai_service_2017-08-08_14-01-39-901", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502190103332", - "orchestration-status": "Active" - }, - { - "service-instance-id": "3dd30ee9-afd9-4c67-aecc-38025205ae1d", - "service-instance-name": "ppp", - "service-type": "", - "service-role": "", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1502087647947", - "orchestration-status": "Active" - }, - { - "service-instance-id": "064983e9-89b8-4e21-a5a6-ca446422de16", - "service-instance-name": "litaltest", - "service-type": "", - "service-role": "", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1502087037035", - "orchestration-status": "Active" - }, - { - "service-instance-id": "db1ef13e-e434-4614-a5e4-ccdbf9ff4f37", - "service-instance-name": "vid-test-4442222331", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502088709341", - "orchestration-status": "Active" - }, - { - "service-instance-id": "757ea8da-ca9d-48a0-8782-8eff90d90532", - "service-instance-name": "vid-e2e-test_aai_service_2017-08-08_14-40-54-152", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502192457669", - "orchestration-status": "Active" - }, - { - "service-instance-id": "83cca0d1-0090-4e08-9221-d0db78e8ba20", - "service-instance-name": "TEST-TEST", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502006816430", - "orchestration-status": "Active" - }, - { - "service-instance-id": "912b54ba-53b7-49ea-851b-a5af84787b61", - "service-instance-name": "vid-test-aaaa222", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502004264219", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2ac3e9ef-30f1-449c-ac41-4b3a4649bad9", - "service-instance-name": "test834884", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1502109623756", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1f9c366c-c3c2-4c7b-8f31-fa1ed8f440ad", - "service-instance-name": "", - "service-type": "null", - "service-role": "null", - "model-invariant-id": "5c3bb706-95fc-4589-b40f-ed024673246a", - "model-version-id": "873e3f27-6561-47a6-80b0-0cd048d5cdfb", - "resource-version": "1502170650437", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f778648a-1db5-4fd2-9d6d-1c3e9dc810c9", - "service-instance-name": "test_0er50405", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502180550390", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/680873ba-2ac2-4139-a40d-5085b978b737", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "680873ba-2ac2-4139-a40d-5085b978b737" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_0450405" - } - ] - } - ] - } - }, - { - "service-instance-id": "eec0b93e-fc84-4f87-badf-6e15becf7604", - "service-instance-name": "test_0e0r045", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502201260530", - "orchestration-status": "Active" - }, - { - "service-instance-id": "aaf93978-0d81-4089-ac91-4d800b0924b1", - "service-instance-name": "vid-e2e-test_service_2017-08-08_14-48-37-562", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502192927130", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b063c325-2c5f-4383-ac35-4f4a5fd75a64", - "service-instance-name": "shayservice4", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1501774259023", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4bdc43ad-ebe5-4a4f-ad33-cf4bb9439a3a", - "service-instance-name": "vid-test-service-456", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500463859730", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ef7ee58d-9ef3-478d-b80e-79c6f31038e2", - "service-instance-name": "test_9045845", - "service-type": "", - "service-role": "", - "model-invariant-id": "6269c77a-a285-473a-be32-9e34a735ae68", - "model-version-id": "de762949-453c-43bd-8610-93eca50b0681", - "resource-version": "1502802546204", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/38b85642-5eae-4e85-9f47-7f9e8772e3d8", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "38b85642-5eae-4e85-9f47-7f9e8772e3d8" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_34342345" - } - ] - } - ] - } - }, - { - "service-instance-id": "771ccd96-61e5-413b-9442-494e1fc12689", - "service-instance-name": "inputest_555", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1509004425083", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/464482f0-fec7-4171-af0e-96363f93f908", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "464482f0-fec7-4171-af0e-96363f93f908" - } - ] - } - ] - } - }, - { - "service-instance-id": "c92f4753-7997-492d-8bdb-a456d2a966eb", - "service-instance-name": "inpu_04504050", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "e3ee9d25-2c6b-4734-8a8c-b6e0dee11ca9", - "model-version-id": "97128a5f-e7e4-4ddd-b1eb-83a611ae1acb", - "resource-version": "1508945168572", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - } - ] - } - }, - { - "service-instance-id": "e3cc78f6-2fa8-43e4-8b9a-84b0bb705199", - "service-instance-name": "vl_inputs001", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509006292295", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/DFW", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "DFW" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/f160c875-ddd1-4ef5-84d8-d098784daa3a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "f160c875-ddd1-4ef5-84d8-d098784daa3a" - } - ] - } - ] - } - }, - { - "service-instance-id": "98948904-a2bb-459a-8442-3d6ac72cf3bb", - "service-instance-name": "test_ppo_999", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1509007469372", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/DFW", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "DFW" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/464482f0-fec7-4171-af0e-96363f93f908", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "464482f0-fec7-4171-af0e-96363f93f908" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f5a633ef-c7ac-4e28-8b62-85495888607e", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f5a633ef-c7ac-4e28-8b62-85495888607e" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfgdfg" - } - ] - } - ] - } - }, - { - "service-instance-id": "0ba9557d-b952-4621-844a-077af0e55147", - "service-instance-name": "testvl_555", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "144aec31-9232-4d9c-ba3a-ee052b4ea0a5", - "model-version-id": "1dbe2b4e-07df-4d41-b49e-881a07fab831", - "resource-version": "1509002554353", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/2811e2fb-005e-40de-990b-c0794f362399", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "2811e2fb-005e-40de-990b-c0794f362399" - } - ] - } - ] - } - }, - { - "service-instance-id": "0673b4d2-c7cb-453e-bd0b-0a6a9c093f0f", - "service-instance-name": "vid-e2e-test_2017-07-18_17-31-16-723", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500388282464", - "orchestration-status": "Active" - }, - { - "service-instance-id": "25abbd6c-a394-44a0-9378-a49374e5fc1b", - "service-instance-name": "vid-e2e-test_2017-07-18_17-54-01-298", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500389647052", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ce7eca35-ea2c-44dd-adb3-941298e0d194", - "service-instance-name": "asdv", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500380792111", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5e5d85a4-106b-4f25-81dc-2756d69b8160", - "service-instance-name": "vid-e2e-test_2017-07-18_17-38-15-572", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500388700897", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4141f288-4070-44fd-bc0b-1289fabc81b7", - "service-instance-name": "vid-e2e-test_2017-07-18_15-43-17-176", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500381802606", - "orchestration-status": "Active" - }, - { - "service-instance-id": "da3ac66a-fdcb-44b8-bef5-16bc0603acfc", - "service-instance-name": "dfhmg", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1500379560690", - "orchestration-status": "Active" - }, - { - "service-instance-id": "16e582ed-e183-413b-ba57-8d1a037eadbc", - "service-instance-name": "vid-e2e-test_2017-07-18_15-25-35-906", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500380741572", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8584c715-181a-40b8-bb77-8f521be498aa", - "service-instance-name": "dsadsdfdsfsdfsd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500377785124", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ed2349b1-fde2-4740-9b6a-92923c0f3564", - "service-instance-name": "vid-e2e-test_2017-07-18_18-08-55-715", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500390542619", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b6482709-2833-4805-9779-d0bb0d422f62", - "service-instance-name": "vid-e2e-test_2017-07-18_18-04-26-432", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500390272714", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a8e88919-9650-44d7-8f9f-e8b73555cf82", - "service-instance-name": "pickpikcpickkc", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500354472092", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2c3e0fc8-215e-461f-8e83-84bbfe4c9aa4", - "service-instance-name": "dsdasdas", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500354946673", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9e98302a-8803-4e4c-bf3b-e46ebc911c7e", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9e98302a-8803-4e4c-bf3b-e46ebc911c7e" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fds" - } - ] - } - ] - } - }, - { - "service-instance-id": "5909c1e6-bd22-4c98-8ed5-ef214751a563", - "service-instance-name": "vid-e2e-test_2017-07-18_08-24-24-224", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500355470123", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f4a5c51d-3ddd-457e-a293-840713d23a19", - "service-instance-name": "fs", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500354782019", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9281d7e0-720e-42a9-b5f9-f135af176099", - "service-instance-name": "jfghh", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1500367011291", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/365525ee-4a1f-4947-91be-c067a9f81a61", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "365525ee-4a1f-4947-91be-c067a9f81a61" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "mkmlk" - } - ] - } - ] - } - }, - { - "service-instance-id": "dd86dd0e-99c1-4567-87e9-d3fa20799b75", - "service-instance-name": "vod-test-666", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500566282895", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8cccc36b-977a-4e58-9e93-ae313d7380d9", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "8cccc36b-977a-4e58-9e93-ae313d7380d9" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-test-vnf-222" - } - ] - } - ] - } - }, - { - "service-instance-id": "a092e48d-44af-40e4-b088-d36b6a637033", - "service-instance-name": "vid-e2e-test_service_2017-07-20_16-40-40-845", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500558051198", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c589d78f-5178-4f9a-ba9d-cec36e19708e", - "service-instance-name": "vid-test-543", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500551310098", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a20b223f-7533-44dc-9deb-c2e627bd3701", - "service-instance-name": "vid-test-432", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500550662376", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/5dc6598f-6da4-468e-92ed-1b45b595f1d8", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "5dc6598f-6da4-468e-92ed-1b45b595f1d8" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-test-vnf-432" - } - ] - } - ] - } - }, - { - "service-instance-id": "43be2af0-014f-470f-9bf3-bcaba534e89e", - "service-instance-name": "test_945994fz", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509272926060", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9b38641c-55ec-48c1-9bf6-3dfedb2d6109", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9b38641c-55ec-48c1-9bf6-3dfedb2d6109" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "hgfdsaafgh" - } - ] - } - ] - } - }, - { - "service-instance-id": "901c9394-e3f7-48fc-bf9d-0e48b26cb7f5", - "service-instance-name": "vid-test-t", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500896893668", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e7158335-42ef-42cc-9bad-9c6b794dcb2b", - "service-instance-name": "vl_usp001", - "service-type": "", - "service-role": "", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1506351703022", - "orchestration-status": "Active" - }, - { - "service-instance-id": "54705472-6522-4d55-a6b8-091a3173f5dd", - "service-instance-name": "test_9934585345", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1506349848890", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b430262c-7a04-48e1-a656-4ff19c60fbae", - "service-instance-name": "test_09459934", - "service-type": "", - "service-role": "", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1506350033897", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e6e9488d-0621-4585-b955-1a768d38f156", - "service-instance-name": "vid-test-556", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500892871481", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f9a4be8b-09c0-4860-bd26-8384a2752e13", - "service-instance-name": "vid-test-887", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500892738430", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d86088ce-5bd0-4c05-94c9-96557f70d2e6", - "service-instance-name": "vid-test-789", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500892617605", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9ac85e73-9444-4fd7-b771-0bc2706cadb1", - "service-instance-name": "vid-test-888", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500892257855", - "orchestration-status": "Active" - }, - { - "service-instance-id": "51cddedb-68a1-47fb-97b9-63f1b7aff086", - "service-instance-name": "vid-test-112", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500896366569", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e2cd68c8-c807-4176-a39c-c44d99418f78", - "service-instance-name": "vid-test-443", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500895145213", - "orchestration-status": "Active" - }, - { - "service-instance-id": "3f93c7cb-2fd0-4557-9514-e189b7testCR", - "service-instance-name": "vid-test-444", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500789244673", - "orchestration-status": "<ORCH_STATUS>", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c015cc0f-0f37-4488-aabf-53795fd93cd3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "c015cc0f-0f37-4488-aabf-53795fd93cd3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fsd" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/0846287b-65bf-45a6-88f6-6a1af4149fac", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "0846287b-65bf-45a6-88f6-6a1af4149fac" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "kjkjk" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9908b762-136f-4b1f-8eb4-ef670ef58bb4", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9908b762-136f-4b1f-8eb4-ef670ef58bb4" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "uiui" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/543931f5-e50e-45a2-a69f-ab727e4c7f2f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "543931f5-e50e-45a2-a69f-ab727e4c7f2f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfsdfdsf" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/25e84884-22d5-44c9-8212-cb459f63e0ba", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "25e84884-22d5-44c9-8212-cb459f63e0ba" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdada" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/013fb0ba-977b-496c-9faa-7f8e5f083eec", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "013fb0ba-977b-496c-9faa-7f8e5f083eec" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gvb" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/06914296-cb46-4b62-9453-329a706a6cbb", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "06914296-cb46-4b62-9453-329a706a6cbb" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "lkllll" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c55da606-cf38-42c7-bc3c-be8e23b19299", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "c55da606-cf38-42c7-bc3c-be8e23b19299" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ss" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/27cc0914-70be-453e-b552-3df6b1d6cda9", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "27cc0914-70be-453e-b552-3df6b1d6cda9" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "yh" - } - ] - } - ] - } - }, - { - "service-instance-id": "0f2624ba-94cf-4ac5-b903-652d49002c97", - "service-instance-name": "vmee1", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1509362054136", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/80bb7c9e-4e3d-4b10-8291-7e85a1347370", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "80bb7c9e-4e3d-4b10-8291-7e85a1347370" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ce792805-a5f3-4bfe-8209-86553e097d91", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ce792805-a5f3-4bfe-8209-86553e097d91" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ssssssssssssssss" - } - ] - } - ] - } - }, - { - "service-instance-id": "43d8a0e6-34b6-42b9-b393-13a870b2a313", - "service-instance-name": "Serviceaimpnf_3", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "306caa85-74c7-48a9-aa22-7e3a564b957a", - "model-version-id": "ecd470eb-05ce-44c9-990f-4b80ac0d922d", - "resource-version": "1509367097941", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/43d8a0e6-34b6-42b9-b393-13a870b2a313/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "3c3f53a2-1cbc-48f4-bb1c-a3b071ab567c", - "service-instance-name": "service_instance_test_123456", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d51048df-47a8-4038-b981-c1cd23dada55", - "model-version-id": "ae93d743-5dca-4f8c-bc8f-16edb87c8fa2", - "resource-version": "1509550565847", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p80", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p80" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4f35c7db-e3e0-4140-a3a2-f8fa7fcc22c7", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "4f35c7db-e3e0-4140-a3a2-f8fa7fcc22c7" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vnf_instance_test_1234567" - } - ] - } - ] - } - }, - { - "service-instance-id": "48b064cd-aeb7-48c0-ae50-3ead0bd7f7a8", - "service-instance-name": "vid-test-4422", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500897698349", - "orchestration-status": "Active" - }, - { - "service-instance-id": "cb062e05-25d0-43f6-89a4-784abb39256e", - "service-instance-name": "ServicePnf_24", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1509377126770", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/cb062e05-25d0-43f6-89a4-784abb39256e/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f363b54e-ed50-4c7b-b404-b54291da2f25", - "service-instance-name": "test0450450", - "service-type": "", - "service-role": "", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1502293720068", - "orchestration-status": "Active" - }, - { - "service-instance-id": "45ae5259-949e-4163-ae40-61e564eb04ba", - "service-instance-name": "dfgbdfbgdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502276519000", - "orchestration-status": "Active" - }, - { - "service-instance-id": "643e277d-7dfe-4ff2-8894-a1ad18860d95", - "service-instance-name": "test_045004", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502279862680", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/68abca17-1fd7-4fe3-8d36-df853ce884e9", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "68abca17-1fd7-4fe3-8d36-df853ce884e9" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_405045" - } - ] - } - ] - } - }, - { - "service-instance-id": "1d439d6d-5867-4522-a730-528256378011", - "service-instance-name": "test_84584", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502293183245", - "orchestration-status": "Active" - }, - { - "service-instance-id": "de850f30-2bb0-43e9-bbb5-07250a435165", - "service-instance-name": "testmacr4050405", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508677320783", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/96208579-2839-442d-bcd7-46902fb5b108", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "96208579-2839-442d-bcd7-46902fb5b108" - } - ] - } - ] - } - }, - { - "service-instance-id": "6f442a1d-3163-4448-ad47-cd0311c8b84c", - "service-instance-name": "macr_03455949594", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508853484814", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/2811e2fb-005e-40de-990b-c0794f362399", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "2811e2fb-005e-40de-990b-c0794f362399" - } - ] - } - ] - } - }, - { - "service-instance-id": "8b1034a6-966d-4534-9622-665d0be9cb5b", - "service-instance-name": "ghjgjhg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", - "model-version-id": "29ab2dd6-e7e0-4e56-9922-5aaa81a32342", - "resource-version": "1508688088252", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p10", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p10" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - } - ] - } - }, - { - "service-instance-id": "42240602-42d9-4914-a87a-45ab88864a01", - "service-instance-name": "testint5464", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1508754951438", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p8", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p8" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d566b9bf-f383-4ee2-8856-271605fe3267", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "d566b9bf-f383-4ee2-8856-271605fe3267" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfdsf" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/429b4e95-6fb3-4f04-9ffb-795b4a3289c3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "429b4e95-6fb3-4f04-9ffb-795b4a3289c3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "oliuyt" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e53c3b6c-9013-4749-9648-f7fb43a60375", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "e53c3b6c-9013-4749-9648-f7fb43a60375" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dfgdfd" - } - ] - } - ] - } - }, - { - "service-instance-id": "88e657dc-e4be-4be8-be34-1396836e9798", - "service-instance-name": "fghfghfghf", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508854622716", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/ab18aa18-9644-441d-be6e-af6cadbc21ab", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "ab18aa18-9644-441d-be6e-af6cadbc21ab" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/def4032e-72ae-4002-a08f-b9457a4be106", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "def4032e-72ae-4002-a08f-b9457a4be106" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "hjhjkhjk" - } - ] - } - ] - } - }, - { - "service-instance-id": "1030f826-3fa5-4057-abb1-18e72ce7e2a1", - "service-instance-name": "vid-test-999", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500892169774", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d578122d-278c-42b2-bee0-2ec441ceeaac", - "service-instance-name": "vid-testt", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500893055281", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4d9c564d-9e83-4fa4-a4c0-41ca93fc9f64", - "service-instance-name": "vid-test-332", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500896543492", - "orchestration-status": "Active" - }, - { - "service-instance-id": "42774ab2-d3e1-46ec-84ff-3db53a18e135", - "service-instance-name": "vid-test-1122", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500897486657", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2fac24c8-13fa-42db-bb2f-529683531fa8", - "service-instance-name": "vid-test-11112", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500897969508", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c0de2bc1-f32a-4cea-a9b0-88571d6b33bf", - "service-instance-name": "vid-testtt", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500893827977", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c13177ec-38b3-4e12-8482-97b0f016247a", - "service-instance-name": "vid-test-221", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500895647987", - "orchestration-status": "Active" - }, - { - "service-instance-id": "412e3b4c-071b-4c58-b314-7fbd176222ff", - "service-instance-name": "vid-e2e-test_service_2017-07-19_16-05-40-066", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500469550619", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/45fe4c3d-c30e-4800-8b68-54b4dea1c248", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "45fe4c3d-c30e-4800-8b68-54b4dea1c248" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test_vnf_2017-07-19_16-06-13-603" - } - ] - } - ] - } - }, - { - "service-instance-id": "635903e5-74ee-4470-be25-53cc730b34bd", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-39-54-357", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500468002639", - "orchestration-status": "Active" - }, - { - "service-instance-id": "0474ac6f-7eb2-4aaf-8cb1-5abd12df2253", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-44-24-952", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500468273196", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b4ff72ff-00e5-42d8-914e-1cbe67a7eb58", - "service-instance-name": "test_werfdzkdkskd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500813475847", - "orchestration-status": "Active" - }, - { - "service-instance-id": "43a08d84-d5d5-4b5e-be2b-2300b474dc70", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-42-55-550", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500468183570", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5390755c-1606-47d9-8b83-da14738067da", - "service-instance-name": "vid-e2e-test_aai_service_2017-07-19_16-13-57-138", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500470041251", - "orchestration-status": "Active" - }, - { - "service-instance-id": "3707ec3b-af13-49ea-b9ff-018b758da115", - "service-instance-name": "vid-e2e-test_2017-07-18_17-17-30-920", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500387456666", - "orchestration-status": "Active" - }, - { - "service-instance-id": "28378666-89cd-47df-8ed9-fc1839a4b265", - "service-instance-name": "test_rt945klol4", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1500377140106", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1d7edacb-8e79-4f6d-936b-93114a974935", - "service-instance-name": "vid-e2e-test_2017-07-18_15-28-31-981", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500380917229", - "orchestration-status": "Active" - }, - { - "service-instance-id": "da51b100-5b39-4c15-b3ea-f23df4473a83", - "service-instance-name": "vfdv", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1500371981705", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ef0a68da-cc95-4e3c-a1d3-3f7f9cb6ee82", - "service-instance-name": "vid-e2e-test_2017-07-18_18-12-22-369", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500390748046", - "orchestration-status": "Active" - }, - { - "service-instance-id": "eff96af1-70ea-4aab-98c5-32306da946ad", - "service-instance-name": "vid-e2e-test_2017-07-18_17-48-39-643", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500389325953", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8718ad9e-a3c4-49d1-a708-a90ba42b9d03", - "service-instance-name": "vid-e2e-test_2017-07-18_18-14-04-926", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500390850156", - "orchestration-status": "Active" - }, - { - "service-instance-id": "16a09e81-4450-4cb2-8391-5890b6f64721", - "service-instance-name": "vid-e2e-test_2017-07-18_17-50-33-811", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500389439126", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5f3fb647-edfb-473c-99a9-3f04603478c1", - "service-instance-name": "vid-e2e-test_2017-07-18_17-52-15-859", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500389541445", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c6af9564-9043-4f65-8bf2-1c7bc56fd43e", - "service-instance-name": "fsdfsdsd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500412901425", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c9213809-2c50-41f7-b73a-22c1ff189bf0", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "c9213809-2c50-41f7-b73a-22c1ff189bf0" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fdsd" - } - ] - } - ] - } - }, - { - "service-instance-id": "8ab3917e-581f-4de3-b0e3-4e06660e8793", - "service-instance-name": "dfghn", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500449579549", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9b6079c3-9442-4480-9c6d-dd03eeee9c82", - "service-instance-name": "hjoi", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500308091305", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5fd59464-ddcf-4589-8f91-3d8b07c115f9", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-16-56-647", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500466624414", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2081af5c-8229-441c-8a0c-701699f5cf49", - "service-instance-name": "sfd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500312534078", - "orchestration-status": "Active" - }, - { - "service-instance-id": "86d60652-b114-4775-8bec-331dd78f4741", - "service-instance-name": "x", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500312034997", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ae6e8ace-a065-432e-930e-c6111bd27932", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-20-00-628", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500466809739", - "orchestration-status": "Active" - }, - { - "service-instance-id": "19faafcb-47a4-45e5-8ee4-d3375c695d7e", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-27-14-135", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500467243388", - "orchestration-status": "Active" - }, - { - "service-instance-id": "aa4fc03e-1ba3-48d1-b5cc-ec8dfec15a4c", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-06-51-198", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500466021989", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4089b9d7-8c02-4a71-b15a-e29082e38c45", - "service-instance-name": "vid-e2e-test_service_2017-07-19_15-12-07-616", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500466335699", - "orchestration-status": "Active" - }, - { - "service-instance-id": "45b11aa5-5747-45a6-a58e-bada5d052465", - "service-instance-name": "fgd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1500309212526", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9f90bb18-d879-4d6e-97fd-ba5964bdfeb7", - "service-instance-name": "hjk", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500311877345", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9f0b62d4-0305-43aa-b2b3-0c22edc7e01c", - "service-instance-name": "q", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500313981483", - "orchestration-status": "Active" - }, - { - "service-instance-id": "19bddbc0-3014-4541-9f9e-c1400daff5c0", - "service-instance-name": "gdf", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500312620055", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b352c6e4-087b-4408-b794-142f1d9e2309", - "service-instance-name": "dcs", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500325142163", - "orchestration-status": "Active" - }, - { - "service-instance-id": "57cdd7bd-ab17-47bb-8b53-9e424d6cf2b2", - "service-instance-name": "fsd", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500323619398", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e305fc65-2120-4cc8-8bf1-bbc8aa302f34", - "service-instance-name": "a", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500314310430", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/82667331-a973-49e5-b3f2-9bd9e07be7eb", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "82667331-a973-49e5-b3f2-9bd9e07be7eb" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vnf3" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/aa879f1f-a88c-41c6-9f54-4a4cfd92d261", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "aa879f1f-a88c-41c6-9f54-4a4cfd92d261" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test0123456" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/7c15cc9b-f09e-4d7b-911a-fce928dbec0f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "7c15cc9b-f09e-4d7b-911a-fce928dbec0f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "addingVNF" - } - ] - } - ] - } - }, - { - "service-instance-id": "a43d04ad-7cc5-48d1-bd44-316979763294", - "service-instance-name": "test_123432", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500372271553", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/feb4e66e-a178-418c-bc2a-b4b09dd82d98", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "feb4e66e-a178-418c-bc2a-b4b09dd82d98" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vf" - } - ] - } - ] - } - }, - { - "service-instance-id": "7a17082d-ea92-4b55-b49d-083f9599b18d", - "service-instance-name": "iosksfnsdkfnsdkjfnskdj", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500369295852", - "orchestration-status": "Active" - }, - { - "service-instance-id": "88fb29c3-8836-4f86-a27a-53a688cae680", - "service-instance-name": "test-sddasfds", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500373378767", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/aa2f42a3-ff1b-4508-9a0c-b256df6208aa", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "aa2f42a3-ff1b-4508-9a0c-b256df6208aa" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "erttert" - } - ] - } - ] - } - }, - { - "service-instance-id": "7dd2ad7d-3056-4d91-bc3c-97c488ae23fb", - "service-instance-name": "kml", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500362405883", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d953154d-584a-4a4a-9bd7-83df8e46c354", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "d953154d-584a-4a4a-9bd7-83df8e46c354" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "nkknkjnkn" - } - ] - } - ] - } - }, - { - "service-instance-id": "5448357b-b1c4-475d-ac0c-a42528e1d51b", - "service-instance-name": "test2", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500323768299", - "orchestration-status": "Active" - }, - { - "service-instance-id": "84bd20e2-91cc-4a59-be62-e3cf4a762322", - "service-instance-name": "test-321312", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500370664268", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c4c1592b-afc1-4555-9902-5089caa95a64", - "service-instance-name": "fds", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb", - "resource-version": "1500324250120", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6759becb-9878-4c70-abe7-f2886dd6c990", - "service-instance-name": "vid-e2e-test_2017-07-18_17-25-58-170", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500387968056", - "orchestration-status": "Active" - }, - { - "service-instance-id": "39f096ce-eab4-49ec-94f1-701f7df5a483", - "service-instance-name": "adrg", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500388978731", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/07126b2b-ac8c-4821-a85b-d86e302b408e", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "07126b2b-ac8c-4821-a85b-d86e302b408e" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ghfergf" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/6415f997-8fe7-45da-8ec2-e1b12b790354", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "6415f997-8fe7-45da-8ec2-e1b12b790354" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ukyjthrgef55" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2d34f74b-e7e7-4f92-87e7-8e4a4321b48b", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "2d34f74b-e7e7-4f92-87e7-8e4a4321b48b" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfdfd" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d754a995-7473-4b94-bf84-0f2734d2924f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "d754a995-7473-4b94-bf84-0f2734d2924f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dsfefg" - } - ] - } - ] - } - }, - { - "service-instance-id": "9f8cdcb0-6ffd-4adc-b245-f7f4fc9752e3", - "service-instance-name": "vid-e2e-test_2017-07-18_17-36-23-097", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500388589551", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7644e248-d2d9-4c61-a087-148beff228ac", - "service-instance-name": "vid-e2e-test_2017-07-18_16-44-33-073", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500385478551", - "orchestration-status": "Active" - }, - { - "service-instance-id": "509a2624-3dae-41ad-9a5a-e62078161e21", - "service-instance-name": "vid-e2e-test_2017-07-18_17-14-27-661", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500387274357", - "orchestration-status": "Active" - }, - { - "service-instance-id": "83e740ef-a293-4840-b04e-efff59c72463", - "service-instance-name": "eqrv", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500385603218", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6fde03e3-46dc-4fff-8daf-078530d560f2", - "service-instance-name": "sdfvsdfvsdf", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500387907127", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/c8e49850-6722-49ea-950c-9ad62a7f889d", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "c8e49850-6722-49ea-950c-9ad62a7f889d" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "adsv" - } - ] - } - ] - } - }, - { - "service-instance-id": "269bf5ae-6698-4303-b074-be51ad7d28c1", - "service-instance-name": "vid-e2e-test_2017-07-18_18-07-11-310", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1500390438483", - "orchestration-status": "Active" - }, - { - "service-instance-id": "587fbd75-3379-412b-b54a-e995e4ffcae4", - "service-instance-name": "forlynn", - "service-type": "", - "service-role": "", - "model-invariant-id": "f627ac4b-6a4f-4406-b409-a986fb0d1d1c", - "model-version-id": "2e057e90-068f-478a-a9d2-9fb7f36ff3c2", - "resource-version": "1504188707424", - "orchestration-status": "Active" - }, - { - "service-instance-id": "62eb3798-b90d-4bc0-9635-c70473a49ae3", - "resource-version": "1506724389470", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/rarf0002v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "rarf0002v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "rarf0002v" - } - ] - } - ] - } - }, - { - "service-instance-id": "27d4ab06-faed-41f4-80f2-2158e62e5861", - "service-instance-name": "vid-test-33333332", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501675131575", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1a127f0b-dc72-471b-bb9d-c15397520b8f", - "service-instance-name": "vid-test-55522", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1501661285161", - "orchestration-status": "Active" - }, - { - "service-instance-id": "fe1786d1-be3f-4c1b-8d71-540df4f4c916", - "service-instance-name": "vid-test-333322255533", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "1de57bcf-365a-4ba7-8a51-7377b7144586", - "resource-version": "1501665788566", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ea53aeec-470c-4e85-9396-0ea6f7316cef", - "service-instance-name": "hmgnfbdsa55", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509025602402", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p10", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p10" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - } - ] - } - }, - { - "service-instance-id": "267d6f47-387d-4e7e-86aa-8d08a86488b1", - "service-instance-name": "trgfeerg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508944715647", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3f592a6f-459b-435e-b0d4-59959ab1d385", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3f592a6f-459b-435e-b0d4-59959ab1d385" - } - ] - } - ] - } - }, - { - "service-instance-id": "7e06da45-07a8-4b85-857f-7a798b558c54", - "service-instance-name": "test_045900034f", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508942442342", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/96208579-2839-442d-bcd7-46902fb5b108", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "96208579-2839-442d-bcd7-46902fb5b108" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/36c2848d-6b5f-42a9-8d68-0314048614a3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "36c2848d-6b5f-42a9-8d68-0314048614a3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ngfdsa434" - } - ] - } - ] - } - }, - { - "service-instance-id": "e84137bb-a982-4aaa-bdfe-e83997c6b93d", - "service-instance-name": "test_4050345034", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509021634347", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/464482f0-fec7-4171-af0e-96363f93f908", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "464482f0-fec7-4171-af0e-96363f93f908" - } - ] - } - ] - } - }, - { - "service-instance-id": "aebe3df8-a734-4dc9-b210-1b47444c19f6", - "service-instance-name": "thfgdf443", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508942117530", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - } - ] - } - }, - { - "service-instance-id": "89d03dd6-fe60-4106-b9e1-3a9c66a7561d", - "service-instance-name": "jhgrfedse44", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1509026377891", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p3", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p3" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/c934f26c-30f8-419b-9e54-31b10d08b29a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "c934f26c-30f8-419b-9e54-31b10d08b29a" - } - ] - } - ] - } - }, - { - "service-instance-id": "761cd4c2-8f65-42a0-8d6e-155c99181c80", - "service-instance-name": "dgfgddfg", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1509032006604", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/73185f03-5531-444d-bc03-fa13f924d66a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "73185f03-5531-444d-bc03-fa13f924d66a" - } - ] - } - ] - } - }, - { - "service-instance-id": "b1707910-718c-488c-841e-fe6166b288d7", - "service-instance-name": "ins_vl_inputs1", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a4ae0698-161d-4e3d-aabb-f94183c733e4", - "model-version-id": "eaa0de99-6407-4bf6-8579-31499dcf21eb", - "resource-version": "1509013009292", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/464482f0-fec7-4171-af0e-96363f93f908", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "464482f0-fec7-4171-af0e-96363f93f908" - } - ] - } - ] - } - }, - { - "service-instance-id": "31ebd5ed-d522-42bd-8b1b-ca8807541b33", - "service-instance-name": "vnftest0987", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1509017207771", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/6e9179b0-864a-40ba-80ba-c51a69384653", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "6e9179b0-864a-40ba-80ba-c51a69384653" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2804acda-dbd1-413f-a731-47f0978ab9dd", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "2804acda-dbd1-413f-a731-47f0978ab9dd" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "hgcfdfff22" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d0b3c921-3bd6-43ec-bf71-3edbb7af5bc7", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "d0b3c921-3bd6-43ec-bf71-3edbb7af5bc7" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bvfvdsfsdf" - } - ] - } - ] - } - }, - { - "service-instance-id": "915c7d5a-c359-475f-bda7-67761c92b029", - "service-instance-name": "aritest000999", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1509026720877", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p80", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p80" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3f592a6f-459b-435e-b0d4-59959ab1d385", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3f592a6f-459b-435e-b0d4-59959ab1d385" - } - ] - } - ] - } - }, - { - "service-instance-id": "4790f1a6-eb5b-4176-95bc-fdb0909e4d87", - "service-instance-name": "ngfdvfg", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1509032932831", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p3", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p3" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - } - ] - } - }, - { - "service-instance-id": "3af158f2-202f-40a8-a749-f508bdb8a4ce", - "service-instance-name": "kdsfhud556", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1509033824516", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p3", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p3" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/c934f26c-30f8-419b-9e54-31b10d08b29a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "c934f26c-30f8-419b-9e54-31b10d08b29a" - } - ] - } - ] - } - }, - { - "service-instance-id": "13dec3b0-ab57-4359-b4ec-4db0811256fc", - "service-instance-name": "newadio", - "service-type": "", - "service-role": "", - "model-invariant-id": "135cf95b-2863-477a-8879-d980474d67f0", - "model-version-id": "32d08699-790f-4460-ba1b-0b7bb4576296", - "resource-version": "1504290530566", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d171c71b-695e-4f9f-84a7-9febf20a7a5e", - "service-instance-name": "AIMinstance", - "service-type": "", - "service-role": "", - "model-invariant-id": "9e060f0b-1b8e-4b91-86f7-f3d5208fb852", - "model-version-id": "6fa842b2-8eca-416b-8b99-d8691f1ad11e", - "resource-version": "1504289007353", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c9407d5f-0227-4335-b1b2-9148a5a27c0e", - "service-instance-name": "ready", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1504200919802", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/693ac78b-a1c2-4267-bb35-cb05b8c1fc2c", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "693ac78b-a1c2-4267-bb35-cb05b8c1fc2c" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fre" - } - ] - } - ] - } - }, - { - "service-instance-id": "d712579c-75fd-4a8f-9378-bfb9bf3aaf58", - "service-instance-name": "demolynn", - "service-type": "", - "service-role": "", - "model-invariant-id": "a7c72b5d-d498-4164-a3a5-2e0fdf5ff1b5", - "model-version-id": "5a5b1d22-f37a-4f85-9ec8-e84a6e196648", - "resource-version": "1504200602108", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ccc21ec4-dd82-4db8-ad42-88f88f3ee980", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ccc21ec4-dd82-4db8-ad42-88f88f3ee980" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "demo8" - } - ] - } - ] - } - }, - { - "service-instance-id": "3ea4acb0-a62f-4e6e-8750-2920b16ab8f0", - "service-instance-name": "mog1", - "service-type": "", - "service-role": "", - "model-invariant-id": "a8b53380-76bd-4d52-b102-165947fbc46a", - "model-version-id": "b1b0c302-fd06-4612-ad50-f9931bd8dde1", - "resource-version": "1504202136745", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6c426e93-8df1-40fd-89c2-ba7e934ab7db", - "service-instance-name": "RGAlina831", - "service-type": "", - "service-role": "", - "model-invariant-id": "ceab97cd-ca68-41a6-9b34-d571b2dd05ed", - "model-version-id": "1a6ae314-7a89-408b-93e5-6d8b8ee4c28a", - "resource-version": "1504211427501", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ed132599-77d3-4a7d-9e14-8e5068b95a6b", - "service-instance-name": "newone", - "service-type": "", - "service-role": "", - "model-invariant-id": "f627ac4b-6a4f-4406-b409-a986fb0d1d1c", - "model-version-id": "2e057e90-068f-478a-a9d2-9fb7f36ff3c2", - "resource-version": "1504200211471", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/3aac4d15-567c-4022-8161-2a73d2c465ba", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "3aac4d15-567c-4022-8161-2a73d2c465ba" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "demo3" - } - ] - } - ] - } - }, - { - "service-instance-id": "3e505763-319c-4ef9-a17c-5ac561abcd44", - "service-instance-name": "lynn", - "service-type": "", - "service-role": "", - "model-invariant-id": "f627ac4b-6a4f-4406-b409-a986fb0d1d1c", - "model-version-id": "2e057e90-068f-478a-a9d2-9fb7f36ff3c2", - "resource-version": "1504198364611", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fee940c1-4f94-4550-be75-193473be1df5", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "fee940c1-4f94-4550-be75-193473be1df5" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "demo" - } - ] - } - ] - } - }, - { - "service-instance-id": "5164a1ed-d7ba-4e33-b82d-3a5f90543c47", - "service-instance-name": "Lital39887395", - "service-type": "", - "service-role": "", - "model-invariant-id": "452538c0-ef1e-4d65-9939-697f6ed58934", - "model-version-id": "f430728a-4530-42be-a577-1206b9484cef", - "resource-version": "1504111659807", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f05c9247-58c0-4558-872d-f9edc6b0e27b", - "service-instance-name": "TestCM", - "service-type": "", - "service-role": "", - "model-invariant-id": "cf3fa46a-e026-4171-9496-56f5e5184b38", - "model-version-id": "e03239af-b20e-4966-aeb8-b558ef4203b6", - "resource-version": "1506257529884", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/95fffe54-d351-42aa-8612-6fed2690b702", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "95fffe54-d351-42aa-8612-6fed2690b702" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "TestCM" - } - ] - } - ] - } - }, - { - "service-instance-id": "0f4f9378-14c6-4fc0-bf8c-53e8b94fc24b", - "service-instance-name": "TestCM1", - "service-type": "", - "service-role": "", - "model-invariant-id": "cf3fa46a-e026-4171-9496-56f5e5184b38", - "model-version-id": "e03239af-b20e-4966-aeb8-b558ef4203b6", - "resource-version": "1506257972911", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ba916d69-3558-4f8d-aded-fc1f4658697f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ba916d69-3558-4f8d-aded-fc1f4658697f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "TestCM1" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f94e2cdb-a731-4703-984f-6db7958673a6", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f94e2cdb-a731-4703-984f-6db7958673a6" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "lital" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/3349b4ae-e9af-447a-9ef6-751233243669", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "3349b4ae-e9af-447a-9ef6-751233243669" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "lyttj" - } - ] - } - ] - } - }, - { - "service-instance-id": "6532a860-334d-4277-aab0-dfc3c0275722", - "service-instance-name": "almog-test-009", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1503328232583", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6f1658ae-09f8-4146-8e99-c618a513b96e", - "service-instance-name": "TestBeforTenantIsolation", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502873224732", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5febf311-cfe5-488d-9480-4e300f44e83b", - "service-instance-name": "test-s-s-s-s-s", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503313229112", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a41ea412-135c-44bd-a999-8771f950e4c0", - "service-instance-name": "vid-e2e-test_aai_service_2017-08-21_15-11-13-501", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503317477669", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4e4cb086-9d47-4c35-a787-7663eef5cd1f", - "service-instance-name": "test-484784jf", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503386331370", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/e90d3fbf-c3f4-4439-9984-b2fa9a48f085", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "e90d3fbf-c3f4-4439-9984-b2fa9a48f085" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fff" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f62913a4-ee21-45ed-9b6a-9bd81ef6d4a3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f62913a4-ee21-45ed-9b6a-9bd81ef6d4a3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dujhdu-444f" - } - ] - } - ] - } - }, - { - "service-instance-id": "864c3974-fc7b-4438-bd1a-9b05bf7b0415", - "service-instance-name": "vid-e2e-test_aai_service_2017-08-21_14-36-39-376", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503315402724", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4da12453-b237-4b4b-abef-52e519db1061", - "service-instance-name": "gfdsfgh45656", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503393201982", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c9b5ce8a-a50c-4bb3-950a-ee0c8e8cd8a8", - "service-instance-name": "vid-test-444333222", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502821470362", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c9275c14-e391-4205-bf23-1667df357535", - "service-instance-name": "PnfTest", - "service-type": "", - "service-role": "", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1502865576535", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9e7f2be3-916d-4bc9-92df-3fce042c1458", - "service-instance-name": "test111", - "service-type": "", - "service-role": "", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1502867371993", - "orchestration-status": "Active" - }, - { - "service-instance-id": "913c5278-ede0-4d85-a24e-a208ce84aef2", - "service-instance-name": "almog-test-007", - "service-type": "", - "service-role": "", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1503328159784", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7b66fff7-15e3-4421-8e80-695ce78e9a40", - "service-instance-name": "test865555665", - "service-type": "", - "service-role": "", - "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637", - "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2", - "resource-version": "1504532289220", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b9769e8f-70aa-4b05-8988-64044aa63498", - "service-instance-name": "TestCharlie", - "model-invariant-id": "4af418a9-c2f5-4fae-a577-b69d6341eee8", - "model-version-id": "745d1bf1-9ed1-413f-8111-f1e984ad63fb", - "resource-version": "1494002070115", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/91124690-bc03-4387-bd6d-96c492a26e47", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "91124690-bc03-4387-bd6d-96c492a26e47" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "TestCharlie" - } - ] - } - ] - } - }, - { - "service-instance-id": "69779f8f-e3d1-4957-b092-4c1e0fa2d962", - "service-instance-name": "test_934584858784", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508313166228", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/43b8a85a-0421-4265-9069-117dd6526b8a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "43b8a85a-0421-4265-9069-117dd6526b8a" - } - ] - } - ] - } - }, - { - "service-instance-id": "687ca9ab-0cbc-49f3-8693-953d4d6b61fe", - "service-instance-name": "te554433", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1508331792032", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/96208579-2839-442d-bcd7-46902fb5b108", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "96208579-2839-442d-bcd7-46902fb5b108" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4d1c9027-05a6-4144-bf9e-9a190b3ec4cd", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "4d1c9027-05a6-4144-bf9e-9a190b3ec4cd" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "mhghg66" - } - ] - } - ] - } - }, - { - "service-instance-id": "8eebe164-928e-4a02-b09a-1d3e85baa553", - "service-instance-name": "tertop009", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508331429003", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p10", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p10" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/73185f03-5531-444d-bc03-fa13f924d66a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "73185f03-5531-444d-bc03-fa13f924d66a" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/353fac93-f9f7-46d6-becb-68f10aae2815", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "353fac93-f9f7-46d6-becb-68f10aae2815" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfhddft" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fbc588a0-70aa-4fdf-bff4-a0fb7037b65a", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "fbc588a0-70aa-4fdf-bff4-a0fb7037b65a" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfddfd5655" - } - ] - } - ] - } - }, - { - "service-instance-id": "3ed5a776-9aab-4fe3-9231-853db3657f5e", - "service-instance-name": "vid-e2e-test_service_2017-07-26_17-06-11-407", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501077979892", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/493e1f9e-03fd-461d-9c43-371e22fc9edd", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "493e1f9e-03fd-461d-9c43-371e22fc9edd" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test_vnf_2017-07-26_17-06-40-404" - } - ] - } - ] - } - }, - { - "service-instance-id": "0471bff5-ceb1-474c-a9da-c877bf21ae9b", - "service-instance-name": "vid-e2e-test_service_2017-07-26_22-41-09-352", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501098077533", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d2c3b450-f8c4-4d7b-8099-f031be9a1bde", - "service-instance-name": "Ser_VID_Lital--1707097", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1501147094625", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f4c7ecc7-9847-4047-8776-1a5bf5e3ea45", - "service-instance-name": "vid-e2e-test_service_2017-07-26_22-50-59-847", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501098666381", - "orchestration-status": "Active" - }, - { - "service-instance-id": "99d31873-a6e5-4f16-861c-6e3b8d3fe8c7", - "service-instance-name": "vid-e2e-test_service_2017-07-26_23-04-22-351", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501099468895", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/aa3d70b1-743a-4492-93b4-3472395bb887", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "aa3d70b1-743a-4492-93b4-3472395bb887" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test-vnf_2017-07-26_23-04-55-822" - } - ] - } - ] - } - }, - { - "service-instance-id": "5a78742a-60ec-4377-88df-746442c7c680", - "service-instance-name": "teat90494848", - "model-invariant-id": "6fe9ad6f-6fa9-4b96-a91e-866a7f3c55a9", - "model-version-id": "be753bed-13e8-4e50-b431-b90dfd0f31b7", - "resource-version": "1499849060540", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7230d7d5-68e6-4772-95c6-59b6edb58f9f", - "service-instance-name": "vid-e2e-test_service_2017-10-15_17-53-59-886", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508079214580", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/z1", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "z1" - } - ] - } - ] - } - }, - { - "service-instance-id": "bb58b58a-2b64-41d5-8d56-3ac95b32b99e", - "service-instance-name": "vid-test-12321", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508143950703", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/z1", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "z1" - } - ] - } - ] - } - }, - { - "service-instance-id": "4ba3e63d-71dc-4912-891d-e0eed048a0a5", - "service-instance-name": "SI_vid894_01", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "d9522f74-c0a9-444e-8b8f-3623da145007", - "resource-version": "1495823285290", - "orchestration-status": "Active" - }, - { - "service-instance-id": "92e1553e-24f7-49ba-94b4-f1538487da52", - "service-instance-name": "lll052617D", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "d9522f74-c0a9-444e-8b8f-3623da145007", - "resource-version": "1495836523699", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7c569714-4174-4d91-9fd0-14051794c3d2", - "service-instance-name": "sdfsdfdsf", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1503842487837", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e25c1753-d5f7-4b5e-880e-cdad5c2f74f7", - "service-instance-name": "lll052617B", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1495815608024", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d8f23bb5-5822-4374-8ece-964c0af90d60", - "service-instance-name": "lll052617A", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1495814776103", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c870081f-b09a-411e-8e2e-fb0e4ba60992", - "service-instance-name": "test-ksdjsd7", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503843463767", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f4770c11-039e-44d2-83a1-ee38c74ffea8", - "service-instance-name": "dsfdsfds", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503906371181", - "orchestration-status": "Active" - }, - { - "service-instance-id": "22e5c795-5747-428f-b997-23e355a3c3b6", - "service-instance-name": "asdasdasd", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503906872840", - "orchestration-status": "Active" - }, - { - "service-instance-id": "66eb9285-edb6-4149-a4fd-4ace1725486e", - "service-instance-name": "asdasdvdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503906293988", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e089b589-5227-4a7c-aa19-92c99507f147", - "service-instance-name": "Mobility_VSP_Service_DS_0906_01", - "service-type": "", - "service-role": "", - "model-invariant-id": "f60ed211-2780-40ea-9d05-94c214e0be5c", - "model-version-id": "0497a6ff-455b-4713-b5de-3e1d4d172b8c", - "resource-version": "1504709046592", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c436daa1-63b5-40e6-892a-1ca67c390ea1", - "service-instance-name": "test_04594959", - "service-type": "", - "service-role": "", - "model-invariant-id": "b7d923c9-6175-41f1-91ba-4565c4953408", - "model-version-id": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "resource-version": "1503820500390", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/50d111b5-134f-4415-b097-5c061a5072ab", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "50d111b5-134f-4415-b097-5c061a5072ab" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_045845w" - } - ] - } - ] - } - }, - { - "service-instance-id": "6eeb541a-2976-4ae2-986f-1e34c7927983", - "service-instance-name": "test_lfgfjdf7", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1503819918168", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8ed80bb9-7548-4305-baef-660453777afa", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "8ed80bb9-7548-4305-baef-660453777afa" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_0459495d" - } - ] - } - ] - } - }, - { - "service-instance-id": "45a68dc7-6d41-47b1-b123-5c958abe49e3", - "service-instance-name": "test_jhjhjjh", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1503844473215", - "orchestration-status": "Active" - }, - { - "service-instance-id": "0ae4ff8e-7848-448e-9b4b-bcc43859dda8", - "service-instance-name": "test045453", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502111666406", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5bfa3a21-65b3-4047-8455-69af6e8451f2", - "service-instance-name": "HHHKJKJKJKJKJ", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502006983390", - "orchestration-status": "Active" - }, - { - "service-instance-id": "54515abc-20c2-4852-9f79-f54530b1c17b", - "service-instance-name": "XSXSXXSX", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502007073155", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/75e79664-98f1-4a77-bdce-4666d1151896", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "75e79664-98f1-4a77-bdce-4666d1151896" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "DFVDXVXBG" - } - ] - } - ] - } - }, - { - "service-instance-id": "12a73cfd-bf36-48fc-8a05-db90ea8d2218", - "service-instance-name": "vid-test-usp-1111", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502006502927", - "orchestration-status": "Active" - }, - { - "service-instance-id": "cca9ce39-80f7-432f-929b-497cc31448e8", - "service-instance-name": "test_0459495", - "service-type": "", - "service-role": "", - "model-invariant-id": "caed4dbb-922a-4942-be87-1f99d56d426a", - "model-version-id": "b77dae3c-ac5b-459c-8df5-1f1de6c59737", - "resource-version": "1502180467964", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7fa929ef-fe96-4515-bb77-f67b99492cc8", - "service-instance-name": "vid-test-111555333222", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502093359964", - "orchestration-status": "Active" - }, - { - "service-instance-id": "145dc127-918e-46dc-beca-fe07cc00c62b", - "service-instance-name": "", - "service-type": "null", - "service-role": "null", - "model-invariant-id": "5c3bb706-95fc-4589-b40f-ed024673246a", - "model-version-id": "873e3f27-6561-47a6-80b0-0cd048d5cdfb", - "resource-version": "1502170966884", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ad57a79b-6078-4831-bdb0-fe59d49d83f6", - "service-instance-name": "vid-e2e-test_aai_service_2017-08-08_14-32-57-249", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502191981359", - "orchestration-status": "Active" - }, - { - "service-instance-id": "288bc6d7-03e6-45ee-b795-a419207fab73", - "service-instance-name": "shaytestvid2", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1502009457141", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7eaf20e0-b629-4d2c-bc12-b50128537550", - "service-instance-name": "vid-test-4422119955", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502093302607", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8c27adcf-343f-42c0-ace5-d4cab15517a8", - "service-instance-name": "DS-vUSP_08042017_Svc_01", - "service-type": "", - "service-role": "", - "model-invariant-id": "e4f8b794-8057-4b1c-acf8-39cdcbc07dae", - "model-version-id": "79572855-8d8c-47db-a5fa-29cb28058f88", - "resource-version": "1501867425306", - "orchestration-status": "Active" - }, - { - "service-instance-id": "56c010cf-13e9-4436-9b95-25c90349bf3b", - "service-instance-name": "vid-test-22-5", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502093787135", - "orchestration-status": "Active" - }, - { - "service-instance-id": "17a94393-ec25-4080-b0f2-e79690c68edb", - "service-instance-name": "test_034034", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502112253718", - "orchestration-status": "Active" - }, - { - "service-instance-id": "0141fb08-f2e3-4a99-9541-e507060d88c0", - "service-instance-name": "test0450405", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502111949341", - "orchestration-status": "Active" - }, - { - "service-instance-id": "cb059250-e6b2-4080-8c3f-dd1a03038d89", - "service-instance-name": "test_0450450", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502783136139", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/829834f1-9d55-4da5-9cf2-c39a54569cc9", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "829834f1-9d55-4da5-9cf2-c39a54569cc9" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vnf_ar_112345" - } - ] - } - ] - } - }, - { - "service-instance-id": "fc73584c-b77a-4ba8-9ddf-c75fd7f2d4ae", - "service-instance-name": "test_9459945", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502805435726", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6f4b830c-e2b7-453c-b900-045fdd66db4e", - "service-instance-name": "vid-test-44444", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501436355937", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2f59588b-5423-4505-bb2c-b8505551f95a", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "2f59588b-5423-4505-bb2c-b8505551f95a" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-test-vnf-44444" - } - ] - } - ] - } - }, - { - "service-instance-id": "362433ab-c1d2-4c99-af62-9421361870bc", - "service-instance-name": "lital3532", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505140621032", - "orchestration-status": "Active" - }, - { - "service-instance-id": "57aba319-3f37-4d9b-9101-ccfac8eed6ca", - "service-instance-name": "eylon1", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505139462227", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a6715839-446e-46f0-9ab3-e90580f21a13", - "service-instance-name": "eylon2", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505140170371", - "orchestration-status": "Active" - }, - { - "service-instance-id": "427229ed-b60f-4d77-8f14-62c4278d30ff", - "service-instance-name": "test_098765432", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505137712759", - "orchestration-status": "Active" - }, - { - "service-instance-id": "bde46fed-f9f2-4e75-83ba-3b3c8830d5da", - "service-instance-name": "dfghgfgfgh", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1507031926132", - "orchestration-status": "Active" - }, - { - "service-instance-id": "951c09ef-3369-49b3-a23b-14d70e86330b", - "service-instance-name": "shanitets27", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1507546827502", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e8d9e0e3-7acc-4dba-8f16-e14437c416a6", - "service-instance-name": "CreateINstance_Service_VOIP_297772_nb5443_0610", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "5cfb7e85-6855-4227-ba36-6a52494e57e3", - "model-version-id": "aaeb9f9d-3e29-4ad9-9fb0-0478d53ad7fd", - "resource-version": "1507238826056", - "orchestration-status": "Active" - }, - { - "service-instance-id": "09e219ad-f71d-4dfa-bec3-f139a85c183b", - "service-instance-name": "ServicePnf_16", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1507470982716", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/09e219ad-f71d-4dfa-bec3-f139a85c183b/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "fc110d0d-72e0-4286-b2be-982b34dc6b29", - "service-instance-name": "jhhh88", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1507462936971", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ae3e6c21-8463-456e-a746-d9932c467e79", - "service-instance-name": "mdnsinstance", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "3987a2eb-5f35-45c1-b09a-74149b16bc50", - "model-version-id": "2ec43e3c-e287-47bb-9201-ad0c725f390a", - "resource-version": "1506527808858", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/6960a4f9-878b-4566-a24a-cbae1f2a1943", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "6960a4f9-878b-4566-a24a-cbae1f2a1943" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "instance" - } - ] - } - ] - } - }, - { - "service-instance-id": "4495bf72-1126-4e9f-8bc9-4f91debe632c", - "service-instance-name": "test_0999239459", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1506429664785", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f526e0c5-7dd0-4ff6-8e0d-e34513108c72", - "service-instance-name": "test_09990234446", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1506429789282", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2be69fe5-9e97-4382-8f40-f2a0feb9aa18", - "service-instance-name": "testoron8765", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1506430488921", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8446f630-0aa4-45b1-9192-9d22968fcc1c", - "service-instance-name": "inputmap_instance001", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "e3ee9d25-2c6b-4734-8a8c-b6e0dee11ca9", - "model-version-id": "97128a5f-e7e4-4ddd-b1eb-83a611ae1acb", - "resource-version": "1506518606738", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6d644284-8e45-43aa-8b7a-3a657eda552a", - "service-instance-name": "ServicePnf_7", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1506588010642", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/6d644284-8e45-43aa-8b7a-3a657eda552a/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "29f814ec-a2b8-41aa-b57c-e50d67bbcb45", - "service-instance-name": "test_02349394", - "service-type": "", - "service-role": "", - "model-invariant-id": "6fe9ad6f-6fa9-4b96-a91e-866a7f3c55a9", - "model-version-id": "be753bed-13e8-4e50-b431-b90dfd0f31b7", - "resource-version": "1505386639581", - "orchestration-status": "Active" - }, - { - "service-instance-id": "dcd856f5-69ea-42df-a8aa-d460a9aefe3e", - "service-instance-name": "hfhdgdgf", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505386037801", - "orchestration-status": "Active" - }, - { - "service-instance-id": "69235f15-bef1-4a6a-9689-bf41a332068c", - "service-instance-name": "ffwfdwedewd", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505385896496", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e720e20f-9997-4e42-a959-a5e4f20135fd", - "service-instance-name": "hjgfdsfrg", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1505387270709", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/2ee1ce2c-1284-426c-817f-2c94a366f298", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "2ee1ce2c-1284-426c-817f-2c94a366f298" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gsdsdfdff" - } - ] - } - ] - } - }, - { - "service-instance-id": "78c57f7f-9568-48e8-9308-4c1badc0a493", - "service-instance-name": "test_0458478576", - "service-type": "", - "service-role": "", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1505387592406", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9f521dd1-9dda-4340-8f34-5295154904eb", - "service-instance-name": "nf-role-ariel", - "service-type": "", - "service-role": "", - "model-invariant-id": "7325761d-fa5a-4a52-9a07-8bcf64d693ed", - "model-version-id": "8786e50b-84f9-4942-83ed-fd3624baacae", - "resource-version": "1505388118278", - "orchestration-status": "Active" - }, - { - "service-instance-id": "4d3d8367-955e-4907-8e39-d4fee5150622", - "service-instance-name": "jfdsghgtrg", - "service-type": "", - "service-role": "", - "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", - "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", - "resource-version": "1505387180101", - "orchestration-status": "Active" - }, - { - "service-instance-id": "11d946a3-8fea-4ea1-9776-cc7be5be2f67", - "service-instance-name": "int_nfrole_01", - "service-type": "", - "service-role": "", - "model-invariant-id": "cf3fa46a-e026-4171-9496-56f5e5184b38", - "model-version-id": "38ee5ebe-b9b8-4cc1-bd98-36db01bfc589", - "resource-version": "1505389411007", - "orchestration-status": "Active" - }, - { - "service-instance-id": "09e1de12-2b12-431c-abbe-cb786fba1d3e", - "service-instance-name": "test03490348", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1505389785708", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f415422d-5930-4f67-b51e-aafd3ccd92cd", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f415422d-5930-4f67-b51e-aafd3ccd92cd" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "sdfdfgdfg" - } - ] - } - ] - } - }, - { - "service-instance-id": "52eb8cee-e55b-4af7-b5cc-42dd5ef93ea1", - "service-instance-name": "nf_instanse1", - "service-type": "", - "service-role": "", - "model-invariant-id": "7325761d-fa5a-4a52-9a07-8bcf64d693ed", - "model-version-id": "8786e50b-84f9-4942-83ed-fd3624baacae", - "resource-version": "1505388525396", - "orchestration-status": "Active" - }, - { - "service-instance-id": "2c9939cd-1f42-4915-b8f8-a453ad0aa266", - "service-instance-name": "test_832438475", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505397144463", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5449cf97-53f8-44cc-b2c7-7c7d82491457", - "service-instance-name": "Eylon10", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505390455607", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ed820473-cc95-4f58-8d1f-50ee2892d88c", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ed820473-cc95-4f58-8d1f-50ee2892d88c" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "asf" - } - ] - } - ] - } - }, - { - "service-instance-id": "48488113-37bb-4f6f-9a34-cf181c4d24f5", - "service-instance-name": "qweqwewq", - "service-type": "", - "service-role": "", - "model-invariant-id": "6269c77a-a285-473a-be32-9e34a735ae68", - "model-version-id": "de762949-453c-43bd-8610-93eca50b0681", - "resource-version": "1505397289921", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ab418d45-067c-48d6-b5a5-d2be160bda8e", - "service-instance-name": "LitalZil", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505372137288", - "orchestration-status": "Active" - }, - { - "service-instance-id": "600c34b5-3e24-4672-bc6f-a5629cac5881", - "service-instance-name": "fsdfsdfsd", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505333533674", - "orchestration-status": "Active" - }, - { - "service-instance-id": "d0451b90-7539-41ce-bc02-9726e07663e1", - "service-instance-name": "gfdgfdgdfgdf", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505386116614", - "orchestration-status": "Active" - }, - { - "service-instance-id": "9f6d1a31-8968-4409-a19e-5a4c5eb46a6e", - "service-instance-name": "testyw3445456", - "service-type": "", - "service-role": "", - "model-invariant-id": "fb3ab6f5-f776-46cd-93af-9f9ad71fc00e", - "model-version-id": "86e9e15f-9fe9-4817-b31f-5db74d131a2a", - "resource-version": "1505401600662", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e49cb1f8-c016-4502-8e59-87cb8bd5df35", - "service-instance-name": "gfdgdfgfd", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505386202387", - "orchestration-status": "Active" - }, - { - "service-instance-id": "ce7c3c47-e047-47a0-a19f-7811d36860e9", - "service-instance-name": "almog-test-008", - "service-type": "", - "service-role": "", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1503328194596", - "orchestration-status": "Active" - }, - { - "service-instance-id": "33d6f055-e2fb-4d14-9d66-64e99145e4ec", - "service-instance-name": "almog-test-006", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503328121547", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a71c5896-ae3b-4684-9fe0-0841e81eed3e", - "service-instance-name": "vid-test-666555444", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502823842315", - "orchestration-status": "Active" - }, - { - "service-instance-id": "dcd45af2-6336-469e-8636-9349bffbc350", - "service-instance-name": "test009877654336", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1503227771684", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/1fb26a31-60ea-4d3b-9c0a-f0d24ebf2604", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "1fb26a31-60ea-4d3b-9c0a-f0d24ebf2604" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test7765584" - } - ] - } - ] - } - }, - { - "service-instance-id": "a2a9e86a-2639-4d3d-8aae-24736c0aa5ac", - "service-instance-name": "test_94589485", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502954795174", - "orchestration-status": "Active" - }, - { - "service-instance-id": "8330708c-8d75-466a-9a95-4dd4c4b56863", - "service-instance-name": "almog-test-003", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1503327995951", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/33d676dc-285f-4e0c-b8b7-4b3f51c63fce", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "33d676dc-285f-4e0c-b8b7-4b3f51c63fce" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "niin" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9b589699-f43a-4777-97ed-1e374965c3d6", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9b589699-f43a-4777-97ed-1e374965c3d6" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fsdfcsdfsdsd" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/20783cde-b631-47b3-bb90-e47022bf1f34", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "20783cde-b631-47b3-bb90-e47022bf1f34" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dsfsdfsdfsdfsdf" - } - ] - } - ] - } - }, - { - "service-instance-id": "ed710dba-0d3d-4278-a30a-b73da2a64ff9", - "service-instance-name": "vid-e2e-test_service_2017-08-21_19-35-51-585", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503333361349", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b1112b0b-c915-46c3-b060-c3c511081e4c", - "service-instance-name": "test-almog-2", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1503325628895", - "orchestration-status": "Active" - }, - { - "service-instance-id": "535af37d-da02-48f4-abc5-00a6cd830d4e", - "service-instance-name": "LitalS", - "service-type": "", - "service-role": "", - "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", - "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0", - "resource-version": "1503326460122", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/68db93ea-d1be-4de4-98a8-0188d162feba", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "68db93ea-d1be-4de4-98a8-0188d162feba" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "LitalVNF" - } - ] - } - ] - } - }, - { - "service-instance-id": "dad637e9-d7b3-4889-a5c6-b55b3ee60640", - "service-instance-name": "tet-8765367", - "service-type": "", - "service-role": "", - "model-invariant-id": "1cc41b64-5c12-4d51-bac9-448e963bd81d", - "model-version-id": "91f79100-6450-4078-80d7-531427b4fe74", - "resource-version": "1503224652570", - "orchestration-status": "Active" - }, - { - "service-instance-id": "bc2300a4-bc3d-4bca-95ac-e34c1885bc44", - "service-instance-name": "rrrrrrrrr", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1503229518489", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/1c9fe7ac-e24e-4f81-ac9a-cf77e16f6222", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "1c9fe7ac-e24e-4f81-ac9a-cf77e16f6222" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "eeeee" - } - ] - } - ] - } - }, - { - "service-instance-id": "9d164ebb-60ee-4d1e-b46a-7769309e5922", - "service-instance-name": "testvnf098655", - "service-type": "", - "service-role": "", - "model-invariant-id": "1cc41b64-5c12-4d51-bac9-448e963bd81d", - "model-version-id": "91f79100-6450-4078-80d7-531427b4fe74", - "resource-version": "1503225090431", - "orchestration-status": "Active" - }, - { - "service-instance-id": "eb4b08b2-6893-4c45-a0a4-5310e2b840e6", - "service-instance-name": "test-almog", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1503241565609", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/68681da7-0847-4a07-b4e6-e7db863513d8", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "68681da7-0847-4a07-b4e6-e7db863513d8" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "almog" - } - ] - } - ] - } - }, - { - "service-instance-id": "f5406f25-02d5-4857-b781-25a17f3889b3", - "service-instance-name": "Service_VOIP_297772_DS_0822_01", - "service-type": "", - "service-role": "", - "model-invariant-id": "5cfb7e85-6855-4227-ba36-6a52494e57e3", - "model-version-id": "aaeb9f9d-3e29-4ad9-9fb0-0478d53ad7fd", - "resource-version": "1503424302015", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c1996c46-4853-45a1-b14d-9d92fb3907c7", - "service-instance-name": "test9459459", - "service-type": "", - "service-role": "", - "model-invariant-id": "75eddbdd-9c15-4778-a058-e4e6129ef2f6", - "model-version-id": "42221f38-7795-4692-8876-082c2fe32ca9", - "resource-version": "1502291939948", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/269cc52e-aafa-4d29-917d-9a7ea03ad311", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "269cc52e-aafa-4d29-917d-9a7ea03ad311" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_03403402" - } - ] - } - ] - } - }, - { - "service-instance-id": "5d523308-d5e1-4cfc-baba-ea7df1f37e25", - "service-instance-name": "uhik", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502291344737", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6f9f86b0-ef30-45a6-b92b-df246a5c6168", - "service-instance-name": "mnbkjhgfddsa", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502275995518", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/7c57a376-ac2e-4411-9015-58efd27621e7", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "7c57a376-ac2e-4411-9015-58efd27621e7" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "poiouuycgf" - } - ] - } - ] - } - }, - { - "service-instance-id": "627f59fe-9e7a-4794-a227-2c2ce8f4cf27", - "service-instance-name": "vid-test-4321", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502291742644", - "orchestration-status": "Active" - }, - { - "service-instance-id": "361bb8aa-e5c7-4c6c-938f-4ea61cd07ed3", - "service-instance-name": "ghfghfgh", - "service-type": "", - "service-role": "", - "model-invariant-id": "caed4dbb-922a-4942-be87-1f99d56d426a", - "model-version-id": "b77dae3c-ac5b-459c-8df5-1f1de6c59737", - "resource-version": "1502293787925", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a5ae7dcf-ca04-4f47-8084-94e7a1b126fd", - "service-instance-name": "dfgndfgnsdfgbns", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502276464647", - "orchestration-status": "Active" - }, - { - "service-instance-id": "634bc44e-f64f-4c0f-ade3-8990be885183", - "service-instance-name": "test_03403", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502290081344", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b8453503-d826-47d1-8a23-332dbb058ee0", - "service-instance-name": "ertherht", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1502357187720", - "orchestration-status": "Active" - }, - { - "service-instance-id": "12094723-866e-450f-9825-8d0e114d1cc4", - "service-instance-name": "test_958886", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "5b174112-cea4-4a36-b540-853b9d0548fc", - "resource-version": "1502356939859", - "orchestration-status": "Active" - }, - { - "service-instance-id": "bd510a5f-bbd0-4d06-b427-4d0230b4def7", - "service-instance-name": "test_Vl_instance1", - "service-type": "", - "service-role": "", - "model-invariant-id": "9f5ed6d5-c960-4903-9625-4ccb6ba9c63a", - "model-version-id": "25447dd8-4154-4146-b57b-bc3d82e1a670", - "resource-version": "1502288021617", - "orchestration-status": "Active" - }, - { - "service-instance-id": "e62bf002-1de0-4efb-9b5a-7f48ec5400f3", - "service-instance-name": "test_056056", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502280371418", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f0b5d0a8-0fd4-4965-9c59-9eee67024945", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f0b5d0a8-0fd4-4965-9c59-9eee67024945" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_0404505" - } - ] - } - ] - } - }, - { - "service-instance-id": "16626bff-21ad-4a2b-820e-1894d06be31c", - "service-instance-name": "test0560560", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502293923490", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6d11dba9-8817-425a-b379-ce55e28ff63a", - "service-instance-name": "newserviceshay2", - "service-type": "", - "service-role": "", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8072abd2-2ef6-475f-91a1-000121d37f7b", - "resource-version": "1502294644240", - "orchestration-status": "Active" - }, - { - "service-instance-id": "f001f409-8cd7-4e5a-b104-a193d0e596ab", - "service-instance-name": "test_0450450777", - "service-type": "", - "service-role": "", - "model-invariant-id": "b1ed0d58-0700-4631-be18-d2f1e527d637", - "model-version-id": "849a6347-cca7-4ae6-b5c2-7d41e9f6d9b2", - "resource-version": "1502294904445", - "orchestration-status": "Active" - }, - { - "service-instance-id": "5979493f-1712-445b-953b-7f9b9a99a314", - "service-instance-name": "mnb", - "service-type": "", - "service-role": "", - "model-invariant-id": "caed4dbb-922a-4942-be87-1f99d56d426a", - "model-version-id": "b77dae3c-ac5b-459c-8df5-1f1de6c59737", - "resource-version": "1502278737864", - "orchestration-status": "Active" - }, - { - "service-instance-id": "47f70a06-7846-44ff-9488-2d60536baf72", - "service-instance-name": "dfghdfghsdfg", - "service-type": "", - "service-role": "", - "model-invariant-id": "d2103eaa-8cc7-4422-ad67-1ce582af0097", - "model-version-id": "5801fed3-b6db-4969-abb4-d1171c4c3202", - "resource-version": "1502278659676", - "orchestration-status": "Active" - }, - { - "service-instance-id": "59eb28d6-ad0e-43d3-976d-e3b36c95c073", - "service-instance-name": "jhgfegt", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508758028801", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/73185f03-5531-444d-bc03-fa13f924d66a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "73185f03-5531-444d-bc03-fa13f924d66a" - } - ] - } - ] - } - }, - { - "service-instance-id": "828696d8-1cc6-4d81-b744-d18d6fa7430a", - "service-instance-name": "test04350495", - "service-type": "test", - "service-role": "test", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "0ebfb706-a846-4715-b0d0-fe0be09458d7", - "model-version-id": "fa06db34-f8e3-42d9-8e51-a76816eb0f0d", - "resource-version": "1508676546378", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - } - ] - } - }, - { - "service-instance-id": "8b19fe19-65a6-4f0a-9362-54caf7b130c8", - "service-instance-name": "trewtr", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", - "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", - "resource-version": "1508656964072", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/5dbe5092-65fb-453d-87f6-e8715668692f", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "5dbe5092-65fb-453d-87f6-e8715668692f" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bgtrfv" - } - ] - } - ] - } - }, - { - "service-instance-id": "96a61cec-fec3-4e23-b370-707f74aa7025", - "service-instance-name": "testyyyo", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508676983145", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/b8a07f26-7a5e-428e-9132-eaaef4377e7a", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "b8a07f26-7a5e-428e-9132-eaaef4377e7a" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dfgdfytr" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/edefbdbc-5d41-44ca-a518-10ade7d0d7a8", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "edefbdbc-5d41-44ca-a518-10ade7d0d7a8" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "gfdsf55" - } - ] - } - ] - } - }, - { - "service-instance-id": "ab4148e7-ad48-424f-b3ba-c60620f572e2", - "service-instance-name": "liz", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "db09cb43-cc92-4070-8187-f2812bdf6676", - "model-version-id": "827e118a-e9e0-4d8e-85ed-72cf22bd0ca8", - "resource-version": "1508674141999", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p10", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p10" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - } - ] - } - }, - { - "service-instance-id": "b6fbe7c9-0acb-46f0-9cef-157c30d55e07", - "service-instance-name": "dfasf", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "Production", - "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", - "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50", - "resource-version": "1508656225209", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/253b1c2a-5922-4629-aec6-61d22e238a5c", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "253b1c2a-5922-4629-aec6-61d22e238a5c" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fce90274-4d29-41ad-a559-e88e12b2c177", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "fce90274-4d29-41ad-a559-e88e12b2c177" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "kjhgfd87" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/8a5fee10-994c-4dfa-a416-79a58c62bd80", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "8a5fee10-994c-4dfa-a416-79a58c62bd80" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "testou00096" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/aef9b371-3efa-48c2-918b-05c9e3ac4aec", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "aef9b371-3efa-48c2-918b-05c9e3ac4aec" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_04594959ccv" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4a2db0c5-db7e-4f25-9623-9d52d5e457d1", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "4a2db0c5-db7e-4f25-9623-9d52d5e457d1" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ghfd_test_045" - } - ] - } - ] - } - }, - { - "service-instance-id": "bd3321bb-3ad6-4222-8520-4eb9c2112c70", - "service-instance-name": "ytititi", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "87447b67-29e3-4244-8038-990a8c70259a", - "model-version-id": "c947a4f0-1a84-4380-8939-9adf54005eb4", - "resource-version": "1508673680395", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p80", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p80" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f0aac2f3-2840-48ad-9d35-905416c6eea3", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f0aac2f3-2840-48ad-9d35-905416c6eea3" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "xdgsdg" - } - ] - } - ] - } - }, - { - "service-instance-id": "8854e480-565c-4533-8b49-9844c55974ef", - "service-instance-name": "test_0234354", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508838123102", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/project1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "project1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/80bb7c9e-4e3d-4b10-8291-7e85a1347370", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "80bb7c9e-4e3d-4b10-8291-7e85a1347370" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/f59bce13-0ba9-4996-a5f2-0ab5001f7915", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "f59bce13-0ba9-4996-a5f2-0ab5001f7915" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "test_03403030dk" - } - ] - } - ] - } - }, - { - "service-instance-id": "f3891ad3-dfc2-48d9-ad79-d3afcb14e499", - "service-instance-name": "testservinputs098", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", - "model-version-id": "8c16d416-f183-4f2e-8a05-48a7ee0738f7", - "resource-version": "1508835067923", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/DFW", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "DFW" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc" - } - ] - } - ] - } - }, - { - "service-instance-id": "82d046fb-036c-412a-8926-07c16622288f", - "service-instance-name": "vid-e2e-test_service_2017-07-26_11-00-33-208", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501056046040", - "orchestration-status": "Active" - }, - { - "service-instance-id": "28adfa51-6d7f-4463-a975-f69e9bc9c3fa", - "service-instance-name": "vid-e2e-test_service_2017-07-26_16-56-30-658", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501077401209", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b368869f-9e69-418a-be61-9c53b33d09e8", - "service-instance-name": "vid-e2e-test_service_2017-07-26_21-55-13-231", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501095318054", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/22c1b09c-4828-4029-9da3-75c0b815a681", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "22c1b09c-4828-4029-9da3-75c0b815a681" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test-vnf_2017-07-26_21-55-43-391" - } - ] - } - ] - } - }, - { - "service-instance-id": "f11e491f-31a4-4fce-9a98-37cc93253249", - "service-instance-name": "vid-e2e-test_service_2017-07-26_22-00-54-093", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501095660896", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d8b18065-f378-4801-85f0-a263c66e9148", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "d8b18065-f378-4801-85f0-a263c66e9148" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test-vnf_2017-07-26_22-01-26-312" - } - ] - } - ] - } - }, - { - "service-instance-id": "30603d2b-570a-4ed3-8146-c5ff5608b430", - "service-instance-name": "vid-e2e-test_service_2017-07-26_16-58-52-390", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501077541635", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/a1a76b1d-1c3a-4239-8341-257958944dce", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "a1a76b1d-1c3a-4239-8341-257958944dce" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test_vnf_2017-07-26_16-59-23-041" - } - ] - } - ] - } - }, - { - "service-instance-id": "37d6cde5-f7b7-446e-b161-b835a7acc9a5", - "service-instance-name": "vid-e2e-test_service_2017-07-26_22-12-38-071", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501096370654", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ac25d056-e0ee-4d8e-b3d3-f26640562384", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ac25d056-e0ee-4d8e-b3d3-f26640562384" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test-vnf_2017-07-26_22-13-18-804" - } - ] - } - ] - } - }, - { - "service-instance-id": "65fa3122-5000-4aa1-9707-696825cf6bee", - "service-instance-name": "vid-e2e-test_service_2017-07-26_23-01-31-327", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501099298353", - "orchestration-status": "Active" - }, - { - "service-instance-id": "599b2af1-92bc-4c99-be63-0f027897b643", - "service-instance-name": "vid-e2e-test_service_2017-07-26_21-03-28-542", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501092216356", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/a4401c1c-505d-4287-a0cb-d2f079bcca4a", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "a4401c1c-505d-4287-a0cb-d2f079bcca4a" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "vid-e2e-test_vnf_2017-07-26_21-04-00-755" - } - ] - } - ] - } - }, - { - "service-instance-id": "649b92a1-d599-4abb-ae22-9d79ab15d39d", - "service-instance-name": "testrttert", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1499866339532", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c64642d2-d014-47bc-83f1-4e4854a20fb5", - "service-instance-name": "test675refg", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1499868496430", - "orchestration-status": "Active" - }, - { - "service-instance-id": "935400cb-3055-41e6-bea9-6fa25c470fe8", - "service-instance-name": "vid-e2e-test_service_2017-09-10_10-39-59-713", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505029212112", - "orchestration-status": "Active" - }, - { - "service-instance-id": "1d61b1be-a7a5-4f01-b980-d83702cb1c81", - "service-instance-name": "vid-e2e-test_aai_service_2017-09-10_11-33-40-608", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1505032423917", - "orchestration-status": "Active" - }, - { - "service-instance-id": "cfd3bc73-45b6-486e-89ed-ecd77d6c28d4", - "service-instance-name": "rtyrtyu", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1504686208504", - "orchestration-status": "Active" - }, - { - "service-instance-id": "b5c0cf11-5cd5-4ac0-9cf3-f794b7d2e9e7", - "service-instance-name": "eylonTest2", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a6a00927-7b10-48ed-bed4-0c9f5cf3fe1b", - "model-version-id": "775fdee6-22a9-4243-9a35-573a67df5fa4", - "resource-version": "1509264230953", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p3", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p3" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/f8494620-44a3-464b-b577-7a2a1113390d", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "f8494620-44a3-464b-b577-7a2a1113390d" - } - ] - } - ] - } - }, - { - "service-instance-id": "e96c6246-59b8-44f1-992a-00dcc9715403", - "service-instance-name": "eylonTest1", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a6a00927-7b10-48ed-bed4-0c9f5cf3fe1b", - "model-version-id": "775fdee6-22a9-4243-9a35-573a67df5fa4", - "resource-version": "1509264071228", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p6", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p6" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/f8494620-44a3-464b-b577-7a2a1113390d", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "f8494620-44a3-464b-b577-7a2a1113390d" - } - ] - } - ] - } - }, - { - "service-instance-id": "3b271daa-7dae-4e7e-8b7c-d4938752d53c", - "service-instance-name": "vik_flexware", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "951fd067-b3c1-41e4-8d1d-54223e37caa6", - "model-version-id": "5b20f93d-042f-4b44-ba8a-8428877975d0", - "resource-version": "1510067918641", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/Nimbus", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "Nimbus" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/2356a43d-ed56-43b6-aefc-8391b82588c9", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "2356a43d-ed56-43b6-aefc-8391b82588c9" - } - ] - } - ] - } - }, - { - "service-instance-id": "037157ae-4edb-4885-af7a-57ae1087e4f0", - "service-instance-name": "ServicePnf_25", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1509378462768", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/037157ae-4edb-4885-af7a-57ae1087e4f0/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "c363d78f-2cfd-4095-a90e-c5412133e46f", - "service-instance-name": "test_034599599sdv", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508411127918", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3f592a6f-459b-435e-b0d4-59959ab1d385", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3f592a6f-459b-435e-b0d4-59959ab1d385" - } - ] - } - ] - } - }, - { - "service-instance-id": "f04f45fe-0563-4b41-affe-4f71591f330a", - "service-instance-name": "testmac_0345095", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e", - "resource-version": "1508413319691", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3e1d8406-881c-40f1-ba47-185f8776aa82", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3e1d8406-881c-40f1-ba47-185f8776aa82" - } - ] - } - ] - } - }, - { - "service-instance-id": "e6f32432-c7a7-4d84-8596-13b931bebed9", - "service-instance-name": "Bracha1234", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508418034736", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p2", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p2" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3f592a6f-459b-435e-b0d4-59959ab1d385", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3f592a6f-459b-435e-b0d4-59959ab1d385" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/edfccd7f-a8d6-4b2d-b87a-4344d868e53c", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "edfccd7f-a8d6-4b2d-b87a-4344d868e53c" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "portal" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/4d73cfb9-3122-47c2-b3dc-9f944bea9134", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "4d73cfb9-3122-47c2-b3dc-9f944bea9134" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "bracha12345" - } - ] - } - ] - } - }, - { - "service-instance-id": "f5e4918e-a0d7-4c50-9474-240edf63bd1d", - "service-instance-name": "triusyt7584", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "a6a00927-7b10-48ed-bed4-0c9f5cf3fe1b", - "model-version-id": "775fdee6-22a9-4243-9a35-573a67df5fa4", - "resource-version": "1508412580537", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p80", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p80" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/3f592a6f-459b-435e-b0d4-59959ab1d385", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "3f592a6f-459b-435e-b0d4-59959ab1d385" - } - ] - } - ] - } - }, - { - "service-instance-id": "0a222d51-2d02-4d19-8926-0cc04b023212", - "service-instance-name": "ServicePnf_17", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "43596836-ae36-4608-a987-6608ede10dac", - "model-version-id": "7fe0b7d7-8f20-4981-a4df-1fc3318defcc", - "resource-version": "1508076064866", - "selflink": "restconf/config/GENERIC-RESOURCE-API:services/service/0a222d51-2d02-4d19-8926-0cc04b023212/service-data/service-topology/", - "orchestration-status": "Active" - }, - { - "service-instance-id": "867f48cb-f5fa-499c-b84d-f33533b2978d", - "service-instance-name": "fffssssaaaeeeewww", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508078868301", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/x1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "x1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/z1", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "z1" - } - ] - } - ] - } - }, - { - "service-instance-id": "257feb6b-ad89-4001-bb9d-54cfe8add8f6", - "service-instance-name": "vid-e2e-test_service_2017-10-15_17-42-19-283", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f", - "resource-version": "1508078514218", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/x1", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "x1" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/z1", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "z1" - } - ] - } - ] - } - }, - { - "service-instance-id": "153635ac-4bbb-4c12-8f54-b23c29f1af01", - "service-instance-name": "vid-test-2224443", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1501674964224", - "orchestration-status": "Active" - }, - { - "service-instance-id": "145d3863-b44c-40cf-addd-45f42a9522ad", - "service-instance-name": "vid-test-444333322", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501665641034", - "orchestration-status": "Active" - }, - { - "service-instance-id": "6798f1fa-fb5c-4638-b1ff-b7b66052e71d", - "service-instance-name": "vid-test-creation-3333", - "service-type": "", - "service-role": "", - "model-invariant-id": "f27484eb-7ee8-40d7-b2ff-7fd5a9133a10", - "model-version-id": "101262c3-74b1-4632-8b60-977770b651d3", - "resource-version": "1501672969683", - "orchestration-status": "Active" - }, - { - "service-instance-id": "67b2bb65-fbee-44dc-a144-88a8b5084d35", - "service-instance-name": "vid-test-333222", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "c079d859-4d81-4add-a9c3-94551f96e2b0", - "resource-version": "1501663697504", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7a9fc646-39a4-4f18-afc8-1be9560d4535", - "service-instance-name": "vid-test-3333222", - "service-type": "", - "service-role": "", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1501675189009", - "orchestration-status": "Active" - }, - { - "service-instance-id": "101e3ef2-8650-11e6-ae22-56b6b6499611", - "resource-version": "1494001848458", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/ctpx0001v", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "ctpx0001v" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "ctpx0001v" - } - ] - } - ] - } - }, - { - "service-instance-id": "c505ba4c-6333-4911-ac60-5736f36ff036", - "service-instance-name": "SlowAAI", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1509613326963", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "project", - "related-link": "/aai/v11/business/projects/project/p80", - "relationship-data": [ - { - "relationship-key": "project.project-name", - "relationship-value": "p80" - } - ] - }, - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/73185f03-5531-444d-bc03-fa13f924d66a", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "73185f03-5531-444d-bc03-fa13f924d66a" - } - ] - } - ] - } - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "AAIAIC25" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "092eb9e8e4b7412e8787dd091bc58e86" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "USP-SIP-IC-24335-T-01" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/bae71557c5bb4d5aac6743a4e5f1d054", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "bae71557c5bb4d5aac6743a4e5f1d054" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-testgamma" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/229bcdc6eaeb4ca59d55221141d01f8e", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "229bcdc6eaeb4ca59d55221141d01f8e" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-STTest2" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/1178612d2b394be4834ad77f567c0af2", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "1178612d2b394be4834ad77f567c0af2" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-SSPtestcustome" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/19c5ade915eb461e8af52fb2fd8cd1f2", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "19c5ade915eb461e8af52fb2fd8cd1f2" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-UncheckedEcopm" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/de007636e25249238447264a988a927b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "de007636e25249238447264a988a927b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-dfsdf" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/62f29b3613634ca6a3065cbe0e020c44", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "62f29b3613634ca6a3065cbe0e020c44" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN/SMS-16-D-Multiservices1" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/649289e30d3244e0b48098114d63c2aa", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "649289e30d3244e0b48098114d63c2aa" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-SSPST66" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/3f21eeea6c2c486bba31dab816c05a32", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "3f21eeea6c2c486bba31dab816c05a32" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-ASSPST47" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f60ce21d3ee6427586cff0d22b03b773", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "f60ce21d3ee6427586cff0d22b03b773" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg67246" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8774659e425f479895ae091bb5d46560", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "8774659e425f479895ae091bb5d46560" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg68359" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/624eb554b0d147c19ff8885341760481", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "624eb554b0d147c19ff8885341760481" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-iftach" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/214f55f5fc414c678059c383b03e4962", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "214f55f5fc414c678059c383b03e4962" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg612401" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c90666c291664841bb98e4d981ff1db5", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "c90666c291664841bb98e4d981ff1db5" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg621340" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ce5b6bc5c7b348e1bf4b91ac9a174278", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "ce5b6bc5c7b348e1bf4b91ac9a174278" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "sspjg621351cloned" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b386b768a3f24c8e953abbe0b3488c02", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "b386b768a3f24c8e953abbe0b3488c02" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-eteancomp" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/dc6c4dbfd225474e9deaadd34968646c", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "dc6c4dbfd225474e9deaadd34968646c" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-T-SPFET" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/02cb5030e9914aa4be120bd9ed1e19eb", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "02cb5030e9914aa4be120bd9ed1e19eb" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-eeweww" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f2f3830e4c984d45bcd00e1a04158a79", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "f2f3830e4c984d45bcd00e1a04158a79" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-spjg61909" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/05b91bd5137f4929878edd965755c06d", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "05b91bd5137f4929878edd965755c06d" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-D-sspjg621512cloned" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/7002fbe8482d4a989ddf445b1ce336e0", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "7002fbe8482d4a989ddf445b1ce336e0" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-vdr" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/4008522be43741dcb1f5422022a2aa0b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "4008522be43741dcb1f5422022a2aa0b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-ssasa" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/f44e2e96a1b6476abfda2fa407b00169", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "f44e2e96a1b6476abfda2fa407b00169" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-D-PFNPT" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/b69a52bec8a84669a37a1e8b72708be7", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "b69a52bec8a84669a37a1e8b72708be7" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-vdre" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fac7d9fd56154caeb9332202dcf2969f", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "fac7d9fd56154caeb9332202dcf2969f" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-NONPODECOMP" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/cb42a77ff45b48a8b8deb83bb64acc74", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "cb42a77ff45b48a8b8deb83bb64acc74" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "ro-T11" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/fa45ca53c80b492fa8be5477cd84fc2b", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "fa45ca53c80b492fa8be5477cd84fc2b" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "ro-T112" - } - ] - } - ] - } - }, - { - "service-type": "TSBC", - "resource-version": "1494001891362", - "service-instances": { - "service-instance": [ - { - "service-instance-id": "c0edefb0-2505-4a34-85cc-96c4cd5a121d", - "service-instance-name": "test-343432", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1500370094198", - "orchestration-status": "Active" - }, - { - "service-instance-id": "7cb54908-f3fb-46b9-b547-d1e670ea95b2", - "service-instance-name": "test765445g", - "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", - "model-version-id": "76f27dfe-33e5-472f-8e0b-acf524adc4f0", - "resource-version": "1499868690949", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/fbb52a16-2c57-4212-802f-32dbba2204f2", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "fbb52a16-2c57-4212-802f-32dbba2204f2" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "fdfdfdf" - } - ] - } - ] - } - }, - { - "service-instance-id": "8e953267-4cd8-45ec-ae7f-bdeb018656c0", - "service-instance-name": "a1", - "service-type": "service_type_shani", - "service-role": "service_role_shani", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "340f3957-ff0a-4503-866d-a34fd1b97450", - "model-version-id": "ee2d8783-8495-4fb1-9553-6cdbd2dd3a50", - "resource-version": "1509355912484", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/2356a43d-ed56-43b6-aefc-8391b82588c9", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "2356a43d-ed56-43b6-aefc-8391b82588c9" - } - ] - } - ] - } - }, - { - "service-instance-id": "e2ecfd33-b5d3-4a7b-85ba-1a709b26b66c", - "service-instance-name": "a3", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "d5937aa1-37fb-4ed0-8c30-5144b89a64ae", - "model-version-id": "06ac9663-54cf-4c77-b926-6e8757cf6380", - "resource-version": "1509356358573", - "orchestration-status": "Active", - "relationship-list": { - "relationship": [ - { - "related-to": "owning-entity", - "related-link": "/aai/v11/business/owning-entities/owning-entity/589fe0db-26c4-45e5-9f4e-a246c74fce76", - "relationship-data": [ - { - "relationship-key": "owning-entity.owning-entity-id", - "relationship-value": "589fe0db-26c4-45e5-9f4e-a246c74fce76" - } - ] - }, - { - "related-to": "generic-vnf", - "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/9c925d7e-1a94-4784-a45b-408c8cc96fa8", - "relationship-data": [ - { - "relationship-key": "generic-vnf.vnf-id", - "relationship-value": "9c925d7e-1a94-4784-a45b-408c8cc96fa8" - } - ], - "related-to-property": [ - { - "property-key": "generic-vnf.vnf-name", - "property-value": "dfdsfds" - } - ] - } - ] - } - }, - { - "service-instance-id": "7dfef88f-fec0-421f-90d4-91eea35a5813", - "service-instance-name": "shanitest", - "service-type": "", - "service-role": "", - "environment-context": "null", - "workload-context": "null", - "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", - "model-version-id": "44671b15-83dd-4db7-a36e-dfada3eaa2f9", - "resource-version": "1508144995828", - "orchestration-status": "Active" - }, - { - "service-instance-id": "a46ca55c-e9bd-4e68-9c49-c98933240218", - "service-instance-name": "si_failtest", - "model-invariant-id": "732263bd-0655-428d-a347-d65676d1a949", - "resource-version": "1494001997513" - }, - { - "service-instance-id": "e165f1af-a3cf-4323-8cd2-607acb55baa9", - "service-instance-name": "first_macro_shani", - "service-type": "", - "service-role": "", - "environment-context": "General_Revenue-Bearing", - "workload-context": "Production", - "model-invariant-id": "5b9c0f33-eec1-484a-bf77-736a6644d7a8", - "model-version-id": "b75e0d22-05ff-4448-9266-5f0d4e1dbbd6", - "resource-version": "1508071197869", - "orchestration-status": "Active" - } - ] - }, - "relationship-list": { - "relationship": [ - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ece35e4a79d547d193451ac38d700046", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "ece35e4a79d547d193451ac38d700046" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-sspstMAIL" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/23cbbd1872864ea08aa53ade25d34172", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "23cbbd1872864ea08aa53ade25d34172" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN Web Tool-15-D-rtertet" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ded2432abb5a4100801331d07787afc2", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "ded2432abb5a4100801331d07787afc2" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN/SMS-16-D-SSPecompFlvr2" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/ad5aab08f5f7435e9983311af543f311", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "ad5aab08f5f7435e9983311af543f311" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-PODECOMP" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/8071dc66981c4294b05483a1cddac801", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "8071dc66981c4294b05483a1cddac801" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "CESAR-100-X-ecompPODprivate" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/036f769581904ca08ead1415c22b9ec0", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "036f769581904ca08ead1415c22b9ec0" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AINWebTool-15-X-PODECOMPCLONE" - } - ] - }, - { - "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/mtn6/tenants/tenant/c2475a36c5e04f12a21593849ae83420", - "relationship-data": [ - { - "relationship-key": "cloud-region.cloud-owner", - "relationship-value": "att-aic" - }, - { - "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "mtn6" - }, - { - "relationship-key": "tenant.tenant-id", - "relationship-value": "c2475a36c5e04f12a21593849ae83420" - } - ], - "related-to-property": [ - { - "property-key": "tenant.tenant-name", - "property-value": "AIN/SMS-16-X-hope" - } - ] - } - ] - } - } - ] - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_cr_view_edit.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_cr_view_edit.json index 8f9a5e430..4fa835dae 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_cr_view_edit.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_cr_view_edit.json @@ -13,7 +13,7 @@ "service-instance-id":"3f93c7cb-2fd0-4557-9514-e189b7testCR" }, "service-subscription":{ - "service-type":"VIRTUAL USP" + "service-type":"TYLER SILVIA" } } ] @@ -41,11 +41,11 @@ "inventory-response-items":{ "inventory-response-item":[ { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"c015cc0f-0f37-4488-aabf-53795fd93cd3", "vnf-name":"fsd", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -134,11 +134,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"0846287b-65bf-45a6-88f6-6a1af4149fac", "vnf-name":"kjkjk", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -207,12 +207,12 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"9908b762-136f-4b1f-8eb4-ef670ef58bb4", "vnf-name":"uiui", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", - "service-id":"vHNGWaas", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", + "service-id":"vRosemarie", "prov-status":"PREPROV", "orchestration-status":"Created", "in-maint":false, @@ -231,11 +231,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"543931f5-e50e-45a2-a69f-ab727e4c7f2f", "vnf-name":"sdfsdfdsf", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"LRSI-OSPF", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -255,12 +255,12 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"25e84884-22d5-44c9-8212-cb459f63e0ba", "vnf-name":"sdada", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", - "service-id":"VIPRaaS", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", + "service-id":"vMuriel", "prov-status":"PREPROV", "orchestration-status":"Created", "in-maint":false, @@ -279,11 +279,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"013fb0ba-977b-496c-9faa-7f8e5f083eec", "vnf-name":"gvb", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -303,11 +303,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"06914296-cb46-4b62-9453-329a706a6cbb", "vnf-name":"lkllll", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -327,11 +327,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"c55da606-cf38-42c7-bc3c-be8e23b19299", "vnf-name":"ss", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -351,11 +351,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"27cc0914-70be-453e-b552-3df6b1d6cda9", "vnf-name":"yh", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"db171b8f-115c-4992-a2e3-ee04cae357e0", "prov-status":"PREPROV", "orchestration-status":"Created", diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit.json index 2f03e675e..e4b4d5d16 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit.json @@ -13,7 +13,7 @@ "service-instance-id":"3f93c7cb-2fd0-4557-9514-e189b7b04f9d" }, "service-subscription":{ - "service-type":"VIRTUAL USP" + "service-type":"TYLER SILVIA" } } ] @@ -41,11 +41,11 @@ "inventory-response-items":{ "inventory-response-item":[ { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"c015cc0f-0f37-4488-aabf-53795fd93cd3", "vnf-name":"fsd", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -118,7 +118,7 @@ "vf-module":{ "vf-module-id":"a231a99c-7e75-4d6d-a0fb-5c7d26f30f77", "vf-module-name":"my_vfModule", - "orchestration-status":"pending-delete", + "orchestration-status":"<VF_MODULE_ORCH_STATUS>", "is-base-vf-module":false, "resource-version":"1505044772033", "model-invariant-id":"eb5a1e09-7f46-4f1c-ab7a-b017bad95261", @@ -134,11 +134,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"0846287b-65bf-45a6-88f6-6a1af4149fac", "vnf-name":"kjkjk", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -207,12 +207,12 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"9908b762-136f-4b1f-8eb4-ef670ef58bb4", "vnf-name":"uiui", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", - "service-id":"vHNGWaas", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", + "service-id":"vRosemarie", "prov-status":"PREPROV", "orchestration-status":"Created", "in-maint":false, @@ -231,11 +231,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"543931f5-e50e-45a2-a69f-ab727e4c7f2f", "vnf-name":"sdfsdfdsf", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"LRSI-OSPF", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -255,12 +255,12 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"25e84884-22d5-44c9-8212-cb459f63e0ba", "vnf-name":"sdada", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", - "service-id":"VIPRaaS", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", + "service-id":"vMuriel", "prov-status":"PREPROV", "orchestration-status":"Created", "in-maint":false, @@ -279,11 +279,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"013fb0ba-977b-496c-9faa-7f8e5f083eec", "vnf-name":"gvb", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -303,11 +303,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"06914296-cb46-4b62-9453-329a706a6cbb", "vnf-name":"lkllll", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -327,11 +327,11 @@ } }, { - "model-name":"VID-PCRF-05-15-17", + "model-name":"VID-RODERICK-05-15-17", "generic-vnf":{ "vnf-id":"c55da606-cf38-42c7-bc3c-be8e23b19299", "vnf-name":"ss", - "vnf-type":"1707vidnf/VID-PCRF-05-15-17 0", + "vnf-type":"1707vidnf/VID-RODERICK-05-15-17 0", "service-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "prov-status":"PREPROV", "orchestration-status":"Created", @@ -378,14 +378,14 @@ "subnet-id": "1254dd9b-e689-4075-a089-f0deeb23c00c", "subnet-name": "APP-C-DND_vEPDG-FN_hsl_fn_net_1_subnet_1", "neutron-subnet-id": "7b5ea34d-fb95-4278-a148-4f6677ebe866", - "gateway-address": "107.243.49.1", - "network-start-address": "107.243.49.0", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", "cidr-mask": "26", "ip-version": "4", "orchestration-status": "Created", "dhcp-enabled": true, - "dhcp-start": "107.243.49.3", - "dhcp-end": "107.243.49.62", + "dhcp-start": "10.0.0.10", + "dhcp-end": "10.0.0.10", "ip-assignment-direction": "false", "resource-version": "1511279493791" }, diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit_test_sssdad.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit_test_sssdad.json index 6547c98e2..23a37697b 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit_test_sssdad.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit_test_sssdad.json @@ -13,7 +13,7 @@ "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f6" }, "service-subscription": { - "service-type": "VIRTUAL USP" + "service-type": "TYLER SILVIA" } } ] diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_pm1111.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_pm1111.json index 1058e6d0a..ff0aac7ac 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_pm1111.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_pm1111.json @@ -25,7 +25,7 @@ "name": "Multiple pProbes", "version": "1.0", "toscaModelURL": "./pm1111.zip", - "category": "Mobility", + "category": "Emanuel", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_test_sssdad.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_test_sssdad.json index 95f35d78b..f3caad187 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_test_sssdad.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_test_sssdad.json @@ -25,7 +25,7 @@ "name": "Multiple pProbes", "version": "1.0", "toscaModelURL": "./pm1111.zip", - "category": "Mobility", + "category": "Emanuel", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_vid-test-444.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_vid-test-444.json index 3410dc1ce..2cff7f69a 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_vid-test-444.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_vid-test-444.json @@ -25,7 +25,7 @@ "name": "Demo Service", "version": "1.0", "toscaModelURL": "./vid-test-444-demo-csar.zip", - "category": "Mobility", + "category": "Emanuel", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_vid-test-cr.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_vid-test-cr.json index 6238afa06..3a4a0e2e1 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_vid-test-cr.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/get_sdc_catalog_services_vid-test-cr.json @@ -25,7 +25,7 @@ "name": "Demo Service", "version": "1.0", "toscaModelURL": "./service-MsoExampleService-csar.zip", - "category": "Mobility", + "category": "Emanuel", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", "lastUpdaterFullName": null, diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/mso_instance_orch_status_req.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/mso_instance_orch_status_req.json index 1b7817a73..1106697cb 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/mso_instance_orch_status_req.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/mso_instance_orch_status_req.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/mso/orchestrationRequests/v5", + "path": "/mso/orchestrationRequests/v.", "queryParams": { "filter": "serviceInstanceId:EQUALS:<SERVICE_INSTANCE_ID>" } diff --git a/vid-automation/src/main/resources/supplementaryFiles/invalid-file.json b/vid-automation/src/main/resources/supplementaryFiles/invalid-file.json new file mode 100644 index 000000000..c399442cf --- /dev/null +++ b/vid-automation/src/main/resources/supplementaryFiles/invalid-file.json @@ -0,0 +1 @@ +aaaaa: aaaaaa
\ No newline at end of file diff --git a/vid-automation/src/main/resources/supplementaryFiles/sample.json b/vid-automation/src/main/resources/supplementaryFiles/sample.json new file mode 100644 index 000000000..c7d245f43 --- /dev/null +++ b/vid-automation/src/main/resources/supplementaryFiles/sample.json @@ -0,0 +1,4 @@ +{ + "param": "ABCD", + "vnf_instance_name": "sample" +}
\ No newline at end of file diff --git a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java index 7d558940d..952aa522d 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java @@ -1,12 +1,33 @@ package org.onap.vid.api; +import static org.hamcrest.CoreMatchers.containsString; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotEquals; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.ofL3Network; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.ofServiceInstance; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.ofVlanTag; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.ofVnf; +import static org.onap.simulator.presetGenerator.presets.ecompportal_att.EcompPortalPresetsUtils.getEcompPortalPresets; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; +import static vid.automation.test.utils.TestHelper.GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS; + import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMultimap; +import java.io.IOException; +import java.lang.reflect.Method; +import java.net.URISyntaxException; +import java.util.UUID; import net.javacrumbs.jsonunit.JsonAssert; +import net.javacrumbs.jsonunit.core.Configuration; +import net.javacrumbs.jsonunit.core.Option; import org.apache.commons.text.StringEscapeUtils; -import org.codehaus.jackson.map.ObjectMapper; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIBadBodyForGetServicesGet; import org.onap.simulator.presetGenerator.presets.aai.PresetAAICloudRegionAndSourceFromConfigurationPut; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetHomingForVfModule; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetInstanceGroupsByCloudRegion; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing; @@ -17,6 +38,9 @@ import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetPortMirroringS import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetPortMirroringSourcePortsError; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetRelatedInstanceGroupsByVnfId; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; import org.onap.vid.model.aai.AaiResponse; import org.onap.vid.model.mso.OperationalEnvironmentList; import org.onap.vid.more.LoggerFormatTest; @@ -29,31 +53,23 @@ import org.springframework.web.client.HttpServerErrorException; import org.springframework.web.util.UriComponentsBuilder; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Features; import vid.automation.test.services.SimulatorApi; - -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.URISyntaxException; - -import static org.hamcrest.CoreMatchers.containsString; -import static org.junit.Assert.*; -import static org.onap.simulator.presetGenerator.presets.ecompportal_att.EcompPortalPresetsUtils.getEcompPortalPresets; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; +import vid.automation.test.utils.TestHelper; public class AaiApiTest extends BaseApiAaiTest { - + private static final String AAI_HOMING_DATA_RESPONSE = "viewEdit/aaiHomingDataResponse.json"; public static final String GET_OPERATIONAL_ENVIRONMENTS_JSON = "get_operational_environments_aai.json"; public static final String GET_OPERATIONAL_ENVIRONMENTS_JSON_ERROR = "get_operational_environments_aai_error.json"; - public static final String[] AAI_GET_SERVICES_ERROR_SIMULATOR_RESPONSES = {"getServicesAaiErrorResp.json", "aai_get_full_subscribers.json"}; - public static final String[] AAI_GET_SERVICES_FINE_SIMULATOR_RESPONSES = {"getServicesAaiFineResp.json", "aai_get_full_subscribers.json"}; - + public static final String[] AAI_GET_SERVICES_ERROR_SIMULATOR_RESPONSES = {"getServicesAaiErrorResp.json", "create_new_instance/aai_get_full_subscribers.json"}; + public static final String[] AAI_GET_SERVICES_FINE_SIMULATOR_RESPONSES = {"getServicesAaiFineResp.json", "create_new_instance/aai_get_full_subscribers.json"}; + public static final String AAI_VNFS_FOR_CHANGE_MANAGEMENT_JSON = "changeManagement/get_vnf_data_by_globalid_and_service_type.json"; public static final String OPERATIONAL_ENVIRONMENT_TYPE = "VNF"; public static final String OPERATIONAL_ENVIRONMENT_STATUS = "Activate"; - public static final String BASE_GET_SERVICES_AAI_REQUEST_BODY = "{\"start\" : \"service-design-and-creation/models\", \"query\" : \"query/serviceModels-byDistributionStatus?distributionStatus=DISTRIBUTION_COMPLETE_OK\";}"; public static final String GET_INSTANCE_GROUPS_BY_CLOUDREGION_EXPECTED_RESPONSE = "{\"results\":[{\"instance-group\":{\"id\":\"AAI-12002-test3-vm230w\",\"description\":\"a9DEa0kpY\",\"instance-group-role\":\"JZmha7QSS4tJ\",\"model-invariant-id\":\"model-id3\",\"model-version-id\":\"a0efd5fc-f7be-4502-936a-a6c6392b958f\",\"instance-group-type\":\"type\",\"resource-version\":\"1520888659539\",\"instance-group-name\":\"wKmBXiO1xm8bK\",\"instance-group-function\":\"testfunction2\",\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"cloud-region.cloud-owner\",\"relationship-value\":\"AAI-12002-vm230w\"},{\"relationship-key\":\"cloud-region.cloud-region-id\",\"relationship-value\":\"AAI-region-vm230w\"}],\"relatedToPropertyList\":[{\"property-key\":\"cloud-region.owner-defined-type\",\"property-value\":null}],\"related-to\":\"cloud-region\",\"related-link\":\"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\"relationship-label\":\"org.onap.relationships.inventory.Uses\",\"relationship-data\":[{\"relationship-key\":\"cloud-region.cloud-owner\",\"relationship-value\":\"AAI-12002-vm230w\"},{\"relationship-key\":\"cloud-region.cloud-region-id\",\"relationship-value\":\"AAI-region-vm230w\"}],\"related-to-property\":[{\"property-key\":\"cloud-region.owner-defined-type\",\"property-value\":null}]}]}}},{\"instance-group\":{\"id\":\"AAI-12002-test1-vm230w\",\"description\":\"a9DEa0kpY\",\"instance-group-role\":\"JZmha7QSS4tJ\",\"model-invariant-id\":\"model-id1\",\"model-version-id\":\"a0efd5fc-f7be-4502-936a-a6c6392b958f\",\"instance-group-type\":\"type\",\"resource-version\":\"1520886467989\",\"instance-group-name\":\"wKmBXiO1xm8bK\",\"instance-group-function\":\"testfunction2\",\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"cloud-region.cloud-owner\",\"relationship-value\":\"AAI-12002-vm230w\"},{\"relationship-key\":\"cloud-region.cloud-region-id\",\"relationship-value\":\"AAI-region-vm230w\"}],\"relatedToPropertyList\":[{\"property-key\":\"cloud-region.owner-defined-type\",\"property-value\":null}],\"related-to\":\"cloud-region\",\"related-link\":\"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\"relationship-label\":\"org.onap.relationships.inventory.Uses\",\"relationship-data\":[{\"relationship-key\":\"cloud-region.cloud-owner\",\"relationship-value\":\"AAI-12002-vm230w\"},{\"relationship-key\":\"cloud-region.cloud-region-id\",\"relationship-value\":\"AAI-region-vm230w\"}],\"related-to-property\":[{\"property-key\":\"cloud-region.owner-defined-type\",\"property-value\":null}]}]}}},{\"instance-group\":{\"id\":\"AAI-12002-test2-vm230w\",\"description\":\"a9DEa0kpY\",\"instance-group-role\":\"JZmha7QSS4tJ\",\"model-invariant-id\":\"model-id2\",\"model-version-id\":\"version2\",\"instance-group-type\":\"type\",\"resource-version\":\"1520888629970\",\"instance-group-name\":\"wKmBXiO1xm8bK\",\"instance-group-function\":\"testfunction2\",\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"cloud-region.cloud-owner\",\"relationship-value\":\"AAI-12002-vm230w\"},{\"relationship-key\":\"cloud-region.cloud-region-id\",\"relationship-value\":\"AAI-region-vm230w\"}],\"relatedToPropertyList\":[{\"property-key\":\"cloud-region.owner-defined-type\",\"property-value\":null}],\"related-to\":\"cloud-region\",\"related-link\":\"/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/AAI-12002-vm230w/AAI-region-vm230w\",\"relationship-label\":\"org.onap.relationships.inventory.Uses\",\"relationship-data\":[{\"relationship-key\":\"cloud-region.cloud-owner\",\"relationship-value\":\"AAI-12002-vm230w\"},{\"relationship-key\":\"cloud-region.cloud-region-id\",\"relationship-value\":\"AAI-region-vm230w\"}],\"related-to-property\":[{\"property-key\":\"cloud-region.owner-defined-type\",\"property-value\":null}]}]}}}]}\n"; - public static final String GET_NETWORK_COLLECTION_EXPECTED_RESPONSE = "{\"results\":{\"collection\":{\"collection-id\":\"collection-1-2018-rs804s\",\"model-invariant-id\":\"5761e0a7-defj777\",\"model-version-id\":\"5761e0a7-defj232\",\"collection-name\":\"collection-name\",\"collection-type\":\"L3-NETWORK\",\"collection-role\":\"SUB-INTERFACE\",\"collection-function\":\"collection-function\",\"collection-customization-id\":\"custom-unique-data-id\",\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"customer.global-customer-id\",\"relationship-value\":\"customer-1-2017-rs804s\"},{\"relationship-key\":\"service-subscription.service-type\",\"relationship-value\":\"service-value7-rs804s\"},{\"relationship-key\":\"service-instance.service-instance-id\",\"relationship-value\":\"2UJZZ01777-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"service-instance.service-instance-name\",\"property-value\":null}],\"related-to\":\"service-instance\",\"related-link\":\"/aai/v13/business/customers/customer/customer-1-2017-rs804s/service-subscriptions/service-subscription/service-value7-rs804s/service-instances/service-instance/2UJZZ01777-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"customer.global-customer-id\",\"relationship-value\":\"customer-1-2017-rs804s\"},{\"relationship-key\":\"service-subscription.service-type\",\"relationship-value\":\"service-value7-rs804s\"},{\"relationship-key\":\"service-instance.service-instance-id\",\"relationship-value\":\"2UJZZ01777-rs804s\"}],\"related-to-property\":[{\"property-key\":\"service-instance.service-instance-name\",\"property-value\":null}]},{\"relationDataList\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}],\"related-to\":\"instance-group\",\"related-link\":\"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"related-to-property\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}]}]},\"resource-version\":\"1521662811309\"},\"networks\":[{\"network-id\":\"l3network-id-rs804s\",\"network-name\":\"oam-net\",\"network-type\":\"Tenant_Layer_3\",\"network-role\":\"HngwProtectedOam.OAM\",\"network-technology\":\"Contrail\",\"is-bound-to-vpn\":false,\"resource-version\":\"1521662814627\",\"is-provider-network\":false,\"is-shared-network\":false,\"is-external-network\":false,\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}],\"related-to\":\"instance-group\",\"related-link\":\"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"related-to-property\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}]}]}},{\"network-id\":\"l3network-id-3-rs804s\",\"network-name\":\"oam-net\",\"network-type\":\"Tenant_Layer_3\",\"network-role\":\"HngwProtectedOam.OAM\",\"network-technology\":\"Contrail\",\"is-bound-to-vpn\":false,\"resource-version\":\"1521662816043\",\"is-provider-network\":false,\"is-shared-network\":false,\"is-external-network\":false,\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}],\"related-to\":\"instance-group\",\"related-link\":\"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"related-to-property\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}]}]}},{\"network-id\":\"l3network-id-2-rs804s\",\"network-name\":\"oam-net\",\"network-type\":\"Tenant_Layer_3\",\"network-role\":\"HngwProtectedOam.OAM\",\"network-technology\":\"Contrail\",\"is-bound-to-vpn\":false,\"resource-version\":\"1521662815304\",\"is-provider-network\":false,\"is-shared-network\":false,\"is-external-network\":false,\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}],\"related-to\":\"instance-group\",\"related-link\":\"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"related-to-property\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}]}]}}],\"service-instance\":{\"service-instance-id\":\"2UJZZ01777-rs804s\",\"resource-version\":\"1521662813382\",\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"collection.collection-id\",\"relationship-value\":\"collection-1-2018-rs804s\"}],\"relatedToPropertyList\":null,\"related-to\":\"collection\",\"related-link\":\"/aai/v13/network/collections/collection/collection-1-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"collection.collection-id\",\"relationship-value\":\"collection-1-2018-rs804s\"}],\"related-to-property\":null}]}},\"instance-group\":{\"id\":\"instanceGroup-2018-rs804s\",\"description\":\"zr6h\",\"instance-group-role\":\"JZmha7QSS4tJ\",\"model-invariant-id\":\"5761e0a7-defj777\",\"model-version-id\":\"5761e0a7-defj22\",\"instance-group-type\":\"7DDjOdNL\",\"resource-version\":\"1521662814023\",\"instance-group-name\":\"wKmBXiO1xm8bK\",\"instance-group-function\":\"testfunction2\",\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}],\"related-to\":\"l3-network\",\"related-link\":\"/aai/v13/network/l3-networks/l3-network/l3network-id-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-rs804s\"}],\"related-to-property\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}]},{\"relationDataList\":[{\"relationship-key\":\"collection.collection-id\",\"relationship-value\":\"collection-1-2018-rs804s\"}],\"relatedToPropertyList\":null,\"related-to\":\"collection\",\"related-link\":\"/aai/v13/network/collections/collection/collection-1-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"collection.collection-id\",\"relationship-value\":\"collection-1-2018-rs804s\"}],\"related-to-property\":null},{\"relationDataList\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-3-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}],\"related-to\":\"l3-network\",\"related-link\":\"/aai/v13/network/l3-networks/l3-network/l3network-id-3-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-3-rs804s\"}],\"related-to-property\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}]},{\"relationDataList\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-2-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}],\"related-to\":\"l3-network\",\"related-link\":\"/aai/v13/network/l3-networks/l3-network/l3network-id-2-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-2-rs804s\"}],\"related-to-property\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}]}]}}}}\n"; + public static final String GET_NETWORK_COLLECTION_EXPECTED_RESPONSE = "{\"results\":{\"collection\":{\"collection-id\":\"collection-1-2018-rs804s\",\"model-invariant-id\":\"5761e0a7-defj777\",\"model-version-id\":\"5761e0a7-defj232\",\"collection-name\":\"collection-name\",\"collection-type\":\"L3-NETWORK\",\"collection-role\":\"SUB-INTERFACE\",\"collection-function\":\"collection-function\",\"collection-customization-id\":\"custom-unique-data-id\",\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"customer.global-customer-id\",\"relationship-value\":\"customer-1-2017-rs804s\"},{\"relationship-key\":\"service-subscription.service-type\",\"relationship-value\":\"service-value7-rs804s\"},{\"relationship-key\":\"service-instance.service-instance-id\",\"relationship-value\":\"2UJZZ01777-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"service-instance.service-instance-name\",\"property-value\":null}],\"related-to\":\"service-instance\",\"related-link\":\"/aai/v13/business/customers/customer/customer-1-2017-rs804s/service-subscriptions/service-subscription/service-value7-rs804s/service-instances/service-instance/2UJZZ01777-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"customer.global-customer-id\",\"relationship-value\":\"customer-1-2017-rs804s\"},{\"relationship-key\":\"service-subscription.service-type\",\"relationship-value\":\"service-value7-rs804s\"},{\"relationship-key\":\"service-instance.service-instance-id\",\"relationship-value\":\"2UJZZ01777-rs804s\"}],\"related-to-property\":[{\"property-key\":\"service-instance.service-instance-name\",\"property-value\":null}]},{\"relationDataList\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}],\"related-to\":\"instance-group\",\"related-link\":\"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"related-to-property\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}]}]},\"resource-version\":\"1521662811309\"},\"networks\":[{\"network-id\":\"l3network-id-rs804s\",\"network-name\":\"oam-net\",\"network-type\":\"Tenant_Layer_3\",\"network-role\":\"RosemaProtectedOam.OAM\",\"network-technology\":\"Contrail\",\"is-bound-to-vpn\":false,\"resource-version\":\"1521662814627\",\"orchestration-status\":\"Created\",\"is-provider-network\":false,\"is-shared-network\":false,\"is-external-network\":false,\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}],\"related-to\":\"instance-group\",\"related-link\":\"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"related-to-property\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}]}]}},{\"network-id\":\"l3network-id-3-rs804s\",\"network-name\":\"oam-net\",\"network-type\":\"Tenant_Layer_3\",\"network-role\":\"RosemaProtectedOam.OAM\",\"network-technology\":\"Contrail\",\"is-bound-to-vpn\":false,\"resource-version\":\"1521662816043\",\"orchestration-status\":\"Created\",\"is-provider-network\":false,\"is-shared-network\":false,\"is-external-network\":false,\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}],\"related-to\":\"instance-group\",\"related-link\":\"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"related-to-property\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}]}]}},{\"network-id\":\"l3network-id-2-rs804s\",\"network-name\":\"oam-net\",\"network-type\":\"Tenant_Layer_3\",\"network-role\":\"RosemaProtectedOam.OAM\",\"network-technology\":\"Contrail\",\"is-bound-to-vpn\":false,\"resource-version\":\"1521662815304\",\"orchestration-status\":\"Created\",\"is-provider-network\":false,\"is-shared-network\":false,\"is-external-network\":false,\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}],\"related-to\":\"instance-group\",\"related-link\":\"/aai/v13/network/instance-groups/instance-group/instanceGroup-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"instance-group.id\",\"relationship-value\":\"instanceGroup-2018-rs804s\"}],\"related-to-property\":[{\"property-key\":\"instance-group.description\",\"property-value\":\"zr6h\"},{\"property-key\":\"instance-group.instance-group-name\",\"property-value\":\"wKmBXiO1xm8bK\"}]}]}}],\"service-instance\":{\"service-instance-id\":\"2UJZZ01777-rs804s\",\"resource-version\":\"1521662813382\",\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"collection.collection-id\",\"relationship-value\":\"collection-1-2018-rs804s\"}],\"relatedToPropertyList\":null,\"related-to\":\"collection\",\"related-link\":\"/aai/v13/network/collections/collection/collection-1-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"collection.collection-id\",\"relationship-value\":\"collection-1-2018-rs804s\"}],\"related-to-property\":null}]}},\"instance-group\":{\"id\":\"instanceGroup-2018-rs804s\",\"description\":\"zr6h\",\"instance-group-role\":\"JZmha7QSS4tJ\",\"model-invariant-id\":\"5761e0a7-defj777\",\"model-version-id\":\"5761e0a7-defj22\",\"instance-group-type\":\"7DDjOdNL\",\"resource-version\":\"1521662814023\",\"instance-group-name\":\"wKmBXiO1xm8bK\",\"instance-group-function\":\"testfunction2\",\"relationship-list\":{\"relationship\":[{\"relationDataList\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}],\"related-to\":\"l3-network\",\"related-link\":\"/aai/v13/network/l3-networks/l3-network/l3network-id-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-rs804s\"}],\"related-to-property\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}]},{\"relationDataList\":[{\"relationship-key\":\"collection.collection-id\",\"relationship-value\":\"collection-1-2018-rs804s\"}],\"relatedToPropertyList\":null,\"related-to\":\"collection\",\"related-link\":\"/aai/v13/network/collections/collection/collection-1-2018-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"collection.collection-id\",\"relationship-value\":\"collection-1-2018-rs804s\"}],\"related-to-property\":null},{\"relationDataList\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-3-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}],\"related-to\":\"l3-network\",\"related-link\":\"/aai/v13/network/l3-networks/l3-network/l3network-id-3-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-3-rs804s\"}],\"related-to-property\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}]},{\"relationDataList\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-2-rs804s\"}],\"relatedToPropertyList\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}],\"related-to\":\"l3-network\",\"related-link\":\"/aai/v13/network/l3-networks/l3-network/l3network-id-2-rs804s\",\"relationship-label\":\"org.onap.relationships.inventory.MemberOf\",\"relationship-data\":[{\"relationship-key\":\"l3-network.network-id\",\"relationship-value\":\"l3network-id-2-rs804s\"}],\"related-to-property\":[{\"property-key\":\"l3-network.network-name\",\"property-value\":\"oam-net\"}]}]}}}}\n"; public static final String GET_AAI_SERVIES_EXPECTED_RESULT = "{\n" + " \"services\": [{\n" + " \"uuid\": \"20c4431c-246d-11e7-93ae-92361f002671\",\n" + @@ -202,8 +218,6 @@ public class AaiApiTest extends BaseApiAaiTest { " \"readOnly\": false\n" + "}"; - static final ObjectMapper om = new ObjectMapper(); - private String getGetOperationEnvironmentsUri() { return uri.toASCIIString() + "/get_operational_environments"; } @@ -262,18 +276,9 @@ public class AaiApiTest extends BaseApiAaiTest { assertEquals(1, list.getOperationalEnvironment().get(0).getRelationshipList().getRelationship().size()); } - - @Test - public void testVoid(){ - SimulatorApi.registerExpectation(SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET, - "add_subinterface/aai_get_tenants.json" - , "add_subinterface/aai_get_services.json" - ); - } - - @Test(dataProvider = "errorCodes") public void getServicesWitErrorResponse(int errorCode) throws IOException, URISyntaxException { + TestHelper.resetAaiCache(GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS, restTemplate, uri); final String expectedResult = "{\"services\":[],\"readOnly\":false}"; callAaiWithSimulatedErrorResponse(AAI_GET_SERVICES_ERROR_SIMULATOR_RESPONSES, @@ -284,11 +289,25 @@ public class AaiApiTest extends BaseApiAaiTest { @Test public void getServicesFineRequest() throws IOException, URISyntaxException { - + TestHelper.resetAaiCache(GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS, restTemplate, uri); callAaiWithSimulatedErrorResponse(AAI_GET_SERVICES_FINE_SIMULATOR_RESPONSES, ImmutableMap.of(), getAaiServicesUri(), "", 200, GET_AAI_SERVIES_EXPECTED_RESULT, HttpMethod.GET); + } + @Test + public void whenGetServicesErrorResponse_badResponseIsNotCached() throws IOException, URISyntaxException { + TestHelper.resetAaiCache(GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS, restTemplate, uri); + + + final String expectedErrorResult = "{\"services\":[],\"readOnly\":false}"; + //call AAI with bad response by clear exceptions from simulator, bad response shall not be cached + callAaiWithSimulatedErrorResponse(new String[]{}, ImmutableMap.of(), getAaiServicesUri(), "", 200, expectedErrorResult, HttpMethod.GET); + + //call AAI with fine response + callAaiWithSimulatedErrorResponse(AAI_GET_SERVICES_FINE_SIMULATOR_RESPONSES, + ImmutableMap.of(), + getAaiServicesUri(), "", 200, GET_AAI_SERVIES_EXPECTED_RESULT, HttpMethod.GET); } @DataProvider @@ -305,7 +324,7 @@ public class AaiApiTest extends BaseApiAaiTest { SimulatorApi.registerExpectationFromPresets(getEcompPortalPresets(), APPEND); SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), APPEND); - restTemplateErrorAgnostic.getForEntity(uri + "/aai_get_services",String.class); + restTemplateErrorAgnostic.getForEntity(uri + "/aai_get_services", String.class); String logLines = LoggerFormatTest.getLogLines("error", 15, 0, restTemplate, uri); assertThat("not found in error log", logLines, containsString("Failed to parse aai response")); @@ -425,12 +444,13 @@ public class AaiApiTest extends BaseApiAaiTest { assertResponse(GET_NETWORK_COLLECTION_EXPECTED_RESPONSE, response); } + @Test public void getNetworkCollectionDetailsByServiceInstanceId_given404ErrorAaiResponse_yield200OkWithErrorMsg() { SimulatorApi.clearAll(); try { restTemplate.getForObject(uri + "/aai_get_network_collection_details/" + "SOME-RANDOM-UUID", String.class); - }catch (HttpClientErrorException e){ + } catch (HttpClientErrorException e) { assertEquals(HttpStatus.NOT_FOUND, e.getStatusCode()); } } @@ -442,7 +462,7 @@ public class AaiApiTest extends BaseApiAaiTest { SimulatorApi.registerExpectationFromPreset(presetAAIGetNetworkCollectionDetails, CLEAR_THEN_SET); try { restTemplate.getForObject(uri + "/aai_get_network_collection_details/" + "SOME-RANDOM-UUID", String.class); - }catch (HttpServerErrorException e){ + } catch (HttpServerErrorException e) { assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, e.getStatusCode()); } } @@ -450,9 +470,9 @@ public class AaiApiTest extends BaseApiAaiTest { @Test public void getGetInstanceGroupsByCloudRegion_yieldValidResponse() { SimulatorApi.clearAll(); - final PresetAAIGetInstanceGroupsByCloudRegion presetAAIGetInstanceGroupsByCloudRegion = new PresetAAIGetInstanceGroupsByCloudRegion("CLOUD-OWNER", "CLOUD-REGION-ID", "NETWORK-FUNCTION"); + final PresetAAIGetInstanceGroupsByCloudRegion presetAAIGetInstanceGroupsByCloudRegion = new PresetAAIGetInstanceGroupsByCloudRegion("CLOUD%20OWNER", "CLOUD-REGION-ID", "NETWORK%20FUNCTION"); SimulatorApi.registerExpectationFromPreset(presetAAIGetInstanceGroupsByCloudRegion, CLEAR_THEN_SET); - final String response = restTemplate.getForObject(uri + "/aai_get_instance_groups_by_cloudregion/" + "CLOUD-OWNER" + "/" + "CLOUD-REGION-ID" + "/" +"NETWORK-FUNCTION", String.class); + final String response = restTemplate.getForObject(uri + "/aai_get_instance_groups_by_cloudregion/" + "CLOUD OWNER" + "/" + "CLOUD-REGION-ID" + "/" + "NETWORK FUNCTION", String.class); assertResponse(GET_INSTANCE_GROUPS_BY_CLOUDREGION_EXPECTED_RESPONSE, response); } @@ -462,16 +482,17 @@ public class AaiApiTest extends BaseApiAaiTest { SimulatorApi.clearAll(); final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("CLOUD-OWNER", "CLOUD-REGION-ID", "NETWORK-FUNCTION"); SimulatorApi.registerExpectationFromPreset(presetAAIGetInstanceGroupsByCloudRegion, CLEAR_THEN_SET); - final String response = restTemplate.getForObject(uri + "/aai_get_instance_groups_by_cloudregion/" + "CLOUD-OWNER" + "/" + "CLOUD-REGION-ID" + "/" +"NETWORK-FUNCTION", String.class); + final String response = restTemplate.getForObject(uri + "/aai_get_instance_groups_by_cloudregion/" + "CLOUD-OWNER" + "/" + "CLOUD-REGION-ID" + "/" + "NETWORK-FUNCTION", String.class); assertResponse(GET_INSTANCE_GROUPS_BY_CLOUDREGION_EXPECTED_RESPONSE, response); } + @Test public void getGetInstanceGroupsByCloudRegion_given404ErrorAaiResponse_yield200OkWithErrorMsg() { SimulatorApi.clearAll(); try { - restTemplate.getForObject(uri + "/aai_get_instance_groups_by_cloudregion/" + "CLOUD-OWNER" + "/" + "CLOUD-REGION-ID" + "/" +"NETWORK-FUNCTION", String.class); - }catch (HttpClientErrorException e){ + restTemplate.getForObject(uri + "/aai_get_instance_groups_by_cloudregion/" + "CLOUD-OWNER" + "/" + "CLOUD-REGION-ID" + "/" + "NETWORK-FUNCTION", String.class); + } catch (HttpClientErrorException e) { assertEquals(HttpStatus.NOT_FOUND, e.getStatusCode()); } } @@ -482,8 +503,8 @@ public class AaiApiTest extends BaseApiAaiTest { final PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing presetAAIGetInstanceGroupsByCloudRegion = new PresetAAIGetInstanceGroupsByCloudRegionRequiredMissing("CLOUD-OWNER", "CLOUD-REGION-ID", "NETWORK-FUNCTION"); SimulatorApi.registerExpectationFromPreset(presetAAIGetInstanceGroupsByCloudRegion, CLEAR_THEN_SET); try { - restTemplate.getForObject(uri + "/aai_get_instance_groups_by_cloudregion/" + "CLOUD-OWNER" + "/" + "CLOUD-REGION-ID" + "/" +"NETWORK-FUNCTION", String.class); - }catch (HttpServerErrorException e){ + restTemplate.getForObject(uri + "/aai_get_instance_groups_by_cloudregion/" + "CLOUD-OWNER" + "/" + "CLOUD-REGION-ID" + "/" + "NETWORK-FUNCTION", String.class); + } catch (HttpServerErrorException e) { assertEquals(HttpStatus.INTERNAL_SERVER_ERROR, e.getStatusCode()); } } @@ -510,18 +531,28 @@ public class AaiApiTest extends BaseApiAaiTest { final PresetAAIGetRelatedInstanceGroupsByVnfId getRelatedInstanceGroupsByVnfId = new PresetAAIGetRelatedInstanceGroupsByVnfId(vnfId); SimulatorApi.registerExpectationFromPreset(getRelatedInstanceGroupsByVnfId, CLEAR_THEN_SET); - final String response = restTemplate.getForObject(uri + "/aai_get_instance_groups_by_vnf_instance_id/" + vnfId, String.class); + final String response = restTemplate.getForObject(uri + "/aai_get_instance_groups_by_vnf_instance_id/" + vnfId, + String.class); assertResponse("[{\"type\":\"instance-group\",\"name\":\"instance group name\"},{\"type\":\"instance-group\",\"name\":\"instance group name\"}]", response); } @Test + public void getHomingDataForVfModule(){ + String vnfId= "0846287b-65bf-45a6-88f6-6a1af4149fac", vfModuleId= "a9b70ac0-5917-4203-a308-0e6920e6d09b"; + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetHomingForVfModule(vnfId,vfModuleId), CLEAR_THEN_SET); + final String response = restTemplate.getForObject(uri + "/aai_get_homing_by_vfmodule/"+ vnfId +"/"+vfModuleId, String.class); + String exectedResponse = TestUtils.convertRequest(objectMapper, AAI_HOMING_DATA_RESPONSE); + assertResponse(exectedResponse,response); + } + + @Test public void getGetRelatedInstanceGroupsByVnfId__yield404NotFound() { final PresetAAIGetRelatedInstanceGroupsByVnfId getRelatedInstanceGroupsByVnfId = new PresetAAIGetRelatedInstanceGroupsByVnfId("abcd"); SimulatorApi.registerExpectationFromPreset(getRelatedInstanceGroupsByVnfId, CLEAR_THEN_SET); try { restTemplate.getForObject(uri + "/aai_get_instance_groups_by_vnf_instance_id/" + "dcba", String.class); - } catch (HttpClientErrorException e){ + } catch (HttpClientErrorException e) { assertEquals(HttpStatus.NOT_FOUND, e.getStatusCode()); } @@ -547,9 +578,162 @@ public class AaiApiTest extends BaseApiAaiTest { assertResponse(expected, response); } + @Test + @FeatureTogglingTest(Features.FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS) + public void networksToVlans_simpleRequest_responseIsCorrect() { + // Prepare randomized values + // Some of these random values are persisted to match with the + // cypress preset "aaiGetNetworksToVlansByServiceInstance.json". + String globalCustomerId = UUID.randomUUID().toString(); + String sdcModelUuid = "5a3ad576-c01d-4bed-8194-0e72b4a3d020"; + String serviceType = "vMOG"; + int vlanIdOuter = 34612; + int vlanIdOuter2 = 8568012; + int vlanIdOuter3 = 4; + + // build hierarchical presets: + // + // service instance + // ║ + // ╠═ network 1 + // ║ ╠═ vlan 1 + // ║ ╚═ vlan 2 + // ║ + // ╠═ network 2 + // ║ ╚═ vlan 3 + // ║ + PresetAAIStandardQueryGet vlanTagPreset1 = ofVlanTag(vlanIdOuter); + PresetAAIStandardQueryGet vlanTagPreset2 = ofVlanTag(vlanIdOuter2); + PresetAAIStandardQueryGet vlanTagPreset3 = ofVlanTag(vlanIdOuter3); + + PresetAAIStandardQueryGet l3NetworkPreset1 = ofL3Network("7989a6d2-ba10-4a5d-8f15-4520bc833090", "DDDEEEFFF", "Provider Network", + ImmutableMultimap.of("vlan-tag", vlanTagPreset1.getReqPath(), "vlan-tag", vlanTagPreset2.getReqPath()), "Failed"); + PresetAAIStandardQueryGet l3NetworkPreset2 = ofL3Network("e8e2332e-1f84-4237-bc97-3b5b842f52e4","GGGHHHIII", "Network", + ImmutableMultimap.of("vlan-tag", vlanTagPreset3.getReqPath()), "Assigned"); + + PresetAAIStandardQueryGet serviceInstance = ofServiceInstance("9cdd1b2a-43a7-47bc-a88e-759ba2399f0b", + "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "6e59c5de-f052-46fa-aa7e-2fca9d674c44", globalCustomerId, serviceType, + ImmutableMultimap.of("l3-network", l3NetworkPreset1.getReqPath(), "l3-network", l3NetworkPreset2.getReqPath())); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + serviceInstance, l3NetworkPreset1, l3NetworkPreset2, vlanTagPreset1, vlanTagPreset2, vlanTagPreset3, + new PresetSDCGetServiceMetadataGet(sdcModelUuid, UUID.randomUUID().toString(), "service-vl-with-5g-network-provider-alacarte.zip"), + new PresetSDCGetServiceToscaModelGet(sdcModelUuid, "service-vl-with-5g-network-provider-alacarte.zip") + ), CLEAR_THEN_SET); + + // THE TEST + final String response = restTemplate.getForObject(uri + "/aai/standardQuery/vlansByNetworks" + + "?serviceInstanceId=" + serviceInstance.getInstanceId() + + "&serviceType=" + serviceType + + "&globalCustomerId=" + globalCustomerId + + "&sdcModelUuid=" + sdcModelUuid + , String.class); + + assertResponse(JsonAssert.when(Option.IGNORING_ARRAY_ORDER), + getResourceAsString("serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json"), + response); + } + + @Test + @FeatureTogglingTest(Features.FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS) + public void networksWithVlansToVnf_simpleRequest_responseIsCorrect() { + // Prepare randomized values + // Some of these random values are persisted to match with the + // cypress preset "aaiGetNetworksWithVlansToVnfByServiceInstance.json". + String globalCustomerId = UUID.randomUUID().toString(); + String sdcModelUuid = "5a3ad576-c01d-4bed-8194-0e72b4a3d020"; + String serviceType = "vMOG"; + int vlanIdOuter = 34123; + int vlanIdOuter2 = 65540; + int vlanIdOuter3 = 12345; + int vlanIdOuter4 = 67890; + int vlanIdOuter5 = 417695; + int vlanIdOuter6 = 783243; + + // build hierarchical presets: + // + // service instance + // ║ + // ╠═ vnf 1 + // ║ ╚═ network 1 + // ║ ╠═ vlan 1 + // ║ ╚═ vlan 2 + // ║ ╚═ network 2 + // ║ ╠═ vlan 3 + // ║ ╚═ vlan 4 + // ║ + // ╠═ vnf 2 + // ║ ╚═ network 3 + // ║ ╠═ vlan 5 + // ║ ╚═ vlan 6 + // ║ + PresetAAIStandardQueryGet vlanTagPreset1 = ofVlanTag(vlanIdOuter); + PresetAAIStandardQueryGet vlanTagPreset2 = ofVlanTag(vlanIdOuter2); + PresetAAIStandardQueryGet vlanTagPreset3 = ofVlanTag(vlanIdOuter3); + PresetAAIStandardQueryGet vlanTagPreset4 = ofVlanTag(vlanIdOuter4); + PresetAAIStandardQueryGet vlanTagPreset5 = ofVlanTag(vlanIdOuter5); + PresetAAIStandardQueryGet vlanTagPreset6 = ofVlanTag(vlanIdOuter6); + + PresetAAIStandardQueryGet l3NetworkPreset1 = ofL3Network("36517f3d-2bc2-48f5-aaf8-418520c54330","AAAAABBBBCCCC", "Provider Network", + ImmutableMultimap.of("vlan-tag", vlanTagPreset1.getReqPath(), "vlan-tag", vlanTagPreset2.getReqPath()), "Assigned"); + + PresetAAIStandardQueryGet l3NetworkPreset2 = ofL3Network("12347f3d-2bc2-48f5-aaf8-418520c54330","DDDEEEE", "Provider Network", + ImmutableMultimap.of("vlan-tag", vlanTagPreset3.getReqPath(), "vlan-tag", vlanTagPreset4.getReqPath()), "Created"); + + PresetAAIStandardQueryGet vnfPreset1 = ofVnf("c015cc0f-0f37-4488-aabf-53795fd93cd3", + ImmutableMultimap.of("l3-network", l3NetworkPreset1.getReqPath() , "l3-network", l3NetworkPreset2.getReqPath())); + + PresetAAIStandardQueryGet l3NetworkPreset3 = ofL3Network("12aa7f3d-2bc2-48f5-aaf8-418520c54330","XXXYYYZZZ", "Network", + ImmutableMultimap.of("vlan-tag", vlanTagPreset5.getReqPath(), "vlan-tag", vlanTagPreset6.getReqPath()), "Created"); + + PresetAAIStandardQueryGet vnfPreset2 = ofVnf("c55da606-cf38-42c7-bc3c-be8e23b19299", ImmutableMultimap.of("l3-network", l3NetworkPreset3.getReqPath())); + + PresetAAIStandardQueryGet serviceInstance = ofServiceInstance("9cdd1b2a-43a7-47bc-a88e-759ba2399f0b", + "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "6e59c5de-f052-46fa-aa7e-2fca9d674c44", globalCustomerId, serviceType, + ImmutableMultimap.of("generic-vnf", vnfPreset1.getReqPath(), "generic-vnf", vnfPreset2.getReqPath())); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + serviceInstance, vnfPreset1, vnfPreset2, l3NetworkPreset1, l3NetworkPreset2, l3NetworkPreset3, vlanTagPreset1, vlanTagPreset2, vlanTagPreset3, vlanTagPreset4, vlanTagPreset5, vlanTagPreset6, + new PresetSDCGetServiceMetadataGet(sdcModelUuid, UUID.randomUUID().toString(), "service-vl-with-5g-network-provider-alacarte.zip"), + new PresetSDCGetServiceToscaModelGet(sdcModelUuid, "service-vl-with-5g-network-provider-alacarte.zip") + ), CLEAR_THEN_SET); + + // THE TEST + final String response = restTemplate.getForObject(uri + "/aai/standardQuery/vlansByNetworks" + + "?serviceInstanceId=" + serviceInstance.getInstanceId() + + "&serviceType=" + serviceType + + "&globalCustomerId=" + globalCustomerId + + "&sdcModelUuid=" + sdcModelUuid + , String.class); + + assertResponse(JsonAssert.when(Option.IGNORING_ARRAY_ORDER), + getResourceAsString("serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json"), + response); + } + + @Test + public void getVnfDataByGlobalIdAndServiceType() { + + SimulatorApi.registerExpectation(AAI_VNFS_FOR_CHANGE_MANAGEMENT_JSON, APPEND); + + String url = uri + "/get_vnf_data_by_globalid_and_service_type/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/vFlowLogic"; + + ResponseEntity<String> response = restTemplate.getForEntity(url, String.class); +//reduced_vnf_data_by_globalid_and_service_type.json + assertTrue(false == response.getBody().contains("generic-vfmodule")); + assertResponse(JsonAssert.when(Option.IGNORING_ARRAY_ORDER), + getResourceAsString("changeManagement/reduced_vnf_data_by_globalid_and_service_type.json"), + response.getBody()); + + } + private void assertResponse(Object expected, String response) { + assertResponse(Configuration.empty(), expected, response); + } + + private void assertResponse(Configuration configuration, Object expected, String response) { try { - JsonAssert.assertJsonEquals(expected, response); + JsonAssert.assertJsonEquals(expected, response, configuration); } catch (Exception | AssertionError e) { System.err.println("response was: " + response); throw e; diff --git a/vid-automation/src/test/java/org/onap/vid/api/AsyncInfraApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AsyncInfraApiTest.java index 5f83f36dc..058cb2f5b 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AsyncInfraApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInfraApiTest.java @@ -1,205 +1,30 @@ package org.onap.vid.api; import com.google.common.collect.ImmutableList; -import com.google.gson.JsonObject; -import net.codestory.http.WebServer; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; import org.onap.vid.more.LoggerFormatTest; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.testng.Assert; import org.testng.annotations.BeforeClass; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import vid.automation.test.infra.Features; -import vid.automation.test.infra.Wait; -import vid.automation.test.model.JobBulk; -import vid.automation.test.model.JobModel; import vid.automation.test.services.SimulatorApi; -import java.net.Inet4Address; -import java.net.InetAddress; -import java.net.NetworkInterface; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.SQLException; -import java.sql.Statement; -import java.util.Collection; -import java.util.Enumeration; -import java.util.List; import java.util.UUID; -import java.util.concurrent.ConcurrentSkipListSet; -import java.util.concurrent.TimeUnit; -import java.util.stream.Collectors; -import java.util.stream.IntStream; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.*; +import static org.hamcrest.Matchers.containsString; import static org.testng.AssertJUnit.assertEquals; public class AsyncInfraApiTest extends BaseApiTest { - private static final String PENDING = "PENDING"; public static final String API_URL = "asyncForTests"; - private boolean asyncJobsIsOn() { - return Features.FLAG_ASYNC_JOBS.isActive() - && Features.FLAG_ASYNC_INSTANTIATION.isActive(); - } - @BeforeClass public void login() { super.login(); } - @BeforeMethod - protected void deleteAllPendingJobs() { - System.out.println("Connecting database..."); - - try (Connection connection = DriverManager.getConnection(DB_CONFIG.url, DB_CONFIG.username, DB_CONFIG.password)) { - System.out.println("Database connected!"); - try (Statement stmt = connection.createStatement()) { - stmt.addBatch("DELETE from `vid_service_info`"); - stmt.addBatch("DELETE FROM `vid_job`"); - - int[] executeBatch = stmt.executeBatch(); - } - - } catch (SQLException e) { - throw new IllegalStateException("Cannot connect the database!", e); - } - } - - - @Test - public void createBulkOfJobsViaApi_thenGetEachOneOfThem() { - int jobCount = 10; - final String url = "http://localhost:1234/testMe"; - ResponseEntity<JobBulk> result = postJobBulk(jobCount, url, "NoOp"); - assertEquals(HttpStatus.OK, result.getStatusCode()); - Assert.assertNotNull(result.getBody()); - assertEquals(jobCount, getJobChildren(result).size()); - - - result.getBody().getJobs().forEach(job -> { - assertThat(job.getUuid(), not(isEmptyOrNullString())); - assertEquals(PENDING, job.getStatus()); - }); - - result.getBody().getJobs().forEach(job -> { - ResponseEntity<JobModel> jobResult = restTemplate.getForEntity(buildUri(API_URL+"/job/{uuid}"), JobModel.class, job.getUuid()); - assertEquals(job.getUuid(), jobResult.getBody().getUuid()); - //assertEquals(PENDING, jobResult.getBody().getStatus()); - }); - } - - private List<JobModel> getJobChildren(ResponseEntity<JobBulk> result) { - return result.getBody().getJobs().stream().filter(job -> job.getTemplateId() != null).collect(Collectors.toList()); - } - - private ResponseEntity<JobBulk> postJobBulk(int jobCount, String url, String type) { - JsonObject jsonObject = new JsonObject(); - jsonObject.addProperty("name", "service-"+random.nextInt()); - jsonObject.addProperty("count", jobCount); - jsonObject.addProperty("url", url); - jsonObject.addProperty("type", type); - ResponseEntity<JobBulk> result = restTemplate.postForEntity(buildUri(API_URL), jsonObject.toString(), JobBulk.class); - return result; - } - - @Test - public void addFewJobs_verifyCallbacksAreAllAndNoDuplicates() throws InterruptedException { - final Collection<String> expected = new ConcurrentSkipListSet<>(); - final Collection<String> results = new ConcurrentSkipListSet<>(); - final Collection<String> duplicates = new ConcurrentSkipListSet<>(); - final String targetPath = "/my-mso"; - - // https://github.com/CodeStory/fluent-http - final WebServer server = new WebServer().configure(routes -> routes - .post(targetPath, (context) -> { - final String body = context.extract(String.class); - if (!results.add(body)) { - duplicates.add(body); - } - return body; - }) - ).startOnRandomPort(); - - final int jobCount = 10; - final int childCount = 2; - - InetAddress inetAddress = getExternalInetAddress(); - - final String returnUrl = "http://" + inetAddress.getHostAddress() + ":" + server.port() + targetPath; - System.out.println(returnUrl); - - // POST jobs - IntStream.range(0, jobCount).parallel().forEach(i -> { - ResponseEntity<JobBulk> result = postJobBulk(childCount, returnUrl, "HttpCall"); - getJobChildren(result).forEach(child -> { - expected.add(child.getUuid()); - }); - }); - Wait.waitFor((actual -> actual.size() == expected.size()), results, 75, 200, TimeUnit.MILLISECONDS); - // wait some another time give change for duplications - TimeUnit.SECONDS.sleep(5); - - if (asyncJobsIsOn()) { - assertThat("async jobs is on: should callback for all jobs - no more, no less", results, equalTo(expected)); - assertThat("async jobs is on: should callback for exactly number of jobs", results, hasSize(jobCount * childCount)); - assertThat("async jobs is on: should have no duplicate jobs callback", duplicates, empty()); - } else { - assertThat("async jobs is off: should not callback for any job", results, empty()); - assertThat("async jobs is off: should have no duplicate jobs callback", duplicates, empty()); - } - - server.stop(); - - } - - private InetAddress getExternalInetAddress() { - // https://stackoverflow.com/questions/9481865/getting-the-ip-address-of-the-current-machine-using-java - InetAddress candidateAddress = null; - try { - for (Enumeration ifaces = NetworkInterface.getNetworkInterfaces(); ifaces.hasMoreElements(); ) { - NetworkInterface iface = (NetworkInterface) ifaces.nextElement(); - - if (iface.getName().contains("docker")) { - // ignore local docker virtual gateway IPs - continue; - } - - // Iterate all IP addresses assigned to each card... - for (Enumeration inetAddrs = iface.getInetAddresses(); inetAddrs.hasMoreElements(); ) { - InetAddress inetAddr = (InetAddress) inetAddrs.nextElement(); - - // take only non-loopback, ipv4 addresses - if (!inetAddr.isLoopbackAddress() && inetAddr instanceof Inet4Address) { - - System.out.println("inetAddr (" + iface.getName() + "): " + inetAddr); - if (inetAddr.isSiteLocalAddress()) { - // Found non-loopback site-local address. Return it immediately... - System.out.println("inetAddr, site-local (" + iface.getName() + "): " + inetAddr); - candidateAddress = inetAddr; - } - else if (candidateAddress == null) { - // Found non-loopback address, but not necessarily site-local. - // Store it as a candidate to be returned if site-local address is not subsequently found... - candidateAddress = inetAddr; - // Note that we don't repeatedly assign non-loopback non-site-local addresses as candidates, - // only the first. For subsequent iterations, candidate will be non-null. - } - } - } - - } - } catch (Exception e) { - throw new RuntimeException(e); - } - return candidateAddress; - } - @Test public void testGetStatusBadRequest() { ResponseEntity<String> jobResult = getJob("1234"); diff --git a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java new file mode 100644 index 000000000..539e857c9 --- /dev/null +++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java @@ -0,0 +1,532 @@ +package org.onap.vid.api; + +import static java.util.Collections.emptyMap; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset.DEFAULT_INSTANCE_ID; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOAddOrRemoveOneInstanceGroupMember; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOAddOrRemoveOneInstanceGroupMember.InstanceGroupMemberAction; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseDelete; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateNetworkALaCarteCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModuleALaCarteCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfALaCarteCypress2; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfGroup; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteALaCarteService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteInstanceGroup; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.onap.vid.model.asyncInstantiation.JobAuditStatus; +import org.onap.vid.model.asyncInstantiation.JobAuditStatus.SourceStatus; +import org.onap.vid.model.asyncInstantiation.ServiceInfo; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import vid.automation.test.Constants; +import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Features; +import vid.automation.test.model.JobStatus; +import vid.automation.test.model.ServiceAction; +import vid.automation.test.services.AsyncJobsService; +import vid.automation.test.services.SimulatorApi; +import vid.automation.test.services.SimulatorApi.RegistrationStrategy; + +@FeatureTogglingTest({Features.FLAG_ASYNC_JOBS, Features.FLAG_ASYNC_INSTANTIATION, Features.FLAG_ASYNC_ALACARTE_VNF}) +public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase { + + private static final String CREATE_BULK_OF_ALACARTE_REQUEST = "asyncInstantiation/vidRequestCreateALaCarte.json"; + private static final String CREATE_BULK_OF_ALACARTE_REQUEST_CYPRESS = "a-la-carte/redux-a-la-carte.json"; + private static final String CREATE_BULK_OF_ALACARTE_NO_TESTAPI_REQUEST_CYPRESS = "a-la-carte/redux-a-la-carte-no-testapi.json"; + private static final String DELETE_BULK_OF_ALACARTE_REQUEST = "VnfGroup/ServiceWithVnfGroupsDeleteRequest.json"; + private static final String VIEW_EDIT_VNF_GROUPS_REQUEST = "VnfGroup/VnfGroupCreate1Delete1None1Request.json"; + private static final String DELETE_TWO_VNF_GROUPS_MEMBER_AND_ADD_ONE_REQUEST = "VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json"; + private static final String DELETE_SERVICE_WITH_TWO_VNF_GROUPS_REQUEST_WITH_GROUPMEMBERS = "VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json"; + + + private static final String SERVICE_INSTANCE_ID = BaseMSOPreset.DEFAULT_INSTANCE_ID; + private static final String MSO_COMPLETE_STATUS = "COMPLETE"; + private static final String MSO_FAILED_STATUS = "FAILED"; + + + @DataProvider + public static Object[][] scenarios() { + return new Object[][]{ + {Scenario.PARALLEL}, + {Scenario.COMPLETED}, +// {Scenario.NAME_TAKEN}, Not relevant because the name uniqueness is supported only for bulk in Macro +// {Scenario.DUPLICATE_NAME}, Not relevant because name duplication is not handled in A La Carte + {Scenario.IN_PROGRESS}, + {Scenario.MSO_FAIL} + }; + } + + @AfterMethod + protected void dropAllFromNameCounter() { + AsyncJobsService asyncJobsService = new AsyncJobsService(); + asyncJobsService.dropAllFromNameCounter(); + } + + @Test + public void deploy1Service0VnfWithStrictSimulatorCompare__verifyStatusAndAudit() { + /* + Legit Preset || deploy 1 Service, no VNF inside + -> JobStatus is Eventually success, audit + is adequate; strict simulator compare + */ + + final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = ImmutableMap.of(SERVICE_NAME, "calazixide85"); + List<PresetMSOBaseCreateInstancePost> createPresets = ImmutableList.of(new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService(names, 0, DEFAULT_REQUEST_ID)); + List<PresetMSOOrchestrationRequestGet> inProgressPresets = ImmutableList.of(new PresetMSOOrchestrationRequestGet()); + List<BasePreset> presets = getPresets(createPresets, inProgressPresets); + + registerExpectationFromPresets(presets, RegistrationStrategy.CLEAR_THEN_SET); + final List<String> uuids = createBulkOfInstances(false, 1, names, CREATE_BULK_OF_ALACARTE_REQUEST); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + + assertServiceInfoSpecific1(jobId, JobStatus.COMPLETED, names.get(SERVICE_NAME)); + assertAuditStatuses(jobId, vidAuditStatusesCompleted(jobId), msoAuditStatusesCompleted(jobId)); + } + + @Test + public void deleteServiceWithTwoVnfGroups_andRetry() { + String parentServiceInstanceId = "service-instance-id"; + String firstVnfGroupToDeleteInstanceId = "VNF_GROUP1_INSTANCE_ID"; + String secondVnfGroupToDeleteInstanceId = "VNF_GROUP2_INSTANCE_ID"; + String firstVnfGroupToDeleteRequestId = UUID.randomUUID().toString(); + String secondVnfGroupToDeleteRequestId = UUID.randomUUID().toString(); + String parentServiceRequestId = UUID.randomUUID().toString(); + List<String> vnfGroupMemberRemoveRequestsIds = ImmutableList.of(UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString()); + + //failed to delete vnf group, and then also service is not deleted + List<PresetMSOBaseCreateInstancePost> createPresets = ImmutableList.of( + new PresetMSOAddOrRemoveOneInstanceGroupMember(firstVnfGroupToDeleteInstanceId, "RELATED_VNF1_INSTANCE_ID", getUserCredentials().getUserId(), vnfGroupMemberRemoveRequestsIds.get(0), InstanceGroupMemberAction.Remove), + new PresetMSOAddOrRemoveOneInstanceGroupMember(firstVnfGroupToDeleteInstanceId, "RELATED_VNF2_INSTANCE_ID", getUserCredentials().getUserId(), vnfGroupMemberRemoveRequestsIds.get(1), InstanceGroupMemberAction.Remove), + new PresetMSOAddOrRemoveOneInstanceGroupMember(firstVnfGroupToDeleteInstanceId, "RELATED_VNF3_INSTANCE_ID", getUserCredentials().getUserId(), vnfGroupMemberRemoveRequestsIds.get(2), InstanceGroupMemberAction.Remove)); + + List<PresetMSOBaseDelete> deletePresets = ImmutableList.of( + new PresetMSODeleteInstanceGroup(firstVnfGroupToDeleteRequestId, firstVnfGroupToDeleteInstanceId, getUserCredentials().getUserId()), + new PresetMSODeleteInstanceGroup(secondVnfGroupToDeleteRequestId, secondVnfGroupToDeleteInstanceId, getUserCredentials().getUserId()) + ); + + List<PresetMSOOrchestrationRequestGet> inProgressPresets = new ArrayList<>(); + inProgressPresets.add(new PresetMSOOrchestrationRequestGet( MSO_COMPLETE_STATUS, firstVnfGroupToDeleteRequestId)); + inProgressPresets.add(new PresetMSOOrchestrationRequestGet( MSO_FAILED_STATUS, secondVnfGroupToDeleteRequestId)); + inProgressPresets.add(new PresetMSOOrchestrationRequestGet( MSO_COMPLETE_STATUS, vnfGroupMemberRemoveRequestsIds.get(0))); + inProgressPresets.add(new PresetMSOOrchestrationRequestGet( MSO_COMPLETE_STATUS, vnfGroupMemberRemoveRequestsIds.get(1))); + inProgressPresets.add(new PresetMSOOrchestrationRequestGet( MSO_COMPLETE_STATUS, vnfGroupMemberRemoveRequestsIds.get(2))); + + List<BasePreset> presets = getPresets(deletePresets, createPresets, inProgressPresets); + registerExpectationFromPresets(presets, RegistrationStrategy.CLEAR_THEN_SET); + final List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of(), DELETE_SERVICE_WITH_TWO_VNF_GROUPS_REQUEST_WITH_GROUPMEMBERS); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + assertServiceInfoSpecificDeletion(jobId, JobStatus.COMPLETED_WITH_ERRORS, "SERVICE_INSTANCE_NAME", "service-instance-type"); + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + TestUtils.hasOrLacksOfEntry(deletePresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(deletePresets.get(1).getReqPath(), 1L), + + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(1).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(createPresets.get(0).getReqPath(), 3L) + + )); + + //retry to delete vnf-group and then delete service + List<BasePreset> retryPresets = ImmutableList.of( + new PresetMSODeleteInstanceGroup(secondVnfGroupToDeleteRequestId, secondVnfGroupToDeleteInstanceId, getUserCredentials().getUserId()), + new PresetMSODeleteALaCarteService(parentServiceRequestId,parentServiceInstanceId ), + new PresetMSOOrchestrationRequestGet( MSO_COMPLETE_STATUS, secondVnfGroupToDeleteRequestId), + new PresetMSOOrchestrationRequestGet( MSO_COMPLETE_STATUS, parentServiceRequestId)); + registerExpectationFromPresets(retryPresets, RegistrationStrategy.CLEAR_THEN_SET); + + List<String> retryUuids = retryJob(jobId); + assertThat(retryUuids, hasSize(1)); + final String retryJobId = retryUuids.get(0); + assertServiceInfoSpecificDeletion(retryJobId, JobStatus.COMPLETED, "SERVICE_INSTANCE_NAME", "service-instance-type"); + + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + TestUtils.hasOrLacksOfEntry(retryPresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(retryPresets.get(1).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(retryPresets.get(2).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(retryPresets.get(3).getReqPath(), 1L) + )); + } + + @DataProvider + public static Object[][] msoRequestStatusDataProvider() { + return new Object[][]{ + {MSO_COMPLETE_STATUS, JobStatus.COMPLETED}, + {MSO_FAILED_STATUS, JobStatus.FAILED} + }; + } + + @Test(dataProvider = "msoRequestStatusDataProvider") + public void deleteServiceWithStrictSimulatorCompare__verifyStatusAndAudit(String msoStatus, JobStatus expectedStatus) { + List<PresetMSOBaseDelete> deletePresets = ImmutableList.of(new PresetMSODeleteALaCarteService( DEFAULT_REQUEST_ID, SERVICE_INSTANCE_ID)); + List<PresetMSOOrchestrationRequestGet> inProgressPresets = ImmutableList.of (new PresetMSOOrchestrationRequestGet(msoStatus), + new PresetMSOOrchestrationRequestGet(msoStatus)); + List<BasePreset> presets = getDeletePresets(deletePresets, inProgressPresets); + + registerExpectationFromPresets(presets, RegistrationStrategy.CLEAR_THEN_SET); + final List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of(), DELETE_BULK_OF_ALACARTE_REQUEST); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + + assertServiceInfoSpecificDeletion(jobId, expectedStatus, "wowServiceWithVnfGroping", "TYLER SILVIA"); + switch (expectedStatus) { + case COMPLETED: + assertAuditStatuses(jobId, vidAuditStatusesCompleted(jobId), msoAuditStatusesCompleted(jobId)); + break; + + case FAILED: + assertAuditStatuses(jobId, vidAuditStatusesFailed(jobId), null); + break; + } + + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + TestUtils.hasOrLacksOfEntry(deletePresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(0).getReqPath(), 1L) + )); + } + + @Test(dataProvider = "msoRequestStatusDataProvider") + public void deleteTwoGroupsAddOneGroup(String msoStatus, JobStatus expectedStatus) { + String parentServiceInstanceId = "service-instance-id"; + String firstVnfGroupToDeleteInstanceId = "VNF_GROUP1_INSTANCE_ID"; + String secondVnfGroupToDeleteInstanceId = "VNF_GROUP2_INSTANCE_ID"; + String firstVnfGroupToDeleteRequestId = UUID.randomUUID().toString(); + String secondVnfGroupToDeleteRequestId = UUID.randomUUID().toString(); + String vnfGroupToCreateRequestId = UUID.randomUUID().toString(); + + List<PresetMSOBaseDelete> deletePresets = ImmutableList.of( + new PresetMSODeleteInstanceGroup(firstVnfGroupToDeleteRequestId, firstVnfGroupToDeleteInstanceId, getUserCredentials().getUserId()), + new PresetMSODeleteInstanceGroup(secondVnfGroupToDeleteRequestId, secondVnfGroupToDeleteInstanceId, getUserCredentials().getUserId())); + + List<PresetMSOBaseCreateInstancePost> createPresets = ImmutableList.of( + new PresetMSOCreateVnfGroup("VNF_GROUP3_INSTANCE_NAME", vnfGroupToCreateRequestId, + PresetMSOCreateVnfGroup.MODEL_INFO_0, parentServiceInstanceId, false)); + List<PresetMSOOrchestrationRequestGet> inProgressPresets = ImmutableList.of( + new PresetMSOOrchestrationRequestGet(msoStatus, firstVnfGroupToDeleteRequestId), + new PresetMSOOrchestrationRequestGet(msoStatus, secondVnfGroupToDeleteRequestId), + new PresetMSOOrchestrationRequestGet(msoStatus, vnfGroupToCreateRequestId, "Instance group was created successfully.") + ); + List<BasePreset> presets = getPresets(deletePresets, createPresets, inProgressPresets); + registerExpectationFromPresets(presets, RegistrationStrategy.CLEAR_THEN_SET); + final List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of(), DELETE_TWO_VNF_GROUPS_MEMBER_AND_ADD_ONE_REQUEST); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + + assertServiceInfoSpecificUpdate(jobId, expectedStatus, "SERVICE_INSTANCE_NAME"); + assertExpectedStatus(expectedStatus, jobId); + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + TestUtils.hasOrLacksOfEntry(deletePresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(deletePresets.get(1).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(1).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(createPresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(2).getReqPath(), 1L) + )); + + } + + @Test + public void viewEditVnfGroup__verifyStatusAndAudit() { + String parentServiceInstanceId = "service-instance-id"; + String vnfGroupToDeleteInstanceId = "VNF_GROUP1_INSTANCE_ID"; + + //failed to create vnf group, failed to remove 1 member (and then also vnf group isn't deleted) + viewEditVnfGroup_registerPresets(parentServiceInstanceId, vnfGroupToDeleteInstanceId, MSO_FAILED_STATUS); + + final List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of(), VIEW_EDIT_VNF_GROUPS_REQUEST); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + + assertServiceInfoSpecificUpdate(jobId, JobStatus.COMPLETED_WITH_ERRORS, "SERVICE_INSTANCE_NAME"); + assertExpectedStatus(JobStatus.COMPLETED_WITH_ERRORS, jobId); + Map<String, Long> recordedRequest = SimulatorApi.retrieveRecordedRequestsPathCounter(); + assertThat(recordedRequest, allOf( + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./instanceGroups/" + vnfGroupToDeleteInstanceId, 0L), //delete vnf group + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./instanceGroups", 1L), //create vnf group + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./instanceGroups/" + vnfGroupToDeleteInstanceId + "/removeMembers", 3L) //remove vnf group members + )); + + //retry - vnf group create, 1 member remove, vnf group delete + viewEditVnfGroup_registerPresets(parentServiceInstanceId, vnfGroupToDeleteInstanceId, MSO_COMPLETE_STATUS); + final List<String> retryUuids = retryJob(jobId); + assertThat(retryUuids, hasSize(1)); + final String retryJobId = retryUuids.get(0); + + assertServiceInfoSpecificUpdate(retryJobId, JobStatus.COMPLETED, "SERVICE_INSTANCE_NAME"); + assertExpectedStatus(JobStatus.COMPLETED, retryJobId); + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./instanceGroups/" + vnfGroupToDeleteInstanceId, 1L), //delete vnf group + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./instanceGroups", 1L), //create vnf group + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./instanceGroups/" + vnfGroupToDeleteInstanceId + "/removeMembers", 1L) //remove vnf group members + )); + } + + private void viewEditVnfGroup_registerPresets(String parentServiceInstanceId, String vnfGroupToDeleteInstanceId, String msoStatus) { + String vnfGroupToDeleteRequestId = UUID.randomUUID().toString(); + String vnfGroupToCreateRequestId = UUID.randomUUID().toString(); + List<String> vnfGroupMemberRemoveRequestsIds = ImmutableList.of(UUID.randomUUID().toString(), UUID.randomUUID().toString(), UUID.randomUUID().toString()); + + List<PresetMSOBaseDelete> deletePresets = ImmutableList.of( + new PresetMSODeleteInstanceGroup(vnfGroupToDeleteRequestId, vnfGroupToDeleteInstanceId, getUserCredentials().getUserId())); + List<PresetMSOBaseCreateInstancePost> createPresets = ImmutableList.of( + new PresetMSOCreateVnfGroup("VNF_GROUP3_INSTANCE_NAME", vnfGroupToCreateRequestId, + PresetMSOCreateVnfGroup.MODEL_INFO_0, parentServiceInstanceId, false), + new PresetMSOAddOrRemoveOneInstanceGroupMember(vnfGroupToDeleteInstanceId, "RELATED_VNF1_INSTANCE_ID", getUserCredentials().getUserId(), vnfGroupMemberRemoveRequestsIds.get(0), InstanceGroupMemberAction.Remove), + new PresetMSOAddOrRemoveOneInstanceGroupMember(vnfGroupToDeleteInstanceId, "RELATED_VNF2_INSTANCE_ID", getUserCredentials().getUserId(), vnfGroupMemberRemoveRequestsIds.get(1), InstanceGroupMemberAction.Remove), + new PresetMSOAddOrRemoveOneInstanceGroupMember(vnfGroupToDeleteInstanceId, "RELATED_VNF3_INSTANCE_ID", getUserCredentials().getUserId(), vnfGroupMemberRemoveRequestsIds.get(2), InstanceGroupMemberAction.Remove)); + List<PresetMSOOrchestrationRequestGet> inProgressPresets = ImmutableList.of( + new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, vnfGroupToDeleteRequestId), // delete instance group + new PresetMSOOrchestrationRequestGet(msoStatus, vnfGroupToCreateRequestId, "Instance group was created successfully."), // create instance group + new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, vnfGroupMemberRemoveRequestsIds.get(0)), // remove instance group member + new PresetMSOOrchestrationRequestGet(msoStatus, vnfGroupMemberRemoveRequestsIds.get(1)), // remove instance group member + new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, vnfGroupMemberRemoveRequestsIds.get(2))); // remove instance group member + + List<BasePreset> presets = getPresets(deletePresets, createPresets, inProgressPresets); + registerExpectationFromPresets(presets, RegistrationStrategy.CLEAR_THEN_SET); + } + + private void assertExpectedStatus(JobStatus expectedStatus, String jobId) { + switch (expectedStatus) { + case COMPLETED: + assertAuditStatuses(jobId, vidAuditStatusesCompleted(jobId), null); + break; + + case FAILED: + assertAuditStatuses(jobId, vidAuditStatusesFailed(jobId), null); + break; + } + } + + @Test + public void deploy1Service1FailedVnf__verifyStatus_andRetry() { + //CreateServiceWithFailedVnf is common for API test and UI test, + //so if you change it, make sure both test are compatible with your changes + CreateServiceWithFailedVnf createServiceWithFailedVnf = new CreateServiceWithFailedVnf(this); + createServiceWithFailedVnf.deployService1FailedVnf(); + createServiceWithFailedVnf.secondRegistration(); + createServiceWithFailedVnf.retryJob(); + createServiceWithFailedVnf.retryAssertion(); + createServiceWithFailedVnf.simulatorCallsAssertion(); + } + + @DataProvider + Object[][] data_deploy1ServiceFromCypress__verifyStatusAndMsoCalls() { + return Features.FLAG_ASYNC_ALACARTE_VFMODULE.isActive() ? new Object[][]{ + {"none", emptyMap(), emptyMap(), true}, + {"none", emptyMap(), emptyMap(), false}, + {"instance", ImmutableMap.of("vnfs", 0L, "networks", 0L, "vfModules", 0L, "volumeGroups", 0L), + ImmutableMap.of("serviceInstances", 1L, "vnfs", 1L, "networks", 1L, "vfModules", 3L, "volumeGroups", 1L),true}, + {"network", emptyMap(), + ImmutableMap.of("networks", 1L), true}, + {"vnf0", ImmutableMap.of("vfModules", 0L, "volumeGroups", 0L), + ImmutableMap.of("vnfs", 1L, "vfModules", 3L, "volumeGroups", 1L), true}, + {"vfModule0", ImmutableMap.of("vfModules", 1L, "volumeGroups", 0L), + ImmutableMap.of("vfModules", 3L, "volumeGroups", 1L), true}, + {"volumeGroup", ImmutableMap.of("vfModules", 2L), + ImmutableMap.of("vfModules", 1L, "volumeGroups", 1L), true}, + {"vfModule1", emptyMap(), + ImmutableMap.of("vfModules", 1L, "volumeGroups", 1L), true}, + {"vfModule2", emptyMap(), + ImmutableMap.of("vfModules", 1L), true} + } : new Object[][]{ + {"none", ImmutableMap.of("vfModules", 0L, "volumeGroups", 0L), emptyMap(), true} + }; + } + + @Test(dataProvider = "data_deploy1ServiceFromCypress__verifyStatusAndMsoCalls") + public void deploy1ServiceFromCypress__verifyStatusAndMsoCalls_andRetry(String whatToFail, Map<String, Long> pathCounterOverride, Map<String, Long> retryPathCounterOverride, boolean withTestApi) { + final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = ImmutableMap.of(SERVICE_NAME, "serviceInstanceName"); + String vnfRequestId = UUID.randomUUID().toString(); + registerPresetsForRetryTest(whatToFail, names, vnfRequestId, withTestApi); + + final List<String> uuids = createBulkOfInstances(false, 1, names, withTestApi? CREATE_BULK_OF_ALACARTE_REQUEST_CYPRESS: CREATE_BULK_OF_ALACARTE_NO_TESTAPI_REQUEST_CYPRESS); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + + JobStatus finalJobStatus; + switch (whatToFail) { + case "none": finalJobStatus = JobStatus.COMPLETED; break; + case "instance": finalJobStatus = JobStatus.FAILED; break; + default: finalJobStatus = JobStatus.COMPLETED_WITH_ERRORS; break; + } + assertServiceInfoSpecific2(jobId, finalJobStatus, names.get(SERVICE_NAME)); + assertRecordedRequests(pathCounterOverride, 1L, vnfRequestId); + + if (!"none".equals(whatToFail)) { + registerPresetsForRetryTest("none", names, vnfRequestId, withTestApi); + + List<String> retryUuids = retryJob(jobId); + assertThat(retryUuids, hasSize(1)); + final String retryJobId = retryUuids.get(0); + + ServiceAction serviceAction = "instance".equals(whatToFail) ? ServiceAction.INSTANTIATE : ServiceAction.UPDATE; + assertServiceInfoSpecific2(retryJobId, JobStatus.COMPLETED, names.get(SERVICE_NAME), serviceAction); + + assertRecordedRequests(retryPathCounterOverride, 0L, vnfRequestId); + } + } + + private void registerPresetsForRetryTest(String whatToFail, ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names, String vnfRequestId, boolean withTestApi ) { + String networkRequestId = UUID.randomUUID().toString(); + String vfModule0RequestId = UUID.randomUUID().toString(); + String vfModule1RequestId = UUID.randomUUID().toString(); + String vfModule2RequestId = UUID.randomUUID().toString(); + String volumeGroupRequestId = UUID.randomUUID().toString(); + List<PresetMSOBaseCreateInstancePost> createPresets = ImmutableList.of( + new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress(names, 0, DEFAULT_REQUEST_ID, Constants.GR_API, withTestApi), + new PresetMSOCreateVnfALaCarteCypress2(vnfRequestId, DEFAULT_INSTANCE_ID, vnfRequestId, "2017-488_PASQUALE-vPE", Constants.GR_API, withTestApi), + new PresetMSOCreateNetworkALaCarteCypress(networkRequestId, DEFAULT_INSTANCE_ID, networkRequestId, "ExtVL", Constants.GR_API, withTestApi) + ); + List<PresetMSOOrchestrationRequestGet> inProgressPresets = ImmutableList.of( + new PresetMSOOrchestrationRequestGet("instance".equals(whatToFail) ? MSO_FAILED_STATUS : COMPLETE), + new PresetMSOOrchestrationRequestGet("vnf0".equals(whatToFail) ? MSO_FAILED_STATUS : COMPLETE, vnfRequestId), + new PresetMSOOrchestrationRequestGet("vfModule0".equals(whatToFail) ? MSO_FAILED_STATUS : COMPLETE, vfModule0RequestId), + new PresetMSOOrchestrationRequestGet("vfModule1".equals(whatToFail) ? MSO_FAILED_STATUS : COMPLETE, vfModule1RequestId), + new PresetMSOOrchestrationRequestGet("vfModule2".equals(whatToFail) ? MSO_FAILED_STATUS : COMPLETE, vfModule2RequestId), + new PresetMSOOrchestrationRequestGet("volumeGroup".equals(whatToFail) ? MSO_FAILED_STATUS : COMPLETE, volumeGroupRequestId), + new PresetMSOOrchestrationRequestGet("network".equals(whatToFail) ? MSO_FAILED_STATUS : COMPLETE, networkRequestId) + ); + List<BasePreset> presetsWithoutVfModule = getPresets(createPresets, inProgressPresets); + + ImmutableList<BasePreset> presets = new ImmutableList.Builder<BasePreset>() + .addAll(presetsWithoutVfModule) + .add(new PresetSDCGetServiceToscaModelGet("2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", "csar-noDynamicFields-ecompNamingFalse-fullModelDetails.zip")) + .add(new PresetSDCGetServiceMetadataGet("2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "csar-noDynamicFields-ecompNamingFalse-fullModelDetails.zip")) + .add(new PresetMSOCreateVfModuleALaCarteCypress(vfModule0RequestId, DEFAULT_INSTANCE_ID, vnfRequestId, PresetMSOCreateVfModuleALaCarteCypress.module0Names, Constants.GR_API, withTestApi)) + .add(PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.forVolumeGroup(volumeGroupRequestId, DEFAULT_INSTANCE_ID, vnfRequestId, Constants.GR_API, withTestApi)) + .add(PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.forVfModule(vfModule1RequestId, DEFAULT_INSTANCE_ID, vnfRequestId, volumeGroupRequestId, Constants.GR_API, withTestApi)) + .add(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_JUST_ANOTHER_REGION_TO_ATT_AIC) + .add(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC) + .add(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MY_REGION_TO_ATT_AIC) + .add(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_LCP_REGION_TEXT_TO_ATT_AIC) + .add(new PresetMSOCreateVfModuleALaCarteCypress(vfModule2RequestId, DEFAULT_INSTANCE_ID, vnfRequestId, PresetMSOCreateVfModuleALaCarteCypress.module2Names, Constants.GR_API, withTestApi)) + .build(); + + registerExpectationFromPresets( + Features.FLAG_ASYNC_ALACARTE_VFMODULE.isActive() ? presets : presetsWithoutVfModule, + RegistrationStrategy.CLEAR_THEN_SET); + } + + private void assertRecordedRequests(Map<String, Long> pathCounterOverride, Long defaultValue, String vnfRequestId) { + Long vfModulesDefaultValue = defaultValue == 1L ? 3L : 0L; + + //noinspection unchecked + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances", + pathCounterOverride.getOrDefault("serviceInstances", defaultValue)), + + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/networks", + pathCounterOverride.getOrDefault("networks", defaultValue)), + + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs", + pathCounterOverride.getOrDefault("vnfs", defaultValue)), + + TestUtils.hasOrLacksOfEntry("/mso/serviceInstances/v./" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/volumeGroups", + pathCounterOverride.getOrDefault("volumeGroups", defaultValue)), + + TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/vfModules", + pathCounterOverride.getOrDefault("vfModules", vfModulesDefaultValue)) + )); + } + + private ImmutableList<JobAuditStatus> vidAuditStatusesCompleted(String jobId) { + return ImmutableList.of( + vidAuditStatus(jobId, "PENDING", false), + vidAuditStatus(jobId, "IN_PROGRESS", false), + vidAuditStatus(jobId, "COMPLETED", true) + ); + } + + private ImmutableList<JobAuditStatus> msoAuditStatusesCompleted(String jobId ) { + return ImmutableList.of( + msoAuditStatus(jobId, "REQUESTED", null, UUID.fromString(DEFAULT_REQUEST_ID)), + msoAuditStatus(jobId, MSO_COMPLETE_STATUS, "Service Instance was created successfully.", UUID.fromString(DEFAULT_REQUEST_ID)) + ); + } + + private JobAuditStatus msoAuditStatus(String jobId, String jobStatus, String additionalInfo, UUID requestId) { + return new JobAuditStatus(UUID.fromString(jobId), jobStatus, SourceStatus.MSO, requestId, additionalInfo, false); + } + + private void assertServiceInfoSpecific2(String jobId, JobStatus jobStatus, String serviceInstanceName) { + assertServiceInfoSpecific2(jobId, jobStatus, serviceInstanceName, ServiceAction.INSTANTIATE); + } + + private void assertServiceInfoSpecific2(String jobId, JobStatus jobStatus, String serviceInstanceName, ServiceAction serviceAction) { + assertExpectedStatusAndServiceInfo(jobStatus, jobId, true, new ServiceInfo( + "us16807000", jobStatus, false, + "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "WayneHolland", "WATKINS", + "JAG1", null, + "092eb9e8e4b7412e8787dd091bc58e86", null, + "JANET25", null, + "TYLER SILVIA", null, + null, serviceInstanceName, + "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", "action-data", "1.0", + jobId, null, serviceAction, false) + ); + } + + private void assertServiceInfoSpecificDeletion(String jobId, JobStatus jobStatus, String serviceInstanceName, String serviceType) { + assertExpectedStatusAndServiceInfo(jobStatus, jobId, true, new ServiceInfo( + "us16807000", jobStatus, false, + null, null, null, + null, null, + null, null, + null, null, + serviceType, null, + null, serviceInstanceName, + "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", "Grouping Service for Test", "1.0", + jobId, null, ServiceAction.DELETE, false) + ); + } + + private void assertServiceInfoSpecificUpdate(String jobId, JobStatus jobStatus, String serviceInstanceName) { + assertExpectedStatusAndServiceInfo(jobStatus, jobId, true, new ServiceInfo( + "us16807000", jobStatus, false, + null, null, null, + null, null, + null, null, + null, null, + "service-instance-type", null, + "service-instance-id", serviceInstanceName, + "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", "Grouping Service for Test", "1.0", + jobId, null, ServiceAction.UPDATE, false) + ); + } + + enum Scenario { + PARALLEL, COMPLETED, NAME_TAKEN, DUPLICATE_NAME, IN_PROGRESS, MSO_FAIL + } + +} diff --git a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest2.java b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest2.java new file mode 100644 index 000000000..54f2cc66f --- /dev/null +++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest2.java @@ -0,0 +1,211 @@ +package org.onap.vid.api; + +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPreset; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseDelete; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2ErrorResponse; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteALaCarteService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGetErrorResponse; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestsGetByRequestId; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestsGetByServiceInstanceId; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames; +import org.onap.vid.model.asyncInstantiation.JobAuditStatus; +import org.onap.vid.model.asyncInstantiation.JobAuditStatus.SourceStatus; +import org.onap.vid.model.asyncInstantiation.ServiceInfo; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Features; +import vid.automation.test.model.JobStatus; +import vid.automation.test.model.ServiceAction; +import vid.automation.test.services.AsyncJobsService; +import vid.automation.test.services.SimulatorApi; +import vid.automation.test.services.SimulatorApi.RegistrationStrategy; + +@FeatureTogglingTest({Features.FLAG_ASYNC_JOBS, Features.FLAG_ASYNC_INSTANTIATION, Features.FLAG_ASYNC_ALACARTE_VNF}) +public class AsyncInstantiationALaCarteApiTest2 extends AsyncInstantiationBase { + + private static final String CREATE_BULK_OF_ALACARTE_MULTIPLE_VNF_NETWORK_REQUEST_CYPRESS = "a-la-carte/redux-multiple-vnf-network.json"; + private static final String DELETE_BULK_OF_ALACARTE_REQUEST = "VnfGroup/ServiceWithVnfGroupsDeleteRequest.json"; + private static final String SERVICE_INSTANCE_ID = BaseMSOPreset.DEFAULT_INSTANCE_ID; + + + @DataProvider + public static Object[][] scenarios() { + return new Object[][]{ + {Scenario.PARALLEL}, + {Scenario.COMPLETED}, +// {Scenario.NAME_TAKEN}, Not relevant because the name uniqueness is supported only for bulk in Macro +// {Scenario.DUPLICATE_NAME}, Not relevant because name duplication is not handled in A La Carte + {Scenario.IN_PROGRESS}, + {Scenario.MSO_FAIL} + }; + } + + @AfterMethod + protected void dropAllFromNameCounter() { + AsyncJobsService asyncJobsService = new AsyncJobsService(); + asyncJobsService.dropAllFromNameCounter(); + } + + @Test + public void deleteService_withBadResponseFromMso_verifyStatus() { + List<PresetMSOBaseDelete> deletePresets = ImmutableList.of(new PresetMSODeleteALaCarteService( DEFAULT_REQUEST_ID, SERVICE_INSTANCE_ID, 500)); + List<PresetMSOOrchestrationRequestGet> inProgressPresets = ImmutableList.of(new PresetMSOOrchestrationRequestGet()); + List<BasePreset> presets = getDeletePresets(deletePresets, inProgressPresets); + + registerExpectationFromPresets(presets, RegistrationStrategy.CLEAR_THEN_SET); + final List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of(), DELETE_BULK_OF_ALACARTE_REQUEST); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + + assertServiceInfoSpecificDeletion(jobId, JobStatus.FAILED, "wowServiceWithVnfGroping", "TYLER SILVIA"); + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + TestUtils.hasOrLacksOfEntry(deletePresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(0).getReqPath(), 0L) + )); + } + + + @Test + public void instantiationFailedForService(){ + CreateInstanceWithFailedService createInstanceWithFailedService = new CreateInstanceWithFailedService(this); + createInstanceWithFailedService.deployServiceFailedInstance(); + } + + @Test + void getBulkForRetry_notFoundException(){ + CreateServiceWithFailedVnf createServiceWithFailedVnf = new CreateServiceWithFailedVnf(this); + createServiceWithFailedVnf.getBulkForRetryNotFound(); + } + + + @Test + public void deploy1Service1FailedVnf_EditJobSendingSameDataAndRetry_verifyNewJobWithSameData() { + CreateServiceWithFailedVnf createServiceWithFailedVnf = new CreateServiceWithFailedVnf(this); + String bulkRetryPayload = createServiceWithFailedVnf.deployService1FailedVnf(); + createServiceWithFailedVnf.assertResourceAuditStatus(bulkRetryPayload); + createServiceWithFailedVnf.secondRegistration(); + createServiceWithFailedVnf.retryJobWithOtherDataAndAssert(bulkRetryPayload); + } + + @Test + public void deploy1Service1FailedVnf_EditSomeDetailsAndRetry_verifyNewJobWithEditedData() { + CreateServiceWithFailedVnf createServiceWithFailedVnf = new CreateServiceWithFailedVnf(this); + String originalBulkForRetry = createServiceWithFailedVnf.deployService1FailedVnf(); + createServiceWithFailedVnf.assertResourceAuditStatus(originalBulkForRetry); + String changedData = createServiceWithFailedVnf.changeSomeDataAndRegisterToSimulator(originalBulkForRetry); + createServiceWithFailedVnf.retryJobWithOtherDataAndAssert(changedData); + } + + private List<JobAuditStatus> getExpectedAuditFromFile(String fileName) throws IOException { + String content = TestUtils.convertRequest(objectMapper, fileName); + List<JobAuditStatus> auditStatusList = ImmutableList.copyOf(objectMapper.readValue(content, JobAuditStatus[].class)); + return auditStatusList; + + + } + + @Test + public void getAuditInfoForALaCarteByServiceInstanceId() throws IOException { + final String expectedMsoAuditInfo = "a-la-carte/auditInfoMSOALaCarte.json"; + registerExpectationFromPreset( + new PresetMSOOrchestrationRequestsGetByServiceInstanceId(), + RegistrationStrategy.CLEAR_THEN_SET); + List<JobAuditStatus> actualMsoAudits = getJobMsoAuditStatusForAlaCarte(UUID.randomUUID().toString(), "aa1234d1-5a33-55df-13ab-12abad84e333", "bc305d54-75b4-431b-adb2-eb6b9e546014"); + List<JobAuditStatus> expectedMsoAudits = getExpectedAuditFromFile(expectedMsoAuditInfo); + assertThat(actualMsoAudits, is(expectedMsoAudits)); + + } + + @Test + public void getAuditInfoForALaCarteByRequestId() { + registerExpectationFromPreset( + new PresetMSOOrchestrationRequestsGetByRequestId(), + RegistrationStrategy.CLEAR_THEN_SET); + final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = ImmutableMap.of(SERVICE_NAME, "serviceInstanceName"); + String uuid = createBulkOfInstances(false, 1, names, CREATE_BULK_OF_ALACARTE_MULTIPLE_VNF_NETWORK_REQUEST_CYPRESS).get(0); + List<JobAuditStatus> actualMsoAudits = getJobMsoAuditStatusForAlaCarte( uuid, "405652f4-ceb3-4a75-9474-8aea71480a77", null); + List<JobAuditStatus> expectedMsoAudits = ImmutableList.of( + new JobAuditStatus("serviceInstanceName", "FAILED", UUID.fromString("405652f4-ceb3-4a75-9474-8aea71480a77"),"Service Instance was failed.",false, "service")); + assertThat(actualMsoAudits, is(expectedMsoAudits)); + + } + + @Test + public void getAuditInfoForALaCarteByJobId() throws IOException { + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + new PresetMSOCreateServiceInstanceGen2ErrorResponse(), + new PresetGetSessionSlotCheckIntervalGet(), + new PresetAAIGetSubscribersGet() + ), + RegistrationStrategy.CLEAR_THEN_SET); + final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = ImmutableMap.of(SERVICE_NAME, "serviceInstanceName"); + String uuid = createBulkOfInstances(false, 1, names, CREATE_BULK_OF_ALACARTE_MULTIPLE_VNF_NETWORK_REQUEST_CYPRESS).get(0); + + assertAndRetryIfNeeded(() -> { + final List<JobAuditStatus> actualMsoAudits = getJobMsoAuditStatusForAlaCarte( uuid, null, null); + List<JobAuditStatus> expectedMsoAudits = ImmutableList.of( + new JobAuditStatus(UUID.fromString(uuid), "FAILED", SourceStatus.MSO, null, + "Http Code:500, \"messageId\":\"SVC0002\",\"text\":\"JSON Object Mapping Request\"", false, "serviceInstanceName")); + assertThat(actualMsoAudits, is(expectedMsoAudits)); + }, 15); + + //assert error audit status + Map<String, Object> bulkForRetry = objectMapper.readValue(getRetryBulk(uuid).getBody(), new TypeReference<Map<String, Object>>(){}); + String serviceTrackById = bulkForRetry.get("trackById").toString(); + Map<String, Object> resourceAuditInfo = (Map) getResourceAuditInfo(serviceTrackById); + assertThat(resourceAuditInfo.get("jobStatus"), equalTo("FAILED")); + assertThat(resourceAuditInfo.get("additionalInfo"), equalTo("Http Code:500, \"messageId\":\"SVC0002\",\"text\":\"JSON Object Mapping Request\"")); + } + + @Test(expectedExceptions = RuntimeException.class) + public void getAuditInfoForALaCarte_badResponseFromMso_throwsException() { + registerExpectationFromPreset( + new PresetMSOOrchestrationRequestGetErrorResponse(500), + RegistrationStrategy.CLEAR_THEN_SET); + getJobMsoAuditStatusForAlaCarte( UUID.randomUUID().toString(), "405652f4-ceb3-4a75-9474-8aea71480a77", null); + } + + private void assertServiceInfoSpecificDeletion(String jobId, JobStatus jobStatus, String serviceInstanceName, String serviceType) { + assertExpectedStatusAndServiceInfo(jobStatus, jobId, true, new ServiceInfo( + "us16807000", jobStatus, false, + null, null, null, + null, null, + null, null, + null, null, + serviceType, null, + null, serviceInstanceName, + "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", "Grouping Service for Test", "1.0", + jobId, null, ServiceAction.DELETE, false) + ); + } + + + enum Scenario { + PARALLEL, COMPLETED, NAME_TAKEN, DUPLICATE_NAME, IN_PROGRESS, MSO_FAIL + } + +} diff --git a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java new file mode 100644 index 000000000..eed6ee90b --- /dev/null +++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java @@ -0,0 +1,645 @@ +package org.onap.vid.api; + +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.allOf; +import static org.hamcrest.Matchers.not; +import static org.hamcrest.collection.IsCollectionWithSize.hasSize; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.RELATED_VNF1_ACTION; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.RELATED_VNF2_ACTION; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_GROUP1_ACTION; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPreset; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.function.Function; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAISearchNodeQueryNonEmptyResult; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOAddOrRemoveOneInstanceGroupMember; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOAddOrRemoveOneInstanceGroupMember.InstanceGroupMemberAction; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOBaseCreateInstancePost; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateNetworkALaCarteServiceCypress2; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceMultipleVnfsServiceCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfALaCarteServiceCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfALaCarteServiceCypress2; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfGroup; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteBaseVfModuleCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteNetworkAlaCarteCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteService; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteVfModuleCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeleteVnfAlaCarteCypress; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.onap.vid.model.asyncInstantiation.JobAuditStatus; +import org.onap.vid.model.asyncInstantiation.JobAuditStatus.SourceStatus; +import org.onap.vid.model.asyncInstantiation.ServiceInfo; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; +import vid.automation.test.infra.FeatureTogglingTest; +import vid.automation.test.infra.Features; +import vid.automation.test.model.JobStatus; +import vid.automation.test.model.ServiceAction; +import vid.automation.test.services.AsyncJobsService; +import vid.automation.test.services.SimulatorApi; +import vid.automation.test.services.SimulatorApi.RegistrationStrategy; + +@FeatureTogglingTest({Features.FLAG_ASYNC_JOBS, Features.FLAG_ASYNC_INSTANTIATION, Features.FLAG_ASYNC_ALACARTE_VNF}) +public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase { + + private static final String CREATE_BULK_OF_ALACARTE_REQUEST = "asyncInstantiation/vidRequestCreateALaCarte.json"; + private static final String CREATE_BULK_OF_ALACARTE_MULTIPLE_VNF_NETWORK_REQUEST_CYPRESS = "a-la-carte/redux-multiple-vnf-network.json"; + private static final String CREATE_BULK_OF_ALACARTE_REQUEST_WITH_VNF_GROUP = "VnfGroup/serviceWithVnfGroupCreateRequest.json"; + private static final String PAYLOAD_TEMPLATE_1_VNF_GROUP_WITH_3_MEMBERS_REQUEST = "VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json"; + private static final String DELETE_AND_CREATE_NETWORK_FROM_SERVICE = "asyncInstantiation/vidRequestDelete1Create1Network.json"; + private static final String DELETE_SERVICE_WITH_NETWORK = "asyncInstantiation/vidRequestDeleteServiceWithNetwork.json"; + private static final String DELETE_AND_CREATE_VNF_FROM_SERVICE = "asyncInstantiation/vidRequestDelete1Create1Vnf.json"; + private static final String DELETE_SERVICE_WITH_VNF = "asyncInstantiation/vidRequestDeleteServiceWithVnf.json"; + + + private static final String FIRST_REQUEST_ID = "d1011670-0e1a-4b74-945d-8bf5aede1d9c"; + private static final String SECOND_REQUEST_ID = "e2011670-0e1a-4b74-945d-8bf5aede1d9c"; + private static final String THIRD_REQUEST_ID = "f3011670-0e1a-4b74-945d-8bf5aede1d9c"; + private static final String SERVICE_INSTANCE_ID = BaseMSOPreset.DEFAULT_INSTANCE_ID; + private static final String MSO_COMPLETE_STATUS = "COMPLETE"; + private static final String MSO_FAILED_STATUS = "FAILED"; + + + @DataProvider + public static Object[][] scenarios() { + return new Object[][]{ + {Scenario.PARALLEL}, + {Scenario.COMPLETED}, +// {Scenario.NAME_TAKEN}, Not relevant because the name uniqueness is supported only for bulk in Macro +// {Scenario.DUPLICATE_NAME}, Not relevant because name duplication is not handled in A La Carte + {Scenario.IN_PROGRESS}, + {Scenario.MSO_FAIL} + }; + } + + @AfterMethod + protected void dropAllFromNameCounter() { + AsyncJobsService asyncJobsService = new AsyncJobsService(); + asyncJobsService.dropAllFromNameCounter(); + } + + @Test(dataProvider = "multipleVnfDataProvider") + public void deployServiceFromCypress__multipleVnfsAndNetwork(String expectedStatus, JobStatus expectedJobStatus) { + dropAllFromNameCounter();// needed because each data provider info not going to after method + final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = ImmutableMap.of(SERVICE_NAME, "serviceInstanceName"); + + List<PresetMSOBaseCreateInstancePost> createPresets = ImmutableList.of( + new PresetMSOCreateServiceInstanceMultipleVnfsServiceCypress(names, 0, DEFAULT_REQUEST_ID), + new PresetMSOCreateVnfALaCarteServiceCypress(FIRST_REQUEST_ID, SERVICE_INSTANCE_ID,"VFvGeraldine00001", "zzz1"), + new PresetMSOCreateVnfALaCarteServiceCypress(SECOND_REQUEST_ID, SERVICE_INSTANCE_ID,"VFvGeraldine00001_001", "ONAP"), + new PresetMSOCreateNetworkALaCarteServiceCypress2(THIRD_REQUEST_ID, SERVICE_INSTANCE_ID, "ExtVL") + ); + List<PresetMSOOrchestrationRequestGet> inProgressPresets = ImmutableList.of( + new PresetMSOOrchestrationRequestGet(expectedStatus.equals("SERVICE_FAILED") ? MSO_FAILED_STATUS : MSO_COMPLETE_STATUS, DEFAULT_REQUEST_ID), + new PresetMSOOrchestrationRequestGet( MSO_COMPLETE_STATUS, FIRST_REQUEST_ID, "First VNF instance was created successfully." ), + new PresetMSOOrchestrationRequestGet(expectedStatus, SECOND_REQUEST_ID, expectedStatus.equals(MSO_COMPLETE_STATUS)?"Second VNF instance was created successfully.": MSO_BASE_ERROR), + new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, THIRD_REQUEST_ID,"Network was created successfully.") + ); + List<BasePreset> presets = getPresets( createPresets, inProgressPresets); + + registerExpectationFromPresets(presets, RegistrationStrategy.CLEAR_THEN_SET); + registerExpectationFromPreset(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC, RegistrationStrategy.APPEND); + + final List<String> uuids = createBulkOfInstances(false, 1, names, CREATE_BULK_OF_ALACARTE_MULTIPLE_VNF_NETWORK_REQUEST_CYPRESS); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + + //expected vid statuses + ImmutableList<JobAuditStatus> vidAuditStatuses; + + if (expectedStatus.equals(MSO_COMPLETE_STATUS)){ + vidAuditStatuses = vidAuditStatusesCompleted(jobId); + } else if (expectedStatus.equals("SERVICE_FAILED")){ + vidAuditStatuses = vidAuditStatusesFailed(jobId); + } else { + vidAuditStatuses = vidAuditStatusesCompletedWithErrors(jobId); + } + + assertServiceInfoSpecific3(jobId, expectedJobStatus , names.get(SERVICE_NAME)); + assertAuditStatuses(jobId, vidAuditStatuses, null); + } + + + @DataProvider + Object[][] multipleVnfDataProvider() { + return new Object[][]{{MSO_FAILED_STATUS, JobStatus.COMPLETED_WITH_ERRORS},{MSO_COMPLETE_STATUS, JobStatus.COMPLETED}, {"SERVICE_FAILED", JobStatus.FAILED}}; + } + + @Test + @FeatureTogglingTest(Features.FLAG_1902_VNF_GROUPING) + public void deploy1ServiceWith1VnfGroup() { + final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = ImmutableMap.of(SERVICE_NAME, "Grouping_Service_Instance"); + String serviceReqId = "3cf5ea96-6b34-4945-b5b1-4a7798b1caf2"; + String serviceInstanceId = BaseMSOPreset.DEFAULT_INSTANCE_ID; + String instanceGroupReqId = "715a5106-cdcc-44ee-8923-83d68a896908"; + + List<PresetMSOBaseCreateInstancePost> createPresets = ImmutableList.of( + new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService(names, 0, serviceReqId), + new PresetMSOCreateVnfGroup("ABC", instanceGroupReqId, PresetMSOCreateVnfGroup.MODEL_INFO_1, serviceInstanceId, false)); + List<PresetMSOOrchestrationRequestGet> inProgressPresets = ImmutableList.of( + new PresetMSOOrchestrationRequestGet("COMPLETE", serviceReqId), + new PresetMSOOrchestrationRequestGet("COMPLETE", instanceGroupReqId, "Instance group was created successfully.")); + List<BasePreset> presets = getPresets(createPresets, inProgressPresets); + + registerExpectationFromPresets(presets, RegistrationStrategy.CLEAR_THEN_SET); + + final List<String> uuids = createBulkOfInstances(false, 1, names, CREATE_BULK_OF_ALACARTE_REQUEST_WITH_VNF_GROUP); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + + assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, new ServiceInfo( + "us16807000", JobStatus.COMPLETED, false, + "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "WayneHolland", "WATKINS", + null, null, + null, null, + null, null, + "TYLER SILVIA", "SILVIA ROBBINS", + null, names.get(SERVICE_NAME), + "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", "Grouping Service for Test", "1.0", + jobId, null, ServiceAction.INSTANTIATE, false)); + + + assertAuditStatuses(jobId, vidAuditStatusesCompleted(jobId),null); + + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + TestUtils.hasOrLacksOfEntry(createPresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(createPresets.get(1).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(1).getReqPath(), 1L))); + } + + @DataProvider + public static Object[][] addAndDeleteMembersMsoStatus() { + return new Object[][]{ + {MSO_COMPLETE_STATUS, MSO_COMPLETE_STATUS, JobStatus.COMPLETED}, + {MSO_FAILED_STATUS, MSO_FAILED_STATUS, JobStatus.FAILED}, + {MSO_COMPLETE_STATUS, MSO_FAILED_STATUS, JobStatus.COMPLETED_WITH_ERRORS} + }; + } + + @Test(dataProvider = "addAndDeleteMembersMsoStatus") + @FeatureTogglingTest(Features.FLAG_1902_VNF_GROUPING) + public void add1delete1GroupMembers_withGoodResponseFromMso_verifyStatusAndRequests(String firstMemberStatus, String secondMemberStatus, JobStatus expectedJobStatus) { + + String firstMemberRequestId = UUID.randomUUID().toString(); + String secondMemberRequestId = UUID.randomUUID().toString(); + + List<PresetMSOAddOrRemoveOneInstanceGroupMember> instanceGroupMemberPreset = ImmutableList.of( + new PresetMSOAddOrRemoveOneInstanceGroupMember("VNF_GROUP1_INSTANCE_ID", "RELATED_VNF1_INSTANCE_ID", getUserCredentials().getUserId(), firstMemberRequestId, InstanceGroupMemberAction.Add), + new PresetMSOAddOrRemoveOneInstanceGroupMember("VNF_GROUP1_INSTANCE_ID", "RELATED_VNF2_INSTANCE_ID", getUserCredentials().getUserId(), secondMemberRequestId, InstanceGroupMemberAction.Remove) + ); + List<PresetMSOOrchestrationRequestGet> inProgressPresets = ImmutableList.of( + new PresetMSOOrchestrationRequestGet(firstMemberStatus, firstMemberRequestId), + new PresetMSOOrchestrationRequestGet(secondMemberStatus, secondMemberRequestId) + ); + + List<BasePreset> presets = getGroupMembersPresets(instanceGroupMemberPreset,inProgressPresets); + registerExpectationFromPresets(presets, RegistrationStrategy.CLEAR_THEN_SET); + final List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of( + VNF_GROUP1_ACTION, "None", + RELATED_VNF1_ACTION, "Create", + RELATED_VNF2_ACTION, "None_Delete" + ), PAYLOAD_TEMPLATE_1_VNF_GROUP_WITH_3_MEMBERS_REQUEST); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + + assertAuditStatuses(jobId, vidAuditStatuses(jobId, expectedJobStatus), null, 60); + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + TestUtils.hasOrLacksOfEntry(instanceGroupMemberPreset.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(instanceGroupMemberPreset.get(1).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(1).getReqPath(), 1L) + )); + } + + @Test + @FeatureTogglingTest(Features.FLAG_1902_VNF_GROUPING) + public void addVnfGroupWith2GroupMembers_withGoodResponseFromMso_verifyStatusAndRequests() { + + String vnfGroupRequestId = UUID.randomUUID().toString(); + String firstMemberRequestId = UUID.randomUUID().toString(); + String secondMemberRequestId = UUID.randomUUID().toString(); + + List <PresetMSOCreateVnfGroup> vnfGroupPreset = ImmutableList.of( + new PresetMSOCreateVnfGroup("VNF_GROUP1_INSTANCE_NAME",vnfGroupRequestId,PresetMSOCreateVnfGroup.MODEL_INFO_0,"service-instance-id", true)); + List<PresetMSOAddOrRemoveOneInstanceGroupMember> instanceGroupMemberPreset = ImmutableList.of( + new PresetMSOAddOrRemoveOneInstanceGroupMember("VNF_GROUP1_INSTANCE_ID", "RELATED_VNF1_INSTANCE_ID", getUserCredentials().getUserId(), firstMemberRequestId, InstanceGroupMemberAction.Add), + new PresetMSOAddOrRemoveOneInstanceGroupMember("VNF_GROUP1_INSTANCE_ID", "RELATED_VNF2_INSTANCE_ID", getUserCredentials().getUserId(), secondMemberRequestId, InstanceGroupMemberAction.Add) + ); + List<PresetMSOOrchestrationRequestGet> inProgressPresets = ImmutableList.of( + new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, vnfGroupRequestId), + new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, firstMemberRequestId), + new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, secondMemberRequestId) + ); + + final ImmutableList.Builder<BasePreset> basePresetBuilder = new ImmutableList.Builder<>(); + basePresetBuilder + .add(new PresetGetSessionSlotCheckIntervalGet()) + .add(new PresetAAIGetSubscribersGet()) + .addAll(instanceGroupMemberPreset) + .addAll(inProgressPresets) + .addAll(vnfGroupPreset); + List<BasePreset> presets = basePresetBuilder.build(); + + registerExpectationFromPresets(presets, RegistrationStrategy.CLEAR_THEN_SET); + final List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of( + VNF_GROUP1_ACTION, "Create", + RELATED_VNF1_ACTION, "Create", + RELATED_VNF2_ACTION, "Create" + ), PAYLOAD_TEMPLATE_1_VNF_GROUP_WITH_3_MEMBERS_REQUEST); + + assertThat(uuids, hasSize(1)); + final String jobId = uuids.get(0); + + assertAuditStatuses(jobId, vidAuditStatusesCompleted(jobId), null, 60); + assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf( + TestUtils.hasOrLacksOfEntry(vnfGroupPreset.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(instanceGroupMemberPreset.get(0).getReqPath(), 2L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(0).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(1).getReqPath(), 1L), + TestUtils.hasOrLacksOfEntry(inProgressPresets.get(2).getReqPath(), 1L) + )); + } + + @Test(dataProvider = "scenarios") + public void aLaCarteServiceScenarioRunner(Scenario scenario) { + /* + This tests creates one or more a-la-carte requests, following one of the these scenarios: + + MSO_FAIL: Submits to MSO, but while getting Orchestration status -> MSO + reports failure + COMPLETED: Clean legit flow. + NAME_TAKEN: Sends request for instance, where AAI reports the name is + already taken. Therefore, MSO expects added postfix _001. + IN_PROGRESS: Submits to MSO, but while getting Orchestration status -> MSO + reports IN_PROGRESS endlessly + DUPLICATE_NAME: Sends two requests for instances with the same name. + PARALLEL: Submits 3 requests, that must not interfere with each other. + */ + + registerExpectationFromPresets(ImmutableList.of( + new PresetGetSessionSlotCheckIntervalGet(), + new PresetAAIGetSubscribersGet() + ), RegistrationStrategy.CLEAR_THEN_SET); + + + final String name0 = randomAlphabetic(18); + + OneServiceActor inProgressCase = new OneServiceActor( + scenario == Scenario.PARALLEL || scenario == Scenario.IN_PROGRESS || scenario == Scenario.DUPLICATE_NAME, + "IN_PROGRESS", "status #1", + ImmutableMap.of(SERVICE_NAME, name0), 0, + JobStatus.IN_PROGRESS, this::vidAuditStatusesInProgress + ); + + OneServiceActor completedCase = new OneServiceActor( + scenario == Scenario.PARALLEL || scenario == Scenario.COMPLETED, + MSO_COMPLETE_STATUS, "status #2", + ImmutableMap.of(SERVICE_NAME, randomAlphabetic(5)), 0, + JobStatus.COMPLETED, this::vidAuditStatusesCompleted + ); + + final String name1 = randomAlphabetic(5); + OneServiceActor occupiedNameCase = new OneServiceActor( + scenario == Scenario.NAME_TAKEN, + MSO_COMPLETE_STATUS, "status #6", + ImmutableMap.of(SERVICE_NAME, name1), 1, + JobStatus.COMPLETED, this::vidAuditStatusesCompleted, + ImmutableList.of(new PresetAAISearchNodeQueryNonEmptyResult("service-instance", name1)) + ); + + OneServiceActor failedCase = new OneServiceActor( + scenario == Scenario.PARALLEL || scenario == Scenario.MSO_FAIL, + "FAILED", "status #3", + ImmutableMap.of(SERVICE_NAME, randomAlphabetic(10)), 0, + JobStatus.FAILED, this::vidAuditStatusesFailed + ); + + OneServiceActor duplicateNameCase = new OneServiceActor( + scenario == Scenario.DUPLICATE_NAME, + MSO_COMPLETE_STATUS, "status #4", + ImmutableMap.of(SERVICE_NAME, name0), 1, + JobStatus.COMPLETED, this::vidAuditStatusesCompleted + ); + + OneServiceActor inProgressTooLongCase = new OneServiceActor( + scenario == Scenario.IN_PROGRESS, + "IN_PROGRESS", "status #5", + ImmutableMap.of(SERVICE_NAME, randomAlphabetic(10)), 0, + JobStatus.FAILED, this::vidAuditStatusesFailed, 24 + ); + + final List<OneServiceActor> servicesActors = + ImmutableList.of(inProgressCase, completedCase, occupiedNameCase, failedCase, duplicateNameCase, inProgressTooLongCase); + + servicesActors.forEach(actor -> registerExpectationFromPresets(actor.getPresets(), + RegistrationStrategy.APPEND)); + + servicesActors.forEach(OneServiceActor::createInstances); + + servicesActors.forEach(OneServiceActor::assertServiceInfo); + servicesActors.forEach(OneServiceActor::assertAuditStatuses2); + } + + @Test + public void delete1Create1NetworkFromService() { + String deleteRequestId = UUID.randomUUID().toString(); + String createRequestId = UUID.randomUUID().toString(); + String serviceInstanceId = BaseMSOPreset.DEFAULT_INSTANCE_ID; + String networkInstanceId = "NETWORK_INSTANCE_ID"; + + registerExpectationFromPresets(ImmutableList.of( + new PresetMSODeleteNetworkAlaCarteCypress(deleteRequestId, serviceInstanceId, networkInstanceId, "us16807000"), + new PresetMSOOrchestrationRequestGet(COMPLETE, deleteRequestId), + new PresetMSOCreateNetworkALaCarteServiceCypress2(createRequestId, serviceInstanceId, "ExtVL", "action-data", "6b528779-44a3-4472-bdff-9cd15ec93450"), + new PresetMSOOrchestrationRequestGet(COMPLETE, createRequestId), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC + ), RegistrationStrategy.CLEAR_THEN_SET); + + List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of(), DELETE_AND_CREATE_NETWORK_FROM_SERVICE); + assertThat(uuids, hasSize(1)); + String jobId = uuids.get(0); + + assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, true, new ServiceInfo( + "us16807000", JobStatus.COMPLETED, false, + "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "WayneHolland", "WATKINS", + "JAG1", "YUDFJULP-JAG1", + "092eb9e8e4b7412e8787dd091bc58e86", "USP-SIP-IC-24335-T-01", + "JANET25", null, + "TYLER SILVIA", null, + null, "InstanceName", + "6b528779-44a3-4472-bdff-9cd15ec93450", "action-data", "1.0", + jobId, null, ServiceAction.UPDATE, false) + ); + } + + @Test + public void deleteServiceWithNetwork() { + String deleteNetworkRequestId = UUID.randomUUID().toString(); + String deleteServiceRequestId = UUID.randomUUID().toString(); + String serviceInstanceId = BaseMSOPreset.DEFAULT_INSTANCE_ID; + String networkInstanceId = "NETWORK_INSTANCE_ID"; + + registerExpectationFromPresets(ImmutableList.of( + new PresetMSODeleteNetworkAlaCarteCypress(deleteNetworkRequestId, serviceInstanceId, networkInstanceId, "us16807000"), + new PresetMSOOrchestrationRequestGet(COMPLETE, deleteNetworkRequestId), + new PresetMSODeleteService(deleteServiceRequestId, serviceInstanceId), + new PresetMSOOrchestrationRequestGet(COMPLETE, deleteServiceRequestId), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC + ), RegistrationStrategy.CLEAR_THEN_SET); + + List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of(), DELETE_SERVICE_WITH_NETWORK); + assertThat(uuids, hasSize(1)); + String jobId = uuids.get(0); + + assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, true, new ServiceInfo( + "us16807000", JobStatus.COMPLETED, false, + "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "WayneHolland", "WATKINS", + "JAG1", "YUDFJULP-JAG1", + "092eb9e8e4b7412e8787dd091bc58e86", "USP-SIP-IC-24335-T-01", + "JANET25", null, + "TYLER SILVIA", null, + null, "InstanceName", + "6b528779-44a3-4472-bdff-9cd15ec93450", "action-data", "1.0", + jobId, null, ServiceAction.DELETE, false) + ); + } + + @Test + public void delete1VnfWithVfModulesAndCreate1VnfFromService() { + String deleteVnfRequestId = UUID.randomUUID().toString(); + String createVnfRequestId = UUID.randomUUID().toString(); + String deleteVfModuleRequestId = UUID.randomUUID().toString(); + String deleteBaseVfModuleRequestId = UUID.randomUUID().toString(); + String serviceInstanceId = BaseMSOPreset.DEFAULT_INSTANCE_ID; + String vnfInstanceId = "VNF_INSTANCE_ID"; + + registerExpectationFromPresets(ImmutableList.of( + new PresetAAIGetSubscribersGet(), + new PresetMSODeleteVnfAlaCarteCypress(deleteVnfRequestId, serviceInstanceId, vnfInstanceId, "us16807000"), + new PresetMSOOrchestrationRequestGet(COMPLETE, deleteVnfRequestId), + new PresetSDCGetServiceToscaModelGet("6b528779-44a3-4472-bdff-9cd15ec93450", "csar-withDynamicFields-ecompNamingFalse-partialModelDetails-vnfEcompNamingFalse.zip"), + new PresetSDCGetServiceMetadataGet("6b528779-44a3-4472-bdff-9cd15ec93450", "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0" , "csar-withDynamicFields-ecompNamingFalse-partialModelDetails-vnfEcompNamingFalse.zip"), + new PresetMSODeleteVfModuleCypress(deleteVfModuleRequestId, serviceInstanceId, vnfInstanceId, "VF_MODULE_INSTANCE_ID"), + new PresetMSOOrchestrationRequestGet(COMPLETE, deleteVfModuleRequestId), + new PresetMSODeleteBaseVfModuleCypress(deleteBaseVfModuleRequestId, serviceInstanceId, vnfInstanceId, "VF_MODULE_BASE_INSTANCE_ID"), + new PresetMSOOrchestrationRequestGet(COMPLETE, deleteBaseVfModuleRequestId), + new PresetMSOCreateVnfALaCarteServiceCypress2(createVnfRequestId, serviceInstanceId, "2017388_PASQUALEvPEmCaNkinstanceName", "zzz1"), + new PresetMSOOrchestrationRequestGet(COMPLETE, createVnfRequestId), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_SOME_LEGACY_REGION_TO_ATT_AIC, + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC, + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AAIAIC25_TO_ATT_AIC + ), RegistrationStrategy.CLEAR_THEN_SET); + + List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of(), DELETE_AND_CREATE_VNF_FROM_SERVICE); + assertThat(uuids, hasSize(1)); + String jobId = uuids.get(0); + + assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, true, new ServiceInfo( + "us16807000", JobStatus.COMPLETED, false, + "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "WayneHolland", "WATKINS", + "NFT1", "NFTJSSSS-NFT1", + "bae71557c5bb4d5aac6743a4e5f1d054", "AIN Web Tool-15-D-testalexandria", + "hvf6", null, + "TYLER SILVIA", null, + "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", "mCaNkinstancename", + "6b528779-44a3-4472-bdff-9cd15ec93450", "action-data", "1.0", + jobId, null, ServiceAction.UPDATE, false) + ); + } + + @Test + public void deleteServiceWithVnf() { + String deleteVnfRequestId = UUID.randomUUID().toString(); + String deleteServiceRequestId = UUID.randomUUID().toString(); + String serviceInstanceId = BaseMSOPreset.DEFAULT_INSTANCE_ID; + String vnfInstanceId = "VNF_INSTANCE_ID"; + + registerExpectationFromPresets(ImmutableList.of( + new PresetMSODeleteVnfAlaCarteCypress(deleteVnfRequestId, serviceInstanceId, vnfInstanceId, "us16807000"), + new PresetMSOOrchestrationRequestGet(COMPLETE, deleteVnfRequestId), + new PresetMSODeleteService(deleteServiceRequestId, serviceInstanceId), + new PresetMSOOrchestrationRequestGet(COMPLETE, deleteServiceRequestId), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_SOME_LEGACY_REGION_TO_ATT_AIC + ), RegistrationStrategy.CLEAR_THEN_SET); + + List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of(), DELETE_SERVICE_WITH_VNF); + assertThat(uuids, hasSize(1)); + String jobId = uuids.get(0); + + assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, true, new ServiceInfo( + "us16807000", JobStatus.COMPLETED, false, + "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "WayneHolland", "WATKINS", + "NFT1", "NFTJSSSS-NFT1", + "bae71557c5bb4d5aac6743a4e5f1d054", "AIN Web Tool-15-D-testalexandria", + "hvf6", null, + "TYLER SILVIA", null, + "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", "mCaNkinstancename", + "6b528779-44a3-4472-bdff-9cd15ec93450", "action-data", "1.0", + jobId, null, ServiceAction.DELETE, false) + ); + } + + private ImmutableList<JobAuditStatus> vidAuditStatusesInProgress(String jobId) { + return ImmutableList.of( + vidAuditStatus(jobId, "PENDING", false), + vidAuditStatus(jobId, "IN_PROGRESS", false) + ); + } + + private ImmutableList<JobAuditStatus> vidAuditStatusesCompleted(String jobId) { + return ImmutableList.of( + vidAuditStatus(jobId, "PENDING", false), + vidAuditStatus(jobId, "IN_PROGRESS", false), + vidAuditStatus(jobId, "COMPLETED", true) + ); + } + + private ImmutableList<JobAuditStatus> vidAuditStatuses(String jobId, JobStatus jobStatus) { + switch(jobStatus) { + case COMPLETED: + return vidAuditStatusesCompleted(jobId); + case COMPLETED_WITH_ERRORS: + return vidAuditStatusesCompletedWithErrors(jobId); + case FAILED: + return vidAuditStatusesFailed(jobId); + case IN_PROGRESS: + return vidAuditStatusesInProgress(jobId); + } + + return null; + } + + private ImmutableList<JobAuditStatus> msoAuditStatuses(String jobId , String lastStatus, String lastAdditionalInfo) { + final List<JobAuditStatus> auditMsoStatuses = getAuditStatuses(jobId, SourceStatus.MSO.name()); + final UUID actualRequestId = auditMsoStatuses.get(0).getRequestId(); + return ImmutableList.of( + msoAuditStatus(jobId, "REQUESTED", null, actualRequestId), + msoAuditStatus(jobId, lastStatus, lastAdditionalInfo, actualRequestId) + ); + } + + private JobAuditStatus msoAuditStatus(String jobId, String jobStatus, String additionalInfo, UUID requestId) { + return new JobAuditStatus(UUID.fromString(jobId), jobStatus, SourceStatus.MSO, requestId, additionalInfo, false); + } + + private void assertServiceInfoSpecific3(String jobId, JobStatus jobStatus, String serviceInstanceName) { + assertExpectedStatusAndServiceInfo(jobStatus, jobId, true, new ServiceInfo( + "us16807000", jobStatus, false, + "aaa1", "aaa1", "yyy1", + "YYY1", "UUUAIAAI-YYY1", + "1178612d2b394be4834ad77f567c0af2", "AIN Web Tool-15-D-SSPtestcustome", + "hvf6", null, + "TYLER SILVIA", null, + null, serviceInstanceName, + "6e59c5de-f052-46fa-aa7e-2fca9d674c44", "ComplexService", "1.0", + jobId, null, ServiceAction.INSTANTIATE, false) + ); + } + + private List<BasePreset> getGroupMembersPresets(List<PresetMSOAddOrRemoveOneInstanceGroupMember> deleteMembersPreset, List<PresetMSOOrchestrationRequestGet> inProgressPresets) { + final ImmutableList.Builder<BasePreset> basePresetBuilder = new ImmutableList.Builder<>(); + basePresetBuilder + .add(new PresetGetSessionSlotCheckIntervalGet()) + .add(new PresetAAIGetSubscribersGet()) + .addAll(deleteMembersPreset) + .addAll(inProgressPresets); + return basePresetBuilder.build(); + } + + + enum Scenario { + PARALLEL, COMPLETED, NAME_TAKEN, DUPLICATE_NAME, IN_PROGRESS, MSO_FAIL + } + + class OneServiceActor { + private final boolean isRelevant; + private final String requestId; + private final String msoInfo; + private final Map<PresetMSOServiceInstanceGen2WithNames.Keys, String> serviceNames; + private final int suffix; + private final String expectedMsoLastStatus; + private final JobStatus jobStatus; + private final Function<String, List<JobAuditStatus>> jobAuditStatusesProvider; + private String jobId; + private int startedHoursAgo = 1; + private List<BasePreset> morePresets = ImmutableList.of(); + + private OneServiceActor(boolean isRelevant, String msoLastStatus, String msoInfo, Map<PresetMSOServiceInstanceGen2WithNames.Keys, String> serviceNames, int suffix, JobStatus jobStatus, Function<String, List<JobAuditStatus>> jobAuditStatusesProvider) { + this.isRelevant = isRelevant; + this.requestId = UUID.randomUUID().toString(); + this.msoInfo = msoInfo; + this.serviceNames = serviceNames; + this.suffix = suffix; + this.expectedMsoLastStatus = msoLastStatus; + this.jobStatus = jobStatus; + this.jobAuditStatusesProvider = jobAuditStatusesProvider; + } + + private OneServiceActor(boolean isRelevant, String msoLastStatus, String msoInfo, Map<PresetMSOServiceInstanceGen2WithNames.Keys, String> serviceNames, int suffix, JobStatus jobStatus, Function<String, List<JobAuditStatus>> jobAuditStatusesProvider, int startedHoursAgo) { + this(isRelevant, msoLastStatus, msoInfo, serviceNames, suffix, jobStatus, jobAuditStatusesProvider); + this.startedHoursAgo = startedHoursAgo; + } + + private OneServiceActor(boolean isRelevant, String msoLastStatus, String msoInfo, Map<PresetMSOServiceInstanceGen2WithNames.Keys, String> serviceNames, int suffix, JobStatus jobStatus, Function<String, List<JobAuditStatus>> jobAuditStatusesProvider, List<BasePreset> morePresets) { + this(isRelevant, msoLastStatus, msoInfo, serviceNames, suffix, jobStatus, jobAuditStatusesProvider); + this.morePresets = morePresets; + } + + public List<BasePreset> getPresets() { + // if not relevant -> return empty list + return isRelevant ? + ImmutableList.<BasePreset>builder().add( + new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteService(serviceNames, suffix, requestId), + new PresetMSOOrchestrationRequestGet(expectedMsoLastStatus, requestId, msoInfo, startedHoursAgo) + ).addAll(morePresets).build() + : ImmutableList.of(); + } + + private void createInstances() { + // call VID with 1 request, keep the job id + if (!isRelevant) return; + final List<String> jobIds = createBulkOfInstances(false, 1, serviceNames, CREATE_BULK_OF_ALACARTE_REQUEST); + assertThat(jobIds, hasSize(1)); + jobId = jobIds.get(0); + } + + private void assertServiceInfo() { + if (!isRelevant) return; + assertThat(jobId, is(not(nullValue()))); + assertServiceInfoSpecific1(jobId, jobStatus, serviceNames.get(SERVICE_NAME)); + } + + private void assertAuditStatuses2() { + if (!isRelevant) return; + assertThat(jobId, is(not(nullValue()))); + assertAuditStatuses(jobId, jobAuditStatusesProvider.apply(jobId), msoAuditStatuses(jobId, expectedMsoLastStatus, msoInfo)); + } + } + +} diff --git a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationApiTest.java index a5b72c261..5c4d8a876 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationApiTest.java @@ -1,27 +1,22 @@ package org.onap.vid.api; import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableSet; import net.bytebuddy.utility.RandomString; import net.javacrumbs.jsonunit.JsonAssert; -import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import org.hamcrest.BaseMatcher; -import org.hamcrest.CoreMatchers; -import org.hamcrest.Description; +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.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAISearchNodeQueryEmptyResult; import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; import org.onap.simulator.presetGenerator.presets.mso.*; import org.onap.vid.model.asyncInstantiation.JobAuditStatus; import org.onap.vid.model.asyncInstantiation.ServiceInfo; -import org.onap.vid.model.mso.MsoResponseWrapper2; -import org.springframework.core.ParameterizedTypeReference; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.RestTemplate; +import org.springframework.web.client.HttpServerErrorException; import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -32,76 +27,33 @@ import vid.automation.test.model.JobStatus; import vid.automation.test.services.SimulatorApi; import java.util.*; -import java.util.function.Predicate; -import java.util.stream.Collectors; +import java.util.concurrent.atomic.AtomicReference; 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.stream.Collectors.*; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.hasProperty; 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.infra.Features.FLAG_1906_INSTANTIATION_API_USER_VALIDATION; +import static vid.automation.test.utils.ExtendedHamcrestMatcher.hasItemsFromCollection; @FeatureTogglingTest({Features.FLAG_ASYNC_JOBS, Features.FLAG_ASYNC_INSTANTIATION}) -public class AsyncInstantiationApiTest extends BaseMsoApiTest { +public class AsyncInstantiationApiTest extends AsyncInstantiationBase { + private static final Logger logger = LogManager.getLogger(AsyncInstantiationApiTest.class); - private static final String CREATE_BULK_OF_MACRO_REQUEST = "asyncInstantiation/vidRequestCreateBulkOfMacro.json"; - - @DataProvider - public static Object[][] trueAndFalse() { - return new Object[][]{{TRUE},{FALSE}}; - } - - private String getCreateBulkUri() { - return uri.toASCIIString() + "/asyncInstantiation/bulk"; - } - - private String getHideServiceUri(String jobId) { - return uri.toASCIIString() + "/asyncInstantiation/hide/"+jobId; - } - - private String getServiceInfoUrl() { - return uri.toASCIIString() + "/asyncInstantiation"; - } - - private String getJobAuditUrl() { - return uri.toASCIIString() + "/asyncInstantiation/auditStatus/{JOB_ID}?source={SOURCE}"; - } - - private String getDeleteServiceUrl(String uuid) { - return uri.toASCIIString() + "/asyncInstantiation/job/" + uuid; - } - - public static class JobIdAndStatusMatcher extends BaseMatcher<ServiceInfo> { - private String expectedJobId; - - public JobIdAndStatusMatcher(String expectedJobId) { - this.expectedJobId = expectedJobId; - } - - @Override - public boolean matches(Object item) { - if (!(item instanceof ServiceInfo)) { - return false; - } - ServiceInfo serviceInfo = (ServiceInfo) item; - return expectedJobId.equals(serviceInfo.jobId); - } - - @Override - public void describeTo(Description description) { - description.appendText("failed to find job with uuid ") - .appendValue(expectedJobId); - } - } + private static final String MSO_BASE_ERROR = + "Received error from SDN-C: java.lang.IllegalArgumentException: All keys must be specified for class org."+ + "opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.assignments.vf."+ + "module.assignments.vms.VmKey. Missing key is getVmType. Supplied key is VmKey []."; + private static final String MSO_ERROR = MSO_BASE_ERROR + StringUtils.repeat(" and a lot of sentences for long message", 60); + private static final String INSTANCE_GROUP_ID_LABEL = "instanceGroupId"; + private static final String INSTANCE_GROUP_LABEL = "instanceGroup"; @Test public void createBulkOfCreateInstances(){ @@ -111,40 +63,6 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { createBulkOfInstancesAndAssert(presets, false, bulkSize, JobStatus.COMPLETED, names); } - private Map<Keys,String> generateNames() { - return Stream.of(Keys.values()).collect( - Collectors.toMap(x->x, x -> UUID.randomUUID().toString().replace("-",""))); - } - - private ImmutableList<BasePreset> addPresetsForCreateBulkOfCreateInstances(int bulkSize, Map<Keys, String> names){ - ImmutableList<BasePreset> msoBulkPresets = IntStream.rangeClosed(1,bulkSize). - mapToObj(i-> new PresetMSOCreateServiceInstanceGen2WithNames(names, i)) - .collect(ImmutableList.toImmutableList()); - ImmutableList<BasePreset> presets = new ImmutableList.Builder<BasePreset>() - .add(new PresetGetSessionSlotCheckIntervalGet()) - .add(new PresetAAIGetSubscribersGet()) - .add(new PresetAAISearchNodeQueryEmptyResult()) - .addAll(msoBulkPresets) - .add(new PresetMSOOrchestrationRequestGet()) - .build(); - return presets; - - } - - private ResponseEntity<List<JobAuditStatus>> auditStatusCall(String url) { - return restTemplate.exchange( - url, - org.springframework.http.HttpMethod.GET, - null, - new ParameterizedTypeReference<List<JobAuditStatus>>() {}); - } - - @DataProvider - public static Object[][] auditSources() { - return new Object[][]{{JobAuditStatus.SourceStatus.VID},{JobAuditStatus.SourceStatus.MSO}}; - } - - @Test(dataProvider = "auditSources") public void getAuditStatus_nonExistingJobId_returnsEmptyList(JobAuditStatus.SourceStatus source){ List<JobAuditStatus> audits = getAuditStatuses(UUID.randomUUID().toString(), source.name()); @@ -170,13 +88,8 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { for(String jobId: jobIds) { List<JobAuditStatus> actualVidAudits = getAuditStatuses(jobId, JobAuditStatus.SourceStatus.VID.name()); List<JobAuditStatus> expectedVidAudits = Stream.of(JobStatus.PENDING, JobStatus.IN_PROGRESS, JobStatus.COMPLETED) - .map(status->new JobAuditStatus(UUID.fromString(jobId), - status.name(), - JobAuditStatus.SourceStatus.VID, - null, - null, - status.equals(JobStatus.COMPLETED))).collect(toList()); - assertThat(actualVidAudits, is(expectedVidAudits)); + .map(status-> vidAuditStatus(jobId, status.name(), status.equals(JobStatus.COMPLETED))).collect(toList()); + assertThat(actualVidAudits, hasItemsFromCollection(expectedVidAudits)); List<JobAuditStatus> actualMsoAudits = getAuditStatuses(jobId, JobAuditStatus.SourceStatus.MSO.name()); List<JobAuditStatus> expectedMsoAudits = Stream.of("REQUESTED", "COMPLETE") @@ -190,29 +103,6 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { } } - protected List<String> createBulkAndWaitForBeCompleted(int bulkSize){ - Map<Keys, String> names = generateNames(); - ImmutableList<BasePreset> presets = addPresetsForCreateBulkOfCreateInstances(bulkSize, names); - final List<String> jobIds = createBulkOfInstances(presets, false, bulkSize, names); - Assert.assertEquals(jobIds.size(),bulkSize); - - assertTrue(String.format("Not all services with ids: %s are in state completed after 30 sec", - jobIds.stream().collect(joining(","))), - - Wait.waitFor(y-> serviceListCall().getBody().stream() - .filter(si -> jobIds.contains(si.jobId)) - .filter(si -> si.jobStatus==JobStatus.COMPLETED) - .count() == bulkSize, - null, 30, 1 )); - return jobIds; - } - - private List<JobAuditStatus> getAuditStatuses(String jobUUID, String source){ - String url = getJobAuditUrl().replace("{JOB_ID}",jobUUID).replace("{SOURCE}", source); - ResponseEntity<List<JobAuditStatus>> statusesResponse = auditStatusCall(url); - assertThat(statusesResponse.getStatusCode(), CoreMatchers.equalTo(HttpStatus.OK)); - return statusesResponse.getBody(); - } @Test(expectedExceptions = HttpClientErrorException.class) public void addBulkAndDeleteInProgress_deletionIsRejected(){ @@ -245,52 +135,6 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { assertThat("deleted job shall not be present in StatusInfo response", statusesNow, is(statusesBefore)); } - private Map<String, JobStatus> addBulkAllPendingButOneInProgress(){ - return addBulkAllPendingButOneInProgress(3); - } - - private Map<String, JobStatus> addBulkAllPendingButOneInProgress(int bulkSize){ - Map<Keys, String> names = generateNames(); - ImmutableList<BasePreset> msoBulkPresets = IntStream.rangeClosed(1,bulkSize) - .mapToObj(i-> new PresetMSOCreateServiceInstanceGen2WithNames(names, i)) - .collect(ImmutableList.toImmutableList()); - ImmutableList<BasePreset> presets = new ImmutableList.Builder<BasePreset>() - .add(new PresetGetSessionSlotCheckIntervalGet()) - .add(new PresetAAISearchNodeQueryEmptyResult()) - .add(new PresetAAIGetSubscribersGet()) - .addAll(msoBulkPresets) - .add(new PresetMSOOrchestrationRequestGet("IN_PROGRESS")) - .build(); - final List<String> jobIds = createBulkOfInstances(presets, false, bulkSize, names); - - // wait for single IN_PROGRESS, so statuses will stop from changing - Wait.waitFor(foo -> serviceListCall().getBody().stream() - .filter(si -> jobIds.contains(si.jobId)) - .anyMatch(si -> si.jobStatus.equals(JobStatus.IN_PROGRESS)), - null, 20, 1); - - final Map<String, JobStatus> statusMapBefore = serviceListCall().getBody().stream() - .filter(si -> jobIds.contains(si.jobId)) - .collect(toMap(si -> si.jobId, si -> si.jobStatus)); - - assertThat(jobIds, hasSize(bulkSize)); - - - return statusMapBefore; - } - - private String deleteOneJobHavingTheStatus(Map<String, JobStatus> jobIdToStatus, JobStatus jobStatus) { - final String jobToDelete = jobIdToStatus.entrySet().stream() - .filter(entry -> entry.getValue().equals(jobStatus)) - .map(Map.Entry::getKey) - .findFirst().orElseThrow(() -> new AssertionError("no job in " + jobStatus + " state: " + jobIdToStatus)); - - - restTemplate.delete(getDeleteServiceUrl(jobToDelete)); - - return jobToDelete; - } - @Test(invocationCount = 3) public void createBulkOfCreateInstancesWithSinglePreset_firstOneInProgressOtherArePending(){ final int bulkSize = 3; @@ -306,7 +150,6 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { // PENDING: The other two jobs - named with _002 and _003 - are the still pending assertThat(jobIds, hasSize(bulkSize)); assertThat(statuses.get(JobStatus.IN_PROGRESS), hasSize(1)); - assertThat(statuses.get(JobStatus.IN_PROGRESS), everyItem(hasProperty("serviceInstanceName", endsWith("_001")))); assertThat(statuses.get(JobStatus.PENDING), hasSize(bulkSize - 1)); } @@ -320,18 +163,16 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { //if there is a preset for create, service shall failed during in_progress (upon get status) //it there is no preset for create, service shall failed during pending (upon create request) List<BasePreset> msoBulkPresets = isPresetForCreate ? - IntStream.rangeClosed(1,bulkSize) - .mapToObj(i-> new PresetMSOCreateServiceInstanceGen2WithNames(names, i)) - .collect(ImmutableList.toImmutableList()) : + generateMsoCreateBulkPresets(bulkSize, names) : new LinkedList<>(); ImmutableList<BasePreset> presets = new ImmutableList.Builder<BasePreset>() .add(new PresetGetSessionSlotCheckIntervalGet()) .add(new PresetAAIGetSubscribersGet()) - .add(new PresetAAISearchNodeQueryEmptyResult()) + .add(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN3_TO_ATT_SABABA) .addAll(msoBulkPresets) .add(new PresetMSOOrchestrationRequestGet("FAILED")) .build(); - List<String> jobIds = createBulkOfInstances(presets, false, bulkSize, names); + List<String> jobIds = createBulkOfMacroInstances(presets, false, bulkSize, names); Assert.assertEquals(jobIds.size(),bulkSize); boolean result = Wait.waitFor(x->{ List<ServiceInfo> serviceInfoList = serviceListCall().getBody(); @@ -346,13 +187,13 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { public void createBulkOfAssignInstances(){ Map<Keys, String> names = generateNames(); final int bulkSize = 2; - ImmutableList<BasePreset> msoBulkPresets = IntStream.rangeClosed(1,bulkSize) + ImmutableList<BasePreset> msoBulkPresets = IntStream.rangeClosed(0, bulkSize-1) .mapToObj(i-> new PresetMSOAssignServiceInstanceGen2WithNames(names, i)) .collect(ImmutableList.toImmutableList()); ImmutableList<BasePreset> presets = new ImmutableList.Builder<BasePreset>() .add(new PresetGetSessionSlotCheckIntervalGet()) .add(new PresetAAIGetSubscribersGet()) - .add(new PresetAAISearchNodeQueryEmptyResult()) + .add(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN3_TO_ATT_SABABA) .addAll(msoBulkPresets) .add(new PresetMSOOrchestrationRequestGet()) .build(); @@ -364,13 +205,12 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { ImmutableList<BasePreset> presets = ImmutableList.of( new PresetGetSessionSlotCheckIntervalGet(), new PresetAAIGetSubscribersGet(), - new PresetAAISearchNodeQueryEmptyResult(), new PresetMSOServiceInstanceGen2ErrorResponse(406)); List<String> jobIds = createBulkOfInstancesAndAssert(presets, true,1, JobStatus.FAILED, generateNames()); String jobId = jobIds.get(0); List<JobAuditStatus> actualMsoAudits = getAuditStatuses(jobId, JobAuditStatus.SourceStatus.MSO.name()); - JobAuditStatus expectedMsoAudit = new JobAuditStatus(UUID.fromString(jobId),"FAILED",JobAuditStatus.SourceStatus.MSO, + JobAuditStatus expectedMsoAudit = new JobAuditStatus(UUID.fromString(jobId), "FAILED", JobAuditStatus.SourceStatus.MSO, null, "Http Code:406, \"messageId\":\"SVC0002\",\"text\":\"JSON Object Mapping Request\"" , false); @@ -378,6 +218,24 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { } @Test + public void whenGetLongErrorMessageFromMso_ThenAuditFirst2000Chars() { + Map<Keys, String> names = generateNames(); + ImmutableList<BasePreset> presets = ImmutableList.of( + new PresetGetSessionSlotCheckIntervalGet(), + new PresetAAIGetSubscribersGet(), + new PresetMSOCreateServiceInstanceGen2WithNames(names, 0), + new PresetMSOOrchestrationRequestGet("FAILED", PresetMSOOrchestrationRequestGet.DEFAULT_REQUEST_ID, MSO_ERROR)); + + List<String> jobIds = createBulkOfInstancesAndAssert(presets, false, 1, JobStatus.FAILED, names); + String jobId = jobIds.get(0); + List<JobAuditStatus> actualMsoAudits = getAuditStatuses(jobId, JobAuditStatus.SourceStatus.MSO.name()); + Optional<JobAuditStatus> jobAuditStatus = actualMsoAudits.stream().filter(x -> x.getJobStatus().equals("FAILED")).findFirst(); + assertTrue(jobAuditStatus.isPresent()); + assertThat(jobAuditStatus.get().getAdditionalInfo(), startsWith(MSO_BASE_ERROR)); + assertThat(jobAuditStatus.get().getAdditionalInfo().length(), is(2000)); + } + + @Test public void whenHideCompletedService_thenServiceNotReturnInServiceList(){ List<String> services = createBulkAndWaitForBeCompleted(2); hideService(services.get(0)); @@ -386,116 +244,14 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { assertThat(serviceInfoList, not(hasItem(services.get(0)))); } - private MsoResponseWrapper2 hideService(String jobId) { - MsoResponseWrapper2 responseWrapper2 = callMsoForResponseWrapper(org.springframework.http.HttpMethod.POST, getHideServiceUri(jobId), ""); - return responseWrapper2; - } - - private List<String> createBulkOfInstancesAndAssert(ImmutableList<BasePreset> presets, boolean isPause, int bulkSize, JobStatus finalState, Map<Keys, String> names){ - List<String> jobIds = createBulkOfInstances(presets, isPause, bulkSize, names); - Assert.assertEquals(jobIds.size(),bulkSize); - for(String jobId: jobIds) { - ServiceInfo expectedServiceInfo = new ServiceInfo("vid1", JobStatus.IN_PROGRESS, isPause, "someID", - "someName", "myProject", "NFT1", "NFTJSSSS-NFT1", "greatTenant", "greatTenant", "mtn3", null, - "mySubType", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", null, names.get(Keys.SERVICE_NAME), - "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb", "AIM_TRANSPORT_00004", "1.0", jobId, null); - JobInfoChecker jobInfoChecker = new JobInfoChecker( - restTemplate, ImmutableSet.of(JobStatus.PENDING, JobStatus.IN_PROGRESS, finalState), jobId, expectedServiceInfo); - boolean result = jobInfoChecker.test(null); - assertTrue("service info of jobId: " + jobId + " was in status: " + jobInfoChecker.lastStatus, result); - - jobInfoChecker.setExpectedJobStatus(ImmutableSet.of(finalState)); - if (ImmutableList.of(JobStatus.COMPLETED, JobStatus.PAUSE).contains(finalState)) { - expectedServiceInfo.serviceInstanceId = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb"; - } - result = Wait.waitFor(jobInfoChecker, null, 20, 1); - assertTrue("service info of jobId: " + jobId + " was in status: " + jobInfoChecker.lastStatus, result); - } - - return jobIds; - } - - private List<String> createBulkOfInstances(ImmutableList<BasePreset> presets, boolean isPause, int bulkSize, Map<Keys, String> names){ - - SimulatorApi.registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); - - String requestBody = TestUtils.convertRequest(objectMapper, CREATE_BULK_OF_MACRO_REQUEST); - requestBody = requestBody.replace("\"IS_PAUSE_VALUE\"", String.valueOf(isPause)).replace("\"BULK_SIZE\"", String.valueOf(bulkSize)); - for (Map.Entry<Keys, String> e : names.entrySet()) { - requestBody = requestBody.replace(e.getKey().name(), e.getValue()); - } - MsoResponseWrapper2 responseWrapper2 = callMsoForResponseWrapper(org.springframework.http.HttpMethod.POST, getCreateBulkUri(), requestBody); - assertNotNull(responseWrapper2); - return (List<String>)responseWrapper2.getEntity(); - } - - public class JobInfoChecker<Integer> implements Predicate<Integer> { - - private final RestTemplate restTemplate; - private Set<JobStatus> expectedJobStatus; - private ServiceInfo expectedServiceInfo; - private final String jobId; - private JobStatus lastStatus; - - public JobInfoChecker(RestTemplate restTemplate, Set<JobStatus> expectedJobStatus, String jobId, ServiceInfo expectedServiceInfo) { - this.restTemplate = restTemplate; - this.expectedJobStatus = expectedJobStatus; - this.jobId = jobId; - this.expectedServiceInfo = expectedServiceInfo; - } - - public void setExpectedJobStatus(Set<JobStatus> expectedJobStatus) { - this.expectedJobStatus = expectedJobStatus; - } - - @Override - public boolean test(Integer integer) { - ResponseEntity<List<ServiceInfo>> serviceListResponse = serviceListCall(); - assertThat(serviceListResponse.getStatusCode(), CoreMatchers.equalTo(HttpStatus.OK)); - assertThat(serviceListResponse.getBody(), hasItem(new JobIdAndStatusMatcher(jobId))); - ServiceInfo serviceInfoFromDB = serviceListResponse.getBody().stream() - .filter(serviceInfo -> serviceInfo.jobId.equals(jobId)) - .findFirst().orElse(null); - Assert.assertNotNull(serviceInfoFromDB); - Assert.assertEquals(serviceInfoDataReflected(serviceInfoFromDB), serviceInfoDataReflected(expectedServiceInfo)); - assertTrue("actual service instance doesn't contain template service name:" + expectedServiceInfo.serviceInstanceName, - serviceInfoFromDB.serviceInstanceName.contains(expectedServiceInfo.serviceInstanceName)); - if (serviceInfoFromDB.jobStatus==JobStatus.IN_PROGRESS || serviceInfoFromDB.jobStatus==JobStatus.COMPLETED) { - assertTrue("actual service instance doesn't contain template service name and trailing numbers:" + expectedServiceInfo.serviceInstanceName, - serviceInfoFromDB.serviceInstanceName.contains(expectedServiceInfo.serviceInstanceName+"_00")); - } - - if (expectedServiceInfo.serviceInstanceId != null) { - assertThat(serviceInfoFromDB.serviceInstanceId, is(expectedServiceInfo.serviceInstanceId)); - } - lastStatus = serviceInfoFromDB.jobStatus; - return expectedJobStatus.contains(serviceInfoFromDB.jobStatus); - } - } - - private ResponseEntity<List<ServiceInfo>> serviceListCall() { - return restTemplate.exchange( - getServiceInfoUrl(), - org.springframework.http.HttpMethod.GET, - null, - new ParameterizedTypeReference<List<ServiceInfo>>() {}); - } - - //serialize fields except of fields we cannot know ahead of time - private static String serviceInfoDataReflected(ServiceInfo service1) { - return new ReflectionToStringBuilder(service1, ToStringStyle.SHORT_PREFIX_STYLE) - .setExcludeFieldNames("jobStatus", "templateId", "statusModifiedDate", "createdBulkDate", "serviceInstanceId", "serviceInstanceName") - .toString(); - } - @Test public void errorResponseInGetStatusFromMso_getAuditStatusFromMso_errorMsgExistInAdditionalInfo(){ Map<Keys, String> names = generateNames(); ImmutableList<BasePreset> presets = new ImmutableList.Builder<BasePreset>() .add(new PresetGetSessionSlotCheckIntervalGet()) .add(new PresetAAIGetSubscribersGet()) - .add(new PresetAAISearchNodeQueryEmptyResult()) - .add(new PresetMSOAssignServiceInstanceGen2WithNames(names, 1)) + .add(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN3_TO_ATT_SABABA) + .add(new PresetMSOAssignServiceInstanceGen2WithNames(names, 0)) .add(new PresetMSOOrchestrationRequestGetErrorResponse(406)) .build(); @@ -516,4 +272,97 @@ public class AsyncInstantiationApiTest extends BaseMsoApiTest { } + @Test + public void inProgressJobMoreThan24HoursIsFailedInVidAudit(){ + addBulkPendingWithCustomList(Collections.singletonList(new PresetMSOOrchestrationRequestGet("IN_PROGRESS",24))); + + AtomicReference<ServiceInfo> inProgressJob = new AtomicReference<>(); + boolean isJobFound = Wait.waitFor(x->{ + List<ServiceInfo> serviceInfoList = serviceListCall().getBody(); + inProgressJob.set(serviceInfoList.stream(). + filter(serviceInfo -> serviceInfo.serviceInstanceId.equals(PresetMSOOrchestrationRequestGet.DEFAULT_SERVICE_INSTANCE_ID) && serviceInfo.jobStatus.equals(JobStatus.FAILED)) + .findFirst() + .orElse(null)); + return inProgressJob.get() != null; + }, null, 15, 1); + + org.junit.Assert.assertTrue("Job with DEFAULT_SERVICE_INSTANCE_ID and status FAILED should present", isJobFound); + + verifyAuditStatuses(inProgressJob.get().jobId, Arrays.asList(JobStatus.PENDING.name(), JobStatus.IN_PROGRESS.name(),JobStatus.FAILED.name()), JobAuditStatus.SourceStatus.VID); + verifyAuditStatuses(inProgressJob.get().jobId, Arrays.asList("REQUESTED", "IN_PROGRESS"), JobAuditStatus.SourceStatus.MSO); + } + + @Test + public void inProgressJobLessThan24HoursIsStillInProgressInVidAudit(){ + addBulkPendingWithCustomList(Collections.singletonList(new PresetMSOOrchestrationRequestGet("IN_PROGRESS",23))); + + AtomicReference<ServiceInfo> inProgressJob = new AtomicReference<>(); + boolean isJobFound = Wait.waitFor(x->{ + List<ServiceInfo> serviceInfoList = serviceListCall().getBody(); + inProgressJob.set(serviceInfoList.stream().filter(serviceInfo -> serviceInfo.serviceInstanceId.equals(PresetMSOOrchestrationRequestGet.DEFAULT_SERVICE_INSTANCE_ID)) + .findFirst() + .orElse(null)); + return inProgressJob.get() != null; + }, null, 15, 1); + + org.junit.Assert.assertTrue("Job with DEFAULT_SERVICE_INSTANCE_ID should present", isJobFound); + org.junit.Assert.assertEquals("Tested job status is not as expected", JobStatus.IN_PROGRESS, inProgressJob.get().getJobStatus()); + + verifyAuditStatuses(inProgressJob.get().jobId, Arrays.asList(JobStatus.PENDING.name(), JobStatus.IN_PROGRESS.name()), JobAuditStatus.SourceStatus.VID); + verifyAuditStatuses(inProgressJob.get().jobId, Arrays.asList("REQUESTED", "IN_PROGRESS"), JobAuditStatus.SourceStatus.MSO); + } + + @Test + public void verifyAuditStatusOfInstanceGroupId(){ + SimulatorApi.registerExpectationFromPreset(new PresetMSOOrchestrationRequestsManyInstanceStatusesGet(INSTANCE_GROUP_ID_LABEL, INSTANCE_GROUP_LABEL), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); + final List<JobAuditStatus> expectedAuditStatusList = getAuditStatusesForInstance("VNFGROUP", "df305d54-75b4-431b-adb2-eb6b9e5460df"); + verifyInstanceAuditStatuses(Arrays.asList( + new JobAuditStatus("groupTestName", "IN_PROGRESS", UUID.fromString("28502bd2-3aff-4a03-9f2b-5a0d1cb1ca24") , INSTANCE_GROUP_LABEL+" instance creation", null, INSTANCE_GROUP_LABEL), + new JobAuditStatus("groupTestName", "COMPLETE",UUID.fromString("28502bd2-3aff-4a03-9f2b-5a0d1cb1ca24") , INSTANCE_GROUP_LABEL+" instance creation", null, INSTANCE_GROUP_LABEL), + new JobAuditStatus("groupTestName", "IN_PROGRESS", UUID.fromString("f711f0ff-24b6-4d7f-9314-4b4eae15f48c") , INSTANCE_GROUP_LABEL+" instance deletion", null, INSTANCE_GROUP_LABEL), + new JobAuditStatus("groupTestName", "COMPLETE",UUID.fromString("f711f0ff-24b6-4d7f-9314-4b4eae15f48c") , INSTANCE_GROUP_LABEL+" instance deletion", null, INSTANCE_GROUP_LABEL)), + expectedAuditStatusList); + } + + @Test(expectedExceptions = HttpClientErrorException.class) + public void verifyAuditStatusOfInstanceGroupId_notExistingVidType(){ + try { + getAuditStatusesForInstance("KUKU", "df305d54-75b4-431b-adb2-eb6b9e5460df"); + } catch (HttpClientErrorException e){ //to verify the properiatary statusCode field + assertThat("Code is not as expected", HttpStatus.BAD_REQUEST.equals(e.getStatusCode())); + throw e; + } + } + + @Test(expectedExceptions = HttpServerErrorException.class) + public void verifyAuditStatusOfInstanceGroupId_notExistingMsoInstanceId(){ + try { + getAuditStatusesForInstance("VNFGROUP", "df305d54-75b4-431b-adb2-eb6b9e5460aa"); + } catch (HttpServerErrorException e){ //to verify the properiatary statusCode field + assertThat("Code is not as expected", HttpStatus.INTERNAL_SERVER_ERROR.equals(e.getStatusCode())); + throw e; + } + } + + @DataProvider + public static Object[][] macroAndALaCarteBulk(){ + return new Object[][]{{CREATE_BULK_OF_MACRO_REQUEST}, {CREATE_BULK_OF_ALACARTE_REQUEST_WITH_VNF}}; + } + + @Test(dataProvider = "macroAndALaCarteBulk", expectedExceptions = HttpClientErrorException.class) + @FeatureTogglingTest(FLAG_1906_INSTANTIATION_API_USER_VALIDATION) + public void verifyCreateBulkOfInstancesUserPermissionValidation(String requestDetailsFileName) { + login(new UserCredentials("mo57174000", "mo57174000", null, null, null)); + try { + createBulkOfInstances(false, 1, Collections.EMPTY_MAP, requestDetailsFileName); + } catch (HttpClientErrorException e){ + assertEquals("Code is not as expected", HttpStatus.FORBIDDEN.value(), e.getStatusCode().value()); + throw e; + } + finally { + login(); + } + + } + } diff --git a/vid-automation/src/test/java/org/onap/vid/api/BaseApiAaiTest.java b/vid-automation/src/test/java/org/onap/vid/api/BaseApiAaiTest.java index 69a6f66cc..4ac38a0e7 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/BaseApiAaiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/BaseApiAaiTest.java @@ -15,9 +15,9 @@ import java.net.URI; import java.net.URISyntaxException; import static net.javacrumbs.jsonunit.JsonMatchers.jsonStringEquals; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.either; import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; import static vid.automation.test.services.SimulatorApi.registerExpectation; /** diff --git a/vid-automation/src/test/java/org/onap/vid/api/CategoryParametersApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/CategoryParametersApiTest.java index 54df0e83e..c04d2ff0d 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/CategoryParametersApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/CategoryParametersApiTest.java @@ -17,6 +17,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import java.io.IOException; import java.util.List; +import java.util.Random; import java.util.UUID; import java.util.stream.Collectors; diff --git a/vid-automation/src/test/java/org/onap/vid/api/ChangeManagementApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/ChangeManagementApiTest.java index 2ad68d75d..999b66cee 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/ChangeManagementApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/ChangeManagementApiTest.java @@ -3,35 +3,27 @@ package org.onap.vid.api; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import org.onap.vid.model.mso.ChangeManagementRequest; -import org.onap.vid.model.mso.ChangeManagementRequestDetails; -import org.onap.vid.model.mso.CloudConfiguration; -import org.onap.vid.model.mso.MsoExceptionResponse; -import org.onap.vid.model.mso.MsoResponseWrapper2; -import org.onap.vid.model.mso.RelatedInstance; -import org.onap.vid.model.mso.RelatedInstanceList; -import org.onap.vid.model.mso.RequestInfo; -import org.onap.vid.model.mso.RequestParameters; -import org.onap.vid.model.workflow.GetVnfWorkflowRelationRequest; -import org.onap.vid.model.workflow.GetWorkflowsResponse; -import org.onap.vid.model.workflow.VnfDetails; -import org.onap.vid.model.workflow.VnfDetailsWithWorkflows; -import org.onap.vid.model.workflow.VnfWorkflowRelationAllResponse; -import org.onap.vid.model.workflow.VnfWorkflowRelationRequest; -import org.onap.vid.model.workflow.VnfWorkflowRelationResponse; -import org.onap.vid.model.workflow.WorkflowsDetail; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.mso.changeManagement.PresetMsoChangeManagementBase; +import org.onap.simulator.presetGenerator.presets.mso.changeManagement.PresetMsoVnfInPlaceSoftwareUpdate; +import org.onap.simulator.presetGenerator.presets.mso.changeManagement.PresetMsoVnfReplace; +import org.onap.simulator.presetGenerator.presets.mso.changeManagement.PresetMsoVnfUpdate; +import org.onap.simulator.presetGenerator.presets.aaf.*; import org.onap.vid.model.mso.*; import org.onap.vid.model.workflow.*; import org.springframework.http.HttpStatus; import org.springframework.util.StopWatch; import org.testng.Assert; +import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import vid.automation.test.services.SimulatorApi; import vid.automation.test.services.SimulatorApi.RegistrationStrategy; +import vid.automation.test.utils.ReadFile; import javax.ws.rs.HttpMethod; import javax.ws.rs.client.Entity; +import javax.ws.rs.client.Invocation; import javax.ws.rs.client.WebTarget; import javax.ws.rs.core.GenericType; import javax.ws.rs.core.MediaType; @@ -51,6 +43,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsInstanceOf.instanceOf; import static org.onap.vid.api.TestUtils.getNestedPropertyInMap; +import static org.testng.AssertJUnit.assertEquals; //This is integration test that require running tomcat @@ -139,6 +132,30 @@ public class ChangeManagementApiTest extends BaseApiTest { }; } + @DataProvider + public static Object[][] credentialsFilterTestData(Method test) { + return new Object[][]{ + {AAFGetBasicAuthPreset.VALID_AUTH_VALUE, 200}, +// {null, 401}, // No auth header TODO: Uncomment when the bug in epsdk will be fixed. Currently If there is no auth header then no credentials validation. + {"xyz", 401}, //undecodable value + {"YUBiLmM6ZGVm", 401} //decodable value but not that expected by cadi filter (simulator) + + }; + } + + @BeforeClass + public static void commonSimulatorRegistration() { + SimulatorApi.registerExpectationFromPreset( + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC, + RegistrationStrategy.CLEAR_THEN_SET); + SimulatorApi.registerExpectationFromPreset( + new AAFGetUrlServicePreset(), + RegistrationStrategy.APPEND); + SimulatorApi.registerExpectationFromPreset( + new AAFGetBasicAuthPreset(), + RegistrationStrategy.APPEND); + } + // IN_PLACE_SOFTWARE_UPDATE @Test public void testInPlaceSoftwareUpdateHappyPath() throws IOException { @@ -199,6 +216,12 @@ public class ChangeManagementApiTest extends BaseApiTest { "mso_in_place_software_update_ok.json", ImmutableMap.of("SERVICE_INSTANCE_ID", vnfIds.serviceInstanceId, "VNF_INSTANCE_ID", vnfIds.vnfInstanceId), RegistrationStrategy.APPEND); + SimulatorApi.registerExpectationFromPreset( + new AAFGetUrlServicePreset(), + RegistrationStrategy.APPEND); + SimulatorApi.registerExpectationFromPreset( + new AAFGetBasicAuthPreset(), + RegistrationStrategy.APPEND); return null; })) .collect(Collectors.toList()); @@ -216,9 +239,8 @@ public class ChangeManagementApiTest extends BaseApiTest { stopWatch.start("init requests"); List<ChangeManagementRequest> requestsList = vnfList.stream().map(vnfIds -> this.createChangeManagementRequest(vnfIds, ChangeManagementRequest.VNF_IN_PLACE_SOFTWARE_UPDATE)).collect(Collectors.toList()); - WebTarget webTarget = client.target(uri). - path(CHANGE_MANAGEMENT+WORKFLOW).resolveTemplate("vnfname","VidVnf"); - List<Callable<Response>> callables = requestsList.stream().map(request->((Callable<Response>) () -> webTarget.request(MediaType.APPLICATION_JSON_TYPE).header("Authorization", "Basic 123==").post(Entity.json(request)))).collect(Collectors.toList()); + WebTarget webTarget = buildWebTarget("VidVnf"); + List<Callable<Response>> callables = requestsList.stream().map(request->((Callable<Response>) () -> webTarget.request(MediaType.APPLICATION_JSON_TYPE).header("Authorization", "Basic " + AAFGetBasicAuthPreset.VALID_AUTH_VALUE).post(Entity.json(request)))).collect(Collectors.toList()); stopWatch.stop(); stopWatch.start("invoke calling to vid"); @@ -286,16 +308,54 @@ public class ChangeManagementApiTest extends BaseApiTest { testChangeManagementGoodPayload(payload, "mso_config_update_ok.json", ChangeManagementRequest.CONFIG_UPDATE); } - @Test - public void testClientCredentialsFilter_expect401() + @Test(dataProvider = "credentialsFilterTestData") + public void testCadiCredentialsFilter(String authValue, int expectedStatusCode) { VnfIds vnfIds = new VnfIds(); ChangeManagementRequest changeManagementRequest = createBasicChangeManagementRequest(vnfIds); changeManagementRequest.setRequestType(ChangeManagementRequest.REPLACE); - WebTarget webTarget = client.target(uri). - path(CHANGE_MANAGEMENT + WORKFLOW).resolveTemplate("vnfname", vnfIds.vnfName); + WebTarget webTarget = buildWebTarget(vnfIds.vnfName); Entity entity = Entity.json(changeManagementRequest); - Assert.assertEquals(401, webTarget.request(MediaType.APPLICATION_JSON_TYPE).post(entity).getStatus()); + Invocation.Builder invocationBuilder = webTarget.request(MediaType.APPLICATION_JSON_TYPE); + if (authValue != null) { + invocationBuilder.header("Authorization", "Basic " + authValue); + } + Response response = invocationBuilder.post(entity); + String body = response.readEntity(String.class); + Assert.assertEquals(response.getStatus(), expectedStatusCode, "Full response: " + body); + } + + @DataProvider + public static Object[][] requestFromSchedulerDataProvider(Method test) { + return new Object[][]{ + { + "e9181708-f105-4dfd-9a36-0e089faa72ba", + new PresetMsoVnfReplace("254583ad-b38c-498b-bdbd-b8de5e07541b", "e9181708-f105-4dfd-9a36-0e089faa72ba"), + "changeManagement/vnfReplaceRequest.json" + }, + { + "c929b7ec-cc9d-11e8-a8d5-f2801f1b9fd1", + new PresetMsoVnfUpdate("d0c59d4a-cc9d-11e8-a8d5-f2801f1b9fd1","c929b7ec-cc9d-11e8-a8d5-f2801f1b9fd1"), + "changeManagement/vnfUpdateRequest.json" + }, + { + "e5403738-da34-4090-8864-ba9cf1bcdd88", + new PresetMsoVnfInPlaceSoftwareUpdate("12709275-787c-4be7-8c9c-fce64ab7ca8c","e5403738-da34-4090-8864-ba9cf1bcdd88"), + "changeManagement/vnfInPlaceSoftwareUpdate.json" + } + }; + } + + @Test(dataProvider = "requestFromSchedulerDataProvider") + public void whenGetFromSchedulerRequest_sendAsExpectedToMso(String vnfInstanceId, PresetMsoChangeManagementBase preset, String requestPath) { + SimulatorApi.registerExpectationFromPreset( + preset, + RegistrationStrategy.APPEND); + String schedulerRequest = ReadFile.loadResourceAsString(requestPath); + Response response = callChangeManagement("VidVnf", Entity.json(schedulerRequest)); + MsoResponseWrapper2 body = response.readEntity(MsoResponseWrapper2.class); + assertEquals(202, body.getStatus()); + assertEquals(vnfInstanceId, getNestedPropertyInMap(body.getEntity(), "requestReferences/instanceId")); } @@ -308,7 +368,7 @@ public class ChangeManagementApiTest extends BaseApiTest { private void assertForHappyPath(VnfIds vnfIds, MsoResponseWrapper2 body, String requestType) { Assert.assertEquals(body.getStatus(), 202, requestType + " failed with wrong http status"); Assert.assertEquals( - TestUtils.getNestedPropertyInMap(body.getEntity(), "requestReferences/instanceId"), + getNestedPropertyInMap(body.getEntity(), "requestReferences/instanceId"), vnfIds.serviceInstanceId, String.format("Failed to find instanceId: %s in " + requestType + " response. Actual body:%s", vnfIds.serviceInstanceId, body.getEntity())); @@ -317,18 +377,25 @@ public class ChangeManagementApiTest extends BaseApiTest { private <T> T callChangeManagementUpdate(VnfIds vnfIds, String expectationPath, Class<T> responseClass, String requestType) { SimulatorApi.registerExpectation( expectationPath, - ImmutableMap.of("SERVICE_INSTANCE_ID", vnfIds.serviceInstanceId, "VNF_INSTANCE_ID", vnfIds.vnfInstanceId), RegistrationStrategy.CLEAR_THEN_SET); + ImmutableMap.of("SERVICE_INSTANCE_ID", vnfIds.serviceInstanceId, "VNF_INSTANCE_ID", vnfIds.vnfInstanceId), RegistrationStrategy.APPEND); ChangeManagementRequest changeManagementRequest = createChangeManagementRequest(vnfIds, requestType); Response response = callChangeManagementUpdate(vnfIds, changeManagementRequest); return response.readEntity(responseClass); } private Response callChangeManagementUpdate(VnfIds vnfIds, ChangeManagementRequest changeManagementRequest) { - WebTarget webTarget = client.target(uri). - path(CHANGE_MANAGEMENT + WORKFLOW).resolveTemplate("vnfname", vnfIds.vnfName); Entity entity = Entity.json(changeManagementRequest); - Response response = webTarget.request(MediaType.APPLICATION_JSON_TYPE).header("Authorization", "Basic 123==").post(entity); - return response; + return callChangeManagement(vnfIds.vnfName, entity); + } + + private Response callChangeManagement(String vnfName, Entity entity) { + WebTarget webTarget = buildWebTarget(vnfName); + return webTarget.request(MediaType.APPLICATION_JSON_TYPE).header("Authorization", "Basic " + AAFGetBasicAuthPreset.VALID_AUTH_VALUE).post(entity); + } + + private WebTarget buildWebTarget(String vnfName) { + return client.target(uri). + path(CHANGE_MANAGEMENT + WORKFLOW).resolveTemplate("vnfname", vnfName); } private void testChangeManagement409Error(String expectationPath, String requestType) throws IOException { @@ -336,13 +403,13 @@ public class ChangeManagementApiTest extends BaseApiTest { MsoResponseWrapper2 body = callChangeManagementUpdate(vnfIds, expectationPath, MsoResponseWrapper2.class, requestType); Assert.assertEquals(body.getStatus(), 409, requestType + " failed with wrong http status"); Assert.assertEquals( - TestUtils.getNestedPropertyInMap(body.getEntity(), "serviceException/messageId"), + getNestedPropertyInMap(body.getEntity(), "serviceException/messageId"), "SVC2000", String.format("Failed to find messageId: %s in " + requestType + " response. Actual body:%s", "SVC2000", body.getEntity())); - assertThat(TestUtils.getNestedPropertyInMap(body.getEntity(), "serviceException/text"), containsString(vnfIds.vnfInstanceId)); + assertThat(getNestedPropertyInMap(body.getEntity(), "serviceException/text"), containsString(vnfIds.vnfInstanceId)); } private void testChangeManagement404Error(String expectationPath, String requestType) throws IOException { @@ -398,7 +465,7 @@ public class ChangeManagementApiTest extends BaseApiTest { VnfIds vnfIds = new VnfIds(); SimulatorApi.registerExpectation( expectationFileName, - ImmutableMap.of("SERVICE_INSTANCE_ID", vnfIds.serviceInstanceId, "VNF_INSTANCE_ID", vnfIds.vnfInstanceId), RegistrationStrategy.CLEAR_THEN_SET); + ImmutableMap.of("SERVICE_INSTANCE_ID", vnfIds.serviceInstanceId, "VNF_INSTANCE_ID", vnfIds.vnfInstanceId), RegistrationStrategy.APPEND); ChangeManagementRequest changeManagementRequest = createChangeManagementRequest(vnfIds, requestType); changeManagementRequest.getRequestDetails().get(0).getRequestParameters().getAdditionalProperties().put("payload",payload); Response response = callChangeManagementUpdate(vnfIds, changeManagementRequest); diff --git a/vid-automation/src/test/java/org/onap/vid/api/OperationalEnvironmentControllerApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/OperationalEnvironmentControllerApiTest.java index e5df2d3b9..222b0f5fb 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/OperationalEnvironmentControllerApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/OperationalEnvironmentControllerApiTest.java @@ -22,8 +22,8 @@ import java.util.LinkedList; import java.util.stream.Collectors; import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; import static org.springframework.http.HttpStatus.BAD_REQUEST; import static org.springframework.http.HttpStatus.METHOD_NOT_ALLOWED; diff --git a/vid-automation/src/test/java/org/onap/vid/api/ProbeApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/ProbeApiTest.java index 931f0004a..e38617b39 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/ProbeApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/ProbeApiTest.java @@ -1,12 +1,31 @@ package org.onap.vid.api; +import static org.hamcrest.CoreMatchers.anyOf; +import static org.hamcrest.CoreMatchers.both; +import static org.hamcrest.CoreMatchers.endsWith; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.CoreMatchers.startsWith; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; + +import com.google.common.collect.ImmutableList; +import java.lang.reflect.Method; +import java.util.Collection; +import java.util.List; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; -import org.hamcrest.MatcherAssert; import org.junit.Assert; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGetInvalidResponse; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestsManyStatusesGet; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestsManyStatusesInvalidResponseGet; +import org.onap.simulator.presetGenerator.presets.scheduler.PresetGetSchedulerChangeManagementInvalidResponse; +import org.onap.simulator.presetGenerator.presets.scheduler.PresetGetSchedulerChangeManagements; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGetEmptyResult; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGetInvalidResponse; import org.onap.vid.model.probe.ExternalComponentStatus; import org.onap.vid.model.probe.HttpRequestMetadata; import org.springframework.core.ParameterizedTypeReference; @@ -17,14 +36,13 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import vid.automation.test.services.SimulatorApi; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Optional; +public class ProbeApiTest extends BaseApiTest { -import static org.hamcrest.CoreMatchers.*; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; + private static final String MSO_QUERY_PARAMS = "filter=requestExecutionDate:EQUALS:01-01-2100"; + private static final String AAI_QUERY_PARMAS = "business/customers?subscriber-type=INFRA&depth=0"; + private static final String SDC_PATH_PARAMS = "46401eec-35bd-4e96-ad0d-0356ff6b8c8d/toscaModel"; + private static final String SCHEDULER_PATH = "http://localhost:1080/scheduler/v1/ChangeManagement/schedules/scheduleDetails/"; -public class ProbeApiTest extends BaseApiTest { @BeforeClass public void login() { @@ -35,70 +53,183 @@ public class ProbeApiTest extends BaseApiTest { public static Object[][] probePresetAndResponse(Method test) { return new Object[][]{ { - new PresetAAIGetSubscribersGet(), - new ExternalComponentStatus(ExternalComponentStatus.Component.AAI, - true, - new HttpRequestMetadata(HttpMethod.GET, - 200, - "business/customers?subscriber-type=INFRA&depth=0", - "{\"customer\":[{\"global-customer-id\":\"MSO_1610_ST\",\"subscriber-name\":\"MSO_1610_ST\",\"subscriber-type\":\"INFRA\",\"resource-version\":\"1494001902987\"},{\"global-customer-id\":\"21014aa2-526b-11e6-beb8-9e71128cae77\",\"subscriber-name\":\"PACKET CORE\",\"subscriber-type\":\"INFRA\",\"resource-version\":\"1494001776295\"},{\"global-customer-id\":\"DHV1707-TestSubscriber-2\",\"subscriber-name\":\"ICORE CORE\",\"subscriber-type\":\"INFRA\",\"resource-version\":\"1498751754450\"},{\"global-customer-id\":\"DHV1707-TestSubscriber-1\",\"subscriber", - "OK" + "all good", + ImmutableList.of( + new PresetAAIGetSubscribersGet(), + new PresetMSOOrchestrationRequestsManyStatusesGet(), + new PresetSDCGetServiceToscaModelGet("46401eec-35bd-4e96-ad0d-0356ff6b8c8d", "serviceCreationTest.zip"), + new PresetGetSchedulerChangeManagements() + ), + ImmutableList.of(new ExternalComponentStatus(ExternalComponentStatus.Component.AAI, + true, + new HttpRequestMetadata(HttpMethod.GET, + 200, + AAI_QUERY_PARMAS, + "{\"customer\":[{\"global-customer-id\":\"CAR_2020_ER\",\"subscriber-name\":\"CAR_2020_ER\",\"subscriber-type\":\"INFRA\",\"resource-version\":\"1494001902987\",\"relationship-list\":null},{\"global-customer-id\":\"21014aa2-526b-11e6-beb8-9e71128cae77\",\"subscriber-name\":\"JULIO ERICKSON\",\"subscriber-type\":\"INFRA\",\"resource-version\":\"1494001776295\",\"relationship-list\":null},{\"global-customer-id\":\"DHV1707-TestSubscriber-2\",\"subscriber-name\":\"DALE BRIDGES\",\"subscriber-type\":\"INFRA\",\"resource-version\":\"1498751754450\",\"relationsh", + "OK" + ) + ), new ExternalComponentStatus(ExternalComponentStatus.Component.MSO, + true, + new HttpRequestMetadata(HttpMethod.GET, + 200, + MSO_QUERY_PARAMS, + "{ " + + " \"requestList\": [{ " + + " \"request\": { " + + " \"requestId\": \"rq1234d1-5a33-55df-13ab-12abad84e333\", " + + " \"startTime\": \"Thu, 04 Jun 2009 02:51:59 GMT\", " + + " \"instanceReferences\": { " + + " \"serviceInstanceId\": \"bc305d54-75b4-431b-adb2-eb6b9e546014\" " + + " }, " + + " \"requestScope\": \"vnf\", " + + " \"requestType\": \"updateInstance\", " + + " \"requestDetails\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"service\", " + + " \"modelInvariantId\": \"sn5256d1-5a33-55df-13ab-12abad84e764\", " + + " \"modelVersionId\": \"ab6478e4-ea33-3346-ac12-ab1", + "OK" + ) + ), new ExternalComponentStatus(ExternalComponentStatus.Component.SDC, + true, + new HttpRequestMetadata(HttpMethod.GET, + 200, + SDC_PATH_PARAMS, + "", + "OK" + ) + ), new ExternalComponentStatus(ExternalComponentStatus.Component.SCHEDULER, + true, + new HttpRequestMetadata(HttpMethod.GET, + 200, + SCHEDULER_PATH, + StringUtils.substring(new PresetGetSchedulerChangeManagements().getResponseBody().toString(), 0, 500), + "OK" ) - ) + )) }, { - new PresetAAIGetSubscribersGetInvalidResponse(200), - new ExternalComponentStatus(ExternalComponentStatus.Component.AAI, + "invalid json", + ImmutableList.of( + new PresetAAIGetSubscribersGetInvalidResponse(200), + new PresetMSOOrchestrationRequestsManyStatusesInvalidResponseGet(200), + new PresetSDCGetServiceToscaModelGetEmptyResult("46401eec-35bd-4e96-ad0d-0356ff6b8c8d"), + new PresetGetSchedulerChangeManagementInvalidResponse(200) + ), + ImmutableList.of(new ExternalComponentStatus(ExternalComponentStatus.Component.AAI, + false, + new HttpRequestMetadata(HttpMethod.GET, + 200, + AAI_QUERY_PARMAS, + "this payload is an invalid json", + "com.fasterxml.jackson.core.JsonParseException" + ) + ), new ExternalComponentStatus(ExternalComponentStatus.Component.MSO, + false, + new HttpRequestMetadata(HttpMethod.GET, + 200, + MSO_QUERY_PARAMS, + "this payload is an invalid json", + "com.fasterxml.jackson.core.JsonParseException" + ) + ), new ExternalComponentStatus(ExternalComponentStatus.Component.SDC, false, new HttpRequestMetadata(HttpMethod.GET, 200, - "business/customers?subscriber-type=INFRA&depth=0", + SDC_PATH_PARAMS, + "", + "error reading model 46401eec-35bd-4e96-ad0d-0356ff6b8c8d from SDC" + ) + ), new ExternalComponentStatus(ExternalComponentStatus.Component.SCHEDULER, + false, + new HttpRequestMetadata(HttpMethod.GET, + 200, + SCHEDULER_PATH, "this payload is an invalid json", - "org.codehaus.jackson.JsonParseException" + "javax.ws.rs.ProcessingException" ) - ) + )) }, { - new PresetAAIGetSubscribersGetInvalidResponse(500), - new ExternalComponentStatus(ExternalComponentStatus.Component.AAI, + "bad http code", + ImmutableList.of( + new PresetAAIGetSubscribersGetInvalidResponse(500), + new PresetMSOOrchestrationRequestsManyStatusesInvalidResponseGet(406), + new PresetSDCGetServiceToscaModelGetInvalidResponse("46401eec-35bd-4e96-ad0d-0356ff6b8c8d", 404), + new PresetGetSchedulerChangeManagementInvalidResponse(400) + ), + ImmutableList.of(new ExternalComponentStatus(ExternalComponentStatus.Component.AAI, false, new HttpRequestMetadata(HttpMethod.GET, 500, - "business/customers?subscriber-type=INFRA&depth=0", + AAI_QUERY_PARMAS, "this payload is an invalid json", "No subscriber received" ) - ) + ), new ExternalComponentStatus(ExternalComponentStatus.Component.MSO, + false, + new HttpRequestMetadata(HttpMethod.GET, + 406, + MSO_QUERY_PARAMS, + "this payload is an invalid json", + "org.apache.http.HttpException: Get with status=406 (200 or 202 expected), url= http" + ) + ), new ExternalComponentStatus(ExternalComponentStatus.Component.SDC, + false, + new HttpRequestMetadata(HttpMethod.GET, + 404, + SDC_PATH_PARAMS, + "simulated error description from sdc", + "model 46401eec-35bd-4e96-ad0d-0356ff6b8c8d not found in SDC" + + " (consider updating vid probe configuration 'probe.sdc.model.uuid')" + ) + ), new ExternalComponentStatus(ExternalComponentStatus.Component.SCHEDULER, + false, + new HttpRequestMetadata(HttpMethod.GET, + 400, + SCHEDULER_PATH, + "this payload is an invalid json", + "org.apache.http.HttpException: Get with status = 400, url = " + SCHEDULER_PATH + ) + )) } }; } @Test(dataProvider = "probePresetAndResponse") - public void probeRequest_returnsResponseAsExpected(BasePreset preset, ExternalComponentStatus expectedStatus ){ - SimulatorApi.registerExpectationFromPreset(preset, CLEAR_THEN_SET); + public void probeRequest_returnsResponseAsExpected(String desc, Collection<BasePreset> presets, Collection<ExternalComponentStatus> expectedStatuses) { + SimulatorApi.registerExpectationFromPresets(presets, CLEAR_THEN_SET); ResponseEntity<List<ExternalComponentStatus>> response = restTemplate.exchange( uri + "/probe", org.springframework.http.HttpMethod.GET, null, - new ParameterizedTypeReference<List<ExternalComponentStatus>>() {}); + new ParameterizedTypeReference<List<ExternalComponentStatus>>() { + }); List<ExternalComponentStatus> probeResults = response.getBody(); - Assert.assertEquals(probeResults.size(),1); - assertAaiGetAllSubscribersAsExpected(probeResults,expectedStatus); - + Assert.assertEquals(4, probeResults.size()); + assertResultAsExpected(ExternalComponentStatus.Component.AAI, probeResults, expectedStatuses); + assertResultAsExpected(ExternalComponentStatus.Component.SDC, probeResults, expectedStatuses); + assertResultAsExpected(ExternalComponentStatus.Component.MSO, probeResults, expectedStatuses); + assertResultAsExpected(ExternalComponentStatus.Component.SCHEDULER, probeResults, expectedStatuses); } - private void assertAaiGetAllSubscribersAsExpected(List<ExternalComponentStatus> probeResults,ExternalComponentStatus expectedStatus){ - Optional<ExternalComponentStatus> aaiGetAllSubscribersResult = probeResults.stream().filter(x -> x.getComponent()== ExternalComponentStatus.Component.AAI).findFirst(); - Assert.assertTrue(aaiGetAllSubscribersResult.isPresent()); - ExternalComponentStatus aaiGetAllSubscribersStatus = aaiGetAllSubscribersResult.get(); - Assert.assertEquals(aaiGetAllSubscribersStatus.isAvailable(),expectedStatus.isAvailable()); + private void assertResultAsExpected(ExternalComponentStatus.Component component, List<ExternalComponentStatus> probeResults, Collection<ExternalComponentStatus> expectedStatuses) { + ExternalComponentStatus expectedStatus = expectedStatuses.stream().filter(x -> x.getComponent() == component) + .findFirst().orElseThrow(() -> new AssertionError("Missing setup for " + component + " expected result")); + ExternalComponentStatus componentStatus = probeResults.stream().filter(x -> x.getComponent() == component) + .findFirst().orElseThrow(() -> new AssertionError(component.name()+" result not found in response")); + + Assert.assertThat("wrong metadata for " + component, requestMetadataReflected(componentStatus.getMetadata()), + is(requestMetadataReflected(expectedStatus.getMetadata()))); - MatcherAssert.assertThat(requestMetadataReflected(aaiGetAllSubscribersStatus.getMetadata()),is(requestMetadataReflected(expectedStatus.getMetadata()))); - MatcherAssert.assertThat(aaiGetAllSubscribersStatus.getMetadata().getUrl(), both(endsWith(expectedStatus.getMetadata().getUrl())).and(startsWith("http"))); + Assert.assertThat("wrong url for " + component, componentStatus.getMetadata().getUrl(), + both(endsWith(expectedStatus.getMetadata().getUrl())).and(startsWith("http"))); - MatcherAssert.assertThat(aaiGetAllSubscribersStatus.getMetadata().getDescription(), + Assert.assertThat("wrong description for " + component, componentStatus.getMetadata().getDescription(), anyOf(equalTo(expectedStatus.getMetadata().getDescription()), startsWith(expectedStatus.getMetadata().getDescription()))); + + Assert.assertThat("wrong status for " + component, componentStatus.isAvailable(), is(expectedStatus.isAvailable())); } //serialize fields except of fields we cannot know ahead of time diff --git a/vid-automation/src/test/java/org/onap/vid/api/SampleApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/SampleApiTest.java index 2b78cdb91..9d7a08120 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/SampleApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/SampleApiTest.java @@ -11,8 +11,9 @@ import vid.automation.test.services.SimulatorApi; import java.io.IOException; -import static org.hamcrest.MatcherAssert.assertThat; +import static java.util.Collections.singletonList; import static org.hamcrest.core.Is.is; +import static org.junit.Assert.assertThat; public class SampleApiTest extends BaseApiTest { diff --git a/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java index 0441da1d2..7735d59af 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/SdcApiTest.java @@ -1,5 +1,16 @@ package org.onap.vid.api; +import static net.javacrumbs.jsonunit.JsonMatchers.jsonStringEquals; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsNot.not; +import static org.testng.Assert.assertFalse; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; +import static vid.automation.test.services.SimulatorApi.registerExpectation; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; +import static vid.automation.test.utils.ReadFile.loadResourceAsString; + import com.fasterxml.jackson.databind.JsonNode; import com.google.common.collect.ImmutableList; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; @@ -11,22 +22,9 @@ import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import vid.automation.test.infra.FeatureTogglingTest; import vid.automation.test.infra.Features; -import java.io.IOException; -import java.net.URISyntaxException; - -import static net.javacrumbs.jsonunit.JsonMatchers.jsonStringEquals; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.either; -import static org.hamcrest.core.Is.is; -import static org.hamcrest.core.IsNot.not; -import static org.testng.Assert.assertFalse; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; -import static vid.automation.test.services.SimulatorApi.registerExpectation; -import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; - public class SdcApiTest extends BaseApiTest { private static final String SDC_GET_SERVICE_MODEL = "/rest/models/services/"; @@ -35,17 +33,17 @@ public class SdcApiTest extends BaseApiTest { private static final String A_LA_CARTE_INSTANTIATION_TYPE_UUID = "4d71990b-d8ad-4510-ac61-496288d9078e"; private static final String A_LA_CARTE_INSTANTIATION_TYPE_INVARIANT_UUID = "d27e42cf-087e-4d31-88ac-6c4b7585f800"; private static final String A_LA_CARTE_INSTANTIATION_TYPE_FILE_PATH = "csar15782222_instantiationTypeAlacarte_invariantUUIDMacro.zip"; - private static final String A_LA_CARTE_INSTANTIATION_TYPE_EXPECTED_RESPONSE = "{\"service\":{\"uuid\":\"4d71990b-d8ad-4510-ac61-496288d9078e\",\"invariantUuid\":\"d27e42cf-087e-4d31-88ac-6c4b7585f800\",\"name\":\"vidmacrofalsenaming\",\"version\":\"1.0\",\"toscaModelURL\":null,\"category\":\"Network L1-3\",\"serviceType\":\"\",\"serviceRole\":\"\",\"description\":\"vidmacrofalsenaming\",\"serviceEcompNaming\":\"false\",\"instantiationType\":\"A-La-Carte\",\"inputs\":{}},\"vnfs\":{},\"networks\":{\"MULTI_PROVIDER_PORT_GROUP 0\":{\"uuid\":\"e5d235de-2188-4f9f-a28c-fe38967883f2\",\"invariantUuid\":\"b0303003-0abb-454c-9119-8cbe2e09e003\",\"description\":\"Creates a neutron multi-provider VLAN network with dummy subnet\",\"name\":\"MULTI_PROVIDER_PORT_GROUP\",\"version\":\"1.0\",\"customizationUuid\":\"0fde4286-ee4c-439d-9556-74b6be6bbc42\",\"inputs\":{},\"commands\":{},\"properties\":{\"network_assignments\":\"{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}\",\"network_flows\":\"{is_network_policy=false, is_bound_to_vpn=false}\",\"network_scope\":\"GLOBAL\",\"network_ecomp_naming\":\"{ecomp_generated_naming=true}\",\"network_type\":\"MULTI_PROVIDER_PORT_GROUP\",\"network_technology\":\"MULTI_GROUP\",\"network_homing\":\"{ecomp_selected_instance_node_target=false}\"},\"type\":\"VL\",\"modelCustomizationName\":\"MULTI_PROVIDER_PORT_GROUP 0\"}},\"collectionResource\":{},\"configurations\":{},\"serviceProxies\":{},\"vfModules\":{},\"volumeGroups\":{},\"pnfs\":{}}"; + private static final String A_LA_CARTE_INSTANTIATION_TYPE_EXPECTED_RESPONSE = "sdcApiTest/aLaCarteInstantiationTypeResponse.json"; private static final String MACRO_INSTANTIATION_TYPE_FILE_PATH = "csar15782222_instantiationTypeMacro_invariantUUIDAlacarte.zip"; private static final String MACRO_INSTANTIATION_TYPE_UUID = "4d71990b-d8ad-4510-ac61-496288d9078e"; private static final String MACRO_INSTANTIATION_TYPE_INVARIANT_UUID = "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba"; - private static final String MACRO_INSTANTIATION_TYPE_EXPECTED_RESPONSE = "{\"service\":{\"uuid\":\"4d71990b-d8ad-4510-ac61-496288d9078e\",\"invariantUuid\":\"a8dcd72d-d44d-44f2-aa85-53aa9ca99cba\",\"name\":\"vidmacrofalsenaming\",\"version\":\"1.0\",\"toscaModelURL\":null,\"category\":\"Network L1-3\",\"serviceType\":\"\",\"serviceRole\":\"\",\"description\":\"vidmacrofalsenaming\",\"serviceEcompNaming\":\"false\",\"instantiationType\":\"Macro\",\"inputs\":{}},\"vnfs\":{},\"networks\":{\"MULTI_PROVIDER_PORT_GROUP 0\":{\"uuid\":\"e5d235de-2188-4f9f-a28c-fe38967883f2\",\"invariantUuid\":\"b0303003-0abb-454c-9119-8cbe2e09e003\",\"description\":\"Creates a neutron multi-provider VLAN network with dummy subnet\",\"name\":\"MULTI_PROVIDER_PORT_GROUP\",\"version\":\"1.0\",\"customizationUuid\":\"0fde4286-ee4c-439d-9556-74b6be6bbc42\",\"inputs\":{},\"commands\":{},\"properties\":{\"network_assignments\":\"{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}\",\"network_flows\":\"{is_network_policy=false, is_bound_to_vpn=false}\",\"network_scope\":\"GLOBAL\",\"network_ecomp_naming\":\"{ecomp_generated_naming=true}\",\"network_type\":\"MULTI_PROVIDER_PORT_GROUP\",\"network_technology\":\"MULTI_GROUP\",\"network_homing\":\"{ecomp_selected_instance_node_target=false}\"},\"type\":\"VL\",\"modelCustomizationName\":\"MULTI_PROVIDER_PORT_GROUP 0\"}},\"collectionResource\":{},\"configurations\":{},\"serviceProxies\":{},\"vfModules\":{},\"volumeGroups\":{},\"pnfs\":{}}"; + private static final String MACRO_INSTANTIATION_TYPE_EXPECTED_RESPONSE = "sdcApiTest/macroInstantiationTypeResponse.json"; private static final String EMPTY_INSTANTIATION_TYPE_FILE_PATH = "csar15782222_instantiationTypeEmpty_invariantUUIDAlacarte.zip"; - private static final String EMPTY_INSTANTIATION_TYPE_EXPECTED_RESPONSE = "{\"service\":{\"uuid\":\"4d71990b-d8ad-4510-ac61-496288d9078e\",\"invariantUuid\":\"a8dcd72d-d44d-44f2-aa85-53aa9ca99cba\",\"name\":\"vidmacrofalsenaming\",\"version\":\"1.0\",\"toscaModelURL\":null,\"category\":\"Network L1-3\",\"serviceType\":\"\",\"serviceRole\":\"\",\"description\":\"vidmacrofalsenaming\",\"serviceEcompNaming\":\"false\",\"instantiationType\":\"ClientConfig\",\"inputs\":{}},\"vnfs\":{},\"networks\":{\"MULTI_PROVIDER_PORT_GROUP 0\":{\"uuid\":\"e5d235de-2188-4f9f-a28c-fe38967883f2\",\"invariantUuid\":\"b0303003-0abb-454c-9119-8cbe2e09e003\",\"description\":\"Creates a neutron multi-provider VLAN network with dummy subnet\",\"name\":\"MULTI_PROVIDER_PORT_GROUP\",\"version\":\"1.0\",\"customizationUuid\":\"0fde4286-ee4c-439d-9556-74b6be6bbc42\",\"inputs\":{},\"commands\":{},\"properties\":{\"network_assignments\":\"{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}\",\"network_flows\":\"{is_network_policy=false, is_bound_to_vpn=false}\",\"network_scope\":\"GLOBAL\",\"network_ecomp_naming\":\"{ecomp_generated_naming=true}\",\"network_type\":\"MULTI_PROVIDER_PORT_GROUP\",\"network_technology\":\"MULTI_GROUP\",\"network_homing\":\"{ecomp_selected_instance_node_target=false}\"},\"type\":\"VL\",\"modelCustomizationName\":\"MULTI_PROVIDER_PORT_GROUP 0\"}},\"collectionResource\":{},\"configurations\":{},\"serviceProxies\":{},\"vfModules\":{},\"volumeGroups\":{},\"pnfs\":{}}"; + private static final String EMPTY_INSTANTIATION_TYPE_EXPECTED_RESPONSE = "sdcApiTest/emptyInstantiationTypeResponse.json"; private static final String BOTH_INSTANTIATION_TYPE_FILE_PATH = "csar15782222_instantiationTypeBoth_invariantUUIDAlacarte.zip"; @@ -53,13 +51,15 @@ public class SdcApiTest extends BaseApiTest { private static final String MIN_MAX_INITIAL_UUID = "43f13072-fe50-496b-b673-7af075d10143"; private static final String MIN_MAX_INITIAL_INVARIANT_UUID = "35fb95d8-d1f0-4e46-99ac-e01b423e8e3f"; private static final String MIN_MAX_INITIAL_FILE_PATH = "min_max_initial_vfModule_csar_v4.0.zip"; - private static final String MIN_MAX_INITIAL_EXPECTED_RESPONSE = "{\"service\":{\"uuid\":\"43f13072-fe50-496b-b673-7af075d10143\",\"invariantUuid\":\"35fb95d8-d1f0-4e46-99ac-e01b423e8e3f\",\"name\":\"ADIOD vMX VPE BV Service 488 test\",\"version\":\"1.0\",\"toscaModelURL\":null,\"category\":\"Network L1-3\",\"serviceType\":\"\",\"serviceRole\":\"\",\"description\":\"Model Creation for PID 291247b . OAM Network Service Name : ADIOD vPE Tenant OAM Network 1 SRIOV Network Service Name : vPE ADIOD Provider Net 1\",\"serviceEcompNaming\":\"true\",\"instantiationType\":\"ClientConfig\",\"inputs\":{\"2017488adiodvpe20_ASN\":{\"type\":\"string\",\"description\":\"AV/PE\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"AV_vPE\"},\"2017488adiodvpe20_bandwidth\":{\"type\":\"string\",\"description\":\"Requested VPE bandwidth\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"10\"},\"2017488adiodvpe20_bandwidth_units\":{\"type\":\"string\",\"description\":\"Units of bandwidth\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"Gbps\"},\"2017488adiodvpe20_AIC_CLLI\":{\"type\":\"string\",\"description\":\"AIC Site CLLI\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"ATLMY8GA\"},\"2017488adiodvpe20_vnf_config_template_version\":{\"type\":\"string\",\"description\":\"VPE Software Version\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"17.2\"},\"2017488adiodvpe20_vnf_instance_name\":{\"type\":\"string\",\"description\":\"The hostname assigned to the vpe.\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"mtnj309me6\"}}},\"vnfs\":{\"2017 488 ADIOD vPE 2 0\":{\"uuid\":\"079266b1-fcf5-44ae-bc04-cc3215b28737\",\"invariantUuid\":\"e2dcd546-e647-4854-9ed9-e0a4d6880636\",\"description\":\"Name ADIOD vPE Description The Provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release code 17.2 Owners Mary Fragale Updated 9-25-17 for version 8.0 of the VLM \",\"name\":\"2017 488 ADIOD vPE 2\",\"version\":\"4.0\",\"customizationUuid\":\"2b4e9125-b607-49a3-81c7-9260f8ca32f4\",\"inputs\":{\"vnf_config_template_version\":{\"type\":\"string\",\"description\":\"VPE Software Version\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"17.2\"},\"bandwidth_units\":{\"type\":\"string\",\"description\":\"Units of bandwidth\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"Gbps\"},\"bandwidth\":{\"type\":\"string\",\"description\":\"Requested VPE bandwidth\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"10\"},\"AIC_CLLI\":{\"type\":\"string\",\"description\":\"AIC Site CLLI\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"ATLMY8GA\"},\"ASN\":{\"type\":\"string\",\"description\":\"AV/PE\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"AV_vPE\"},\"vnf_instance_name\":{\"type\":\"string\",\"description\":\"The hostname assigned to the vpe.\",\"entry_schema\":null,\"inputProperties\":null,\"constraints\":[],\"required\":true,\"default\":\"mtnj309me6\"}},\"commands\":{\"vnf_config_template_version\":{\"displayName\":\"vnf_config_template_version\",\"command\":\"get_input\",\"inputName\":\"2017488adiodvpe20_vnf_config_template_version\"},\"bandwidth_units\":{\"displayName\":\"bandwidth_units\",\"command\":\"get_input\",\"inputName\":\"2017488adiodvpe20_bandwidth_units\"},\"bandwidth\":{\"displayName\":\"bandwidth\",\"command\":\"get_input\",\"inputName\":\"2017488adiodvpe20_bandwidth\"},\"AIC_CLLI\":{\"displayName\":\"AIC_CLLI\",\"command\":\"get_input\",\"inputName\":\"2017488adiodvpe20_AIC_CLLI\"},\"ASN\":{\"displayName\":\"ASN\",\"command\":\"get_input\",\"inputName\":\"2017488adiodvpe20_ASN\"},\"vnf_instance_name\":{\"displayName\":\"vnf_instance_name\",\"command\":\"get_input\",\"inputName\":\"2017488adiodvpe20_vnf_instance_name\"}},\"properties\":{\"vmxvre_retype\":\"RE-VMX\",\"vnf_config_template_version\":\"get_input:2017488adiodvpe20_vnf_config_template_version\",\"sriov44_net_id\":\"48d399b3-11ee-48a8-94d2-f0ea94d6be8d\",\"int_ctl_net_id\":\"2f323477-6936-4d01-ac53-d849430281d9\",\"vmxvpfe_sriov41_0_port_mac\":\"00:11:22:EF:AC:DF\",\"int_ctl_net_name\":\"VMX-INTXI\",\"vmx_int_ctl_prefix\":\"128.0.0.0\",\"sriov43_net_id\":\"da349ca1-6de9-4548-be88-2d88e99bfef5\",\"sriov42_net_id\":\"760669ba-013d-4d9b-b0e7-4151fe2e6279\",\"sriov41_net_id\":\"25ad52d5-c165-40f8-b3b0-ddfc2373280a\",\"nf_type\":\"vPE\",\"vmxvpfe_int_ctl_ip_1\":\"128.0.0.16\",\"is_AVPN_service\":\"false\",\"vmx_RSG_name\":\"vREXI-affinity\",\"vmx_int_ctl_forwarding\":\"l2\",\"vmxvre_oam_ip_0\":\"10.40.123.5\",\"vmxvpfe_sriov44_0_port_mac\":\"00:11:22:EF:AC:DF\",\"vmxvpfe_sriov41_0_port_vlanstrip\":\"false\",\"vmxvpfe_sriov42_0_port_vlanfilter\":\"4001\",\"vmxvpfe_sriov44_0_port_unknownunicastallow\":\"true\",\"vmxvre_image_name_0\":\"VRE-ENGINE_17.2-S2.1.qcow2\",\"vmxvre_instance\":\"0\",\"vmxvpfe_sriov43_0_port_mac\":\"00:11:22:EF:AC:DF\",\"vmxvre_flavor_name\":\"ns.c1r16d32.v5\",\"vmxvpfe_volume_size_0\":\"40.0\",\"vmxvpfe_sriov43_0_port_vlanfilter\":\"4001\",\"nf_naming\":\"{ecomp_generated_naming=true}\",\"multi_stage_design\":\"false\",\"nf_naming_code\":\"tvpr\",\"vmxvre_name_0\":\"vREXI\",\"vmxvpfe_sriov42_0_port_vlanstrip\":\"false\",\"vmxvpfe_volume_name_0\":\"vPFEXI_FBVolume\",\"vmx_RSG_id\":\"bd89a33c-13c3-4a04-8fde-1a57eb123141\",\"vmxvpfe_image_name_0\":\"VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2\",\"vmxvpfe_sriov43_0_port_unknownunicastallow\":\"true\",\"vmxvpfe_sriov44_0_port_unknownmulticastallow\":\"true\",\"vmxvre_console\":\"vidconsole\",\"vmxvpfe_sriov44_0_port_vlanfilter\":\"4001\",\"vmxvpfe_sriov42_0_port_mac\":\"00:11:22:EF:AC:DF\",\"vmxvpfe_volume_id_0\":\"47cede15-da2f-4397-a101-aa683220aff3\",\"vmxvpfe_sriov42_0_port_unknownmulticastallow\":\"true\",\"vmxvpfe_sriov44_0_port_vlanstrip\":\"false\",\"vf_module_id\":\"123\",\"nf_function\":\"Firewall\",\"vmxvpfe_sriov43_0_port_unknownmulticastallow\":\"true\",\"vmxvre_int_ctl_ip_0\":\"128.0.0.1\",\"ecomp_generated_naming\":\"true\",\"AIC_CLLI\":\"get_input:2017488adiodvpe20_AIC_CLLI\",\"vnf_name\":\"mtnj309me6vre\",\"vmxvpfe_sriov41_0_port_unknownunicastallow\":\"true\",\"vmxvre_volume_type_1\":\"HITACHI\",\"vmxvpfe_sriov44_0_port_broadcastallow\":\"true\",\"vmxvre_volume_type_0\":\"HITACHI\",\"vmxvpfe_volume_type_0\":\"HITACHI\",\"vmxvpfe_sriov43_0_port_broadcastallow\":\"true\",\"bandwidth_units\":\"get_input:2017488adiodvpe20_bandwidth_units\",\"vnf_id\":\"123\",\"vmxvre_oam_prefix\":\"24\",\"availability_zone_0\":\"mtpocfo-kvm-az01\",\"ASN\":\"get_input:2017488adiodvpe20_ASN\",\"vmxvre_chassis_i2cid\":\"161\",\"vmxvpfe_name_0\":\"vPFEXI\",\"bandwidth\":\"get_input:2017488adiodvpe20_bandwidth\",\"availability_zone_max_count\":\"1\",\"vmxvre_volume_size_0\":\"45.0\",\"vmxvre_volume_size_1\":\"50.0\",\"vmxvpfe_sriov42_0_port_broadcastallow\":\"true\",\"vmxvre_oam_gateway\":\"10.40.123.1\",\"vmxvre_volume_name_1\":\"vREXI_FAVolume\",\"vmxvre_ore_present\":\"0\",\"vmxvre_volume_name_0\":\"vREXI_FBVolume\",\"vmxvre_type\":\"0\",\"vnf_instance_name\":\"get_input:2017488adiodvpe20_vnf_instance_name\",\"vmxvpfe_sriov41_0_port_unknownmulticastallow\":\"true\",\"oam_net_id\":\"b95eeb1d-d55d-4827-abb4-8ebb94941429\",\"vmx_int_ctl_len\":\"24\",\"vmxvpfe_sriov43_0_port_vlanstrip\":\"false\",\"vmxvpfe_sriov41_0_port_broadcastallow\":\"true\",\"vmxvre_volume_id_1\":\"6e86797e-03cd-4fdc-ba72-2957119c746d\",\"vmxvpfe_sriov41_0_port_vlanfilter\":\"4001\",\"nf_role\":\"MIS\",\"vmxvre_volume_id_0\":\"f4eacb79-f687-4e9d-b760-21847c8bb15a\",\"vmxvpfe_sriov42_0_port_unknownunicastallow\":\"true\",\"vmxvpfe_flavor_name\":\"ns.c20r16d25.v5\"},\"type\":\"VF\",\"modelCustomizationName\":\"2017 488 ADIOD vPE 2 0\",\"vfModules\":{\"2017488adiodvpe20..2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\":{\"uuid\":\"13bea14d-9405-43c6-920b-97bab64b6a01\",\"invariantUuid\":\"83dc51de-a337-498e-9fee-763603a057b4\",\"customizationUuid\":\"a90865d5-6de0-4ef8-bf53-d45fa3edddfc\",\"description\":null,\"name\":\"2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\",\"version\":\"1\",\"modelCustomizationName\":\"2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\",\"properties\":{\"minCountInstances\":null,\"maxCountInstances\":null,\"initialCount\":null,\"vfModuleLabel\":\"ADIOD_vPFE_BV\"},\"inputs\":{},\"volumeGroupAllowed\":true},\"2017488adiodvpe20..2017488AdiodVpe2..ADIOD_vRE_BV..module-1\":{\"uuid\":\"3f6d5e51-a9a0-4c53-bb6d-be836767d96f\",\"invariantUuid\":\"54466b6d-e33c-4f4d-87e2-32bc5b103589\",\"customizationUuid\":\"dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1\",\"description\":null,\"name\":\"2017488AdiodVpe2..ADIOD_vRE_BV..module-1\",\"version\":\"1\",\"modelCustomizationName\":\"2017488AdiodVpe2..ADIOD_vRE_BV..module-1\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":\"ADIOD_vRE_BV\"},\"inputs\":{},\"volumeGroupAllowed\":true},\"2017488adiodvpe20..2017488AdiodVpe2..ADIOD_base_vPE_BV..module-0\":{\"uuid\":\"0a45a870-3a19-4238-a72a-eadfc583d4fe\",\"invariantUuid\":\"c636b302-fba2-4ed7-9f3b-c99715b6bb2e\",\"customizationUuid\":\"a0b634e6-514e-4977-91dd-3b8c295e6bc8\",\"description\":null,\"name\":\"2017488AdiodVpe2..ADIOD_base_vPE_BV..module-0\",\"version\":\"1\",\"modelCustomizationName\":\"2017488AdiodVpe2..ADIOD_base_vPE_BV..module-0\",\"properties\":{\"minCountInstances\":1,\"maxCountInstances\":1,\"initialCount\":1,\"vfModuleLabel\":\"ADIOD_base_vPE_BV\"},\"inputs\":{},\"volumeGroupAllowed\":false}},\"volumeGroups\":{\"2017488adiodvpe20..2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\":{\"uuid\":\"13bea14d-9405-43c6-920b-97bab64b6a01\",\"invariantUuid\":\"83dc51de-a337-498e-9fee-763603a057b4\",\"customizationUuid\":\"a90865d5-6de0-4ef8-bf53-d45fa3edddfc\",\"description\":null,\"name\":\"2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\",\"version\":\"1\",\"modelCustomizationName\":\"2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\",\"properties\":{\"minCountInstances\":null,\"maxCountInstances\":null,\"initialCount\":null,\"vfModuleLabel\":\"ADIOD_vPFE_BV\"},\"inputs\":{}},\"2017488adiodvpe20..2017488AdiodVpe2..ADIOD_vRE_BV..module-1\":{\"uuid\":\"3f6d5e51-a9a0-4c53-bb6d-be836767d96f\",\"invariantUuid\":\"54466b6d-e33c-4f4d-87e2-32bc5b103589\",\"customizationUuid\":\"dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1\",\"description\":null,\"name\":\"2017488AdiodVpe2..ADIOD_vRE_BV..module-1\",\"version\":\"1\",\"modelCustomizationName\":\"2017488AdiodVpe2..ADIOD_vRE_BV..module-1\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":\"ADIOD_vRE_BV\"},\"inputs\":{}}},\"vfcInstanceGroups\":{}}},\"networks\":{},\"collectionResource\":{},\"configurations\":{},\"serviceProxies\":{},\"vfModules\":{\"2017488adiodvpe20..2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\":{\"uuid\":\"13bea14d-9405-43c6-920b-97bab64b6a01\",\"invariantUuid\":\"83dc51de-a337-498e-9fee-763603a057b4\",\"customizationUuid\":\"a90865d5-6de0-4ef8-bf53-d45fa3edddfc\",\"description\":null,\"name\":\"2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\",\"version\":\"1\",\"modelCustomizationName\":\"2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\",\"properties\":{\"minCountInstances\":null,\"maxCountInstances\":null,\"initialCount\":null,\"vfModuleLabel\":\"ADIOD_vPFE_BV\"},\"inputs\":{},\"volumeGroupAllowed\":true},\"2017488adiodvpe20..2017488AdiodVpe2..ADIOD_base_vPE_BV..module-0\":{\"uuid\":\"0a45a870-3a19-4238-a72a-eadfc583d4fe\",\"invariantUuid\":\"c636b302-fba2-4ed7-9f3b-c99715b6bb2e\",\"customizationUuid\":\"a0b634e6-514e-4977-91dd-3b8c295e6bc8\",\"description\":null,\"name\":\"2017488AdiodVpe2..ADIOD_base_vPE_BV..module-0\",\"version\":\"1\",\"modelCustomizationName\":\"2017488AdiodVpe2..ADIOD_base_vPE_BV..module-0\",\"properties\":{\"minCountInstances\":1,\"maxCountInstances\":1,\"initialCount\":1,\"vfModuleLabel\":\"ADIOD_base_vPE_BV\"},\"inputs\":{},\"volumeGroupAllowed\":false},\"2017488adiodvpe20..2017488AdiodVpe2..ADIOD_vRE_BV..module-1\":{\"uuid\":\"3f6d5e51-a9a0-4c53-bb6d-be836767d96f\",\"invariantUuid\":\"54466b6d-e33c-4f4d-87e2-32bc5b103589\",\"customizationUuid\":\"dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1\",\"description\":null,\"name\":\"2017488AdiodVpe2..ADIOD_vRE_BV..module-1\",\"version\":\"1\",\"modelCustomizationName\":\"2017488AdiodVpe2..ADIOD_vRE_BV..module-1\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":\"ADIOD_vRE_BV\"},\"inputs\":{},\"volumeGroupAllowed\":true}},\"volumeGroups\":{\"2017488adiodvpe20..2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\":{\"uuid\":\"13bea14d-9405-43c6-920b-97bab64b6a01\",\"invariantUuid\":\"83dc51de-a337-498e-9fee-763603a057b4\",\"customizationUuid\":\"a90865d5-6de0-4ef8-bf53-d45fa3edddfc\",\"description\":null,\"name\":\"2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\",\"version\":\"1\",\"modelCustomizationName\":\"2017488AdiodVpe2..ADIOD_vPFE_BV..module-2\",\"properties\":{\"minCountInstances\":null,\"maxCountInstances\":null,\"initialCount\":null,\"vfModuleLabel\":\"ADIOD_vPFE_BV\"},\"inputs\":{}},\"2017488adiodvpe20..2017488AdiodVpe2..ADIOD_vRE_BV..module-1\":{\"uuid\":\"3f6d5e51-a9a0-4c53-bb6d-be836767d96f\",\"invariantUuid\":\"54466b6d-e33c-4f4d-87e2-32bc5b103589\",\"customizationUuid\":\"dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1\",\"description\":null,\"name\":\"2017488AdiodVpe2..ADIOD_vRE_BV..module-1\",\"version\":\"1\",\"modelCustomizationName\":\"2017488AdiodVpe2..ADIOD_vRE_BV..module-1\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":\"ADIOD_vRE_BV\"},\"inputs\":{}}},\"pnfs\":{}}"; - private static final String MIN_MAX_INITIAL_UUID_OLD_CSAR = "245562de-3984-49ef-a708-6c9d7cfcabd1"; private static final String MIN_MAX_INITIAL_INVARIANT_UUID_OLD_CSAR = "24216d6-71d0-41c8-ac81-0c5acfee514a"; - private static final String MIN_MAX_INITIAL_FILE_PATH_OLD_CSAR = "service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip"; - private static final String MIN_MAX_INITIAL_EXPECTED_RESPONSE_OLD_CSAR = "{\"service\":{\"uuid\":\"281b5f7d-c7ac-4ea9-92fb-2c1d625ca681\",\"invariantUuid\":\"a977af77-db15-4375-a637-e9b994ecd569\",\"name\":\"vMME_rVPMS_FE AIC3.0-11.2.1.7_SVC\",\"version\":\"1.0\",\"toscaModelURL\":null,\"category\":\"Mobility\",\"serviceType\":null,\"serviceRole\":null,\"description\":\"New service for vMME vProbe Front End AIC3.0 VPMS Radcom 11.2.1.7. Front End includes Qrouter, vProbe aff, vLB Agent aff and vLB.\",\"serviceEcompNaming\":\"true\",\"instantiationType\":null,\"inputs\":{}},\"vnfs\":{\"vMMEvProbe_FE_AIC3-11.2.1_VF 1\":{\"uuid\":\"245562de-3984-49ef-a708-6c9d7cfcabd1\",\"invariantUuid\":\"124216d6-71d0-41c8-ac81-0c5acfee514a\",\"description\":\" New service for vMME vProbe Front End AIC3.0 VPMS Radcom 11.2.1.7. Front End includes Qrouter, vProbe aff, vLB Agent aff and vLB. \",\"name\":\"vMMEvProbe_FE_AIC3-11.2.1_VF\",\"version\":\"1.0\",\"customizationUuid\":\"8293273d-0e76-4661-926f-06a01ad2e683\",\"inputs\":{},\"commands\":{},\"properties\":{},\"type\":null,\"modelCustomizationName\":\"vMMEvProbe_FE_AIC3-11.2.1_VF 1\",\"vfModules\":{\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\":{\"uuid\":\"e67e5b39-1f3b-4692-beec-eda94a0375a5\",\"invariantUuid\":\"21c1b57d-a618-4397-a7f4-9c37169ea09b\",\"customizationUuid\":\"a7d59494-3710-4b05-b4cd-e45dadbdc7ac\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null,\"volumeGroupAllowed\":true},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Base_Module..module-0\":{\"uuid\":\"59bb7d14-278f-4ff5-bd5a-1a720c8b0d19\",\"invariantUuid\":\"9b5589c2-e4d1-4456-a23b-e0001c349155\",\"customizationUuid\":\"b9d6f6e8-e24a-4ad9-b863-1c3f6757bfe7\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Base_Module..module-0\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Base_Module..module-0\",\"properties\":{\"minCountInstances\":1,\"maxCountInstances\":1,\"initialCount\":1,\"vfModuleLabel\":null},\"inputs\":null,\"volumeGroupAllowed\":false},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\":{\"uuid\":\"530e5e9f-2e82-4946-bf59-630f4d7ef4de\",\"invariantUuid\":\"d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd\",\"customizationUuid\":\"c1f95365-716c-4f6c-9477-a8f760a2edce\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null,\"volumeGroupAllowed\":true},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\":{\"uuid\":\"064385f9-795b-4fcb-9e3b-51d7d0ccad80\",\"invariantUuid\":\"603e8f71-88ad-4bbf-9992-2e9a72a91e29\",\"customizationUuid\":\"3b5efcd3-d14d-4b0e-91cf-937db5aa65b5\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null,\"volumeGroupAllowed\":true},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\":{\"uuid\":\"85b712e0-af62-4255-aeb6-ec9ae0f4eb13\",\"invariantUuid\":\"cba59330-855a-460b-8856-f6bff0dac6c2\",\"customizationUuid\":\"962479d7-b5b7-4129-bf9f-bfe4775e7921\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null,\"volumeGroupAllowed\":true}},\"volumeGroups\":{\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\":{\"uuid\":\"e67e5b39-1f3b-4692-beec-eda94a0375a5\",\"invariantUuid\":\"21c1b57d-a618-4397-a7f4-9c37169ea09b\",\"customizationUuid\":\"a7d59494-3710-4b05-b4cd-e45dadbdc7ac\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\":{\"uuid\":\"530e5e9f-2e82-4946-bf59-630f4d7ef4de\",\"invariantUuid\":\"d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd\",\"customizationUuid\":\"c1f95365-716c-4f6c-9477-a8f760a2edce\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\":{\"uuid\":\"064385f9-795b-4fcb-9e3b-51d7d0ccad80\",\"invariantUuid\":\"603e8f71-88ad-4bbf-9992-2e9a72a91e29\",\"customizationUuid\":\"3b5efcd3-d14d-4b0e-91cf-937db5aa65b5\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\":{\"uuid\":\"85b712e0-af62-4255-aeb6-ec9ae0f4eb13\",\"invariantUuid\":\"cba59330-855a-460b-8856-f6bff0dac6c2\",\"customizationUuid\":\"962479d7-b5b7-4129-bf9f-bfe4775e7921\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null}},\"vfcInstanceGroups\":{}}},\"networks\":{},\"collectionResource\":null,\"configurations\":null,\"serviceProxies\":null,\"vfModules\":{\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\":{\"uuid\":\"e67e5b39-1f3b-4692-beec-eda94a0375a5\",\"invariantUuid\":\"21c1b57d-a618-4397-a7f4-9c37169ea09b\",\"customizationUuid\":\"a7d59494-3710-4b05-b4cd-e45dadbdc7ac\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null,\"volumeGroupAllowed\":true},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Base_Module..module-0\":{\"uuid\":\"59bb7d14-278f-4ff5-bd5a-1a720c8b0d19\",\"invariantUuid\":\"9b5589c2-e4d1-4456-a23b-e0001c349155\",\"customizationUuid\":\"b9d6f6e8-e24a-4ad9-b863-1c3f6757bfe7\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Base_Module..module-0\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Base_Module..module-0\",\"properties\":{\"minCountInstances\":1,\"maxCountInstances\":1,\"initialCount\":1,\"vfModuleLabel\":null},\"inputs\":null,\"volumeGroupAllowed\":false},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\":{\"uuid\":\"530e5e9f-2e82-4946-bf59-630f4d7ef4de\",\"invariantUuid\":\"d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd\",\"customizationUuid\":\"c1f95365-716c-4f6c-9477-a8f760a2edce\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null,\"volumeGroupAllowed\":true},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\":{\"uuid\":\"064385f9-795b-4fcb-9e3b-51d7d0ccad80\",\"invariantUuid\":\"603e8f71-88ad-4bbf-9992-2e9a72a91e29\",\"customizationUuid\":\"3b5efcd3-d14d-4b0e-91cf-937db5aa65b5\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null,\"volumeGroupAllowed\":true},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\":{\"uuid\":\"85b712e0-af62-4255-aeb6-ec9ae0f4eb13\",\"invariantUuid\":\"cba59330-855a-460b-8856-f6bff0dac6c2\",\"customizationUuid\":\"962479d7-b5b7-4129-bf9f-bfe4775e7921\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null,\"volumeGroupAllowed\":true}},\"volumeGroups\":{\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\":{\"uuid\":\"e67e5b39-1f3b-4692-beec-eda94a0375a5\",\"invariantUuid\":\"21c1b57d-a618-4397-a7f4-9c37169ea09b\",\"customizationUuid\":\"a7d59494-3710-4b05-b4cd-e45dadbdc7ac\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\":{\"uuid\":\"530e5e9f-2e82-4946-bf59-630f4d7ef4de\",\"invariantUuid\":\"d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd\",\"customizationUuid\":\"c1f95365-716c-4f6c-9477-a8f760a2edce\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\":{\"uuid\":\"064385f9-795b-4fcb-9e3b-51d7d0ccad80\",\"invariantUuid\":\"603e8f71-88ad-4bbf-9992-2e9a72a91e29\",\"customizationUuid\":\"3b5efcd3-d14d-4b0e-91cf-937db5aa65b5\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null},\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\":{\"uuid\":\"85b712e0-af62-4255-aeb6-ec9ae0f4eb13\",\"invariantUuid\":\"cba59330-855a-460b-8856-f6bff0dac6c2\",\"customizationUuid\":\"962479d7-b5b7-4129-bf9f-bfe4775e7921\",\"description\":null,\"name\":\"VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\",\"version\":\"1\",\"modelCustomizationName\":\"vmmevprobe_fe_aic31121_vf1..VmmevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3\",\"properties\":{\"minCountInstances\":0,\"maxCountInstances\":null,\"initialCount\":0,\"vfModuleLabel\":null},\"inputs\":null}},\"pnfs\":null}"; + private static final String MIN_MAX_INITIAL_FILE_PATH_OLD_CSAR = "service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip"; + + private static final String GROUPING_SERVICE_ROLE_FILE_PATH = "csar15782222_instantiationTypeAlacarte_VnfGrouping.zip"; + private static final String GROUPING_SERVICE_ROLE_UUID = "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc"; + private static final String GROUPING_SERVICE_ROLE_INVARIANT_UUID = "7ee41ce4-4827-44b0-a48e-2707a59905d2"; + private static final String GROUPING_SERVICE_ROLE_EXPECTED_RESPONSE = "VnfGroup/groupingServiceRoleResponse.json"; @BeforeClass public void login() { @@ -74,20 +74,22 @@ public class SdcApiTest extends BaseApiTest { } @Test - public void getServiceModelALaCarteInstantiation() throws IOException, URISyntaxException { + public void getServiceModelALaCarteInstantiation() { registerToSimulatorWithPresets(A_LA_CARTE_INSTANTIATION_TYPE_UUID, A_LA_CARTE_INSTANTIATION_TYPE_INVARIANT_UUID, A_LA_CARTE_INSTANTIATION_TYPE_FILE_PATH); ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + A_LA_CARTE_INSTANTIATION_TYPE_UUID), String.class); Assert.assertEquals(response.getStatusCode(), HttpStatus.OK); - assertThat("The response is in the format of JSON", response.getBody(), either(is(A_LA_CARTE_INSTANTIATION_TYPE_EXPECTED_RESPONSE)).or(jsonStringEquals(A_LA_CARTE_INSTANTIATION_TYPE_EXPECTED_RESPONSE))); + String aLaCarteInstantiationTypeExpectedResponse = loadResourceAsString(A_LA_CARTE_INSTANTIATION_TYPE_EXPECTED_RESPONSE); + assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(turnOffInstantiationUI(aLaCarteInstantiationTypeExpectedResponse)))); } @Test - public void getServiceModelMacroInstantiation() throws IOException, URISyntaxException { + public void getServiceModelMacroInstantiation() { registerToSimulatorWithPresets(MACRO_INSTANTIATION_TYPE_UUID, MACRO_INSTANTIATION_TYPE_INVARIANT_UUID, MACRO_INSTANTIATION_TYPE_FILE_PATH); ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + MACRO_INSTANTIATION_TYPE_UUID), String.class); Assert.assertEquals(response.getStatusCode(), HttpStatus.OK); - assertThat("The response is in the format of JSON", response.getBody(), either(is(MACRO_INSTANTIATION_TYPE_EXPECTED_RESPONSE)).or(jsonStringEquals(MACRO_INSTANTIATION_TYPE_EXPECTED_RESPONSE))); + String macroInstantiationTypeExpectedResponse = loadResourceAsString(MACRO_INSTANTIATION_TYPE_EXPECTED_RESPONSE); + assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(turnOffInstantiationUI(macroInstantiationTypeExpectedResponse)))); } @@ -96,8 +98,8 @@ public class SdcApiTest extends BaseApiTest { registerToSimulatorWithPresets(MACRO_INSTANTIATION_TYPE_UUID, MACRO_INSTANTIATION_TYPE_INVARIANT_UUID, EMPTY_INSTANTIATION_TYPE_FILE_PATH); ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + MACRO_INSTANTIATION_TYPE_UUID), String.class); Assert.assertEquals(response.getStatusCode(), HttpStatus.OK); - assertThat("The response is in the format of JSON", response.getBody(), either(is(EMPTY_INSTANTIATION_TYPE_EXPECTED_RESPONSE)).or(jsonStringEquals(EMPTY_INSTANTIATION_TYPE_EXPECTED_RESPONSE))); - + String emptyInstantiationTypeExpectedResponse = loadResourceAsString(EMPTY_INSTANTIATION_TYPE_EXPECTED_RESPONSE); + assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(turnOffInstantiationUI(emptyInstantiationTypeExpectedResponse)))); } @Test @@ -105,7 +107,8 @@ public class SdcApiTest extends BaseApiTest { registerToSimulatorWithPresets(MACRO_INSTANTIATION_TYPE_UUID, MACRO_INSTANTIATION_TYPE_INVARIANT_UUID, BOTH_INSTANTIATION_TYPE_FILE_PATH); ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + MACRO_INSTANTIATION_TYPE_UUID), String.class); Assert.assertEquals(response.getStatusCode(), HttpStatus.OK); - assertThat("The response is in the format of JSON", response.getBody(), either(is(MACRO_INSTANTIATION_TYPE_EXPECTED_RESPONSE)).or(jsonStringEquals(MACRO_INSTANTIATION_TYPE_EXPECTED_RESPONSE))); + String macroInstantiationTypeExpectedResponse = loadResourceAsString(MACRO_INSTANTIATION_TYPE_EXPECTED_RESPONSE); + assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(turnOffInstantiationUI(macroInstantiationTypeExpectedResponse)))); } @Test @@ -113,7 +116,8 @@ public class SdcApiTest extends BaseApiTest { registerToSimulatorWithPresets(MIN_MAX_INITIAL_UUID, MIN_MAX_INITIAL_INVARIANT_UUID, MIN_MAX_INITIAL_FILE_PATH); ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + MIN_MAX_INITIAL_UUID), String.class); Assert.assertEquals(response.getStatusCode(), HttpStatus.OK); - assertThat("The response is in the format of JSON", response.getBody(), either(is(MIN_MAX_INITIAL_EXPECTED_RESPONSE)).or(jsonStringEquals(MIN_MAX_INITIAL_EXPECTED_RESPONSE))); + String minMaxInitialExpectedResponse = loadResourceAsString("sdcApiTest/minMaxInitialExpectedResponse.json"); + assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(turnOffInstantiationUI(minMaxInitialExpectedResponse)))); } @Test @@ -121,7 +125,18 @@ public class SdcApiTest extends BaseApiTest { registerToSimulatorWithPresets(MIN_MAX_INITIAL_UUID_OLD_CSAR, MIN_MAX_INITIAL_INVARIANT_UUID_OLD_CSAR, MIN_MAX_INITIAL_FILE_PATH_OLD_CSAR); ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + MIN_MAX_INITIAL_UUID_OLD_CSAR), String.class); Assert.assertEquals(response.getStatusCode(), HttpStatus.OK); - assertThat("The response is in the format of JSON", response.getBody(), either(is(MIN_MAX_INITIAL_EXPECTED_RESPONSE_OLD_CSAR)).or(jsonStringEquals(MIN_MAX_INITIAL_EXPECTED_RESPONSE_OLD_CSAR))); + String minMaxInitialExpectedResponseOldCsar = loadResourceAsString("sdcApiTest/minMaxInitialExpectedResponseOldCsar.json"); + assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(minMaxInitialExpectedResponseOldCsar))); + } + + @Test + @FeatureTogglingTest(Features.FLAG_1902_VNF_GROUPING) + public void getServiceModelWithServiceRoleGrouping(){ + registerToSimulatorWithPresets(GROUPING_SERVICE_ROLE_UUID, GROUPING_SERVICE_ROLE_INVARIANT_UUID, GROUPING_SERVICE_ROLE_FILE_PATH); + ResponseEntity<String> response = restTemplate.getForEntity(buildUri(SDC_GET_SERVICE_MODEL + GROUPING_SERVICE_ROLE_UUID), String.class); + Assert.assertEquals(response.getStatusCode(), HttpStatus.OK); + String groupingServiceRoleExpectedResponse = loadResourceAsString(GROUPING_SERVICE_ROLE_EXPECTED_RESPONSE); + assertThat("The response is in the format of JSON", response.getBody(), is(jsonStringEquals(groupingServiceRoleExpectedResponse))); } private void registerToSimulatorWithPresets(String uuid, String invariantUuid, String pathPath){ @@ -131,6 +146,15 @@ public class SdcApiTest extends BaseApiTest { registerExpectationFromPresets(presets, CLEAR_THEN_SET); } + private String turnOffInstantiationUI(String expectedJson) { + if (!Features.FLAG_5G_IN_NEW_INSTANTIATION_UI.isActive()) { + // replaces the instantiationUI field-value with "legacy", whatever it was + return expectedJson.replaceFirst("(\"instantiationUI\": *\")[^\"]*(\",)", "$1legacy$2"); + } else { + return expectedJson; + } + } + @Test public void withModelFromE2eWithToscaParserButNewFlow_requestModels_expectVnfRelatedVfModulesNotNull() { @@ -139,8 +163,8 @@ public class SdcApiTest extends BaseApiTest { volumeGroups, because a 'isNewFlow' value in org.onap.vid.asdc.parser.ToscaParserImpl was always false because a coding error. */ - registerExpectation("get_sdc_catalog_services_VmmeRvpmsFeAic3011217Svc.json", CLEAR_THEN_SET); - registerExpectation("aai_get_full_subscribers.json", APPEND); + registerExpectation("get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json", CLEAR_THEN_SET); + registerExpectation("create_new_instance/aai_get_full_subscribers.json", APPEND); final JsonNode response = restTemplate.getForObject(uri + "/rest/models/services/" + "245562de-3984-49ef-a708-6c9d7cfcabd1", JsonNode.class); diff --git a/vid-automation/src/test/java/org/onap/vid/api/ServiceInstanceMsoApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/ServiceInstanceMsoApiTest.java index ce290c89f..40ce80ba6 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/ServiceInstanceMsoApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/ServiceInstanceMsoApiTest.java @@ -1,16 +1,21 @@ package org.onap.vid.api; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import java.io.IOException; +import java.net.URISyntaxException; import org.apache.commons.text.StringEscapeUtils; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOActivateFabricConfiguration; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSOActivateFabricConfigurationErrorResponse; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeactivateAndCloudDelete; +import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeactivateAndCloudDeleteErrorResponse; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.testng.annotations.Test; import vid.automation.test.infra.FeatureTogglingTest; import vid.automation.test.infra.Features; -import java.io.IOException; -import java.net.URISyntaxException; - public class ServiceInstanceMsoApiTest extends BaseMsoApiTest{ //Urls @@ -18,11 +23,15 @@ public class ServiceInstanceMsoApiTest extends BaseMsoApiTest{ public static final String MSO_DEACTIVATE_SERVICE_INSTANCE = "mso/mso_deactivate_service_instance/f36f5734-e9df-4fbf-9f35-61be13f028a1"; public static final String MSO_DELETE_SERVICE_INSTANCE = "mso/mso_delete_svc_instance/f36f5734-e9df-4fbf-9f35-61be13f028a1?serviceStatus=active"; public static final String MSO_UNASSIGN_SERVICE_INSTANCE = "mso/mso_delete_svc_instance/f36f5734-e9df-4fbf-9f35-61be13f028a1?serviceStatus=created"; + public static final String MSO_ACTIVATE_FABRIC_CONFIGURATION = "mso/mso_activate_fabric_configuration/f36f5734-e9df-4fbf-9f35-61be13f028a1"; + public static final String MSO_DEACTIVATE_AND_CLOUD_DELETE = "mso/mso_vfmodule_soft_delete/f36f5734-e9df-4fbf-9f35-61be13f028a1/vnfId/vfModuleId"; //Request Details private static final String ACTIVATE_SERVICE_REQUEST_DETAILS = "registration_to_simulator/body_jsons/mso_request_activate_service_instance.json"; private static final String DEACTIVATE_SERVICE_REQUEST_DETAILS = "registration_to_simulator/body_jsons/mso_request_deactivate_service_instance.json"; private static final String DELETE_AND_UNASSIGN_SERVICE_REQUEST_DETAILS = "registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json"; + private static final String ACTIVATE_FABRIC_CONFIGURATION_REQUEST_DETAILS = "registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json"; + private static final String DEACTIVATE_AND_CLOUD_DELETE_DATA = "registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json"; //Jsons private static final String ACTIVATE_OK_JSON = "activate_service_instance.json"; @@ -35,7 +44,8 @@ public class ServiceInstanceMsoApiTest extends BaseMsoApiTest{ //Expected Responses private static final String EXPECTED_SUCCESS_MSO_RESPONSE = "{\"requestReferences\": {\"instanceId\": \"f36f5734-e9df-4fbf-9f35-61be13f028a1\", \"requestId\": \"b6dc9806-b094-42f7-9386-a48de8218ce8\"}}"; - private static final String EXPECTED_ERROR_MSO_RESPONSE = "{\"error\":\"222\",\"message\":\"error message\"}"; + private static final String EXPECTED_ERROR_MSO_RESPONSE = "{\"message\":\"error message\",\"error\":\"222\"}"; + @Test public void testActivateServiceInstanceSucceed() throws Exception { @@ -118,4 +128,37 @@ public class ServiceInstanceMsoApiTest extends BaseMsoApiTest{ buildUri(MSO_DEACTIVATE_SERVICE_INSTANCE), requestBody, errorCode, EXPECTED_ERROR_MSO_RESPONSE, HttpMethod.POST); } + + @Test + public void testActivateFabricConfigurationSucceed() throws Exception { + String requestBody = TestUtils.convertRequest(objectMapper, ACTIVATE_FABRIC_CONFIGURATION_REQUEST_DETAILS); + callMsoWithFineRequest(new PresetMSOActivateFabricConfiguration("f36f5734-e9df-4fbf-9f35-61be13f028a1", "b6dc9806-b094-42f7-9386-a48de8218ce8"), buildUri(MSO_ACTIVATE_FABRIC_CONFIGURATION), requestBody, + HttpStatus.ACCEPTED.value(), EXPECTED_SUCCESS_MSO_RESPONSE, HttpMethod.POST); + } + + @Test(dataProvider = "errorCodes") + public void testActivateFabricConfigurationFailed(int errorCode) throws IOException, URISyntaxException { + String requestBody = TestUtils.convertRequest(objectMapper, ACTIVATE_FABRIC_CONFIGURATION_REQUEST_DETAILS); + callMsoWithSimulatedErrorResponse(new PresetMSOActivateFabricConfigurationErrorResponse("f36f5734-e9df-4fbf-9f35-61be13f028a1", errorCode), + buildUri(MSO_ACTIVATE_FABRIC_CONFIGURATION), requestBody, errorCode, EXPECTED_ERROR_MSO_RESPONSE, HttpMethod.POST); + } + + @Test + public void testDeactivateAndCloudDeleteSucceed() throws Exception { + String requestBody = TestUtils.convertRequest(objectMapper, DEACTIVATE_AND_CLOUD_DELETE_DATA); + callMsoWithFineRequest(ImmutableList.of( + new PresetMSODeactivateAndCloudDelete("f36f5734-e9df-4fbf-9f35-61be13f028a1", "vnfId", "vfModuleId", "b6dc9806-b094-42f7-9386-a48de8218ce8", "irma-aic"), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC), + buildUri(MSO_DEACTIVATE_AND_CLOUD_DELETE), requestBody, + HttpStatus.ACCEPTED.value(), EXPECTED_SUCCESS_MSO_RESPONSE, HttpMethod.POST); + } + + @Test(dataProvider = "errorCodes") + public void testDeactivateAndCloudDeleteFailed(int errorCode) throws IOException, URISyntaxException { + String requestBody = TestUtils.convertRequest(objectMapper, DEACTIVATE_AND_CLOUD_DELETE_DATA); + callMsoWithSimulatedErrorResponse(ImmutableList.of( + new PresetMSODeactivateAndCloudDeleteErrorResponse("f36f5734-e9df-4fbf-9f35-61be13f028a1", "vnfId", "vfModuleId", errorCode, "irma-aic"), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC), + buildUri(MSO_DEACTIVATE_AND_CLOUD_DELETE), requestBody, errorCode, EXPECTED_ERROR_MSO_RESPONSE, HttpMethod.POST); + } } diff --git a/vid-automation/src/test/java/org/onap/vid/api/ServicePermissionsApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/ServicePermissionsApiTest.java new file mode 100644 index 000000000..385ec9b0d --- /dev/null +++ b/vid-automation/src/test/java/org/onap/vid/api/ServicePermissionsApiTest.java @@ -0,0 +1,63 @@ +package org.onap.vid.api; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + +import com.google.common.collect.ImmutableMap; +import java.util.Map; +import org.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; +import vid.automation.test.Constants; +import vid.automation.test.model.User; +import vid.automation.test.services.SimulatorApi; + +public class ServicePermissionsApiTest extends BaseApiTest { + + private final String emanuelSubscriberId = "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"; + private final String uspVoiceSubscriberId = "e433710f-9217-458d-a79d-1c7aff376d89"; + + @BeforeClass + public void setAaiSubscribers() { + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetSubscribersGet(), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); + } + + @Test + public void servicePermissions_loginWithPermissions_1IsPermitted1NotPermitted() { + login(userCredentials(Constants.Users.EMANUEL_vWINIFRED)); + assertPermissions(emanuelSubscriberId, "vRichardson", true); + assertPermissions(emanuelSubscriberId, "someNonexistent", false); + } + + @Test + public void servicePermissions_loginPermissionsWithTenant_IsPermittedRegardlessOfTenant() { + login(userCredentials("Emanuel_with_tenant")); + assertPermissions(emanuelSubscriberId, "vWINIFRED", true); + } + + @Test + public void servicePermissions_loginWithNoPermissionsAtAll_nothingIsPermitted() { + login(userCredentials(Constants.Users.READONLY)); + assertPermissions(emanuelSubscriberId, "vRichardson", false); + assertPermissions(emanuelSubscriberId, "someNonexistent", false); + } + + @Test + public void servicePermissions_serviceTypeWithSpace_isPermitted() { + login(userCredentials(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA)); + assertPermissions(uspVoiceSubscriberId, "TYLER SILVIA", true); + } + + private UserCredentials userCredentials(String userName) { + User user = usersService.getUser(userName); + return new UserCredentials(user.credentials.userId, user.credentials.password, userName, "", ""); + } + + private void assertPermissions(final String subscriberId, final String serviceType, boolean isEditPermitted) { + final Map response = restTemplate.getForObject(uri + "/roles/service_permissions?subscriberId=" + subscriberId + "&serviceType=" + serviceType, Map.class); + assertThat(response, is(ImmutableMap.of( + "isEditPermitted", isEditPermitted + ))); + } +} diff --git a/vid-automation/src/test/java/org/onap/vid/api/ServiceTreeApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/ServiceTreeApiTest.java new file mode 100644 index 000000000..52aa2e388 --- /dev/null +++ b/vid-automation/src/test/java/org/onap/vid/api/ServiceTreeApiTest.java @@ -0,0 +1,370 @@ +package org.onap.vid.api; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.ImmutableMultimap; +import com.google.common.collect.Multimap; +import org.onap.simulator.presetGenerator.presets.aai.*; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; +import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; +import vid.automation.test.services.SimulatorApi; + +import java.util.UUID; + +import static org.apache.commons.text.StringEscapeUtils.escapeJson; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.*; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; + +public class ServiceTreeApiTest extends BaseApiTest { + + private static final String API_URL = "/aai_get_service_instance_topology/{subscriberId}/{serviceType}/{serviceInstanceId}"; + + @BeforeClass + public void login() { + super.login(); + } + + @Test + public void serviceWithNoChildren_requestDoesSomething() { + final PresetAAIStandardQueryGet serviceInstance = + PresetAAIStandardQueryGet.ofServiceInstance("service-instance-id", "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "service-instance-model-invariant-id", "global-customer-id", "service-instance-type", ImmutableMultimap.of()); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + serviceInstance, + new PresetAAIModelsByInvariantIdGet(ImmutableList.of("service-instance-model-invariant-id")), + new PresetSDCGetServiceMetadataGet("7a6ee536-f052-46fa-aa7e-2fca9d674c44", "service-instance-model-invariant-id", "csar15782222_instantiationTypeMacroWithNetwork.zip"), + new PresetSDCGetServiceToscaModelGet("7a6ee536-f052-46fa-aa7e-2fca9d674c44", "csar15782222_instantiationTypeMacroWithNetwork.zip") + ), CLEAR_THEN_SET); + final String response = restTemplate.getForObject(buildUri(API_URL), String.class, "global-customer-id", "service-instance-type", "service-instance-id"); + + assertJsonEquals(response, "" + + "{" + + " \"instanceName\": \"" + escapeJson(serviceInstance.getInstanceName()) + "\"," + + " \"action\": \"None\"," + + " \"instanceId\": \"service-instance-id\"," + + " \"orchStatus\": \"GARBAGE DATA\"," + + " \"globalSubscriberId\": \"global-customer-id\"," + + " \"subscriptionServiceType\": \"service-instance-type\"," + + " \"owningEntityId\": null," + + " \"owningEntityName\": null," + + " \"productFamilyId\": null," + + " \"lcpCloudRegionId\": null," + + " \"tenantId\": null," + + " \"tenantName\": null," + + " \"aicZoneId\": null," + + " \"aicZoneName\": null," + + " \"projectName\": null," + + " \"rollbackOnFailure\": null," + + " \"modelInfo\": {" + + " \"modelInvariantId\": \"service-instance-model-invariant-id\"," + + " \"modelVersionId\": \"7a6ee536-f052-46fa-aa7e-2fca9d674c44\"," + + " \"modelName\": \"vf_vEPDG\"," + + " \"modelType\": \"service\"," + + " \"modelVersion\": \"2.0\"" + + " }," + + " \"vnfs\": {}," + + " \"networks\": {}," + + " \"vnfGroups\": {}," + + " \"validationCounter\": 0," + + " \"existingVNFCounterMap\": {}," + + " \"existingNetworksCounterMap\": {}," + + " \"existingVnfGroupCounterMap\": {}," + + " \"isALaCarte\": false" + + "}"); + } + + @Test + public void searchGroupMembers_expected4vnfs() { + PresetAAIStandardQueryGet instanceGroup1 = PresetAAIStandardQueryGet.ofInstanceGroup("L3-NETWORK", "SUB_INTERFACE", ImmutableMultimap.of()); + PresetAAIStandardQueryGet instanceGroup2 = PresetAAIStandardQueryGet.ofInstanceGroup("LOAD-GROUP", "SERVICE-ACCESS", ImmutableMultimap.of()); + + PresetAAIStandardQueryGet vnfPreset1 = + PresetAAIStandardQueryGet.ofRelatedVnf(randUuid(), "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "", + ImmutableMultimap.of("instance-group", instanceGroup1.getReqPath())); + + PresetAAIStandardQueryGet vnfPreset2 = + PresetAAIStandardQueryGet.ofRelatedVnf(randUuid(), "eb5f56bf-5855-4e61-bd00-3e19a953bf02", + "\"in-maint\": true,", ImmutableMultimap.of()); + + PresetAAIStandardQueryGet vnfPreset3 = + PresetAAIStandardQueryGet.ofRelatedVnf(randUuid(), "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", "", + ImmutableMultimap.of("instance-group", instanceGroup1.getReqPath())); + + PresetAAIStandardQueryGet vnfPreset4 = + PresetAAIStandardQueryGet.ofRelatedVnf(randUuid(), "b7f2e8fb-ac71-4ea0-a801-06ef1479ea84", + "\"in-maint\": true,", ImmutableMultimap.of()); + + PresetAAIStandardQueryGet vnfPreset5 = + PresetAAIStandardQueryGet.ofRelatedVnf(randUuid(), "b7f2e8fb-ac71-4ea0-a801-06ef1479ea84", + "\"in-maint\": true,", ImmutableMultimap.of("instance-group", instanceGroup2.getReqPath())); + + Multimap<String, String> serviceInstance1 = ImmutableMultimap.<String, String>builder() + .putAll("generic-vnf", vnfPreset1.getReqPath()) + .putAll("generic-vnf", vnfPreset3.getReqPath()) + .build(); + + Multimap<String, String> serviceInstance2 = ImmutableMultimap.<String, String>builder() + .putAll("generic-vnf", vnfPreset2.getReqPath()) + .putAll("generic-vnf", vnfPreset4.getReqPath()) + .putAll("generic-vnf", vnfPreset5.getReqPath()) + .build(); + + PresetAAIGetServiceInstancesByInvariantId serviceInstancesList = new PresetAAIGetServiceInstancesByInvariantId( + "global-customer-id", "service-instance-type", "24632e6b-584b-4f45-80d4-fefd75fd9f14", + ImmutableMap.of("service-instance-id1", serviceInstance1, + "service-instance-id2", serviceInstance2)); + + + SimulatorApi.registerExpectationFromPresets( + ImmutableList.of(serviceInstancesList, + vnfPreset1, instanceGroup1, + vnfPreset2, + vnfPreset3, + vnfPreset4, + vnfPreset5, instanceGroup2, //this vnf should be filtered out + new PresetAAIModelsByInvariantIdGet(ImmutableList.of("vnf-instance-model-invariant-id")), + new PresetAAIGetCloudRegionFromVnf(vnfPreset1.getInstanceId()), + new PresetAAIGetCloudRegionFromVnf(vnfPreset2.getInstanceId()), + new PresetAAIGetCloudRegionFromVnf(vnfPreset3.getInstanceId()), + new PresetAAIGetCloudRegionFromVnf(vnfPreset4.getInstanceId()) + ), CLEAR_THEN_SET); + + String api_url = "aai_search_group_members?subscriberId={subscriberId}&serviceType={serviceType}&serviceInvariantId={serviceInvariantId}" + + "&groupType={groupType}&groupRole={groupRole}"; + + final String response = restTemplate.getForObject(buildUri(api_url), String.class, "global-customer-id", "service-instance-type", "24632e6b-584b-4f45-80d4-fefd75fd9f14", "LOAD-GROUP", "SERVICE-ACCESS"); + + LOGGER.info(response); + + String expected = TestUtils.convertRequest(objectMapper, "VnfGroup/searchMembersResponse.json"); + expected = expected + .replace("VNF1_INSTANCE_NAME", vnfPreset1.getInstanceName()) + .replace("VNF1_INSTANCE_ID", vnfPreset1.getInstanceId()) + .replace("VNF1_INSTANCE_TYPE", vnfPreset1.getInstanceType()) + .replace("VNF2_INSTANCE_NAME", vnfPreset2.getInstanceName()) + .replace("VNF2_INSTANCE_ID", vnfPreset2.getInstanceId()) + .replace("VNF2_INSTANCE_TYPE", vnfPreset2.getInstanceType()) + .replace("VNF3_INSTANCE_NAME", vnfPreset3.getInstanceName()) + .replace("VNF3_INSTANCE_ID", vnfPreset3.getInstanceId()) + .replace("VNF3_INSTANCE_TYPE", vnfPreset3.getInstanceType()) + .replace("VNF4_INSTANCE_NAME", vnfPreset4.getInstanceName()) + .replace("VNF4_INSTANCE_ID", vnfPreset4.getInstanceId()) + .replace("VNF4_INSTANCE_TYPE", vnfPreset4.getInstanceType()); + + assertJsonEquals(response, expected); + } + + @Test + public void searchGroupMembers_expectedNoResult() { + PresetAAIGetServiceInstancesByInvariantId serviceInstancesList = new PresetAAIGetServiceInstancesByInvariantId( + "global-customer-id", "service-instance-type", "24632e6b-584b-4f45-80d4-fefd75fd9f14", + ImmutableMap.of("service-instance-id1", ImmutableMultimap.of(), + "service-instance-id2", ImmutableMultimap.of())); + + + SimulatorApi.registerExpectationFromPreset(serviceInstancesList, CLEAR_THEN_SET); + + String api_url = "aai_search_group_members?subscriberId={subscriberId}&serviceType={serviceType}&serviceInvariantId={serviceInvariantId}" + + "&groupType={groupType}&groupRole={groupRole}"; + + final String response = restTemplate.getForObject(buildUri(api_url), String.class, "global-customer-id", "service-instance-type", "24632e6b-584b-4f45-80d4-fefd75fd9f14", "LOAD-GROUP", "SERVICE-ACCESS"); + + assertJsonEquals(response, "[]"); + } + + @Test + public void serviceWithMultiplePlys_responseIsReasonable() { + + PresetAAIStandardQueryGet l3NetworkPreset1 = + PresetAAIStandardQueryGet.ofL3Network("CONTRAIL30_BASIC", "Assigned", + ImmutableMultimap.of()); + + PresetAAIStandardQueryGet vlanTag1 = PresetAAIStandardQueryGet.ofVlanTag(44); + + PresetAAIStandardQueryGet l3NetworkPreset2 = + + PresetAAIStandardQueryGet.ofL3Network("CONTRAIL30_BASIC", "Created", + ImmutableMultimap.of("vlan-tag", vlanTag1.getReqPath())); + + PresetAAIStandardQueryGet l3NetworkPreset3 = + PresetAAIStandardQueryGet.ofL3Network("CONTRAIL30_BASIC", "Assigned", "nvtprov", "ddc3f20c-08b5-40fd-af72-c6d14636b986","94fdd893-4a36-4d70-b16a-ec29c54c184f", + ImmutableMultimap.of()); + + PresetAAIStandardQueryGet l3NetworkPreset4 = + PresetAAIStandardQueryGet.ofL3Network("CONTRAIL30_HIMELGUARD", "Created", "preprov", "ddc3f20c-08b5-40fd-af72-c6d14636b986","94fdd893-4a36-4d70-b16a-ec29c54c184f", + ImmutableMultimap.of()); + + PresetAAIStandardQueryGet volumeGroup1 = + PresetAAIStandardQueryGet.ofVolumeGroup("vSON_test", ImmutableMultimap.of()); + + PresetAAIStandardQueryGet instanceGroup1 = PresetAAIStandardQueryGet.ofInstanceGroup("L3-NETWORK", "Ruby Figueroa", ImmutableMultimap.of()); + + PresetAAIStandardQueryGet collection1 = + PresetAAIStandardQueryGet.ofCollectionResource("Assigned", + ImmutableMultimap.of("instance-group", instanceGroup1.getReqPath())); + + PresetAAIStandardQueryGet vnfPreset1 = + PresetAAIStandardQueryGet.ofVnf(randUuid(), + ImmutableMultimap.of("l3-network", l3NetworkPreset1.getReqPath(), "l3-network", l3NetworkPreset2.getReqPath())); + + PresetAAIStandardQueryGet vnfPreset2 = + PresetAAIStandardQueryGet.ofVnf(randUuid(), "d6557200-ecf2-4641-8094-5393ae3aae60","91415b44-753d-494c-926a-456a9172bbb9", + "\"in-maint\": true,", ImmutableMultimap.of("volume-group", volumeGroup1.getReqPath())); + + PresetAAIGetVfModulesByVnf vfModules2 = new PresetAAIGetVfModulesByVnf(vnfPreset2.getInstanceId()); + + final PresetAAIStandardQueryGet serviceInstance = + PresetAAIStandardQueryGet.ofServiceInstance("service-instance-id", "6e59c5de-f052-46fa-aa7e-2fca9d674c44", "d27e42cf-087e-4d31-88ac-6c4b7585f800", "global-customer-id", "service-instance-type", + ImmutableMultimap.<String, String>builder() + .putAll("l3-network", l3NetworkPreset3.getReqPath(), l3NetworkPreset4.getReqPath()) + .putAll("collection", collection1.getReqPath()) + .putAll("generic-vnf", vnfPreset1.getReqPath(), vnfPreset2.getReqPath()) + .build() + ); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + serviceInstance, + l3NetworkPreset3, l3NetworkPreset4, vnfPreset1, vnfPreset2, collection1, + volumeGroup1, l3NetworkPreset1, l3NetworkPreset2, instanceGroup1, + vlanTag1, vfModules2, + new PresetAAIModelsByInvariantIdGet(ImmutableList.of("d27e42cf-087e-4d31-88ac-6c4b7585f800")), + new PresetGetSessionSlotCheckIntervalGet(), + new PresetAAIGetSubscribersGet(), + new PresetSDCGetServiceMetadataGet("6e59c5de-f052-46fa-aa7e-2fca9d674c44", "d27e42cf-087e-4d31-88ac-6c4b7585f800", "csar15782222_instantiationTypeMacroWithNetwork.zip"), + new PresetSDCGetServiceToscaModelGet("6e59c5de-f052-46fa-aa7e-2fca9d674c44", "csar15782222_instantiationTypeMacroWithNetwork.zip") + ), CLEAR_THEN_SET); + + String expected = TestUtils.convertRequest(objectMapper, "aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json"); + expected = expected + .replace("SERVICE_INSTANCE_NAME", serviceInstance.getInstanceName()) + .replace("VNF1_INSTANCE_NAME", vnfPreset1.getInstanceName()) + .replace("VNF1_INSTANCE_ID", vnfPreset1.getInstanceId()) + .replace("VNF1_INSTANCE_TYPE", vnfPreset1.getInstanceType()) + .replace("VNF2_INSTANCE_NAME", vnfPreset2.getInstanceName()) + .replace("VNF2_INSTANCE_ID", vnfPreset2.getInstanceId()) + .replace("VNF2_INSTANCE_TYPE", vnfPreset2.getInstanceType()) + .replace("NETWORK1_INSTANCE_NAME", l3NetworkPreset1.getInstanceName()) + .replace("NETWORK1_INSTANCE_ID", l3NetworkPreset1.getInstanceId()) + .replace("NETWORK2_INSTANCE_NAME", l3NetworkPreset2.getInstanceName()) + .replace("NETWORK2_INSTANCE_ID", l3NetworkPreset2.getInstanceId()) + .replace("NETWORK3_INSTANCE_NAME", l3NetworkPreset3.getInstanceName()) + .replace("NETWORK3_INSTANCE_ID", l3NetworkPreset3.getInstanceId()) + .replace("NETWORK4_INSTANCE_NAME", l3NetworkPreset4.getInstanceName()) + .replace("NETWORK4_INSTANCE_ID", l3NetworkPreset4.getInstanceId()); + + String response = restTemplate.getForObject(buildUri(API_URL), String.class, "global-customer-id", "service-instance-type", "service-instance-id"); + + assertJsonEquals(response, expected); + } + + @Test + public void serviceWithVnfGotError_exceptionIsThrown() { + + PresetAAIStandardQueryGet vnfPreset = + PresetAAIStandardQueryGet.ofVnf(randUuid(), + ImmutableMultimap.of("l3-network", "/aai/v../I'm a wrong path")); + + final PresetAAIStandardQueryGet serviceInstance = + PresetAAIStandardQueryGet.ofServiceInstance("service-instance-id", "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "service-instance-model-invariant-id", "global-customer-id", "service-instance-type", + ImmutableMultimap.<String, String>builder() + .putAll("generic-vnf", vnfPreset.getReqPath()) + .build() + ); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + serviceInstance, + vnfPreset, + new PresetAAIModelsByInvariantIdGet(ImmutableList.of("service-instance-model-invariant-id")), + new PresetSDCGetServiceMetadataGet("7a6ee536-f052-46fa-aa7e-2fca9d674c44", "service-instance-model-invariant-id", "csar15782222_instantiationTypeMacroWithNetwork.zip"), + new PresetSDCGetServiceToscaModelGet("7a6ee536-f052-46fa-aa7e-2fca9d674c44", "csar15782222_instantiationTypeMacroWithNetwork.zip"), + new PresetGetSessionSlotCheckIntervalGet(), + new PresetAAIGetSubscribersGet() + ), CLEAR_THEN_SET); + + final ResponseEntity<String> response = restTemplateErrorAgnostic.getForEntity(buildUri(API_URL), String.class, "global-customer-id", "service-instance-type", "service-instance-id"); + assertThat(response.getBody(),containsString("AAI node fetching failed")); + assertThat(response.getStatusCode(), is(HttpStatus.INTERNAL_SERVER_ERROR)); + } + + @Test + public void serviceWithTwoVnfGroupsAndRelatedVnfs() { + PresetAAIStandardQueryGet relatedVnf1 = + PresetAAIStandardQueryGet.ofRelatedVnf(randUuid(), "7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "", ImmutableMultimap.of()); + + PresetAAIStandardQueryGet relatedVnf2 = + PresetAAIStandardQueryGet.ofRelatedVnf(randUuid(), "d6557200-ecf2-4641-8094-5393ae3aae60", + "", ImmutableMultimap.of()); + + PresetAAIStandardQueryGet relatedVnf3 = + PresetAAIStandardQueryGet.ofRelatedVnf(randUuid(), "d6557200-ecf2-4641-8094-5393ae3aae60", + "", ImmutableMultimap.of()); + + final PresetAAIStandardQueryGet vnfGroup1 = + PresetAAIStandardQueryGet.ofInstanceGroup("vnfGroup-type", "Teresa Bradley", + ImmutableMultimap.<String, String>builder() + .putAll("generic-vnf", relatedVnf1.getReqPath(), relatedVnf2.getReqPath(), relatedVnf3.getReqPath()) + .build() + ); + + final PresetAAIStandardQueryGet vnfGroup2 = + PresetAAIStandardQueryGet.ofInstanceGroup("vnfGroup-type", "Stanley Mccarthy", ImmutableMultimap.of()); + + final PresetAAIStandardQueryGet serviceInstance = + PresetAAIStandardQueryGet.ofServiceInstance("service-instance-id", "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", "7ee41ce4-4827-44b0-a48e-2707a59905d2", "global-customer-id", "service-instance-type", + ImmutableMultimap.<String, String>builder() + .putAll("instance-group", vnfGroup1.getReqPath(),vnfGroup2.getReqPath()) + .build() + ); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + serviceInstance, + vnfGroup1,vnfGroup2, relatedVnf1, relatedVnf2, relatedVnf3, + new PresetAAIModelsByInvariantIdGet(ImmutableList.of("7ee41ce4-4827-44b0-a48e-2707a59905d2", "vnf-instance-model-invariant-id")), + new PresetGetSessionSlotCheckIntervalGet(), + new PresetAAIGetSubscribersGet(), + new PresetSDCGetServiceMetadataGet("4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", "7ee41ce4-4827-44b0-a48e-2707a59905d2", "service-vnf-grouping-csar.zip"), + new PresetSDCGetServiceToscaModelGet("4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", "service-vnf-grouping-csar.zip") + ), CLEAR_THEN_SET); + + String expected = TestUtils.convertRequest(objectMapper, "VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json"); + expected = expected + .replace("SERVICE_INSTANCE_NAME", serviceInstance.getInstanceName()) + .replace("VNF_GROUP1_INSTANCE_ID", vnfGroup1.getInstanceId()) + .replace("VNF_GROUP1_INSTANCE_NAME", vnfGroup1.getInstanceName()) + .replace("VNF_GROUP1_INSTANCE_TYPE", vnfGroup1.getInstanceType()) + .replace("VNF_GROUP1_INSTANCE_ROLE", vnfGroup1.getInstanceRole()) + + .replace("RELATED_VNF1_INSTANCE_ID", relatedVnf1.getInstanceId()) + .replace("RELATED_VNF1_INSTANCE_NAME", relatedVnf1.getInstanceName()) + .replace("RELATED_VNF1_INSTANCE_TYPE", relatedVnf1.getInstanceType()) + + .replace("RELATED_VNF2_INSTANCE_ID", relatedVnf2.getInstanceId()) + .replace("RELATED_VNF2_INSTANCE_NAME", relatedVnf2.getInstanceName()) + .replace("RELATED_VNF2_INSTANCE_TYPE", relatedVnf2.getInstanceType()) + + .replace("RELATED_VNF3_INSTANCE_ID", relatedVnf3.getInstanceId()) + .replace("RELATED_VNF3_INSTANCE_NAME", relatedVnf3.getInstanceName()) + .replace("RELATED_VNF3_INSTANCE_TYPE", relatedVnf3.getInstanceType()) + + .replace("VNF_GROUP2_INSTANCE_ID", vnfGroup2.getInstanceId()) + .replace("VNF_GROUP2_INSTANCE_NAME", vnfGroup2.getInstanceName()) + .replace("VNF_GROUP2_INSTANCE_TYPE", vnfGroup2.getInstanceType()) + .replace("VNF_GROUP2_INSTANCE_ROLE", vnfGroup2.getInstanceRole()); + + final String response = restTemplate.getForObject(buildUri(API_URL), String.class, "global-customer-id", "service-instance-type", "service-instance-id"); + + assertJsonEquals(response, expected); + } + + private String randUuid() { + return UUID.randomUUID().toString(); + } +} diff --git a/vid-automation/src/test/java/org/onap/vid/api/VersionControllerApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/VersionControllerApiTest.java new file mode 100644 index 000000000..4dc799193 --- /dev/null +++ b/vid-automation/src/test/java/org/onap/vid/api/VersionControllerApiTest.java @@ -0,0 +1,26 @@ +package org.onap.vid.api; + +import org.junit.Assert; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.ResponseEntity; +import org.springframework.web.client.RestTemplate; +import org.testng.annotations.Test; + +import java.util.HashMap; + +public class VersionControllerApiTest extends BaseApiTest { + + @Test + public void probeRequest_returnsResponseAsExpected() { + // without log-in + ResponseEntity<HashMap<String, String>> response = new RestTemplate().exchange( + uri + "/version", + org.springframework.http.HttpMethod.GET, + null, + new ParameterizedTypeReference<HashMap<String, String>>() { + }); + HashMap<String,String> versionResults = response.getBody(); + Assert.assertNotNull(versionResults.get("features")); + Assert.assertNotNull(versionResults.get("build")); + } +} diff --git a/vid-automation/src/test/java/org/onap/vid/api/VidConfigurationApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/VidConfigurationApiTest.java index 38ce8613d..ec479d900 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/VidConfigurationApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/VidConfigurationApiTest.java @@ -4,6 +4,7 @@ import org.springframework.http.ResponseEntity; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import static java.util.Collections.singletonList; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; diff --git a/vid-automation/src/test/java/org/onap/vid/api/pProbeAaiApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/pProbeAaiApiTest.java index 1765645af..db10fdc57 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/pProbeAaiApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/pProbeAaiApiTest.java @@ -1,6 +1,13 @@ package org.onap.vid.api; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy; +import static vid.automation.test.services.SimulatorApi.registerExpectation; + import com.google.common.collect.ImmutableMap; +import java.io.IOException; +import java.lang.reflect.Method; +import java.net.URISyntaxException; +import java.util.ArrayList; import org.apache.commons.text.StringEscapeUtils; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; @@ -9,14 +16,6 @@ import org.testng.Assert; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -import java.io.IOException; -import java.lang.reflect.Method; -import java.net.URISyntaxException; -import java.util.ArrayList; - -import static vid.automation.test.services.SimulatorApi.RegistrationStrategy; -import static vid.automation.test.services.SimulatorApi.registerExpectation; - public class pProbeAaiApiTest extends BaseApiAaiTest { @@ -36,7 +35,7 @@ public class pProbeAaiApiTest extends BaseApiAaiTest { //URIs private static final String GET_SERVICE_INSTANCE_PNFS = "aai_get_service_instance_pnfs/31739f3e-526b-11e6-beb8-9e71128cae77/AIM Transport/f36f5734-e9df-4fbf-9f35-61be13f028a1"; private static final String GET_SPECIFIC_PNF_URI = "aai_get_pnfs/pnf/DEAAI78"; - private static final String GET_PNF_BY_REGION = "aai_get_pnf_instances/e433710f-9217-458d-a79d-1c7aff376d89/VIRTUAL USP/8a84e59b-45fe-4851-8ff1-34225a0b32c3/83b458fd-5dd3-419b-a9e3-7335814a0911/AAIAIC25/Cisco/Nexus 3048-TP"; + private static final String GET_PNF_BY_REGION = "aai_get_pnf_instances/e433710f-9217-458d-a79d-1c7aff376d89/TYLER SILVIA/8a84e59b-45fe-4851-8ff1-34225a0b32c3/83b458fd-5dd3-419b-a9e3-7335814a0911/JANET25/Cisco/Nexus 3048-TP"; @@ -109,7 +108,7 @@ public class pProbeAaiApiTest extends BaseApiAaiTest { @Test public void testGetPnfDataByRegion() throws Exception { - String expected = "{\"results\":[{\"id\":\"901128280\",\"url\":\"/aai/v12/network/pnfs/pnf/AS-pnf2-10219--as988q\",\"properties\":{\"pnfName\":\"AS-pnf2-10219--as988q\",\"equipType\":\"Switch\",\"equipVendor\":\"Cisco\",\"equipModel\":\"Nexus3048-TP\",\"inMaint\":false,\"resourceVersion\":\"1508776538192\"},\"nodeType\":\"pnf\",\"relatedTo\":[{\"id\":\"532488360\",\"url\":\"/aai/v12/business/customers/customer/customer-10219-as988q/service-subscriptions/service-subscription/serviceSub2-test-10219-as988q/service-instances/service-instance/serviceIns2-test-10219-as988q\",\"nodeType\":\"service-instance\",\"relationshipLabel\":\"uses\"},{\"id\":\"860164248\",\"url\":\"/aai/v12/cloud-infrastructure/complexes/complex/complex-10219--as988q\",\"nodeType\":\"complex\",\"relationshipLabel\":\"locatedIn\"}]}],\"additionalProperties\":{}}"; + String expected = "{\"results\":[{\"id\":\"901128280\",\"url\":\"/aai/v12/network/pnfs/pnf/AS-pnf2-10219--as988q\",\"properties\":{\"pnfName\":\"AS-pnf2-10219--as988q\",\"equipType\":\"Switch\",\"equipVendor\":\"Cisco\",\"equipModel\":\"Nexus3048-TP\",\"inMaint\":false,\"resourceVersion\":\"1508776538192\"},\"nodeType\":\"pnf\",\"relatedTo\":[{\"id\":\"532488360\",\"url\":\"/aai/v12/business/customers/customer/customer-10219-as988q/service-subscriptions/service-subscription/serviceSub2-test-10219-as988q/service-instances/service-instance/serviceIns2-test-10219-as988q\",\"node-type\":\"service-instance\",\"relationship-label\":\"uses\"},{\"id\":\"860164248\",\"url\":\"/aai/v12/cloud-infrastructure/complexes/complex/complex-10219--as988q\",\"node-type\":\"complex\",\"relationship-label\":\"locatedIn\"}]}]}"; callAaiWithSimulatedErrorResponse(GET_PNF_BY_REGION_RESPONSE, ImmutableMap.of(), buildUri(GET_PNF_BY_REGION), "",200,expected, HttpMethod.GET); @@ -136,7 +135,7 @@ public class pProbeAaiApiTest extends BaseApiAaiTest { @Test public void testGetPnfDataByRegionNoResults() throws IOException, URISyntaxException { final String registratedResult = "{\"results\":[]}"; - final String expectedResult ="{\"results\":[],\"additionalProperties\":{}}"; + final String expectedResult ="{\"results\":[]}"; final int expectedResponseCode = 200; callAaiWithSimulatedErrorResponse(GET_PNF_BY_REGION_RESPONSE_EMPTY, ImmutableMap.of("500", Integer.toString(expectedResponseCode),"\"ERROR_PAYLOAD\"", StringEscapeUtils.escapeJson(registratedResult)), diff --git a/vid-automation/src/test/java/org/onap/vid/api/pProbeMsoApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/pProbeMsoApiTest.java index c082ef95a..534dc6934 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/pProbeMsoApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/pProbeMsoApiTest.java @@ -1,7 +1,11 @@ package org.onap.vid.api; +import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.apache.commons.text.StringEscapeUtils; +import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; +import org.onap.simulator.presetGenerator.presets.mso.configuration.PresetMSOActOnConfiguration; +import org.onap.simulator.presetGenerator.presets.mso.configuration.PresetMSOCreateConfiguration; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.testng.annotations.Test; @@ -15,7 +19,7 @@ public class pProbeMsoApiTest extends BaseMsoApiTest{ private static final String MSO_REMOVE_RELATIONSHIP = "/mso/mso_remove_relationship/f36f5734-e9df-4fbf-9f35-61be13f028a1"; private static final String MSO_ADD_RELATIONSHIP = "/mso/mso_add_relationship/f36f5734-e9df-4fbf-9f35-61be13f028a1"; public static final String MSO_CREATE_CONFIGURATION = "mso/mso_create_configuration_instance/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations/"; - public static final String MSO_ACTIVATE_CONFIGURATION = "mso/mso_activate_configuration/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations/a53c9ca8-8986-44da-9e5e-9e4179e6c78a"; + public static final String MSO_ACTIVATE_CONFIGURATION = "mso/mso_activate_configuration/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113"; @@ -24,15 +28,12 @@ public class pProbeMsoApiTest extends BaseMsoApiTest{ //Request Details private static final String CREATE_CONFIGURATION_REQUEST_DETAILS = "registration_to_simulator/body_jsons/mso_request_create_configuration.json"; - + private static final String ACTIVATE_CONFIGURATION_REQUEST_DETAILS = "registration_to_simulator/body_jsons/mso_request_activate_configuration.json"; //Jsons private static final String DISSOCIATE_OK_JSON = "dissociate_pnf_from_service_instance.json"; private static final String DISSOCIATE_FAILED_JSON = "dissociate_pnf_from_service_instance_error.json"; private static final String ASSOCIATE_OK_JSON = "mso_add_relationships.json"; private static final String ASSOCIATE_FAILED_JSON = "mso_add_relationships_error.json"; - private static final String CREATE_CONFIGURATION_OK_JSON = "mso_create_configurations.json"; - private static final String CREATE_CONFIGURATION_FAILED_JSON = "mso_create_configurations_error.json"; - private static final String ACTIVATE_CONFIGURATION_OK_JSON = "mso_activate_configurations.json"; //Expected Responses private static final String EXPECTED_SUCCESS_MSO_RESPONSE = "{\"requestReferences\": {\"instanceId\": \"f36f5734-e9df-4fbf-9f35-61be13f028a1\", \"requestId\": \"b6dc9806-b094-42f7-9386-a48de8218ce8\"}}"; @@ -73,25 +74,31 @@ public class pProbeMsoApiTest extends BaseMsoApiTest{ @Test public void testCreateConfigurationSucceed() throws Exception { String requestBody = TestUtils.convertRequest(objectMapper, CREATE_CONFIGURATION_REQUEST_DETAILS); - callMsoWithFineRequest(CREATE_CONFIGURATION_OK_JSON, ImmutableMap.of(), buildUri(MSO_CREATE_CONFIGURATION), - requestBody, HttpStatus.ACCEPTED.value(),EXPECTED_SUCCESS_MSO_RESPONSE , HttpMethod.POST); + callMsoWithFineRequest(ImmutableList.of( + new PresetMSOCreateConfiguration("f36f5734-e9df-4fbf-9f35-61be13f028a1"), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AAIAIC25_TO_ATT_AIC + ), + buildUri(MSO_CREATE_CONFIGURATION), requestBody, + HttpStatus.ACCEPTED.value(), EXPECTED_SUCCESS_MSO_RESPONSE, HttpMethod.POST); } @Test public void testActivateConfigurationSucceed() throws Exception { - String requestBody = "" + - "{" + - " \"val\": \"dummy payload\"" + - "}"; - callMsoWithFineRequest(ACTIVATE_CONFIGURATION_OK_JSON, ImmutableMap.of(), buildUri(MSO_ACTIVATE_CONFIGURATION), - requestBody, HttpStatus.ACCEPTED.value(),EXPECTED_SUCCESS_MSO_RESPONSE , HttpMethod.POST); + String requestBody = TestUtils.convertRequest(objectMapper, ACTIVATE_CONFIGURATION_REQUEST_DETAILS); + callMsoWithFineRequest(ImmutableList.of( + new PresetMSOActOnConfiguration("activate", "b6dc9806-b094-42f7-9386-a48de8218ce8", "f36f5734-e9df-4fbf-9f35-61be13f028a1"), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC + ), + buildUri(MSO_ACTIVATE_CONFIGURATION), + requestBody, HttpStatus.ACCEPTED.value(), EXPECTED_SUCCESS_MSO_RESPONSE, HttpMethod.POST); } @Test(dataProvider = "errorCodes") public void testCreateConfigurationError(int errorCode) throws IOException, URISyntaxException { String requestBody = TestUtils.convertRequest(objectMapper, CREATE_CONFIGURATION_REQUEST_DETAILS); - callMsoWithSimulatedErrorResponse(CREATE_CONFIGURATION_FAILED_JSON, - ImmutableMap.of("\"<ERROR_CODE>\"", Integer.toString(errorCode),"\"<ERROR_PAYLOAD>\"", StringEscapeUtils.escapeJson(EXPECTED_ERROR_MSO_RESPONSE)), + callMsoWithSimulatedErrorResponse(ImmutableList.of( + new PresetMSOCreateConfiguration("f36f5734-e9df-4fbf-9f35-61be13f028a1", errorCode, EXPECTED_ERROR_MSO_RESPONSE), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AAIAIC25_TO_ATT_AIC), buildUri(MSO_CREATE_CONFIGURATION), requestBody,errorCode,EXPECTED_ERROR_MSO_RESPONSE,HttpMethod.POST); } @@ -99,8 +106,9 @@ public class pProbeMsoApiTest extends BaseMsoApiTest{ @Test public void testCreateConfigurationFail() throws Exception { String requestBody = "498/*ht5ru7 mjhnb"; - callMsoWithSimulatedErrorResponse(CREATE_CONFIGURATION_FAILED_JSON, - ImmutableMap.of("\"<ERROR_CODE>\"", 500), + callMsoWithSimulatedErrorResponse(ImmutableList.of( + new PresetMSOCreateConfiguration("f36f5734-e9df-4fbf-9f35-61be13f028a1", 500, EXPECTED_ERROR_MSO_RESPONSE), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AAIAIC25_TO_ATT_AIC), buildUri(MSO_CREATE_CONFIGURATION), requestBody,500,EXPECTED_ERROR_MSO_RESPONSE,HttpMethod.POST); } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java index 91dd3ff27..00372c043 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/ChangeManagementRequest.java @@ -14,9 +14,9 @@ import java.util.Map; public class ChangeManagementRequest { public static class MsoChangeManagementRequest { - public final static String SOFTWARE_UPDATE = "inPlaceSoftwareUpdate"; + public static final String SOFTWARE_UPDATE = "inPlaceSoftwareUpdate"; public static final String REPLACE = "replace"; - public final static String CONFIG_UPDATE = "applyUpdatedConfig"; + public static final String CONFIG_UPDATE = "applyUpdatedConfig"; } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java index 59e0e2f37..c51a91f65 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironment.java @@ -1,7 +1,6 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class OperationalEnvironment { @@ -29,7 +28,6 @@ public class OperationalEnvironment { this.relationshipList = relationshipList; } - @JsonProperty("operational-environment-id") public String getOperationalEnvironmentId() { return operationalEnvironmentId; } @@ -38,7 +36,6 @@ public class OperationalEnvironment { this.operationalEnvironmentId = operationalEnvironmentId; } - @JsonProperty("operational-environment-name") public String getOperationalEnvironmentName() { return operationalEnvironmentName; } @@ -47,7 +44,6 @@ public class OperationalEnvironment { this.operationalEnvironmentName = operationalEnvironmentName; } - @JsonProperty("operational-environment-type") public String getOperationalEnvironmentType() { return operationalEnvironmentType; } @@ -56,7 +52,6 @@ public class OperationalEnvironment { this.operationalEnvironmentType = operationalEnvironmentType; } - @JsonProperty("operational-environment-status") public String getOperationalEnvironmentStatus() { return operationalEnvironmentStatus; } @@ -65,7 +60,6 @@ public class OperationalEnvironment { this.operationalEnvironmentStatus = operationalEnvironmentStatus; } - @JsonProperty("tenant-context") public String getTenantContext() { return tenantContext; } @@ -74,7 +68,6 @@ public class OperationalEnvironment { this.tenantContext = tenantContext; } - @JsonProperty("workload-context") public String getWorkloadContext() { return workloadContext; } @@ -83,7 +76,6 @@ public class OperationalEnvironment { this.workloadContext = workloadContext; } - @JsonProperty("resource-version") public String getResourceVersion() { return resourceVersion; } @@ -92,7 +84,6 @@ public class OperationalEnvironment { this.resourceVersion = resourceVersion; } - @JsonProperty("relationship-list") public RelationshipList getRelationshipList() { return relationshipList; } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java index 1ff84d3a3..c063b9971 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/OperationalEnvironmentList.java @@ -1,19 +1,16 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonIgnoreProperties; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import java.util.List; @JsonIgnoreProperties(ignoreUnknown = true) public class OperationalEnvironmentList { - @JsonProperty("operational-environment") public List<OperationalEnvironment> getOperationalEnvironment() { return operationalEnvironment; } - @JsonProperty("operational-environment") public void setOperationalEnvironment(List<OperationalEnvironment> operationalEnvironment) { this.operationalEnvironment = operationalEnvironment; } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java index 60fff94ab..e16c9db34 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelatedToProperty.java @@ -1,8 +1,6 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonProperty; - public class RelatedToProperty { public String getPropertyKey() { @@ -25,11 +23,9 @@ public class RelatedToProperty { } - @JsonProperty("property-key") public String propertyKey; - @JsonProperty("property-value") public String propertyValue; } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java b/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java index a8f0f22de..b83cd626d 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/Relationship.java @@ -1,22 +1,16 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.List; public class Relationship { - @JsonProperty("related-to") public String relatedTo; - @JsonProperty("related-link") public String relatedLink; - @JsonProperty("relationship-data") public List<RelationshipData> relationshipData; - @JsonProperty("related-to-property") public List<RelatedToProperty> relatedToProperty; diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java index 1e6ad2a19..aa81be72d 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipData.java @@ -1,30 +1,22 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonProperty; - public class RelationshipData { - @JsonProperty("relationship-key") public String getRelationshipKey() { return relationshipKey; } - @JsonProperty("relationship-key") public void setRelationshipKey(String relationshipKey) { this.relationshipKey = relationshipKey; } - @JsonProperty("relationship-value") public String getRelationshipValue() { return relationshipValue; } - @JsonProperty("relationship-value") public void setRelationshipValue(String relationshipValue) { this.relationshipValue = relationshipValue; } - @JsonProperty("relationship-key") public String relationshipKey; - @JsonProperty("relationship-value") public String relationshipValue; } diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java index 56a077d5a..599a2b2bc 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RelationshipList.java @@ -1,23 +1,18 @@ package org.onap.vid.model.mso; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.List; public class RelationshipList { - @JsonProperty("relationship") public List<Relationship> getRelationship() { return relationship; } - @JsonProperty("relationship") public void setRelationship(List<Relationship> relationship) { this.relationship = relationship; } - @JsonProperty("relationship") public List<Relationship> relationship; diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java index d25acbd21..a1e476914 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestInfo.java @@ -6,7 +6,6 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; -import javax.annotation.Generated; import java.util.HashMap; import java.util.Map; @@ -16,7 +15,6 @@ import java.util.Map; * */ @JsonInclude(JsonInclude.Include.NON_NULL) -@Generated("org.jsonschema2pojo") @JsonPropertyOrder({ "billingAccountNumber", "callbackUrl", diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java index d3574d7b5..9706f0d5d 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/RequestParameters.java @@ -6,14 +6,12 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; -import javax.annotation.Generated; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @JsonInclude(JsonInclude.Include.NON_NULL) -@Generated("org.jsonschema2pojo") @JsonPropertyOrder({ "subscriptionServiceType", "userParams" diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java b/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java index 67cded838..80976f37d 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/SubscriberInfo.java @@ -6,7 +6,6 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; -import javax.annotation.Generated; import java.util.HashMap; import java.util.Map; @@ -16,7 +15,6 @@ import java.util.Map; * */ @JsonInclude(JsonInclude.Include.NON_NULL) -@Generated("org.jsonschema2pojo") @JsonPropertyOrder({ "globalSubscriberId", "subscriberCommonSiteId", diff --git a/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java b/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java index 384e45631..0459b5a28 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java +++ b/vid-automation/src/test/java/org/onap/vid/model/mso/UserParam.java @@ -6,12 +6,10 @@ import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; -import javax.annotation.Generated; import java.util.HashMap; import java.util.Map; @JsonInclude(JsonInclude.Include.NON_NULL) -@Generated("org.jsonschema2pojo") @JsonPropertyOrder({ "name", "value" diff --git a/vid-automation/src/test/java/org/onap/vid/model/probe/ExternalComponentStatus.java b/vid-automation/src/test/java/org/onap/vid/model/probe/ExternalComponentStatus.java index b247613d6..759f2e08c 100644 --- a/vid-automation/src/test/java/org/onap/vid/model/probe/ExternalComponentStatus.java +++ b/vid-automation/src/test/java/org/onap/vid/model/probe/ExternalComponentStatus.java @@ -1,7 +1,7 @@ package org.onap.vid.model.probe; public class ExternalComponentStatus { - public enum Component {AAI, MSO, SCHEDULER} + public enum Component {AAI, MSO, SDC, SCHEDULER} private Component component; private boolean available; private HttpRequestMetadata metadata; diff --git a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java index fd8f48279..7ca29f854 100644 --- a/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java +++ b/vid-automation/src/test/java/org/onap/vid/more/LoggerFormatTest.java @@ -1,7 +1,17 @@ package org.onap.vid.more; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.Matchers.greaterThan; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.junit.Assert.assertThat; + import com.fasterxml.jackson.databind.JsonNode; +import java.net.URI; +import java.util.HashMap; +import java.util.Map; import org.apache.commons.lang3.StringUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.onap.vid.api.BaseApiTest; import org.springframework.web.client.RestTemplate; @@ -9,20 +19,12 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import vid.automation.test.services.SimulatorApi; -import java.net.URI; -import java.util.HashMap; -import java.util.Map; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; -import static org.hamcrest.Matchers.greaterThanOrEqualTo; - public class LoggerFormatTest extends BaseApiTest { - // See: https://wiki.web.att.com/display/KSAT/REST-based+Log+Checker - private final static String logChecker = "http://eelflogcheck.it.att.com:31820/validate"; + // See: https://www.openecomp.org/KSAT/REST-based+Log+Checker + private final static String logChecker = "http://eelf.onap.org:31820/validate"; + private final Logger logger = LogManager.getLogger(LoggerFormatTest.class); @BeforeClass public void login() { @@ -56,9 +58,9 @@ public class LoggerFormatTest extends BaseApiTest { private void validateLogsFormat(String logName, String logType) { String logLines = getLogLines(logName); + logger.info("logLines are: "+logLines); JsonNode response = getCheckerResults(logType, logLines); - - System.out.println(response); + logger.info("Response is:" + response.toString()); double fieldscore = response.path("summary").path("score").path("fieldscore").asDouble(); double overall = response.path("summary").path("score").path("overallscore").asDouble(); diff --git a/vid-automation/src/test/java/org/onap/vid/more/RequestIdFilterInstalled.java b/vid-automation/src/test/java/org/onap/vid/more/RequestIdFilterInstalled.java index 560538737..0a0045d4d 100644 --- a/vid-automation/src/test/java/org/onap/vid/more/RequestIdFilterInstalled.java +++ b/vid-automation/src/test/java/org/onap/vid/more/RequestIdFilterInstalled.java @@ -4,23 +4,22 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import org.junit.Assert; +import org.onap.simulator.presetGenerator.presets.aaf.AAFGetBasicAuthPreset; +import org.onap.simulator.presetGenerator.presets.aaf.AAFGetUrlServicePreset; import org.onap.vid.api.BaseApiTest; import org.onap.vid.api.OperationalEnvironmentControllerApiTest; import org.onap.vid.api.ServiceInstanceMsoApiTest; -import org.springframework.http.HttpEntity; -import org.springframework.http.HttpHeaders; -import org.springframework.http.HttpMethod; -import org.springframework.http.ResponseEntity; +import org.springframework.http.*; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import vid.automation.test.services.SimulatorApi; +import java.util.List; import java.util.UUID; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.nullValue; import static org.onap.vid.api.CategoryParametersApiTest.GET_CATEGORY_PARAMETER_PROPERTIES; import static org.onap.vid.api.pProbeMsoApiTest.MSO_CREATE_CONFIGURATION; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @@ -49,7 +48,7 @@ public class RequestIdFilterInstalled extends BaseApiTest { } @Test - public void frontendApi_doGET_RequestIdReceived() { + public void frontendApi_doGET_RequestIdReceived() throws InterruptedException { final Pair<HttpEntity, String> responseAndUuid = makeRequest( HttpMethod.GET, @@ -62,7 +61,7 @@ public class RequestIdFilterInstalled extends BaseApiTest { } @Test - public void frontendApi_doPOST_RequestIdReceived() { + public void frontendApi_doPOST_RequestIdReceived() throws InterruptedException { final Pair<HttpEntity, String> responseAndUuid = makeRequest( HttpMethod.POST, @@ -87,14 +86,13 @@ public class RequestIdFilterInstalled extends BaseApiTest { @Test(groups = { "worksOnlyWithLocalhostVID" }) - public void mopOwningEntityApi_doGET_RequestIdReceived() { + public void mopOwningEntityApi_doGET_RequestIdReceived() throws InterruptedException { final Pair<HttpEntity, String> responseAndUuid = makeRequest( HttpMethod.GET, "/" + GET_CATEGORY_PARAMETER_PROPERTIES + "?familyName=PARAMETER_STANDARDIZATION", null ); - assertThatUuidInResponseAndUuidIsInARecentLog(responseAndUuid); /* @@ -110,12 +108,18 @@ public class RequestIdFilterInstalled extends BaseApiTest { } @Test - public void schedulerApi_doPOST_RequestIdReceived() { + public void schedulerApi_doPOST_RequestIdReceived() throws InterruptedException { final String anyInstanceId = "any instance id"; SimulatorApi.registerExpectation( "mso_in_place_software_update_ok.json", ImmutableMap.of("SERVICE_INSTANCE_ID", anyInstanceId, "VNF_INSTANCE_ID", anyInstanceId), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); + SimulatorApi.registerExpectationFromPreset( + new AAFGetUrlServicePreset(), + SimulatorApi.RegistrationStrategy.APPEND); + SimulatorApi.registerExpectationFromPreset( + new AAFGetBasicAuthPreset(), + SimulatorApi.RegistrationStrategy.APPEND); final Pair<HttpEntity, String> responseAndUuid = makeRequest( HttpMethod.POST, "/change-management/workflow/" + anyInstanceId, @@ -126,7 +130,7 @@ public class RequestIdFilterInstalled extends BaseApiTest { } @Test - public void healthcheck_doGET_RequestIdReceived(){ + public void healthcheck_doGET_RequestIdReceived() { final Pair<HttpEntity, String> responseAndUuid = makeRequest( HttpMethod.GET, "/healthCheck", null ); @@ -142,14 +146,16 @@ public class RequestIdFilterInstalled extends BaseApiTest { // THIS TEST IS NOT JUST NICE TO HAVE, it also lets us know // that the request/response ran through our "promise request // id" filter, which is great! - assertThat(response, not(nullValue())); - assertThat(response.getHeaders().get(ECOMP_REQUEST_ID_ECHO), containsInAnyOrder(uuid)); + Assert.assertNotNull(response); + List<String> ecompRequestIdHeaderValues = response.getHeaders().get(ECOMP_REQUEST_ID_ECHO); + Assert.assertNotNull(ecompRequestIdHeaderValues); + Assert.assertTrue(ecompRequestIdHeaderValues.contains(uuid)); } private void assertThatTermIsInARecentLog(String uuid) { final ImmutableList<String> logLines = ImmutableList.of( - LoggerFormatTest.getLogLines("audit", 5, 0, restTemplate, uri), - LoggerFormatTest.getLogLines("error", 5, 0, restTemplate, uri) + LoggerFormatTest.getLogLines("audit", 20, 0, restTemplate, uri), + LoggerFormatTest.getLogLines("error", 20, 0, restTemplate, uri) ); // Assert that audit *OR* error has the uuid @@ -164,13 +170,13 @@ public class RequestIdFilterInstalled extends BaseApiTest { final String uuid = UUID.randomUUID().toString(); final HttpHeaders headers = new HttpHeaders(); headers.add(ECOMP_REQUEST_ID, uuid); - headers.add(AUTHORIZATION, "Basic 123=="); + headers.add(AUTHORIZATION, "Basic " + AAFGetBasicAuthPreset.VALID_AUTH_VALUE); + headers.setContentType(MediaType.APPLICATION_JSON); - SimulatorApi.clearExpectations(); if (!StringUtils.isEmpty(expectationFilename)) { SimulatorApi.registerExpectation(expectationFilename, APPEND); } - SimulatorApi.registerExpectation("aai_get_full_subscribers.json", APPEND); + SimulatorApi.registerExpectation("create_new_instance/aai_get_full_subscribers.json", APPEND); SimulatorApi.registerExpectation("ecompportal_getSessionSlotCheckInterval.json", APPEND); HttpEntity entity = new HttpEntity<>(body, headers); diff --git a/vid-automation/src/test/java/org/onap/vid/more/SimulatorLoaderTest.java b/vid-automation/src/test/java/org/onap/vid/more/SimulatorLoaderTest.java index bc550ae19..eff73cf70 100644 --- a/vid-automation/src/test/java/org/onap/vid/more/SimulatorLoaderTest.java +++ b/vid-automation/src/test/java/org/onap/vid/more/SimulatorLoaderTest.java @@ -1,13 +1,7 @@ package org.onap.vid.more; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIBadBodyForGetServicesGet; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkZones; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetPNFByRegionErrorPut; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetServicesGet; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAISearchNodeQueryEmptyResult; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut; +import org.onap.simulator.presetGenerator.presets.aai.*; import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetUserGet; import org.onap.simulator.presetGenerator.presets.mso.PresetActivateServiceInstancePost; @@ -34,6 +28,7 @@ import java.util.List; import java.util.Map; import static org.testng.Assert.assertEquals; +import static vid.automation.test.infra.ModelInfo.aLaCarteServiceCreationTest; import static vid.automation.test.services.SimulatorApi.registerExpectationFromPreset; import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; @@ -43,8 +38,9 @@ public class SimulatorLoaderTest extends BaseApiTest { protected Invocation.Builder createSimulatorRequestBuilder(BasePreset preset) { WebTarget webTarget = client.target(SimulatorApi.getSimulationUri() + preset.getReqPath()); webTarget = addQueryParamsToWebTarget(preset, webTarget); - return webTarget.request() + Invocation.Builder builder = webTarget.request() .accept("application/json"); + return addHeadersToBuilder(preset, builder); } private WebTarget addQueryParamsToWebTarget(BasePreset preset, WebTarget webTarget) { @@ -56,11 +52,16 @@ public class SimulatorLoaderTest extends BaseApiTest { return webTarget; } + private Invocation.Builder addHeadersToBuilder(BasePreset preset, Invocation.Builder builder) { + preset.getRequestHeaders().forEach((key,value)->builder.header(key,value)); + return builder; + } + @DataProvider public static Object[][] presetClassesWithPutPost(Method test) { return new Object[][]{ {new PresetAAIGetPNFByRegionErrorPut()}, - {new PresetAAIServiceDesignAndCreationPut("a","b")}, + {new PresetAAIServiceDesignAndCreationPut()}, {new PresetDeactivateServiceInstancePost()}, {new PresetActivateServiceInstancePost()}, {new PresetMSOCreateServiceInstancePost()} @@ -87,11 +88,10 @@ public class SimulatorLoaderTest extends BaseApiTest { {new PresetGetSessionSlotCheckIntervalGet()}, {new PresetGetUserGet()}, {new PresetAAIGetServicesGet()}, - {new PresetSDCGetServiceMetadataGet("a" , "b", "serviceCreationTest.zip")}, - {new PresetSDCGetServiceToscaModelGet( "a", "serviceCreationTest.zip")}, + {new PresetSDCGetServiceMetadataGet(aLaCarteServiceCreationTest)}, + {new PresetSDCGetServiceToscaModelGet( aLaCarteServiceCreationTest)}, {new PresetMSOOrchestrationRequestGet()}, {new PresetAAIGetNetworkZones()}, - {new PresetAAISearchNodeQueryEmptyResult()}, {new PresetAAIBadBodyForGetServicesGet("not a json")}, }; } diff --git a/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json new file mode 100644 index 000000000..08534ce49 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json @@ -0,0 +1,40 @@ +{ + "isDirty":true, + "vnfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "wowservicewithvnfgroping": "" + }, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceName": "wowServiceWithVnfGroping", + "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", + "orchStatus": "ACTIVE", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": null, + "owningEntityName": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": false, + "isALaCarte": true, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + "testApi": "VNF_API", + "action": "Delete" +} diff --git a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json new file mode 100644 index 000000000..f1bbf1712 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json @@ -0,0 +1,204 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "service_instance_name": "", + "vnf_group3_instance_name": "" + }, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 3 + }, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": { + "VNF_GROUP1_INSTANCE_ID": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "VNF_GROUP1_INSTANCE_ID", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None_Delete", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs":{ + "RELATED_VNF1_INSTANCE_ID":{ + "action":"None_Delete", + "instanceName":"RELATED_VNF1_INSTANCE_NAME", + "instanceId":"RELATED_VNF1_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "modelType":"vnf", + "modelName":"vf_vEPDG", + "modelVersion":"2.0" + }, + "instanceType":"RELATED_VNF1_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"RELATED_VNF1_INSTANCE_ID", + "serviceInstanceId":null, + "serviceInstanceName":null, + "tenantName":null + }, + "RELATED_VNF2_INSTANCE_ID":{ + "action":"None_Delete", + "instanceName":"RELATED_VNF2_INSTANCE_NAME", + "instanceId":"RELATED_VNF2_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60", + "modelType":"vnf" + }, + "instanceType":"RELATED_VNF2_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"RELATED_VNF2_INSTANCE_ID", + "serviceInstanceId":null, + "serviceInstanceName":null, + "tenantName":null + }, + "RELATED_VNF3_INSTANCE_ID":{ + "action":"None_Delete", + "instanceName":"RELATED_VNF3_INSTANCE_NAME", + "instanceId":"RELATED_VNF3_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60", + "modelType":"vnf" + }, + "instanceType":"RELATED_VNF3_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"RELATED_VNF3_INSTANCE_ID", + "serviceInstanceId":null, + "serviceInstanceName":null, + "tenantName":null + } + } + }, + "VNF_GROUP2_INSTANCE_ID": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "VNF_GROUP2_INSTANCE_ID", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": {} + }, + "groupingservicefortest..ResourceInstanceGroup..0": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "ag5aav86u4j", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP3_INSTANCE_NAME", + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelUniqueId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ], + "vnfs":{} + } + }, + "bulkSize": 1, + "instanceName": "SERVICE_INSTANCE_NAME", + + "instanceId": "service-instance-id", + "orchStatus": "GARBAGE DATA", + "globalSubscriberId": "global-customer-id", + "subscriptionServiceType": "service-instance-type", + "owningEntityId": null, + "owningEntityName": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": false, + "isALaCarte": true, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + + "testApi": "VNF_API" +} diff --git a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json new file mode 100644 index 000000000..f43a1dd12 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json @@ -0,0 +1,178 @@ +{ + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 2 + }, + "existingNetworksCounterMap": {}, + "vnfs": {}, + "vnfGroups": { + "VNF_GROUP1_INSTANCE_ID": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "VNF_GROUP1_INSTANCE_ID", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None_Delete", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": { + "RELATED_VNF1_INSTANCE_ID": { + "action": "None_Delete", + "instanceName": "RELATED_VNF1_INSTANCE_NAME", + "instanceId": "RELATED_VNF1_INSTANCE_ID", + "orchStatus": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "modelInfo": { + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelVersionId": "7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "modelType": "vnf", + "modelName": "vf_vEPDG", + "modelVersion": "2.0" + }, + "instanceType": "RELATED_VNF1_INSTANCE_TYPE", + "provStatus": null, + "inMaint": false, + "uuid": "7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "originalName": null, + "legacyRegion": null, + "lineOfBusiness": null, + "platformName": null, + "trackById": "RELATED_VNF1_INSTANCE_ID", + "serviceInstanceId": null, + "serviceInstanceName": null, + "tenantName": null + }, + "RELATED_VNF2_INSTANCE_ID": { + "action": "None_Delete", + "instanceName": "RELATED_VNF2_INSTANCE_NAME", + "instanceId": "RELATED_VNF2_INSTANCE_ID", + "orchStatus": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "modelInfo": { + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60", + "modelType": "vnf" + }, + "instanceType": "RELATED_VNF2_INSTANCE_TYPE", + "provStatus": null, + "inMaint": false, + "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60", + "originalName": null, + "legacyRegion": null, + "lineOfBusiness": null, + "platformName": null, + "trackById": "RELATED_VNF2_INSTANCE_ID", + "serviceInstanceId": null, + "serviceInstanceName": null, + "tenantName": null + }, + "RELATED_VNF3_INSTANCE_ID": { + "action": "None_Delete", + "instanceName": "RELATED_VNF3_INSTANCE_NAME", + "instanceId": "RELATED_VNF3_INSTANCE_ID", + "orchStatus": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "modelInfo": { + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60", + "modelType": "vnf" + }, + "instanceType": "RELATED_VNF3_INSTANCE_TYPE", + "provStatus": null, + "inMaint": false, + "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60", + "originalName": null, + "legacyRegion": null, + "lineOfBusiness": null, + "platformName": null, + "trackById": "RELATED_VNF3_INSTANCE_ID", + "serviceInstanceId": null, + "serviceInstanceName": null, + "tenantName": null + } + } + }, + "VNF_GROUP2_INSTANCE_ID": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "VNF_GROUP2_INSTANCE_ID", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None_Delete", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": {} + } + }, + "instanceParams": [], + "globalSubscriberId": "global-customer-id", + "subscriptionServiceType": "service-instance-type", + "projectName": null, + "owningEntityId": null, + "bulkSize": 1, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + "existingNames": { + "service_instance_name": "" + }, + "instanceName": "SERVICE_INSTANCE_NAME", + "owningEntityName": null, + "rollbackOnFailure": false, + "testApi": "VNF_API", + "isALaCarte": true, + "action": "Delete", + "isDirty": true, + "instanceId": "service-instance-id", + "orchStatus": "GARBAGE DATA", + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "networks": {}, + "validationCounter": 0 +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json new file mode 100644 index 000000000..f83799308 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json @@ -0,0 +1,139 @@ +{ + "service": { + "vidNotions": { + "instantiationUI": "serviceWithVnfGrouping", + "modelCategory": "other", + "viewEditUI": "serviceWithVnfGrouping" + }, + "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "invariantUuid": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "name": "Grouping Service for Test", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L4+", + "serviceType": "INFRASTRUCTURE", + "serviceRole": "GROUPING", + "description": "xxx", + "serviceEcompNaming": "true", + "instantiationType": "A-La-Carte", + "inputs": {} + }, + "vnfs": {}, + "networks": {}, + "collectionResource": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": { + "vDOROTHEA_svc_vprs_proxy 0": { + "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c", + "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc", + "description": "A Proxy for Service vDOROTHEA_Svc_vPRS", + "name": "vDOROTHEA_Svc_vPRS Service Proxy", + "version": "1.0", + "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9", + "inputs": {}, + "commands": {}, + "properties": { + "ecomp_generated_naming": "false" + }, + "type": "Service Proxy", + "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274", + "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14", + "sourceModelName": "vDOROTHEA_Svc_vPRS" + }, + "tsbc0001vm001_svc_proxy 0": { + "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c", + "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc", + "description": "A Proxy for Service tsbc0001vm001_Svc", + "name": "tsbc0001vm001_Svc Service Proxy", + "version": "1.0", + "customizationUuid": "3d814462-30fb-4c62-b997-9aa360d27ead", + "inputs": {}, + "commands": {}, + "properties": { + "ecomp_generated_naming": "false" + }, + "type": "Service Proxy", + "sourceModelUuid": "28aeb8f6-5620-4148-8bfb-a5fb406f0309", + "sourceModelInvariant": "c989ab9a-33c7-46ec-b521-1b2daef5f047", + "sourceModelName": "tsbc0001vm001_Svc" + } + }, + "vfModules": {}, + "volumeGroups": {}, + "pnfs": {}, + "vnfGroups": { + "groupingservicefortest..ResourceInstanceGroup..0": { + "type": "VnfGroup", + "invariantUuid": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "version": "1", + "name": "groupingservicefortest..ResourceInstanceGroup..0", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "properties": { + "contained_resource_type": "VF", + "role": "SERVICE-ACCESS", + "function": "DATA", + "description": "DDD0", + "type": "LOAD-GROUP", + "ecomp_generated_naming": "true", + "quantity": 4 + }, + "members": { + "vDOROTHEA_svc_vprs_proxy 0": { + "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c", + "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc", + "description": "A Proxy for Service vDOROTHEA_Svc_vPRS", + "name": "vDOROTHEA_Svc_vPRS Service Proxy", + "version": "1.0", + "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9", + "inputs": {}, + "commands": {}, + "properties": { + "ecomp_generated_naming": "false" + }, + "type": "Service Proxy", + "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274", + "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14", + "sourceModelName": "vDOROTHEA_Svc_vPRS" + } + } + }, + "groupingservicefortest..ResourceInstanceGroup..1": { + "type": "VnfGroup", + "invariantUuid": "a704112d-dbc6-4e56-8d4e-aec57e95ef9a", + "uuid": "c2b300e6-45de-4e5e-abda-3032bee2de56", + "version": "1", + "name": "groupingservicefortest..ResourceInstanceGroup..1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..1", + "properties": { + "contained_resource_type": "VF", + "role": "SERVICE-ACCESS", + "function": "SIGNALING", + "description": "DDD1", + "type": "LOAD-GROUP", + "ecomp_generated_naming": "true", + "quantity": 3 + }, + "members": { + "tsbc0001vm001_svc_proxy 0": { + "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c", + "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc", + "description": "A Proxy for Service tsbc0001vm001_Svc", + "name": "tsbc0001vm001_Svc Service Proxy", + "version": "1.0", + "customizationUuid": "3d814462-30fb-4c62-b997-9aa360d27ead", + "inputs": {}, + "commands": {}, + "properties": { + "ecomp_generated_naming": "false" + }, + "type": "Service Proxy", + "sourceModelUuid": "28aeb8f6-5620-4148-8bfb-a5fb406f0309", + "sourceModelInvariant": "c989ab9a-33c7-46ec-b521-1b2daef5f047", + "sourceModelName": "tsbc0001vm001_Svc" + } + } + } + } +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json new file mode 100644 index 000000000..734c13306 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json @@ -0,0 +1,178 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "service_instance_name": "" + }, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 2 + }, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": { + "VNF_GROUP1_INSTANCE_ID": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "VNF_GROUP1_INSTANCE_ID", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "VNF_GROUP1_ACTION", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": { + "RELATED_VNF1_INSTANCE_ID":{ + "action":"RELATED_VNF1_ACTION", + "instanceName":"RELATED_VNF1_INSTANCE_NAME", + "instanceId":"RELATED_VNF1_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "modelType":"vnf", + "modelName":"vf_vEPDG", + "modelVersion":"2.0" + }, + "instanceType":"RELATED_VNF1_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"RELATED_VNF1_INSTANCE_ID", + "serviceInstanceId":null, + "serviceInstanceName":null, + "tenantName":null + }, + "RELATED_VNF2_INSTANCE_ID":{ + "action":"RELATED_VNF2_ACTION", + "instanceName":"RELATED_VNF2_INSTANCE_NAME", + "instanceId":"RELATED_VNF2_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60", + "modelType":"vnf" + }, + "instanceType":"RELATED_VNF2_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"RELATED_VNF2_INSTANCE_ID", + "serviceInstanceId":null, + "serviceInstanceName":null, + "tenantName":null + }, + "RELATED_VNF3_INSTANCE_ID":{ + "action":"None", + "instanceName":"RELATED_VNF3_INSTANCE_NAME", + "instanceId":"RELATED_VNF3_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60", + "modelType":"vnf" + }, + "instanceType":"RELATED_VNF3_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"RELATED_VNF3_INSTANCE_ID", + "serviceInstanceId":null, + "serviceInstanceName":null, + "tenantName":null + } + } + }, + "VNF_GROUP2_INSTANCE_ID": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "VNF_GROUP2_INSTANCE_ID", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "vnfs": {} + } + }, + "bulkSize": 1, + "instanceName": "SERVICE_INSTANCE_NAME", + "instanceId": "service-instance-id", + "orchStatus": "GARBAGE DATA", + "globalSubscriberId": "global-customer-id", + "subscriptionServiceType": "service-instance-type", + "owningEntityId": null, + "owningEntityName": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": false, + "isALaCarte": true, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + "testApi": "VNF_API" +} diff --git a/vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json b/vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json new file mode 100644 index 000000000..e48e41c57 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json @@ -0,0 +1,114 @@ +[ + { + "action":"None", + "instanceName":"VNF1_INSTANCE_NAME", + "instanceId":"VNF1_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":"hvf23b", + "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a", + "tenantName":"APPC-24595-T-IST-02C", + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "modelVersion":"2.0", + "modelName":"vf_vEPDG", + "modelType":"vnf" + }, + "instanceType":"VNF1_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"VNF1_INSTANCE_ID", + "serviceInstanceId":"service-instance-id1", + "serviceInstanceName":"service-instance-name" + }, + { + "action":"None", + "instanceName":"VNF2_INSTANCE_NAME", + "instanceId":"VNF2_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":"hvf23b", + "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a", + "tenantName":"APPC-24595-T-IST-02C", + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"eb5f56bf-5855-4e61-bd00-3e19a953bf02", + "modelVersion":"1.0", + "modelName":"vf_vEPDG", + "modelType":"vnf" + }, + "instanceType":"VNF2_INSTANCE_TYPE", + "provStatus":null, + "inMaint":true, + "uuid":"eb5f56bf-5855-4e61-bd00-3e19a953bf02", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"VNF2_INSTANCE_ID", + "serviceInstanceId":"service-instance-id2", + "serviceInstanceName":"service-instance-name" + }, + { + "action":"None", + "instanceName":"VNF3_INSTANCE_NAME", + "instanceId":"VNF3_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":"hvf23b", + "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a", + "tenantName":"APPC-24595-T-IST-02C", + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelVersion":"1.0", + "modelName":"Grouping Service for Test", + "modelType":"vnf" + }, + "instanceType":"VNF3_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"VNF3_INSTANCE_ID", + "serviceInstanceId":"service-instance-id1", + "serviceInstanceName":"service-instance-name" + }, + { + "action":"None", + "instanceName":"VNF4_INSTANCE_NAME", + "instanceId":"VNF4_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":"hvf23b", + "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a", + "tenantName":"APPC-24595-T-IST-02C", + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"b7f2e8fb-ac71-4ea0-a801-06ef1479ea84", + "modelVersion":"4.0", + "modelName":"vf_vEPDG", + "modelType":"vnf" + }, + "instanceType":"VNF4_INSTANCE_TYPE", + "provStatus":null, + "inMaint":true, + "uuid":"b7f2e8fb-ac71-4ea0-a801-06ef1479ea84", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"VNF4_INSTANCE_ID", + "serviceInstanceId":"service-instance-id2", + "serviceInstanceName":"service-instance-name" + } +]
\ No newline at end of file diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json new file mode 100644 index 000000000..be4bfe428 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json @@ -0,0 +1,30 @@ +{ + "instanceName":"wowServiceWithVnfGroping", + "instanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb", + "orchStatus":"ACTIVE", + "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType":"TYLER SILVIA", + "owningEntityId":null, + "owningEntityName":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "tenantName":null, + "aicZoneId":null, + "aicZoneName":null, + "projectName":null, + "rollbackOnFailure":null, + "isALaCarte":true, + "modelInfo":{ + "modelInvariantId":"7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName":"Grouping Service for Test", + "modelType":"service", + "modelVersion":"1.0" + }, + "vnfs":{}, + "networks":{}, + "validationCounter":0, + "existingVNFCounterMap":{}, + "existingNetworksCounterMap":{} +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json new file mode 100644 index 000000000..0f4bc3fa3 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json @@ -0,0 +1,65 @@ +{ + "existingVNFCounterMap": { + }, + "existingVnfGroupCounterMap": { + "c2b300e6-45de-4e5e-abda-3032bee2de56": 1 + }, + "existingNetworksCounterMap": { + }, + "vnfs":{}, + "vnfGroups": { + "groupingservicefortest..ResourceInstanceGroup..1": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "groupingservicefortest..ResourceInstanceGroup..1", + "isMissingData": false, + "trackById": "tv2mmg4erg", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..1", + "instanceName": "ABC", + "instanceParams": [ + { + } + ], + "modelInfo": { + "modelInvariantId": "a704112d-dbc6-4e56-8d4e-aec57e95ef9a", + "modelVersionId": "c2b300e6-45de-4e5e-abda-3032bee2de56", + "modelName": "groupingservicefortest..ResourceInstanceGroup..1", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..1", + "modelUniqueId" : "c2b300e6-45de-4e5e-abda-3032bee2de56", + "uuid": "c2b300e6-45de-4e5e-abda-3032bee2de56" + }, + "uuid": "c2b300e6-45de-4e5e-abda-3032bee2de56", + "vnfs":{} + } + }, + "instanceParams": [ + { + "2017488_PASQUALEvpe0_ASN": "AV_vPE" + } + ], + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "projectName": "WATKINS", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "bulkSize": 1, + "modelInfo": { + "modelType": "service", + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelVersion": "1.0" + }, + "existingNames": { + "abc": "" + }, + "instanceName": "Grouping_Service_Instance", + "subscriberName": "SILVIA ROBBINS", + "owningEntityName": "WayneHolland", + "rollbackOnFailure": true, + "testApi": "VNF_API", + "isALaCarte": true, + "isDirty":true, + "action": "Create" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json new file mode 100644 index 000000000..42af8a789 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json @@ -0,0 +1,171 @@ +{ + "instanceName":"SERVICE_INSTANCE_NAME", + "action": "None", + "instanceId":"service-instance-id", + "orchStatus":"GARBAGE DATA", + "globalSubscriberId":"global-customer-id", + "subscriptionServiceType":"service-instance-type", + "owningEntityId":null, + "owningEntityName":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "tenantName":null, + "aicZoneId":null, + "aicZoneName":null, + "projectName":null, + "rollbackOnFailure":null, + "isALaCarte":true, + "modelInfo":{ + "modelInvariantId":"7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName":"Grouping Service for Test", + "modelType":"service", + "modelVersion":"1.0" + }, + "vnfs":{}, + "networks":{}, + "vnfGroups":{ + "VNF_GROUP1_INSTANCE_ID":{ + "originalName":"groupingservicefortest..ResourceInstanceGroup..0", + "trackById":"VNF_GROUP1_INSTANCE_ID", + "instanceName":"VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "instanceId":"VNF_GROUP1_INSTANCE_ID", + "instanceType":"VNF_GROUP1_INSTANCE_TYPE", + "orchStatus":null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint":false, + "modelInfo":{ + "modelType":"instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId":"4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole":"VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction":"vTSBC Customer Landing Network Collection", + "vnfs":{ + "RELATED_VNF1_INSTANCE_ID":{ + "action":"None", + "instanceName":"RELATED_VNF1_INSTANCE_NAME", + "instanceId":"RELATED_VNF1_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "modelType":"vnf", + "modelName":"vf_vEPDG", + "modelVersion":"2.0" + }, + "instanceType":"RELATED_VNF1_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"RELATED_VNF1_INSTANCE_ID", + "serviceInstanceId":null, + "serviceInstanceName":null, + "tenantName":null + }, + "RELATED_VNF2_INSTANCE_ID":{ + "action":"None", + "instanceName":"RELATED_VNF2_INSTANCE_NAME", + "instanceId":"RELATED_VNF2_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60", + "modelType":"vnf" + }, + "instanceType":"RELATED_VNF2_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"RELATED_VNF2_INSTANCE_ID", + "serviceInstanceId":null, + "serviceInstanceName":null, + "tenantName":null + }, + "RELATED_VNF3_INSTANCE_ID":{ + "action":"None", + "instanceName":"RELATED_VNF3_INSTANCE_NAME", + "instanceId":"RELATED_VNF3_INSTANCE_ID", + "orchStatus":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "modelInfo":{ + "modelInvariantId":"vnf-instance-model-invariant-id", + "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60", + "modelType":"vnf" + }, + "instanceType":"RELATED_VNF3_INSTANCE_TYPE", + "provStatus":null, + "inMaint":false, + "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60", + "originalName":null, + "legacyRegion":null, + "lineOfBusiness":null, + "platformName":null, + "trackById":"RELATED_VNF3_INSTANCE_ID", + "serviceInstanceId":null, + "serviceInstanceName":null, + "tenantName":null + } + } + }, + "VNF_GROUP2_INSTANCE_ID":{ + "originalName":"groupingservicefortest..ResourceInstanceGroup..0", + "trackById":"VNF_GROUP2_INSTANCE_ID", + "instanceName":"VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None", + "instanceId":"VNF_GROUP2_INSTANCE_ID", + "instanceType":"VNF_GROUP2_INSTANCE_TYPE", + "orchStatus":null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint":false, + "modelInfo":{ + "modelType":"instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId":"4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole":"VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction":"vTSBC Customer Landing Network Collection", + "vnfs": {} + } + }, + "validationCounter":0, + "existingVNFCounterMap":{}, + "existingVnfGroupCounterMap":{ + "daeb6568-cef8-417f-9075-ed259ce59f48": 2 + }, + "existingNetworksCounterMap":{} +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json new file mode 100644 index 000000000..2e0f85ee4 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json @@ -0,0 +1,123 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": {}, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "service_instance_name": "", + "vnf_group3_instance_name": "" + }, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 3 + }, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": { + "groupingservicefortest..ResourceInstanceGroup..0:001": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:001", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "rollbackOnFailure": "false", + "action": "None_Delete", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection" + }, + "groupingservicefortest..ResourceInstanceGroup..0:002": { + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "trackById": "groupingservicefortest..ResourceInstanceGroup..0:002", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "action": "None_Delete", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "orchStatus": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelType": "instanceGroup", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "tenantId": null, + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceGroupFunction": "vTSBC Customer Landing Network Collection" + }, + "groupingservicefortest..ResourceInstanceGroup..0": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "isMissingData": false, + "trackById": "ag5aav86u4j", + "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "instanceName": "VNF_GROUP3_INSTANCE_NAME", + + + "modelInfo": { + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48", + "modelName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelVersion": "1", + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "instanceParams": [{} + ] + } + }, + "bulkSize": 1, + "instanceName": "SERVICE_INSTANCE_NAME", + + "instanceId": "service-instance-id", + "orchStatus": "GARBAGE DATA", + "globalSubscriberId": "global-customer-id", + "subscriptionServiceType": "service-instance-type", + "owningEntityId": null, + "owningEntityName": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": false, + "isALaCarte": true, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0" + }, + + "testApi": "VNF_API" +} diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json new file mode 100644 index 000000000..da9727e89 --- /dev/null +++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json @@ -0,0 +1,209 @@ +{ + "action": "None", + "aicZoneId": null, + "aicZoneName": null, + "bulkSize": 1, + "existingNames": { + "service_instance_name": "" + }, + "existingNetworksCounterMap": {}, + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": { + "daeb6568-cef8-417f-9075-ed259ce59f48": 2, + "c2b300e6-45de-4e5e-abda-3032bee2de56": 0 + }, + "globalSubscriberId": "global-customer-id", + "instanceId": "service-instance-id", + "instanceName": "SERVICE_INSTANCE_NAME", + "instanceParams": [], + "isALaCarte": true, + "isDirty": true, + "lcpCloudRegionId": null, + "modelInfo": { + "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelName": "Grouping Service for Test", + "modelType": "service", + "modelVersion": "1.0", + "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc" + }, + "networks": {}, + "orchStatus": "GARBAGE DATA", + "owningEntityId": null, + "owningEntityName": null, + "productFamilyId": null, + "projectName": null, + "rollbackOnFailure": false, + "subscriptionServiceType": "service-instance-type", + "tenantId": null, + "tenantName": null, + "testApi": "VNF_API", + "validationCounter": 0, + "vnfGroups": { + "VNF_GROUP1_INSTANCE_ID": { + "action": "None", + "inMaint": false, + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE", + "instanceId": "VNF_GROUP1_INSTANCE_ID", + "instanceName": "VNF_GROUP1_INSTANCE_NAME", + "instanceType": "VNF_GROUP1_INSTANCE_TYPE", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "modelInfo": { + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelType": "instanceGroup", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "orchStatus": null, + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "trackById": "VNF_GROUP1_INSTANCE_ID", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "vnfs": { + "RELATED_VNF1_INSTANCE_ID": { + "action": "None", + "inMaint": false, + "instanceId": "RELATED_VNF1_INSTANCE_ID", + "instanceName": "RELATED_VNF1_INSTANCE_NAME", + "instanceType": "RELATED_VNF1_INSTANCE_TYPE", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "modelInfo": { + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelName": "vf_vEPDG", + "modelType": "vnf", + "modelVersion": "2.0", + "modelVersionId": "7a6ee536-f052-46fa-aa7e-2fca9d674c44" + }, + "orchStatus": null, + "originalName": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "serviceInstanceId": null, + "serviceInstanceName": null, + "tenantId": null, + "tenantName": null, + "trackById": "RELATED_VNF1_INSTANCE_ID", + "uuid": "7a6ee536-f052-46fa-aa7e-2fca9d674c44" + }, + "RELATED_VNF2_INSTANCE_ID": { + "action": "None", + "inMaint": false, + "instanceId": "RELATED_VNF2_INSTANCE_ID", + "instanceName": "RELATED_VNF2_INSTANCE_NAME", + "instanceType": "RELATED_VNF2_INSTANCE_TYPE", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "modelInfo": { + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelType": "vnf", + "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60" + }, + "orchStatus": null, + "originalName": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "serviceInstanceId": null, + "serviceInstanceName": null, + "tenantId": null, + "tenantName": null, + "trackById": "RELATED_VNF2_INSTANCE_ID", + "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60" + }, + "RELATED_VNF3_INSTANCE_ID": { + "action": "None", + "inMaint": false, + "instanceId": "RELATED_VNF3_INSTANCE_ID", + "instanceName": "RELATED_VNF3_INSTANCE_NAME", + "instanceType": "RELATED_VNF3_INSTANCE_TYPE", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "modelInfo": { + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelType": "vnf", + "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60" + }, + "orchStatus": null, + "originalName": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "serviceInstanceId": null, + "serviceInstanceName": null, + "tenantId": null, + "tenantName": null, + "trackById": "RELATED_VNF3_INSTANCE_ID", + "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60" + }, + "VNF1_INSTANCE_ID": { + "action": "Create", + "inMaint": false, + "instanceId": "VNF1_INSTANCE_ID", + "instanceName": "VNF1_INSTANCE_NAME", + "instanceType": "VNF1_INSTANCE_TYPE", + "isSelected": true, + "lcpCloudRegionId": "hvf23b", + "legacyRegion": null, + "lineOfBusiness": null, + "modelInfo": { + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelName": "vf_vEPDG", + "modelType": "vnf", + "modelVersion": "2.0", + "modelVersionId": "7a6ee536-f052-46fa-aa7e-2fca9d674c44" + }, + "orchStatus": null, + "originalName": null, + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "serviceInstanceId": "service-instance-id1", + "serviceInstanceName": "service-instance-name", + "tenantId": "3e9a20a3e89e45f884e09df0cc2d2d2a", + "tenantName": "APPC-24595-T-IST-02C", + "trackById": "VNF1_INSTANCE_ID", + "uuid": "7a6ee536-f052-46fa-aa7e-2fca9d674c44", + "vnfStoreKey": "VNF1_INSTANCE_ID" + } + } + }, + "VNF_GROUP2_INSTANCE_ID": { + "action": "None", + "inMaint": false, + "instanceGroupFunction": "vTSBC Customer Landing Network Collection", + "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE", + "instanceId": "VNF_GROUP2_INSTANCE_ID", + "instanceName": "VNF_GROUP2_INSTANCE_NAME", + "instanceType": "VNF_GROUP2_INSTANCE_TYPE", + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "modelInfo": { + "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0", + "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", + "modelType": "instanceGroup", + "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48" + }, + "orchStatus": null, + "originalName": "groupingservicefortest..ResourceInstanceGroup..0", + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "trackById": "VNF_GROUP2_INSTANCE_ID", + "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48", + "vnfs": {} + } + }, + "vnfs": {} +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarte.json b/vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarte.json new file mode 100644 index 000000000..450e43863 --- /dev/null +++ b/vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarte.json @@ -0,0 +1,18 @@ +[ + { + "instanceName": "instance name 1", + "instanceType" : "service", + "jobStatus": "COMPLETE", + "requestId": "405652f4-ceb3-4a75-9474-8aea71480a77", + "additionalInfo": "Service Instance was created successfully.", + "final": "false" + }, + { + "instanceName": "instance name 2", + "instanceType" : "service", + "jobStatus": "COMPLETE", + "requestId": "688d40cd-6bfd-4a4b-95f4-5e4ffa6d6fc5", + "additionalInfo": "Vnf has been created successfully.", + "final": "false" + } +] diff --git a/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte-no-testapi.json b/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte-no-testapi.json new file mode 100644 index 000000000..47643d21e --- /dev/null +++ b/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte-no-testapi.json @@ -0,0 +1,194 @@ +{ + "action":"Create", + "isDirty":false, + "validationCounter":0, + "existingVNFCounterMap": {}, + "existingNetworksCounterMap": {}, + "vnfs": { + "2017-488_PASQUALE-vPE 0": { + "action": "Create", + "rollbackOnFailure": "true", + "vfModules": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "instanceName": "mimazepubi", + "lcpCloudRegionId": "hvf6", + "tenantId": "624eb554b0d147c19ff8885341760481", + "rollbackOnFailure": "false", + "sdncPreLoad": false, + "instanceParams": [{} + ], + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelUniqueId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "isMissingData": false + } + }, + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { + "instanceName": "puwesovabe", + "volumeGroupName": "puwesovabe_vol", + "lcpCloudRegionId": "JANET25", + "legacyRegion": "my region", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "rollbackOnFailure": "true", + "sdncPreLoad": true, + "instanceParams": [{ + "PASQUALEvpe0_bandwidth": "10", + "2017488_PASQUALEvpe0_vnf_instance_name": "mtnj309me6", + "2017488_PASQUALEvpe0_vnf_config_template_version": "17.2", + "2017488_PASQUALEvpe0_AIC_CLLI": "ATLMY8GA", + "PASQUALEvpe0_bandwidth_units": "Gbps" + } + ], + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelUniqueId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", + "isMissingData": false + } + }, + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2": { + "instanceName": "bnmgtrx", + "volumeGroupName": "", + "lcpCloudRegionId": "hvf6", + "tenantId": "624eb554b0d147c19ff8885341760481", + "rollbackOnFailure": "false", + "sdncPreLoad": false, + "instanceParams": [{} + ], + "modelInfo": { + "modelInvariantId": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", + "modelVersionId": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "modelName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2", + "modelVersion": "6", + "modelCustomizationId": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "modelUniqueId": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2", + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a" + }, + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "isMissingData": false + } + } + }, + "isMissingData": false, + "originalName": "2017-488_PASQUALE-vPE 0", + "vnfStoreKey": "2017-488_PASQUALE-vPE 0", + "trackById": "s0z58emiprq", + "instanceName": "2017-488_PASQUALE-vPE", + "inMaint":false, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "lcpCloudRegionId": "JANET25", + "legacyRegion": "just another region", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "platformName": "xxx1", + "lineOfBusiness": "zzz1", + "instanceParams": [ + {} + ], + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelUniqueId" : "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + } + }, + "networks": { + "ExtVL 0": { + "action": "Create", + "rollbackOnFailure": "true", + "isMissingData": false, + "originalName": "ExtVL 0", + "networkStoreKey": "ExtVL 0", + "trackById": "s0z58emiprq", + "instanceName": "ExtVL", + "inMaint":false, + "legacyRegion": "lcpRegionText", + "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "platformName": "xxx1", + "lineOfBusiness": "zzz1", + "instanceParams": [ + {} + ], + "modelInfo": { + "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName": "ExtVL 0", + "modelInvariantId": "379f816b-a7aa-422f-be30-17114ff50b7c", + "modelUniqueId" : "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelName": "ExtVL", + "modelVersion": "37.0", + "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" + }, + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" + } + }, + "vnfGroups":{ + }, + "optionalGroupMembersMap": {}, + "existingVnfGroupCounterMap": {}, + "instanceParams": [ + {} + ], + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "projectName": "WATKINS", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "owningEntityName": "WayneHolland", + "bulkSize": 1, + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + "modelUniqueId": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + "modelName": "action-data", + "modelVersion": "1.0", + "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd" + }, + "isEcompGeneratedNaming": true, + "existingNames": { + "serviceinstancename": "" + }, + "instanceName": "serviceInstanceName", + "rollbackOnFailure": "true", + "isALaCarte": true, + "name": "action-data", + "version": "1.0", + "description": "", + "category": "", + "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "serviceType": "", + "serviceRole": "", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "tenantName": null, + "aicZoneId": "JAG1", + "aicZoneName": null, + "lcpCloudRegionId": "JANET25", + "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", + "isMultiStepDesign": false +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte.json b/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte.json new file mode 100644 index 000000000..7fcc9b1eb --- /dev/null +++ b/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte.json @@ -0,0 +1,195 @@ +{ + "action":"Create", + "isDirty":false, + "validationCounter":0, + "existingVNFCounterMap": {}, + "existingNetworksCounterMap": {}, + "vnfs": { + "2017-488_PASQUALE-vPE 0": { + "action": "Create", + "rollbackOnFailure": "true", + "vfModules": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "instanceName": "mimazepubi", + "lcpCloudRegionId": "hvf6", + "tenantId": "624eb554b0d147c19ff8885341760481", + "rollbackOnFailure": "false", + "sdncPreLoad": false, + "instanceParams": [{} + ], + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelUniqueId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "isMissingData": false + } + }, + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { + "instanceName": "puwesovabe", + "volumeGroupName": "puwesovabe_vol", + "lcpCloudRegionId": "JANET25", + "legacyRegion": "my region", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "rollbackOnFailure": "true", + "sdncPreLoad": true, + "instanceParams": [{ + "PASQUALEvpe0_bandwidth": "10", + "2017488_PASQUALEvpe0_vnf_instance_name": "mtnj309me6", + "2017488_PASQUALEvpe0_vnf_config_template_version": "17.2", + "2017488_PASQUALEvpe0_AIC_CLLI": "ATLMY8GA", + "PASQUALEvpe0_bandwidth_units": "Gbps" + } + ], + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelUniqueId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", + "isMissingData": false + } + }, + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2": { + "instanceName": "bnmgtrx", + "volumeGroupName": "", + "lcpCloudRegionId": "hvf6", + "tenantId": "624eb554b0d147c19ff8885341760481", + "rollbackOnFailure": "false", + "sdncPreLoad": false, + "instanceParams": [{} + ], + "modelInfo": { + "modelInvariantId": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", + "modelVersionId": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "modelName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2", + "modelVersion": "6", + "modelCustomizationId": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "modelUniqueId": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2", + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a" + }, + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "isMissingData": false + } + } + }, + "isMissingData": false, + "originalName": "2017-488_PASQUALE-vPE 0", + "vnfStoreKey": "2017-488_PASQUALE-vPE 0", + "trackById": "s0z58emiprq", + "instanceName": "2017-488_PASQUALE-vPE", + "inMaint":false, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "lcpCloudRegionId": "JANET25", + "legacyRegion": "just another region", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "platformName": "xxx1", + "lineOfBusiness": "zzz1", + "instanceParams": [ + {} + ], + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelUniqueId" : "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + } + }, + "networks": { + "ExtVL 0": { + "action": "Create", + "rollbackOnFailure": "true", + "isMissingData": false, + "originalName": "ExtVL 0", + "networkStoreKey": "ExtVL 0", + "trackById": "s0z58emiprq", + "instanceName": "ExtVL", + "inMaint":false, + "legacyRegion": "lcpRegionText", + "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "platformName": "xxx1", + "lineOfBusiness": "zzz1", + "instanceParams": [ + {} + ], + "modelInfo": { + "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName": "ExtVL 0", + "modelInvariantId": "379f816b-a7aa-422f-be30-17114ff50b7c", + "modelUniqueId" : "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelName": "ExtVL", + "modelVersion": "37.0", + "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" + }, + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" + } + }, + "vnfGroups":{ + }, + "optionalGroupMembersMap": {}, + "existingVnfGroupCounterMap": {}, + "instanceParams": [ + {} + ], + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "projectName": "WATKINS", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "owningEntityName": "WayneHolland", + "bulkSize": 1, + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + "modelUniqueId": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + "modelName": "action-data", + "modelVersion": "1.0", + "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd" + }, + "isEcompGeneratedNaming": true, + "existingNames": { + "serviceinstancename": "" + }, + "instanceName": "serviceInstanceName", + "rollbackOnFailure": "true", + "isALaCarte": true, + "name": "action-data", + "version": "1.0", + "description": "", + "category": "", + "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "serviceType": "", + "serviceRole": "", + "testApi": "GR_API", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "tenantName": null, + "aicZoneId": "JAG1", + "aicZoneName": null, + "lcpCloudRegionId": "JANET25", + "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", + "isMultiStepDesign": false +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/a-la-carte/redux-multiple-vnf-network.json b/vid-automation/src/test/resources/a-la-carte/redux-multiple-vnf-network.json new file mode 100644 index 000000000..de2fca2ba --- /dev/null +++ b/vid-automation/src/test/resources/a-la-carte/redux-multiple-vnf-network.json @@ -0,0 +1,118 @@ +{ + "vnfs": { + "VF_vGeraldine 0": { + "originalName": "VF_vGeraldine 0", + "rollbackOnFailure": "true", + "instanceName": "VFvGeraldine00001", + "isMissingData": false, + "modelName": "VF_vGeraldine 0", + "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "lineOfBusiness": "zzz1", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e", + "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60", + "modelName": "VF_vGeraldine", + "modelVersion": "2.0", + "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9", + "modelCustomizationName": "VF_vGeraldine 0" + }, + "legacyRegion": null + }, + "VF_vGeraldine 0:0001": { + "originalName": "VF_vGeraldine 0", + "instanceName": "VFvGeraldine00001_001", + "rollbackOnFailure": "true", + "isMissingData": false, + "modelName": "VF_vGeraldine 0", + "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "trackById": "e4wwvf531y8", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e", + "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60", + "modelUniqueId" : "91415b44-753d-494c-926a-456a9172bbb9", + "modelName": "VF_vGeraldine", + "modelVersion": "2.0", + "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9", + "modelCustomizationName": "VF_vGeraldine 0", + "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60" + }, + "legacyRegion": null, + "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60", + "instanceParams": [ + {} + ] + } + }, + "networks": { + "ExtVL 0": { + "action": "Create", + "rollbackOnFailure": "true", + "isMissingData": false, + "originalName": "ExtVL 0", + "networkStoreKey": "ExtVL 0", + "trackById": "8gdsx5jxxj8", + "inMaint":false, + "instanceName": "ExtVL", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "lcpCloudRegionId": "hvf6", + "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", + "platformName": "xxx1", + "lineOfBusiness": "zzz1", + "instanceParams": [ + {} + ], + "modelInfo": { + "modelInvariantId": "379f816b-a7aa-422f-be30-17114ff50b7c", + "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelUniqueId" : "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelName": "ExtVL", + "modelVersion": "37.0", + "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName": "ExtVL 0", + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" + }, + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" + } + }, + "validationCounter": 0, + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "subscriptionServiceType": "TYLER SILVIA", + "lcpCloudRegionId": "hvf6", + "testApi": "GR_API", + "tenantId": "1178612d2b394be4834ad77f567c0af2", + "aicZoneId": "YYY1", + "projectName": "yyy1", + "owningEntityId": "aaa1", + "owningEntityName": "aaa1", + "rollbackOnFailure": "true", + "isALaCarte": true, + "isEcompGeneratedNaming": false, + "bulkSize": 1, + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44", + "modelName": "ComplexService", + "modelVersion": "1.0" + }, + "instanceName": "serviceInstanceName", + "existingNames": { + "serviceinstancename": "", + "vfvgeraldine00001": "", + "vfvgeraldine00001_001": "" + }, + "existingVNFCounterMap": { + "d6557200-ecf2-4641-8094-5393ae3aae60": 1, + "undefined": 1 + }, + "existingNetworksCounterMap": {}, + "tenantName": "AIN Web Tool-15-D-SSPtestcustome", + "aicZoneName": "UUUAIAAI-YYY1" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json new file mode 100644 index 000000000..a95573558 --- /dev/null +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json @@ -0,0 +1,274 @@ +{ + "instanceName":"SERVICE_INSTANCE_NAME", + "action": "None", + "instanceId":"service-instance-id", + "orchStatus":"GARBAGE DATA", + "globalSubscriberId":"global-customer-id", + "subscriptionServiceType":"service-instance-type", + "owningEntityId":null, + "owningEntityName":null, + "productFamilyId":null, + "lcpCloudRegionId":null, + "tenantId":null, + "tenantName":null, + "aicZoneId":null, + "aicZoneName":null, + "projectName":null, + "rollbackOnFailure":null, + "isALaCarte":false, + "modelInfo":{ + "modelInvariantId":"d27e42cf-087e-4d31-88ac-6c4b7585f800", + "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44", + "modelName":"vf_vEPDG", + "modelType":"service", + "modelVersion":"5.0" + }, + "vnfs": { + "VNF1_INSTANCE_ID": { + "originalName": null, + "trackById": "VNF1_INSTANCE_ID", + "instanceName": "VNF1_INSTANCE_NAME", + "action": "None", + "instanceId": "VNF1_INSTANCE_ID", + "instanceType": "VNF1_INSTANCE_TYPE", + "orchStatus": null, + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelVersionId": "vnf-instance-model-version-id", + "modelCustomizationId": "vnf-instance-model-customization-id", + "modelType": "vnf" + }, + "uuid": "vnf-instance-model-version-id", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null, + "vfModules": {}, + "networks": { + "NETWORK1_INSTANCE_ID": { + "originalName": null, + "trackById": "NETWORK1_INSTANCE_ID", + "instanceName": "NETWORK1_INSTANCE_NAME", + "action": "None", + "instanceId": "NETWORK1_INSTANCE_ID", + "instanceType": "CONTRAIL30_BASIC", + "orchStatus": "Assigned", + "provStatus": "prov", + "inMaint": false, + "modelInfo": { + "modelInvariantId": "network-instance-model-invariant-id", + "modelVersionId": "network-instance-model-version-id", + "modelCustomizationId": "network-instance-model-customization-id", + "modelType": "network" + }, + "uuid": "network-instance-model-version-id", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null + }, + "NETWORK2_INSTANCE_ID": { + "originalName": null, + "trackById": "NETWORK2_INSTANCE_ID", + "instanceName": "NETWORK2_INSTANCE_NAME", + "action": "None", + "instanceId": "NETWORK2_INSTANCE_ID", + "instanceType": "CONTRAIL30_BASIC", + "orchStatus": "Created", + "provStatus": "prov", + "inMaint": false, + "modelInfo": { + "modelInvariantId": "network-instance-model-invariant-id", + "modelVersionId": "network-instance-model-version-id", + "modelCustomizationId": "network-instance-model-customization-id", + "modelType": "network" + }, + "uuid": "network-instance-model-version-id", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null + } + } + }, + "VNF2_INSTANCE_ID": { + "originalName": "VF_vGeraldine 0", + "trackById": "VNF2_INSTANCE_ID", + "instanceName": "VNF2_INSTANCE_NAME", + "action": "None", + "instanceId": "VNF2_INSTANCE_ID", + "instanceType": "VNF2_INSTANCE_TYPE", + "orchStatus": null, + "provStatus": null, + "inMaint": true, + "modelInfo": { + "modelCustomizationName": "VF_vGeraldine 0", + "modelInvariantId": "vnf-instance-model-invariant-id", + "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60", + "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9", + "modelType": "vnf" + }, + "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null, + "vfModules": { + "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": { + "2c1ca484-cbc2-408b-ab86-25a2c15ce280": { + "originalName": "VfVgeraldine..vflorence_vlc..module-1", + "trackById": "2c1ca484-cbc2-408b-ab86-25a2c15ce280", + "instanceName": "ss820f_0918_db", + "action": "None", + "instanceId": "2c1ca484-cbc2-408b-ab86-25a2c15ce280", + "instanceType": null, + "orchStatus": "deleted", + "provStatus": null, + "inMaint": true, + "modelInfo": { + "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1", + "modelCustomizationId": "55b1be94-671a-403e-a26c-667e9c47d091", + "modelInvariantId": "09edc9ef-85d0-4b26-80de-1f569d49e750", + "modelVersionId": "522159d5-d6e0-4c2a-aa44-5a542a12a830", + "modelType": "vfModule" + }, + "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null, + "isBase": false, + "volumeGroupName": null + } + }, + "dc229cd8-c132-4455-8517-5c1787c18b14": { + "3ef042c4-259f-45e0-9aba-0989bd8d1cc5": { + "originalName": null, + "trackById": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5", + "instanceName": "ss820f_0918_base", + "action": "None", + "instanceId": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5", + "instanceType": null, + "orchStatus": "Assigned", + "provStatus": null, + "inMaint": false, + "modelInfo": { + "modelCustomizationId": "8ad8670b-0541-4499-8101-275bbd0e8b6a", + "modelInvariantId": "1e463c9c-404d-4056-ba56-28fd102608de", + "modelVersionId": "dc229cd8-c132-4455-8517-5c1787c18b14", + "modelType": "vfModule" + }, + "uuid": "dc229cd8-c132-4455-8517-5c1787c18b14", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null, + "isBase": true, + "volumeGroupName": null + } + } + }, + "networks": {} + } + }, + "networks": { + "NETWORK3_INSTANCE_ID": { + "originalName": "ExtVL 0", + "trackById": "NETWORK3_INSTANCE_ID", + "instanceName": "NETWORK3_INSTANCE_NAME", + "action": "None", + "instanceId": "NETWORK3_INSTANCE_ID", + "instanceType": "CONTRAIL30_BASIC", + "orchStatus": "Assigned", + "provStatus": "nvtprov", + "inMaint": false, + "modelInfo": { + "modelCustomizationName": "ExtVL 0", + "modelInvariantId": "network-instance-model-invariant-id", + "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelType": "network" + }, + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null + }, + "NETWORK4_INSTANCE_ID": { + "originalName": "ExtVL 0", + "trackById": "NETWORK4_INSTANCE_ID", + "instanceName": "NETWORK4_INSTANCE_NAME", + "action": "None", + "instanceId": "NETWORK4_INSTANCE_ID", + "instanceType": "CONTRAIL30_HIMELGUARD", + "orchStatus": "Created", + "provStatus": "preprov", + "inMaint": false, + "modelInfo": { + "modelCustomizationName": "ExtVL 0", + "modelInvariantId": "network-instance-model-invariant-id", + "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelType": "network" + }, + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null + } + }, + "instanceName": "SERVICE_INSTANCE_NAME", + "action": "None", + "instanceId": "service-instance-id", + "orchStatus": "GARBAGE DATA", + "globalSubscriberId": "global-customer-id", + "subscriptionServiceType": "service-instance-type", + "owningEntityId": null, + "owningEntityName": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": null, + "isALaCarte": false, + "modelInfo": { + "modelInvariantId": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44", + "modelName": "vf_vEPDG", + "modelType": "service", + "modelVersion": "5.0" + }, + "validationCounter": 0, + "vnfGroups": {}, + "existingVNFCounterMap": { + "91415b44-753d-494c-926a-456a9172bbb9": 1, + "vnf-instance-model-customization-id": 1 + }, + "existingNetworksCounterMap": { + "94fdd893-4a36-4d70-b16a-ec29c54c184f": 2 + }, + "existingVnfGroupCounterMap": {} +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json new file mode 100644 index 000000000..0fbf83070 --- /dev/null +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json @@ -0,0 +1,392 @@ +{ + "service": { + "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44", + "invariantUuid": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "name": "ComplexService", + "version": "1.0", + "toscaModelURL": null, + "category": "Emanuel", + "serviceType": "", + "serviceRole": "", + "description": "ComplexService", + "serviceEcompNaming": "true", + "instantiationType": "Macro", + "inputs": {}, + "vidNotions": { + "instantiationUI": "legacy", + "modelCategory": "other", + "viewEditUI": "legacy" + } + }, + "vnfs": { + "VF_vGeraldine 0": { + "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60", + "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e", + "description": "VSP_vGeraldine", + "name": "VF_vGeraldine", + "version": "2.0", + "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9", + "inputs": {}, + "commands": {}, + "properties": { + "gpb2_Internal2_mac": "00:11:22:EF:AC:DF", + "sctp-b-ipv6-egress_src_start_port": "0", + "sctp-a-ipv6-egress_rule_application": "any", + "Internal2_allow_transit": "true", + "sctp-b-IPv6_ethertype": "IPv6", + "sctp-a-egress_rule_application": "any", + "sctp-b-ingress_action": "pass", + "sctp-b-ingress_rule_protocol": "icmp", + "ncb2_Internal1_mac": "00:11:22:EF:AC:DF", + "sctp-b-ipv6-ingress-src_start_port": "0.0", + "ncb1_Internal2_mac": "00:11:22:EF:AC:DF", + "fsb_volume_size_0": "320.0", + "sctp-b-egress_src_addresses": "local", + "sctp-a-ipv6-ingress_ethertype": "IPv4", + "sctp-a-ipv6-ingress-dst_start_port": "0", + "sctp-b-ipv6-ingress_rule_application": "any", + "domain_name": "default-domain", + "sctp-a-ingress_rule_protocol": "icmp", + "sctp-b-egress-src_start_port": "0.0", + "sctp-a-egress_src_addresses": "local", + "sctp-b-display_name": "epc-sctp-b-ipv4v6-sec-group", + "sctp-a-egress-src_start_port": "0.0", + "sctp-a-ingress_ethertype": "IPv4", + "sctp-b-ipv6-ingress-dst_end_port": "65535", + "sctp-b-dst_subnet_prefix_v6": "::", + "nf_naming": "{ecomp_generated_naming=true}", + "sctp-a-ipv6-ingress_src_subnet_prefix": "0.0.0.0", + "sctp-b-egress-dst_start_port": "0.0", + "ncb_flavor_name": "nv.c20r64d1", + "gpb1_Internal1_mac": "00:11:22:EF:AC:DF", + "sctp-b-egress_dst_subnet_prefix_len": "0.0", + "Internal2_net_cidr": "10.0.0.10", + "sctp-a-ingress-dst_start_port": "0.0", + "sctp-a-egress-dst_start_port": "0.0", + "fsb1_Internal2_mac": "00:11:22:EF:AC:DF", + "sctp-a-egress_ethertype": "IPv4", + "vlc_st_service_mode": "in-network-nat", + "sctp-a-ipv6-egress_ethertype": "IPv4", + "sctp-a-egress-src_end_port": "65535.0", + "sctp-b-ipv6-egress_rule_application": "any", + "sctp-b-egress_action": "pass", + "sctp-a-ingress-src_subnet_prefix_len": "0.0", + "sctp-b-ipv6-ingress-src_end_port": "65535.0", + "sctp-b-name": "epc-sctp-b-ipv4v6-sec-group", + "fsb2_Internal1_mac": "00:11:22:EF:AC:DF", + "sctp-a-ipv6-ingress-src_start_port": "0.0", + "sctp-b-ipv6-egress_ethertype": "IPv4", + "Internal1_net_cidr": "10.0.0.10", + "sctp-a-egress_dst_subnet_prefix": "0.0.0.0", + "fsb_flavor_name": "nv.c20r64d1", + "sctp_rule_protocol": "132", + "sctp-b-ipv6-ingress_src_subnet_prefix_len": "0", + "sctp-a-ipv6-ingress_rule_application": "any", + "ecomp_generated_naming": "true", + "sctp-a-IPv6_ethertype": "IPv6", + "vlc2_Internal1_mac": "00:11:22:EF:AC:DF", + "vlc_st_virtualization_type": "virtual-machine", + "sctp-b-ingress-dst_start_port": "0.0", + "sctp-b-ingress-dst_end_port": "65535.0", + "sctp-a-ipv6-ingress-src_end_port": "65535.0", + "sctp-a-display_name": "epc-sctp-a-ipv4v6-sec-group", + "sctp-b-ingress_rule_application": "any", + "int2_sec_group_name": "int2-sec-group", + "vlc_flavor_name": "nd.c16r64d1", + "sctp-b-ipv6-egress_src_addresses": "local", + "vlc_st_interface_type_int1": "other1", + "sctp-b-egress-src_end_port": "65535.0", + "sctp-a-ipv6-egress-dst_start_port": "0", + "vlc_st_interface_type_int2": "other2", + "sctp-a-ipv6-egress_rule_protocol": "any", + "Internal2_shared": "false", + "sctp-a-ipv6-egress_dst_subnet_prefix_len": "0", + "Internal2_rpf": "disable", + "vlc1_Internal1_mac": "00:11:22:EF:AC:DF", + "sctp-b-ipv6-egress_src_end_port": "65535", + "sctp-a-ipv6-egress_src_addresses": "local", + "sctp-a-ingress-dst_end_port": "65535.0", + "sctp-a-ipv6-egress_src_end_port": "65535", + "Internal1_forwarding_mode": "l2", + "Internal2_dhcp": "false", + "sctp-a-dst_subnet_prefix_v6": "::", + "pxe_image_name": "MME_PXE-Boot_16ACP04_GA.qcow2", + "vlc_st_interface_type_gtp": "other0", + "ncb1_Internal1_mac": "00:11:22:EF:AC:DF", + "sctp-b-src_subnet_prefix_v6": "::", + "sctp-a-egress_dst_subnet_prefix_len": "0.0", + "int1_sec_group_name": "int1-sec-group", + "Internal1_dhcp": "false", + "sctp-a-ipv6-egress_dst_end_port": "65535", + "Internal2_forwarding_mode": "l2", + "fsb2_Internal2_mac": "00:11:22:EF:AC:DF", + "sctp-b-egress_dst_subnet_prefix": "0.0.0.0", + "Internal1_net_cidr_len": "17", + "gpb2_Internal1_mac": "00:11:22:EF:AC:DF", + "sctp-b-ingress-src_subnet_prefix_len": "0.0", + "sctp-a-ingress_dst_addresses": "local", + "sctp-a-egress_action": "pass", + "fsb_volume_type_0": "SF-Default-SSD", + "ncb2_Internal2_mac": "00:11:22:EF:AC:DF", + "vlc_st_interface_type_sctp_a": "left", + "vlc_st_interface_type_sctp_b": "right", + "sctp-a-src_subnet_prefix_v6": "::", + "vlc_st_version": "2", + "sctp-b-egress_ethertype": "IPv4", + "sctp-a-ingress_rule_application": "any", + "gpb1_Internal2_mac": "00:11:22:EF:AC:DF", + "instance_ip_family_v6": "v6", + "sctp-a-ipv6-egress_src_start_port": "0", + "sctp-b-ingress-src_start_port": "0.0", + "sctp-b-ingress_dst_addresses": "local", + "fsb1_Internal1_mac": "00:11:22:EF:AC:DF", + "vlc_st_interface_type_oam": "management", + "multi_stage_design": "false", + "oam_sec_group_name": "oam-sec-group", + "Internal2_net_gateway": "10.0.0.10", + "sctp-a-ipv6-ingress-dst_end_port": "65535", + "sctp-b-ipv6-egress-dst_start_port": "0", + "Internal1_net_gateway": "10.0.0.10", + "sctp-b-ipv6-egress_rule_protocol": "any", + "gtp_sec_group_name": "gtp-sec-group", + "sctp-a-ipv6-egress_dst_subnet_prefix": "0.0.0.0", + "sctp-b-ipv6-egress_dst_subnet_prefix_len": "0", + "sctp-a-ipv6-ingress_dst_addresses": "local", + "sctp-a-egress_rule_protocol": "icmp", + "sctp-b-ipv6-egress_action": "pass", + "sctp-a-ipv6-egress_action": "pass", + "Internal1_shared": "false", + "sctp-b-ipv6-ingress_rule_protocol": "any", + "Internal2_net_cidr_len": "17", + "sctp-a-name": "epc-sctp-a-ipv4v6-sec-group", + "sctp-a-ingress-src_end_port": "65535.0", + "sctp-b-ipv6-ingress_src_subnet_prefix": "0.0.0.0", + "sctp-a-egress-dst_end_port": "65535.0", + "sctp-a-ingress_action": "pass", + "sctp-b-egress_rule_protocol": "icmp", + "sctp-b-ipv6-ingress_action": "pass", + "vlc_st_service_type": "firewall", + "sctp-b-ipv6-egress_dst_end_port": "65535", + "sctp-b-ipv6-ingress-dst_start_port": "0", + "vlc2_Internal2_mac": "00:11:22:EF:AC:DF", + "vlc_st_availability_zone": "true", + "fsb_volume_image_name_1": "MME_FSB2_16ACP04_GA.qcow2", + "sctp-b-ingress-src_subnet_prefix": "0.0.0.0", + "sctp-a-ipv6-ingress_src_subnet_prefix_len": "0", + "Internal1_allow_transit": "true", + "gpb_flavor_name": "nv.c20r64d1", + "availability_zone_max_count": "1", + "fsb_volume_image_name_0": "MME_FSB1_16ACP04_GA.qcow2", + "sctp-b-ipv6-ingress_dst_addresses": "local", + "sctp-b-ipv6-egress_dst_subnet_prefix": "0.0.0.0", + "sctp-b-ipv6-ingress_ethertype": "IPv4", + "vlc1_Internal2_mac": "00:11:22:EF:AC:DF", + "sctp-a-ingress-src_subnet_prefix": "0.0.0.0", + "sctp-a-ipv6-ingress_action": "pass", + "Internal1_rpf": "disable", + "sctp-b-ingress_ethertype": "IPv4", + "sctp-b-egress_rule_application": "any", + "sctp-b-ingress-src_end_port": "65535.0", + "sctp-a-ipv6-ingress_rule_protocol": "any", + "sctp-a-ingress-src_start_port": "0.0", + "sctp-b-egress-dst_end_port": "65535.0" + }, + "type": "VF", + "modelCustomizationName": "VF_vGeraldine 0", + "vfModules": { + "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": { + "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830", + "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b", + "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091", + "description": null, + "name": "VfVgeraldine..vflorence_vlc..module-1", + "version": "2", + "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "vflorence_vlc", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": { + "uuid": "41708296-e443-4c71-953f-d9a010f059e1", + "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9", + "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c", + "description": null, + "name": "VfVgeraldine..vflorence_gpb..module-2", + "version": "2", + "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "vflorence_gpb", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": { + "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87", + "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d", + "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861", + "description": null, + "name": "VfVgeraldine..base_vflorence..module-0", + "version": "2", + "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_vflorence", + "baseModule": true + }, + "inputs": {}, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": { + "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87", + "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d", + "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861", + "description": null, + "name": "VfVgeraldine..base_vflorence..module-0", + "version": "2", + "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_vflorence", + "baseModule": true + }, + "inputs": {} + } + }, + "vfcInstanceGroups": {} + } + }, + "networks": { + "ExtVL 0": { + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c", + "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks", + "name": "ExtVL", + "version": "37.0", + "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "inputs": {}, + "commands": {}, + "properties": { + "network_role" : "network role 1, network role 2", + "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}", + "exVL_naming": "{ecomp_generated_naming=true}", + "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}", + "network_homing": "{ecomp_selected_instance_node_target=false}" + }, + "type": "VL", + "modelCustomizationName": "ExtVL 0" + } + }, + "collectionResource": {}, + "configurations": { + "Port Mirroring Configuration By Policy 0": { + "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50", + "invariantUuid": "6ef0ca40-f366-4897-951f-abd65d25f6f7", + "description": "A port mirroring configuration by policy object", + "name": "Port Mirroring Configuration By Policy", + "version": "27.0", + "customizationUuid": "3c3b7b8d-8669-4b3b-8664-61970041fad2", + "inputs": {}, + "commands": {}, + "properties": {}, + "type": "Configuration", + "modelCustomizationName": "Port Mirroring Configuration By Policy 0", + "sourceNodes": [], + "collectorNodes": null, + "configurationByPolicy": false + } + }, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": { + "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": { + "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830", + "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b", + "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091", + "description": null, + "name": "VfVgeraldine..vflorence_vlc..module-1", + "version": "2", + "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "vflorence_vlc", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": { + "uuid": "41708296-e443-4c71-953f-d9a010f059e1", + "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9", + "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c", + "description": null, + "name": "VfVgeraldine..vflorence_gpb..module-2", + "version": "2", + "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "vflorence_gpb", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": { + "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87", + "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d", + "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861", + "description": null, + "name": "VfVgeraldine..base_vflorence..module-0", + "version": "2", + "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_vflorence", + "baseModule": true + }, + "inputs": {}, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": { + "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87", + "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d", + "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861", + "description": null, + "name": "VfVgeraldine..base_vflorence..module-0", + "version": "2", + "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_vflorence", + "baseModule": true + }, + "inputs": {} + } + }, + "pnfs": {} +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json new file mode 100644 index 000000000..b2ba2c7e9 --- /dev/null +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json @@ -0,0 +1,263 @@ +{ + "networks": { + "ExtVL 0": { + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c", + "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks", + "name": "ExtVL", + "version": "37.0", + "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "inputs": {}, + "commands": {}, + "modelInfo": { + "modelVersionId": "12345-5858-6565", + "modelName": "modelForNetwork" + }, + "properties": { + "min_instances": 1, + "max_instances": 10, + "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}", + "exVL_naming": "{ecomp_generated_naming=true}", + "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}", + "network_homing": "{ecomp_selected_instance_node_target=false}" + }, + "type": "VL", + "instanceName" : "NetInstance", + "modelCustomizationName": "ExtVL 0", + "isFailed": true + } + }, + "vnfs": { + "2017-388_PASQUALE-vPE 0": { + "vfModules": {}, + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168", + "modelName": "2017-388_PASQUALE-vPE", + "modelVersion": "4.0", + "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c", + "modelCustomizationName": "2017-388_PASQUALE-vPE 0", + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168" + }, + "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0": { + "vfModules": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO", + "action": "None", + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "provStatus": "Prov Status", + "orchStatus": "Active", + "inMaint": true, + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86" + } + }, + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc", + "orchStatus": "Create", + "provStatus": "Prov Status", + "inMaint": false, + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "orchStatus": "Created", + "inMaint": false, + "instanceName": "2017488_PASQUALEvPEVNFinstancename", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0:0001": { + "vfModules": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO_001", + "action": "None", + "provStatus": "Prov Status", + "inMaint": true, + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + } + }, + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename_001", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc_001", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "instanceName": "2017488_PASQUALEvPEVNFinstancename_001", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0:0002": { + "vfModules": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO_002", + "action": "None", + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + } + }, + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename_002", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc_002", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "instanceName": "2017488_PASQUALEvPEVNFinstancename_002", + "action": "None", + "legacyRegion": "some legacy region" + } + }, + "validationCounter": 0, + "existingVNFCounterMap": { + "afacccf6-397d-45d6-b5ae-94c39734b168": 1, + "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3 + }, + "existingNetworksCounterMap": {}, + "instanceName": "mCaNkinstancename", + "action": "None", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "aicZoneId": "NFT1", + "projectName": "WATKINS", + "rollbackOnFailure": "true", + "aicZoneName": "NFTJSSSS-NFT1", + "owningEntityName": "WayneHolland", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName": "action-data", + "modelVersion": "1.0", + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte": false, + "orchStatus": "Active", + "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json new file mode 100644 index 000000000..ccf095294 --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json @@ -0,0 +1,62 @@ +{ + "modelInfo": { + "modelInvariantId": "0367689e-d41e-483f-b200-eab17e4a7f8d", + "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705", + "modelName": "gayawabawe", + "modelType": "service", + "modelVersion": "5.1" + }, + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "Lucine Sarika", + "projectName": "zasaki", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriberName": "SILVIA ROBBINS", + "productFamilyId": "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3", + "instanceName": "SERVICE_NAME", + "subscriptionServiceType": "TYLER SILVIA", + "lcpCloudRegionId": "a93f8383-707e-43fa-8191-a6e69a1aab17", + "tenantId": "c85f0e80-0636-44a4-8cb2-4ec00d056e79", + "tenantName": "Hedvika Wendelin", + "aicZoneId": "de738e5f-3704-4a14-b98f-3bf86ac0c0a0", + "aicZoneName": "voloyakane-senamo", + "vnfs": { + "vSAMP12 1": { + "modelInfo": { + "modelCustomizationName": "vSAMP12 1", + "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe042c22-ba82-43c6-b2f6-8f1fc4164091", + "modelName": "vSAMP12", + "modelType": "vnf", + "modelVersion": "1.0" + }, + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "instanceName": "SERVICE_NAME_vnf", + "action": "Create", + "platformName": "vnf_platformName", + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e", + "instanceParams": [], + "rollbackOnFailure": false, + "instanceId": null, + "vfModules": {}, + "trackById": "TRACK_BY_ID", + "isFailed": true, + "statusMessage":"Vnf failed.", + "lineOfBusiness": "vnf_lineOfBusinessName" + } + }, + "networks": {}, + "vnfGroups": {}, + "instanceParams": [], + "pause": false, + "bulkSize": 1, + "rollbackOnFailure": false, + "isALaCarte": true, + "testApi": "VNF_API", + "instanceId": "INSTANCE_ID", + "action": "None", + "trackById": "TRACK_BY_ID", + "isFailed": false, + "statusMessage": null +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json new file mode 100644 index 000000000..d1c40594b --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json @@ -0,0 +1,67 @@ +{ + "action": "Create", + "aicZoneId": "de738e5f-3704-4a14-b98f-3bf86ac0c0a0", + "aicZoneName": "voloyakane-senamo", + "bulkSize": 1, + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "instanceId": null, + "instanceName": "INSTANCE_NAME", + "instanceParams": [ + ], + "isALaCarte": true, + "isFailed": true, + "lcpCloudRegionId": "a93f8383-707e-43fa-8191-a6e69a1aab17", + "modelInfo": { + "modelInvariantId": "0367689e-d41e-483f-b200-eab17e4a7f8d", + "modelName": "gayawabawe", + "modelType": "service", + "modelVersion": "5.1", + "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705" + }, + "networks": { + }, + "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "Lucine Sarika", + "pause": false, + "productFamilyId": "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3", + "projectName": "zasaki", + "rollbackOnFailure": false, + "statusMessage": "The service instantiation is failed.", + "subscriberName": "SILVIA ROBBINS", + "subscriptionServiceType": "TYLER SILVIA", + "tenantId": "c85f0e80-0636-44a4-8cb2-4ec00d056e79", + "tenantName": "Hedvika Wendelin", + "testApi": "VNF_API", + "trackById": "TRACK_BY_ID", + "vnfGroups": { + }, + "vnfs": { + "vSAMP12 1": { + "action": "Create", + "instanceId": null, + "instanceName": "VNF_NAME", + "instanceParams": [ + ], + "isFailed": false, + "lcpCloudRegionId": "mdt1", + "lineOfBusiness": "vnf_lineOfBusinessName", + "modelInfo": { + "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7", + "modelCustomizationName": "vSAMP12 1", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelName": "vSAMP12", + "modelType": "vnf", + "modelVersion": "1.0", + "modelVersionId": "fe042c22-ba82-43c6-b2f6-8f1fc4164091" + }, + "platformName": "vnf_platformName", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "rollbackOnFailure": false, + "statusMessage": null, + "tenantId": "88a6ca3ee0394ade9403f075db23167e", + "trackById": "TRACK_BY_ID", + "vfModules": { + } + } + } +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/asyncInstantiation/auditModalFailedServiceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/auditModalFailedServiceInstance.json new file mode 100644 index 000000000..c5593ea1a --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/auditModalFailedServiceInstance.json @@ -0,0 +1,12 @@ +{ + "id":null, + "jobId":null, + "instanceName":"1INSTANCE_NAME", + "instanceType":null, + "jobStatus":"FAILED", + "source":null, + "requestId":"e5f93320-cce6-424d-adc6-259a4ee8b342", + "additionalInfo":"The service instantiation is failed. Please check vconfiiiiiiiguratttttion again.", + "final":false, + "createdDate":1549198388000 +} diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json new file mode 100644 index 000000000..71ba53661 --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json @@ -0,0 +1,26 @@ +{ + "modelInfo": { + "modelInvariantId": "0367689e-d41e-483f-b200-eab17e4a7f8d", + "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705", + "modelName": "gayawabawe", + "modelVersion": "5.1" + }, + "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "Lucine Sarika", + "projectName" : "zasaki", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriberName": "SILVIA ROBBINS", + "productFamilyId" : "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3", + "instanceName" : "SERVICE_NAME", + "subscriptionServiceType" : "TYLER SILVIA", + "aicZoneId" : "de738e5f-3704-4a14-b98f-3bf86ac0c0a0", + "aicZoneName" : "voloyakane-senamo", + "lcpCloudRegionId" : "a93f8383-707e-43fa-8191-a6e69a1aab17", + "lcpCloudRegionName" : "Cyrus Graciano", + "tenantId" : "c85f0e80-0636-44a4-8cb2-4ec00d056e79", + "tenantName" : "Hedvika Wendelin", + "bulkSize": "1", + "testApi": "VNF_API", + "isALaCarte": true +} + diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json new file mode 100644 index 000000000..430675256 --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json @@ -0,0 +1,44 @@ +{ + "modelInfo": { + "modelInvariantId": "0367689e-d41e-483f-b200-eab17e4a7f8d", + "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705", + "modelName": "gayawabawe", + "modelVersion": "5.1" + }, + "vnfGroups": + { + "MSOTEST103a":{ + "modelInfo": { + "modelType": "instanceGroup", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe042c22-ba82-43c6-b2f6-8f1fc4164091", + "modelName": "vSAMP12", + "modelVersion": "1.0", + "modelCustomizationName": "vSAMP12 1", + "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7" + }, + "instanceName": "VNF_GROUP_NAME", + "isUserProvidedNaming": true, + "rollbackOnFailure": false + } + }, + "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489", + "owningEntityName": "Lucine Sarika", + "projectName" : "zasaki", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriberName": "SILVIA ROBBINS", + "productFamilyId" : "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3", + "instanceName" : "SERVICE_NAME", + "isUserProvidedNaming":"true", + "subscriptionServiceType" : "TYLER SILVIA", + "aicZoneId" : "de738e5f-3704-4a14-b98f-3bf86ac0c0a0", + "aicZoneName" : "voloyakane-senamo", + "lcpCloudRegionId" : "a93f8383-707e-43fa-8191-a6e69a1aab17", + "lcpCloudRegionName" : "Cyrus Graciano", + "tenantId" : "c85f0e80-0636-44a4-8cb2-4ec00d056e79", + "tenantName" : "Hedvika Wendelin", + "bulkSize": "1", + "testApi": "VNF_API", + "isALaCarte": true +} + diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateBulkOfMacro.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateBulkOfMacro.json index 0ceaeeb3e..22bc229c0 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateBulkOfMacro.json +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateBulkOfMacro.json @@ -12,9 +12,8 @@ "subscriberName": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "productFamilyId" : "myProductFamilyId", "instanceName" : "SERVICE_NAME", - "isUserProvidedNaming":"true", "subscriptionServiceType" : "mySubType", - "lcpCloudRegionId" : "mtn3", + "lcpCloudRegionId" : "hvf3", "tenantId" : "greatTenant", "tenantName" : "greatTenant", "aicZoneId" : "NFT1", @@ -32,7 +31,6 @@ }, "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", "instanceName": "VNF_NAME", - "isUserProvidedNaming":"true", "platformName": "platformName", "lineOfBusinessName": "lineOfBusinessName", "lcpCloudRegionId": "mdt1", diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json new file mode 100644 index 000000000..eeda4e59a --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json @@ -0,0 +1,117 @@ +{ + "action":"None", + "isDirty":true, + "vnfs":{ + + }, + "instanceParams":[ + { + "2017488_PASQUALEvpe0_ASN":"AV_vPE" + } + ], + "validationCounter":0, + "existingNames":{ + "123":"", + "instancename":"", + "yoav":"" + }, + "existingVNFCounterMap":{ + + }, + "existingVnfGroupCounterMap":{ + + }, + "existingNetworksCounterMap":{ + "94fdd893-4a36-4d70-b16a-ec29c54c184f":1 + }, + "networks":{ + "ExtVL 0":{ + "rollbackOnFailure":"false", + "productFamilyId":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "lcpCloudRegionId":"hvf6", + "tenantId":"229bcdc6eaeb4ca59d55221141d01f8e", + "lineOfBusiness":"zzz1", + "platformName":"platform", + "originalName":"ExtVL 0", + "modelInfo":{ + "modelInvariantId":"379f816b-a7aa-422f-be30-17114ff50b7c", + "modelVersionId":"ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelName":"ExtVL", + "modelVersion":"37.0", + "modelType":"network", + "modelCustomizationId":"94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName":"ExtVL 0" + }, + "instanceName":"ExtVL 0", + "instanceId":"NETWORK_INSTANCE_ID", + "action":"None_Delete" + }, + "ExtVL 0_1":{ + "action":"Create", + "inMaint":false, + "rollbackOnFailure":"true", + "originalName":"ExtVL 0", + "isMissingData":false, + "trackById":"r21vcx0szoc", + "networkStoreKey":"ExtVL 0_1", + "instanceName":"ExtVL", + "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "lcpCloudRegionId":"hvf6", + "tenantId":"229bcdc6eaeb4ca59d55221141d01f8e", + "platformName":"xxx1", + "lineOfBusiness":"zzz1", + "instanceParams":[ + { + + } + ], + "modelInfo":{ + "modelInvariantId":"379f816b-a7aa-422f-be30-17114ff50b7c", + "modelVersionId":"ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelName":"ExtVL", + "modelVersion":"37.0", + "modelCustomizationId":"94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName":"ExtVL 0", + "uuid":"ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelUniqueId":"94fdd893-4a36-4d70-b16a-ec29c54c184f" + }, + "uuid":"ddc3f20c-08b5-40fd-af72-c6d14636b986" + } + }, + "vnfGroups":{ + + }, + "bulkSize":1, + "instanceName":"InstanceName", + "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType":"TYLER SILVIA", + "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77", + "lcpCloudRegionId":"JANET25", + "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", + "aicZoneId":"JAG1", + "projectName":"WATKINS", + "rollbackOnFailure":true, + "aicZoneName":"YUDFJULP-JAG1", + "owningEntityName":"WayneHolland", + "testApi":"GR_API", + "tenantName":"USP-SIP-IC-24335-T-01", + "modelInfo":{ + "modelInvariantId":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId":"6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName":"action-data", + "modelVersion":"1.0", + "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte":true, + "name":"action-data", + "version":"1.0", + "description":"", + "category":"", + "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450", + "invariantUuid":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "serviceType":"", + "serviceRole":"", + "isMultiStepDesign":false, + "instanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json new file mode 100644 index 000000000..3ee4a2b20 --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json @@ -0,0 +1,286 @@ +{ + "action": "None", + "isDirty": true, + "vnfs": { + "2017-388_PASQUALE-vPE 0": { + "vfModules": {}, + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168", + "modelName": "2017-388_PASQUALE-vPE", + "modelVersion": "4.0", + "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c", + "modelCustomizationName": "2017-388_PASQUALE-vPE 0", + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168" + }, + "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0": { + "vfModules": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceId": "VF_MODULE_BASE_INSTANCE_ID", + "instanceName": "VFinstancenameZERO", + "action": "None_Delete", + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "provStatus": "Prov Status", + "orchStatus": "Active", + "inMaint": true, + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86" + } + }, + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceId": "VF_MODULE_INSTANCE_ID", + "instanceName": "VFinstancename", + "action": "None_Delete", + "volumeGroupName": "VFinstancename_vol_abc", + "orchStatus": "Create", + "provStatus": "Prov Status", + "inMaint": false, + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "orchStatus": "Created", + "inMaint": false, + "instanceId": "VNF_INSTANCE_ID", + "instanceName": "2017488_PASQUALEvPEVNFinstancename", + "action": "None_Delete", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0:0001": { + "vfModules": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO_001", + "action": "None", + "provStatus": "Prov Status", + "inMaint": true, + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + } + }, + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename_001", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc_001", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "instanceName": "2017488_PASQUALEvPEVNFinstancename_001", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-488_PASQUALE-vPE 0:0002": { + "vfModules": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "instanceName": "VFinstancenameZERO_002", + "action": "None", + "modelInfo": { + "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelVersion": "5", + "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + }, + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" + } + }, + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { + "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "instanceName": "VFinstancename_002", + "action": "None", + "volumeGroupName": "VFinstancename_vol_abc_002", + "modelInfo": { + "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", + "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelVersion": "6", + "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + }, + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" + } + } + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "instanceName": "2017488_PASQUALEvPEVNFinstancename_002", + "action": "None", + "legacyRegion": "some legacy region" + }, + "2017-388_PASQUALE-vPE 0_1": { + "action": "Create", + "inMaint": false, + "rollbackOnFailure": "true", + "originalName": "2017-388_PASQUALE-vPE 0", + "isMissingData": false, + "trackById": "wk10c4hh1oj", + "vfModules": {}, + "vnfStoreKey": "2017-388_PASQUALE-vPE 0_1", + "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName", + "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "lcpCloudRegionId": "hvf6", + "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", + "platformName": "xxx1", + "lineOfBusiness": "zzz1", + "instanceParams": [ + { + "vnf_config_template_version": "17.2", + "bandwidth_units": "Gbps", + "bandwidth": "10", + "AIC_CLLI": "ATLMY8GA", + "ASN": "AV_vPE", + "vnf_instance_name": "mtnj309me6" + } + ], + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168", + "modelName": "2017-388_PASQUALE-vPE", + "modelVersion": "4.0", + "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c", + "modelCustomizationName": "2017-388_PASQUALE-vPE 0", + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", + "modelUniqueId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c" + }, + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168" + } + }, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "mcankinstancename": "" + }, + "existingVNFCounterMap": { + "afacccf6-397d-45d6-b5ae-94c39734b168": 1, + "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3, + "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1 + }, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", + "instanceName": "mCaNkinstancename", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "aicZoneId": "NFT1", + "projectName": "WATKINS", + "rollbackOnFailure": true, + "aicZoneName": "NFTJSSSS-NFT1", + "owningEntityName": "WayneHolland", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName": "action-data", + "modelVersion": "1.0", + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte": true, + "orchStatus": "Active", + "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "testApi": "VNF_API" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json new file mode 100644 index 000000000..171568b89 --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json @@ -0,0 +1,86 @@ +{ + "action":"None_Delete", + "isDirty":true, + "vnfs":{ + + }, + "instanceParams":[ + { + "2017488_PASQUALEvpe0_ASN":"AV_vPE" + } + ], + "validationCounter":0, + "existingNames":{ + "123":"", + "instancename":"", + "yoav":"" + }, + "existingVNFCounterMap":{ + + }, + "existingVnfGroupCounterMap":{ + + }, + "existingNetworksCounterMap":{ + "94fdd893-4a36-4d70-b16a-ec29c54c184f":1 + }, + "networks":{ + "ExtVL 0":{ + "rollbackOnFailure":"false", + "productFamilyId":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "lcpCloudRegionId":"hvf6", + "tenantId":"229bcdc6eaeb4ca59d55221141d01f8e", + "lineOfBusiness":"zzz1", + "platformName":"platform", + "originalName":"ExtVL 0", + "modelInfo":{ + "modelInvariantId":"379f816b-a7aa-422f-be30-17114ff50b7c", + "modelVersionId":"ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelName":"ExtVL", + "modelVersion":"37.0", + "modelType":"network", + "modelCustomizationId":"94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName":"ExtVL 0" + }, + "instanceName":"ExtVL 0", + "instanceId":"NETWORK_INSTANCE_ID", + "action":"None_Delete" + } + }, + "vnfGroups":{ + + }, + "bulkSize":1, + "instanceName":"InstanceName", + "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType":"TYLER SILVIA", + "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77", + "lcpCloudRegionId":"JANET25", + "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", + "aicZoneId":"JAG1", + "projectName":"WATKINS", + "rollbackOnFailure":true, + "aicZoneName":"YUDFJULP-JAG1", + "owningEntityName":"WayneHolland", + "testApi":"GR_API", + "tenantName":"USP-SIP-IC-24335-T-01", + "modelInfo":{ + "modelInvariantId":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId":"6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName":"action-data", + "modelVersion":"1.0", + "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte":true, + "name":"action-data", + "version":"1.0", + "description":"", + "category":"", + "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450", + "invariantUuid":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "serviceType":"", + "serviceRole":"", + "isMultiStepDesign":false, + "instanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json new file mode 100644 index 000000000..695ce343b --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json @@ -0,0 +1,71 @@ +{ + "action": "None_Delete", + "isDirty": true, + "vnfs": { + "2017-488_PASQUALE-vPE 0": { + "vfModules": { + }, + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "lineOfBusiness": "ONAP", + "platformName": "platform", + "modelInfo": { + "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "modelName": "2017-488_PASQUALE-vPE", + "modelVersion": "5.0", + "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "modelCustomizationName": "2017-488_PASQUALE-vPE 0", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09" + }, + "orchStatus": "Created", + "inMaint": false, + "instanceId": "VNF_INSTANCE_ID", + "instanceName": "2017488_PASQUALEvPEVNFinstancename", + "action": "None_Delete", + "legacyRegion": "some legacy region" + } + }, + "instanceParams": [], + "validationCounter": 0, + "existingNames": { + "mcankinstancename": "" + }, + "existingVNFCounterMap": { + "afacccf6-397d-45d6-b5ae-94c39734b168": 1, + "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3, + "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1 + }, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", + "instanceName": "mCaNkinstancename", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "aicZoneId": "NFT1", + "projectName": "WATKINS", + "rollbackOnFailure": true, + "aicZoneName": "NFTJSSSS-NFT1", + "owningEntityName": "WayneHolland", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName": "action-data", + "modelVersion": "1.0", + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte": true, + "orchStatus": "Active", + "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "testApi": "VNF_API" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/changeManagement/reduced_vnf_data_by_globalid_and_service_type.json b/vid-automation/src/test/resources/changeManagement/reduced_vnf_data_by_globalid_and_service_type.json new file mode 100644 index 000000000..20831bec8 --- /dev/null +++ b/vid-automation/src/test/resources/changeManagement/reduced_vnf_data_by_globalid_and_service_type.json @@ -0,0 +1,539 @@ +{ + "results": [ + { + "id": "3400916992", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1", + "properties": { + "service-instance-id": "66b13cb4-b575-449f-aa45-ffbfe005c7b1", + "service-instance-name": "CHARLOTTE_preload_1710_0914", + "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "model-version-id": "1525f534-99a2-408f-b847-ff636997d352", + "resource-version": "1505856078810", + "orchestration-status": "Active" + }, + "related-to": [ + { + "id": "10207440", + "node-type": "service-subscription", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + }, + { + "id": "3481829392", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec" + } + ] + }, + { + "id": "3771572432", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95", + "properties": { + "service-instance-id": "f195837b-ef28-42c3-8dea-47ad37eaed95", + "service-instance-name": "CHARLOTTE_preload_1710_0914_0920", + "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", + "resource-version": "1505964829466", + "orchestration-status": "Active" + }, + "related-to": [ + { + "id": "10207440", + "node-type": "service-subscription", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + }, + { + "id": "3484520464", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1" + } + ] + }, + { + "id": "3775807704", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700", + "properties": { + "service-instance-id": "9ad4ac55-a5e0-4b49-95c0-b2d846abf700", + "service-instance-name": "CHARLOTTE_preload_1710_0914_100417", + "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", + "resource-version": "1507144734087", + "orchestration-status": "Active" + }, + "related-to": [ + { + "id": "10207440", + "node-type": "service-subscription", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + }, + { + "id": "3783459064", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165" + } + ] + }, + { + "id": "4178862184", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2", + "properties": { + "service-instance-id": "599c7247-b083-447c-b6b1-0cdd5170dfd2", + "service-instance-name": "CHARLOTTE_preload_1710_0914_1010", + "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", + "resource-version": "1507664240411", + "orchestration-status": "Active" + }, + "related-to": [ + { + "id": "10207440", + "node-type": "service-subscription", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + }, + { + "id": "3892133896", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a" + } + ] + }, + { + "id": "3008335920", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08", + "properties": { + "service-instance-id": "97315a05-e6f3-4c47-ae7e-d850c327aa08", + "service-instance-name": "CHARLOTTE_preload_1710_0914_0927", + "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616", + "resource-version": "1506527653053", + "orchestration-status": "Active" + }, + "related-to": [ + { + "id": "10207440", + "node-type": "service-subscription", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic" + }, + { + "id": "3418898432", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855" + } + ] + }, + { + "id": "3481829392", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec", + "properties": { + "vnf-id": "0c465dd3-4151-4da9-92a2-541bb3174cec", + "vnf-name": "Eoghan Fausto", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1505856137206", + "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "model-version-id": "afacccf6-397d-45d6-b5ae-94c39734b168", + "model-customization-id": "b54689f8-45c5-4be2-9e91-f033e028feec", + "nf-type": "DNS", + "nf-function": "Mobile DNS", + "nf-role": "vWheeler", + "nf-naming-code": "null" + }, + "related-to": [ + { + "id": "3285635208", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/d49713bf-1bff-4eab-bed1-a8f1bb83aa98" + }, + { + "id": "3441209432", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/b8397fec-cf13-40b3-be8f-7d0912506419" + }, + { + "id": "3687522312", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/fd098a52-09be-4c48-a9e9-a565d1b39db3" + }, + { + "id": "3400916992", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1" + }, + { + "id": "3477385312", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + } + ] + }, + { + "id": "3484520464", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1", + "properties": { + "vnf-id": "c2d2d389-fa00-4fb4-a269-e46d495719e1", + "vnf-name": "Odell Romana", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1505964996823", + "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820", + "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994", + "nf-type": "DNS", + "nf-function": "Mobile DNS", + "nf-role": "vMobileDNS", + "nf-naming-code": "null" + }, + "related-to": [ + { + "id": "3447107680", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/c4711b5c-742e-4d03-8146-bff763f69fbd" + }, + { + "id": "3448307712", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/0ba3fcdd-0536-4ac7-a9ec-8d8622db7fb2" + }, + { + "id": "3692179528", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/6bb843eb-ef84-43b1-83b4-3154a7f9928c" + }, + { + "id": "3771588816", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/a4c008c6-cac0-4e3f-928f-90fa37dc8c4b" + }, + { + "id": "3904077944", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/eecb619c-a173-4ead-bf48-d4d09cbbdd5e" + }, + { + "id": "4027855088", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/1e29424e-2dca-45ac-b1df-59a8f74d0bc1" + }, + { + "id": "4390871192", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/b185220a-7f63-4b29-867d-1452813a4f09" + }, + { + "id": "4450529432", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/7a0c4b98-b3cc-490c-bbab-e2d7f169f2d7" + }, + { + "id": "3771572432", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95" + } + ] + }, + { + "id": "3783459064", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165", + "properties": { + "vnf-id": "54626a59-ec0d-4fa9-b0c2-08d008688165", + "vnf-name": "Dominika Fionnbharr", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1507144948937", + "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820", + "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994", + "nf-type": "DNS", + "nf-function": "Mobile DNS", + "nf-role": "vMobileDNS", + "nf-naming-code": "null" + }, + "related-to": [ + { + "id": "3775807704", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700" + } + ] + }, + { + "id": "3892133896", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a", + "properties": { + "vnf-id": "d74503d8-abab-49c6-ba48-a6211eee9b7a", + "vnf-name": "CHARLOTTE_PreloadTest_VNF", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1507664288548", + "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820", + "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994", + "nf-type": "DNS", + "nf-function": "Mobile DNS", + "nf-role": "vMobileDNS", + "nf-naming-code": "null" + }, + "related-to": [ + { + "id": "4178862184", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2" + } + ] + }, + { + "id": "1507690314", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/385548e2-3f31-4900-9437-317d0346e49a", + "properties": { + "vnf-id": "385548e2-3f31-4900-9437-317d0346e49a", + "vnf-name": "Senga Gabrielle", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "7788675952902", + "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "model-version-id": "b217c612-7fcf-484c-861b-df0a5c4b5bcb", + "model-customization-id": "ce15d245-763c-4079-ac82-fe93007adb69", + "nf-type": "DNS", + "nf-function": "Mobile DNS", + "nf-role": "vMobileDNS", + "nf-naming-code": "null" + }, + "related-to": [ + { + "id": "3664617648", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" + }, + { + "id": "3008335920", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + }, + { + "id": "3477385312", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + } + ] + }, + { + "id": "5278880615", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0465e048-92a4-4a7f-bfe7-de39b32de4bd", + "properties": { + "vnf-id": "0465e048-92a4-4a7f-bfe7-de39b32de4bd", + "vnf-name": "Constantius Raghu", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "7788675952902", + "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "model-version-id": "afacccf6-397d-45d6-b5ae-94c39734b168", + "model-customization-id": "ce15d245-763c-4079-ac82-fe93007adb69", + "nf-type": "DNS", + "nf-function": "Mobile DNS", + "nf-role": "vWheeler", + "nf-naming-code": "null" + }, + "related-to": [ + { + "id": "3664617648", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" + }, + { + "id": "3008335920", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + }, + { + "id": "3477385312", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + } + ] + }, + { + "id": "3418898432", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", + "properties": { + "vnf-id": "8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", + "vnf-name": "zolson3amdns02test2", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1507132024933", + "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820", + "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994", + "nf-type": "DNS", + "nf-function": "Mobile DNS", + "nf-role": "vMobileDNS", + "nf-naming-code": "null" + }, + "related-to": [ + { + "id": "3664617648", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" + }, + { + "id": "3008335920", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + }, + { + "id": "3477385312", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + }, + { + "id": "3647635704", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0" + }, + { + "id": "3664621744", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce" + }, + { + "id": "3975352504", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f" + }, + { + "id": "4059455552", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7" + }, + { + "id": "4098130088", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e" + }, + { + "id": "4401291416", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1" + }, + { + "id": "4458950808", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82" + } + ] + }, + { + "id": "1024648346", + "node-type": "generic-vnf", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/a58bf551-a79c-42d1-83b4-ed9288036245", + "properties": { + "vnf-id": "a58bf551-a79c-42d1-83b4-ed9288036245", + "vnf-name": "Harrison Kris", + "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "4679861552759", + "model-invariant-id": "00beb8f9-6d39-452f-816d-c709b9cbb87d", + "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413", + "model-customization-id": "14e8057d-b22a-405c-84aa-90b82bfd6e46", + "nf-type": "DNS", + "nf-function": "Mobile DNS", + "nf-role": "vMobileDNS", + "nf-naming-code": "null" + }, + "related-to": [ + { + "id": "3664617648", + "node-type": "vf-module", + "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc" + }, + { + "id": "3008335920", + "node-type": "service-instance", + "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08" + }, + { + "id": "3477385312", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976" + }, + { + "id": "3647635704", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0" + }, + { + "id": "3664621744", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce" + }, + { + "id": "3975352504", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f" + }, + { + "id": "4059455552", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7" + }, + { + "id": "4098130088", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e" + }, + { + "id": "4401291416", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1" + }, + { + "id": "4458950808", + "node-type": "vserver", + "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82" + } + ] + } + ] + }
\ No newline at end of file diff --git a/vid-automation/src/test/resources/changeManagement/vnfInPlaceSoftwareUpdate.json b/vid-automation/src/test/resources/changeManagement/vnfInPlaceSoftwareUpdate.json new file mode 100644 index 000000000..76d368b6e --- /dev/null +++ b/vid-automation/src/test/resources/changeManagement/vnfInPlaceSoftwareUpdate.json @@ -0,0 +1,26 @@ +{ + "requestDetails": [{ + + "vnfName": "VidVnf", + "vnfInstanceId": "e5403738-da34-4090-8864-ba9cf1bcdd88", + + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "source": "VID", + "requestorId": "az2016" + }, + "requestParameters": { + "payload": "{\"existing_software_version\": \"3.1\", \"new_software_version\": \"3.2\", \"operations_timeout\": \"3600\"}" + }, + + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "12709275-787c-4be7-8c9c-fce64ab7ca8c" + } + }] + }], + "requestType" : "vnf in place software update" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/changeManagement/vnfReplaceRequest.json b/vid-automation/src/test/resources/changeManagement/vnfReplaceRequest.json new file mode 100644 index 000000000..9fd971aad --- /dev/null +++ b/vid-automation/src/test/resources/changeManagement/vnfReplaceRequest.json @@ -0,0 +1,40 @@ +{ + "requestDetails": [{ + + "vnfName": "VidVnf", + "vnfInstanceId": "e9181708-f105-4dfd-9a36-0e089faa72ba", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "254583ad-b38c-498b-bdbd-b8de5e07541b", + "modelName": "vSAMP12", + "modelVersion": "2.0", + "modelCustomizationName": "vSAMP12 1", + "modelCustomizationId": "c539433a-84a6-4082-a12e-5c9b00c3b960" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "source": "VID", + "requestorId": "az2016" + }, + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "254583ad-b38c-498b-bdbd-b8de5e07541b", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "9ebb1521-2e74-47a4-aac7-e71a79f73a79", + "modelName": "fakeModelName", + "modelVersion": "2.0" + } + } + }], + "requestParameters": { + "rebuildVolumeGroups": false + } + }], + "requestType" : "replace" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/changeManagement/vnfUpdateRequest.json b/vid-automation/src/test/resources/changeManagement/vnfUpdateRequest.json new file mode 100644 index 000000000..e57b39b13 --- /dev/null +++ b/vid-automation/src/test/resources/changeManagement/vnfUpdateRequest.json @@ -0,0 +1,45 @@ +{ + "requestDetails": [{ + + "vnfName": "VidVnf", + "vnfInstanceId": "c929b7ec-cc9d-11e8-a8d5-f2801f1b9fd1", + + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "254583ad-b38c-498b-bdbd-b8de5e07541b", + "modelName": "vSAMP12", + "modelVersion": "2.0", + "modelCustomizationName": "vSAMP12 1", + "modelCustomizationId": "c539433a-84a6-4082-a12e-5c9b00c3b960" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "source": "VID", + "suppressRollback": false, + "requestorId": "az2016" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "d0c59d4a-cc9d-11e8-a8d5-f2801f1b9fd1", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "9ebb1521-2e74-47a4-aac7-e71a79f73a79", + "modelName": "fakeModelName", + "modelVersion": "2.0" + } + } + } + ], + "requestParameters": { + "usePreload": true + } + + }], + "requestType" : "update" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_full_subscribers.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_full_subscribers.json deleted file mode 100644 index 23009f8db..000000000 --- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_full_subscribers.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "simulatorRequest": { - "method": "GET", - "path": "/aai/v../business/customers", - "queryParams": { - "subscriber-type": "INFRA", - "depth": 0 - } - } , - "simulatorResponse": { - "responseCode": 200, - "body": { - "customer":[ - { - "global-customer-id":"MSO_1610_ST", - "subscriber-name":"MSO_1610_ST", - "subscriber-type":"INFRA", - "resource-version":"1494001902987" - }, - { - "global-customer-id":"21014aa2-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"PACKET CORE", - "subscriber-type":"INFRA", - "resource-version":"1494001776295" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-2", - "subscriber-name":"ICORE CORE", - "subscriber-type":"INFRA", - "resource-version":"1498751754450" - }, - { - "global-customer-id":"DHV1707-TestSubscriber-1", - "subscriber-name":"PACKET1 CORE", - "subscriber-type":"INFRA", - "resource-version":"1498595633607" - }, - { - "global-customer-id":"jimmy-example", - "subscriber-name":"JimmyExampleCust-20161102", - "subscriber-type":"INFRA", - "resource-version":"1494001970063" - }, - { - "global-customer-id":"jimmy-example2", - "subscriber-name":"JimmyExampleCust-20161103", - "subscriber-type":"INFRA", - "resource-version":"1494001970225" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-102", - "subscriber-name":"DHV1802-TestSub-PWT-102", - "subscriber-type":"INFRA", - "resource-version":"1508852495058" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-101", - "subscriber-name":"DHV1802-TestSub-PWT-101", - "subscriber-type":"INFRA", - "resource-version":"1508179953733" - }, - { - "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name":"Mobility", - "subscriber-type":"INFRA", - "resource-version":"1494001894192" - }, - { - "global-customer-id":"DHV1802-Subscriber-4", - "subscriber-name":"DHV1802-Subscriber-5", - "subscriber-type":"INFRA", - "resource-version":"1509134064531" - }, - { - "global-customer-id":"DHV1802-TestSub-PWT-103", - "subscriber-name":"DHV1802-TestSub-PWT-103", - "subscriber-type":"INFRA", - "resource-version":"1509045503736" - }, - { - "global-customer-id":"DHV1802-Subscriber-2", - "subscriber-name":"DHV1802-Subscriber-2", - "subscriber-type":"INFRA", - "resource-version":"1509122065439" - }, - { - "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name":"USP VOICE", - "subscriber-type":"INFRA", - "resource-version":"1494001938080" - }, - { - "global-customer-id":"DHV1802-Subscriber-3", - "subscriber-name":"DHV1802-Subscriber-3", - "subscriber-type":"INFRA", - "resource-version":"1509122759407" - }, - { - "global-customer-id":"31739f3e-526b-11e6-beb8-9e71128cae77", - "subscriber-name":"FIREWALL/MISC", - "subscriber-type":"INFRA", - "resource-version":"1494001772223" - } - ] - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json index da18285bc..74b8637aa 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json +++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json @@ -7,7 +7,7 @@ }, "body": { "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", - "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP" + "query": "query/pnf-fromModel-byRegion?cloudRegionId=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP" } } , "simulatorResponse": { diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json index 5dc4e77eb..386c982c0 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json @@ -7,7 +7,7 @@ }, "body": { "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", - "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP" + "query": "query/pnf-fromModel-byRegion?cloudRegionId=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP" } } , "simulatorResponse": { diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json index a0e9e88cc..a4a63574e 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json +++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v12/network/pnfs/pnf/DEAAI78" + "path": "/aai/v../network/pnfs/pnf/DEAAI78" } , "simulatorResponse": { "responseCode": 200, diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json index cc84a7588..ee88d71ea 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v12/network/pnfs/pnf/DEAAI78" + "path": "/aai/v../network/pnfs/pnf/DEAAI78" } , "simulatorResponse": { "responseCode": 500, diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations.json b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration.json index de0c07bc8..d88343ae4 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations.json +++ b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration.json @@ -1,8 +1,8 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations" - } , + "path": "/mso/serviceInstantiation/v7/serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activateFabricConfiguration" + }, "simulatorResponse": { "responseCode": 202, "body": { diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration_error.json b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration_error.json new file mode 100644 index 000000000..90f380ea1 --- /dev/null +++ b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration_error.json @@ -0,0 +1,10 @@ +{ + "simulatorRequest": { + "method": "POST", + "path": "/mso/serviceInstantiation/v7/serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activateFabricConfiguration" + }, + "simulatorResponse": { + "responseCode": 500, + "body": "ERROR_PAYLOAD" + } +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json index 949a86afb..773bfd0dd 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" }, "simulatorResponse": { "responseCode": 202, diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json index 96322b7ae..73ff898a7 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate" } , "simulatorResponse": { "responseCode": 500, diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json new file mode 100644 index 000000000..b0bf14b55 --- /dev/null +++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json @@ -0,0 +1,34 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "configuration", + "modelInvariantId": "model-invariant-id-9533", + "modelVersionId": "model-version-id-9533", + "modelCustomizationId": "08a181aa-72eb-435f-9593-e88a3ad0a86b" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1" + }, + "requestInfo": { + "source": "VID", + "requestorId": "us16807000" + }, + "relatedInstanceList": [ + { + "relatedInstance": { + "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", + "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "modelName": "ServiceContainerMultiplepProbes", + "modelVersion": "1.0" + } + } + } + ], + "requestParameters": { + "userParams": [] + } + } +} diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json new file mode 100644 index 000000000..97bc6e46d --- /dev/null +++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json @@ -0,0 +1,22 @@ +{ + "requestDetails": { + "modelInfo": { + "modelType": "service", + "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff", + "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe", + "modelName": "Test", + "modelVersion": "1.0" + }, + "cloudConfiguration": { + "lcpCloudRegionId": "mdt1", + "tenantId": "88a6ca3ee0394ade9403f075db23167e" + }, + "requestInfo": { + "source": "VID", + "requestorId": "az2016" + }, + "requestParameters": { + "aLaCarte": false + } + } +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json index e0942bae2..c726590eb 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json +++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json @@ -1,4 +1,3 @@ - { "requestDetails": { "modelInfo": { @@ -11,49 +10,46 @@ "modelCustomizationName": "Port Mirroring Configuration By Policy 1" }, "cloudConfiguration": { - "lcpCloudRegionId": "AAIAIC25" + "lcpCloudRegionId": "JANET25" }, "requestInfo": { - "instanceName":"test_sssdad", + "instanceName": "dummy_instance", "source": "VID", - "requestorId": "1" + "requestorId": "us16807000" }, - "relatedInstanceList": [ - { - "relatedInstance": { - "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6 ", - "modelInfo": { - "modelType": "service", - "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", - "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7", - "modelName": "ServiceContainerMultiplepProbes", - "modelVersion": "1.0" - } + "relatedInstanceList": [{ + "relatedInstance": { + "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6", + "modelInfo": { + "modelType": "service", + "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408", + "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "modelName": "ServiceContainerMultiplepProbes", + "modelVersion": "1.0" } - }, - { - "relatedInstance": { - "instanceId": "9be14a4f-7367-4cf9-96a1-f08f10f485a7", - "instanceDirection": "source", - "modelInfo": { - "modelType": "vnf", - "modelInvariantId": "a7eac2b3-8444-40ee-92e3-b3359b32445c", - "modelVersionId": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6", - "modelName": "vmmeService2", - "modelVersion": "1.0", - "modelCustomizationId": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17" - } + } + }, { + "relatedInstance": { + "instanceId": "9be14a4f-7367-4cf9-96a1-f08f10f485a7", + "instanceDirection": "source", + "modelInfo": { + "modelType": "vnf", + "modelInvariantId": "51f2c559-1aba-4fd4-bbf9-8cbbef85ff2a", + "modelVersionId": "cb05b259-9f26-4b33-b96c-13c2c202c091", + "modelName": "vf_vEPDG", + "modelVersion": "2.0", + "modelCustomizationId": "35aeaae9-74f7-4b6a-adda-65edb0110361" } - }, - { - "relatedInstance": { - "instanceId": "AS-pnf2-10219--as988q", - "instanceDirection": "destination", - "modelInfo": { - "modelType": "pnf" - } + } + }, { + "relatedInstance": { + "instanceName": "AS-pnf2-10219--as988q", + "instanceDirection": "destination", + "modelInfo": { + "modelType": "pnf" } } + } ], "requestParameters": { "userParams": [] diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json new file mode 100644 index 000000000..ad588b68b --- /dev/null +++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json @@ -0,0 +1,5 @@ +{ + "lcpCloudRegionId": "hvf6", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "userId": "us16807000" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json index 951eac1fb..3b0204aa7 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json @@ -12,7 +12,7 @@ "requestorId": "16807000" }, "requestParameters": { - "testApi": "GR_API", + "testApi": "VNF_API", "aLaCarte": false } } diff --git a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json index d98dbfe64..ce27b5920 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" } , "simulatorResponse": { "responseCode": 202, diff --git a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json index 1a6aee73a..7e808b812 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate" } , "simulatorResponse": { "responseCode": 500, diff --git a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json index c5e3c6ee4..ef551184d 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json +++ b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" } , "simulatorResponse": { "responseCode": 202, diff --git a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json index d4b5f54fc..073fd359f 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships" } , "simulatorResponse": { "responseCode": 404, diff --git a/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json b/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json index a43092ef9..a71270e72 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json +++ b/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json @@ -2,7 +2,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ecompportal_att/auxapi//getSessionSlotCheckInterval" + "path": "/ecompportal_att/auxapi//v3/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, @@ -22,6 +22,26 @@ { "simulatorRequest": { "method": "GET", + "path": "/ecompportal_att/auxapi/v3/getSessionSlotCheckInterval" + }, + "simulatorResponse": { + "responseCode": 200, + "body": "300000" + } + }, + { + "simulatorRequest": { + "method": "POST", + "path": "/ecompportal_att/auxapi/extendSessionTimeOuts" + }, + "simulatorResponse": { + "responseCode": 200, + "body": "300000" + } + }, + { + "simulatorRequest": { + "method": "GET", "path": "/ecompportal_att/auxapi/context/get_user" }, "simulatorResponse": { diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json index 61ede56d1..50707ccb1 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v12/network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100" + "path": "/aai/v14/network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100" } , "simulatorResponse": { "responseCode": 200, diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json index abe4d2b5e..082a3bf4e 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v12/network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100" + "path": "/aai/v../network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100" } , "simulatorResponse": { "responseCode": 404, diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json b/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json index 955f356d9..596104b83 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json @@ -38,7 +38,7 @@ { "operational-environment-id": "UUID of ECOMP Operational Environment", "operational-environment-name": "ECOMP Env Name", - "operational-environment-type": "ECOMP", + "operational-environment-type": "ONAP", "operational-environment-status": "Activate", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VmmeRvpmsFeAic3011217Svc.json b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json index 1d7849a6c..7fca48f10 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VmmeRvpmsFeAic3011217Svc.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json @@ -6,7 +6,7 @@ }, "simulatorResponse": { "responseCode": 200, - "file": "service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip" + "file": "service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip" } }, { @@ -24,7 +24,7 @@ "invariantUUID": "124216d6-71d0-41c8-ac81-0c5acfee514a", "name": "vMMEvProbe_FE_AIC3-11.2.1_VF", "version": "1.0", - "toscaModelURL": "./service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip", + "toscaModelURL": "./service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip", "category": "Application L4+", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json b/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json index 235c642ec..a5ea4e230 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/aai/v12/business/customers/customer/31739f3e-526b-11e6-beb8-9e71128cae77/service-subscriptions/service-subscription/AIM+Transport/service-instances/service-instance/f36f5734-e9df-4fbf-9f35-61be13f028a1" + "path": "/aai/v../business/customers/customer/31739f3e-526b-11e6-beb8-9e71128cae77/service-subscriptions/service-subscription/AIM+Transport/service-instances/service-instance/f36f5734-e9df-4fbf-9f35-61be13f028a1" } , "simulatorResponse": { "responseCode": 404 diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_activate_configurations.json b/vid-automation/src/test/resources/registration_to_simulator/mso_activate_configurations.json deleted file mode 100644 index 19d70d90b..000000000 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_activate_configurations.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations/a53c9ca8-8986-44da-9e5e-9e4179e6c78a/activate", - "body": { - "val": "dummy payload" - } - } , - "simulatorResponse": { - "responseCode": 202, - "responseHeaders": { - "Content-Type": "application/json" - }, - "body": { - "requestReferences": { - "instanceId": "f36f5734-e9df-4fbf-9f35-61be13f028a1", - "requestId": "b6dc9806-b094-42f7-9386-a48de8218ce8" - } - } - } -}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json index 7b72f053a..c85b3cb63 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" } , "simulatorResponse": { "responseCode": 202, diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json index 126369df3..f8f6fbbbd 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" + "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships" } , "simulatorResponse": { "responseCode": 500, diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json index 58d338726..c3fb0b009 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig" + "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig" } , "simulatorResponse": { "responseCode": 404, diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json index f049d7662..27eb0dc98 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig" + "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig" } , "simulatorResponse": { "responseCode": 409, diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json index 09addafe9..021d012f6 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig" + "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig" } , "simulatorResponse": { "responseCode": 202, diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations_error.json b/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations_error.json deleted file mode 100644 index 0752cd15f..000000000 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations_error.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "simulatorRequest": { - "method": "POST", - "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations" - } , - "simulatorResponse": { - "responseCode": "<ERROR_CODE>", - "body": "<ERROR_PAYLOAD>" - } -}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json index b5e3f1883..d48d2ae78 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate" + "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate" } , "simulatorResponse": { "responseCode": 404, diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json index f3985ef32..fa429c9e9 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate" + "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate" } , "simulatorResponse": { "responseCode": 409, diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json index ee0453393..4ce1936c4 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json +++ b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json @@ -1,7 +1,7 @@ { "simulatorRequest": { "method": "POST", - "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate" + "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate" } , "simulatorResponse": { "responseCode": 202, diff --git a/vid-automation/src/test/resources/registration_to_simulator/portal_remote_users.json b/vid-automation/src/test/resources/registration_to_simulator/portal_remote_users.json new file mode 100644 index 000000000..3b3f878f7 --- /dev/null +++ b/vid-automation/src/test/resources/registration_to_simulator/portal_remote_users.json @@ -0,0 +1,18 @@ +{ + "simulatorRequest": { + "method" : "GET", + "path" : "/ecompportal_att/auxapi//v3/user/1" + } , + "simulatorResponse": { + "responseCode": 200, + "body": { + "firstName": "1", + "lastName": "1", + "orgId": 1, + "loginId": "1", + "loginPwd": "1", + "active": true, + "internal": true + } + } +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json new file mode 100644 index 000000000..ff4b6d1b6 --- /dev/null +++ b/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json @@ -0,0 +1,54 @@ +{ + "service": { + "vidNotions": { + "instantiationUI": "legacy", + "modelCategory": "other", + "viewEditUI": "legacy" + }, + "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e", + "invariantUuid": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "name": "vidmacrofalsenaming", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L1-3", + "serviceType": "", + "serviceRole": "", + "description": "vidmacrofalsenaming", + "serviceEcompNaming": "false", + "instantiationType": "A-La-Carte", + "inputs": {} + }, + "vnfs": {}, + "networks": { + "MULTI_PROVIDER_PORT_GROUP 0": { + "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2", + "invariantUuid": "b0303003-0abb-454c-9119-8cbe2e09e003", + "description": "Creates a neutron multi-provider VLAN network with dummy subnet", + "name": "MULTI_PROVIDER_PORT_GROUP", + "version": "1.0", + "customizationUuid": "0fde4286-ee4c-439d-9556-74b6be6bbc42", + "inputs": {}, + "commands": {}, + "properties": { + "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}", + "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}", + "network_scope": "GLOBAL", + "network_ecomp_naming": "{ecomp_generated_naming=true}", + "network_type": "MULTI_PROVIDER_PORT_GROUP", + "network_technology": "MULTI_GROUP", + "network_homing": "{ecomp_selected_instance_node_target=false}", + "ecomp_generated_naming": "false" + }, + "type": "VL", + "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0" + } + }, + "collectionResource": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": {}, + "volumeGroups": {}, + "pnfs": {}, + "vnfGroups": {} +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json new file mode 100644 index 000000000..2136c84cb --- /dev/null +++ b/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json @@ -0,0 +1,54 @@ +{ + "service": { + "vidNotions": { + "instantiationUI": "legacy", + "modelCategory": "other", + "viewEditUI": "legacy" + }, + "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e", + "invariantUuid": "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba", + "name": "vidmacrofalsenaming", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L1-3", + "serviceType": "", + "serviceRole": "", + "description": "vidmacrofalsenaming", + "serviceEcompNaming": "false", + "instantiationType": "ClientConfig", + "inputs": {} + }, + "vnfs": {}, + "networks": { + "MULTI_PROVIDER_PORT_GROUP 0": { + "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2", + "invariantUuid": "b0303003-0abb-454c-9119-8cbe2e09e003", + "description": "Creates a neutron multi-provider VLAN network with dummy subnet", + "name": "MULTI_PROVIDER_PORT_GROUP", + "version": "1.0", + "customizationUuid": "0fde4286-ee4c-439d-9556-74b6be6bbc42", + "inputs": {}, + "commands": {}, + "properties": { + "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}", + "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}", + "network_scope": "GLOBAL", + "network_ecomp_naming": "{ecomp_generated_naming=true}", + "network_type": "MULTI_PROVIDER_PORT_GROUP", + "network_technology": "MULTI_GROUP", + "network_homing": "{ecomp_selected_instance_node_target=false}", + "ecomp_generated_naming": "false" + }, + "type": "VL", + "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0" + } + }, + "collectionResource": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": {}, + "volumeGroups": {}, + "pnfs": {}, + "vnfGroups": {} +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json new file mode 100644 index 000000000..07fd1d3a9 --- /dev/null +++ b/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json @@ -0,0 +1,54 @@ +{ + "service": { + "vidNotions": { + "instantiationUI": "legacy", + "modelCategory": "other", + "viewEditUI": "legacy" + }, + "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e", + "invariantUuid": "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba", + "name": "vidmacrofalsenaming", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L1-3", + "serviceType": "", + "serviceRole": "", + "description": "vidmacrofalsenaming", + "serviceEcompNaming": "false", + "instantiationType": "Macro", + "inputs": {} + }, + "vnfs": {}, + "networks": { + "MULTI_PROVIDER_PORT_GROUP 0": { + "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2", + "invariantUuid": "b0303003-0abb-454c-9119-8cbe2e09e003", + "description": "Creates a neutron multi-provider VLAN network with dummy subnet", + "name": "MULTI_PROVIDER_PORT_GROUP", + "version": "1.0", + "customizationUuid": "0fde4286-ee4c-439d-9556-74b6be6bbc42", + "inputs": {}, + "commands": {}, + "properties": { + "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}", + "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}", + "network_scope": "GLOBAL", + "network_ecomp_naming": "{ecomp_generated_naming=true}", + "network_type": "MULTI_PROVIDER_PORT_GROUP", + "network_technology": "MULTI_GROUP", + "network_homing": "{ecomp_selected_instance_node_target=false}", + "ecomp_generated_naming": "false" + }, + "type": "VL", + "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0" + } + }, + "collectionResource": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": {}, + "volumeGroups": {}, + "pnfs": {}, + "vnfGroups": {} +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json new file mode 100644 index 000000000..785635cd6 --- /dev/null +++ b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json @@ -0,0 +1,454 @@ +{ + "service": { + "vidNotions": { + "instantiationUI": "legacy", + "modelCategory": "other", + "viewEditUI": "legacy" + }, + "uuid": "43f13072-fe50-496b-b673-7af075d10143", + "invariantUuid": "35fb95d8-d1f0-4e46-99ac-e01b423e8e3f", + "name": "PASQUALE vMX VPE BV Service 488 test", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L1-3", + "serviceType": "", + "serviceRole": "", + "description": "Model Creation for PID 291247b . OAM Network Service Name : PASQUALE vPE Tenant OAM Network 1 SRIOV Network Service Name : vPE PASQUALE Provider Net 1", + "serviceEcompNaming": "true", + "instantiationType": "ClientConfig", + "inputs": { + "2017488PASQUALEvpe20_ASN": { + "type": "string", + "description": "AV/PE", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "AV_vPE" + }, + "2017488PASQUALEvpe20_bandwidth": { + "type": "string", + "description": "Requested VPE bandwidth", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "10" + }, + "2017488PASQUALEvpe20_bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "Gbps" + }, + "2017488PASQUALEvpe20_AIC_CLLI": { + "type": "string", + "description": "AIC Site CLLI", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "ATLMY8GA" + }, + "2017488PASQUALEvpe20_vnf_config_template_version": { + "type": "string", + "description": "VPE Software Version", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "17.2" + }, + "2017488PASQUALEvpe20_vnf_instance_name": { + "type": "string", + "description": "The hostname assigned to the vpe.", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "mtnj309me6" + } + } + }, + "vnfs": { + "2017 488 PASQUALE vPE 2 0": { + "uuid": "079266b1-fcf5-44ae-bc04-cc3215b28737", + "invariantUuid": "e2dcd546-e647-4854-9ed9-e0a4d6880636", + "description": "Name PASQUALE vPE Description The Provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release code 17.2 Owners Mary Fragale Updated 9-25-17 for version 8.0 of the VLM ", + "name": "2017 488 PASQUALE vPE 2", + "version": "4.0", + "customizationUuid": "2b4e9125-b607-49a3-81c7-9260f8ca32f4", + "inputs": { + "vnf_config_template_version": { + "type": "string", + "description": "VPE Software Version", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "17.2" + }, + "bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "Gbps" + }, + "bandwidth": { + "type": "string", + "description": "Requested VPE bandwidth", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "10" + }, + "AIC_CLLI": { + "type": "string", + "description": "AIC Site CLLI", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "ATLMY8GA" + }, + "ASN": { + "type": "string", + "description": "AV/PE", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "AV_vPE" + }, + "vnf_instance_name": { + "type": "string", + "description": "The hostname assigned to the vpe.", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "mtnj309me6" + } + }, + "commands": { + "vnf_config_template_version": { + "displayName": "vnf_config_template_version", + "command": "get_input", + "inputName": "2017488PASQUALEvpe20_vnf_config_template_version" + }, + "bandwidth_units": { + "displayName": "bandwidth_units", + "command": "get_input", + "inputName": "2017488PASQUALEvpe20_bandwidth_units" + }, + "bandwidth": { + "displayName": "bandwidth", + "command": "get_input", + "inputName": "2017488PASQUALEvpe20_bandwidth" + }, + "AIC_CLLI": { + "displayName": "AIC_CLLI", + "command": "get_input", + "inputName": "2017488PASQUALEvpe20_AIC_CLLI" + }, + "ASN": { + "displayName": "ASN", + "command": "get_input", + "inputName": "2017488PASQUALEvpe20_ASN" + }, + "vnf_instance_name": { + "displayName": "vnf_instance_name", + "command": "get_input", + "inputName": "2017488PASQUALEvpe20_vnf_instance_name" + } + }, + "properties": { + "vmxvre_retype": "RE-VMX", + "vnf_config_template_version": "get_input:2017488PASQUALEvpe20_vnf_config_template_version", + "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", + "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", + "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", + "int_ctl_net_name": "VMX-INTXI", + "vmx_int_ctl_prefix": "10.0.0.10", + "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", + "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", + "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", + "nf_type": "vPE", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", + "is_AVPN_service": "false", + "vmx_RSG_name": "vREXI-affinity", + "vmx_int_ctl_forwarding": "l2", + "vmxvre_oam_ip_0": "10.0.0.10", + "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_sriov41_0_port_vlanstrip": "false", + "vmxvpfe_sriov42_0_port_vlanfilter": "4001", + "vmxvpfe_sriov44_0_port_unknownunicastallow": "true", + "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2", + "vmxvre_instance": "0", + "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvre_flavor_name": "ns.c1r16d32.v5", + "vmxvpfe_volume_size_0": "40.0", + "vmxvpfe_sriov43_0_port_vlanfilter": "4001", + "nf_naming": "{ecomp_generated_naming=true}", + "multi_stage_design": "false", + "nf_naming_code": "tvpr", + "vmxvre_name_0": "vREXI", + "vmxvpfe_sriov42_0_port_vlanstrip": "false", + "vmxvpfe_volume_name_0": "vPFEXI_FBVolume", + "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141", + "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2", + "vmxvpfe_sriov43_0_port_unknownunicastallow": "true", + "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true", + "vmxvre_console": "vidconsole", + "vmxvpfe_sriov44_0_port_vlanfilter": "4001", + "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3", + "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", + "vmxvpfe_sriov44_0_port_vlanstrip": "false", + "vf_module_id": "123", + "nf_function": "Firewall", + "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", + "vmxvre_int_ctl_ip_0": "10.0.0.10", + "ecomp_generated_naming": "true", + "AIC_CLLI": "get_input:2017488PASQUALEvpe20_AIC_CLLI", + "vnf_name": "mtnj309me6vre", + "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", + "vmxvre_volume_type_1": "HITACHI", + "vmxvpfe_sriov44_0_port_broadcastallow": "true", + "vmxvre_volume_type_0": "HITACHI", + "vmxvpfe_volume_type_0": "HITACHI", + "vmxvpfe_sriov43_0_port_broadcastallow": "true", + "bandwidth_units": "get_input:2017488PASQUALEvpe20_bandwidth_units", + "vnf_id": "123", + "vmxvre_oam_prefix": "24", + "availability_zone_0": "mtpocfo-kvm-az01", + "ASN": "get_input:2017488PASQUALEvpe20_ASN", + "vmxvre_chassis_i2cid": "161", + "vmxvpfe_name_0": "vPFEXI", + "bandwidth": "get_input:2017488PASQUALEvpe20_bandwidth", + "availability_zone_max_count": "1", + "vmxvre_volume_size_0": "45.0", + "vmxvre_volume_size_1": "50.0", + "vmxvpfe_sriov42_0_port_broadcastallow": "true", + "vmxvre_oam_gateway": "10.0.0.10", + "vmxvre_volume_name_1": "vREXI_FAVolume", + "vmxvre_ore_present": "0", + "vmxvre_volume_name_0": "vREXI_FBVolume", + "vmxvre_type": "0", + "vnf_instance_name": "get_input:2017488PASQUALEvpe20_vnf_instance_name", + "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true", + "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429", + "vmx_int_ctl_len": "24", + "vmxvpfe_sriov43_0_port_vlanstrip": "false", + "vmxvpfe_sriov41_0_port_broadcastallow": "true", + "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d", + "vmxvpfe_sriov41_0_port_vlanfilter": "4001", + "nf_role": "MIS", + "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a", + "vmxvpfe_sriov42_0_port_unknownunicastallow": "true", + "vmxvpfe_flavor_name": "ns.c20r16d25.v5" + }, + "type": "VF", + "modelCustomizationName": "2017 488 PASQUALE vPE 2 0", + "vfModules": { + "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": { + "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01", + "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4", + "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc", + "description": null, + "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "version": "1", + "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "properties": { + "minCountInstances": null, + "maxCountInstances": null, + "initialCount": null, + "vfModuleLabel": "PASQUALE_vPFE_BV", + "baseModule" : false + }, + "inputs": {}, + "volumeGroupAllowed": true + }, + "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": { + "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f", + "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589", + "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1", + "description": null, + "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "version": "1", + "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "PASQUALE_vRE_BV", + "baseModule" : false + }, + "inputs": {}, + "volumeGroupAllowed": true + }, + "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0": { + "uuid": "0a45a870-3a19-4238-a72a-eadfc583d4fe", + "invariantUuid": "c636b302-fba2-4ed7-9f3b-c99715b6bb2e", + "customizationUuid": "a0b634e6-514e-4977-91dd-3b8c295e6bc8", + "description": null, + "name": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0", + "version": "1", + "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "PASQUALE_base_vPE_BV", + "baseModule" : true + }, + "inputs": {}, + "volumeGroupAllowed": false + } + }, + "volumeGroups": { + "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": { + "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01", + "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4", + "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc", + "description": null, + "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "version": "1", + "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "properties": { + "minCountInstances": null, + "maxCountInstances": null, + "initialCount": null, + "vfModuleLabel": "PASQUALE_vPFE_BV", + "baseModule" : false + }, + "inputs": {} + }, + "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": { + "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f", + "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589", + "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1", + "description": null, + "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "version": "1", + "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "PASQUALE_vRE_BV", + "baseModule" : false + }, + "inputs": {} + } + }, + "vfcInstanceGroups": {} + } + }, + "networks": {}, + "collectionResource": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": { + "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": { + "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01", + "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4", + "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc", + "description": null, + "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "version": "1", + "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "properties": { + "minCountInstances": null, + "maxCountInstances": null, + "initialCount": null, + "vfModuleLabel": "PASQUALE_vPFE_BV", + "baseModule" : false + }, + "inputs": {}, + "volumeGroupAllowed": true + }, + "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0": { + "uuid": "0a45a870-3a19-4238-a72a-eadfc583d4fe", + "invariantUuid": "c636b302-fba2-4ed7-9f3b-c99715b6bb2e", + "customizationUuid": "a0b634e6-514e-4977-91dd-3b8c295e6bc8", + "description": null, + "name": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0", + "version": "1", + "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "PASQUALE_base_vPE_BV", + "baseModule" : true + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": { + "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f", + "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589", + "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1", + "description": null, + "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "version": "1", + "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "PASQUALE_vRE_BV", + "baseModule" : false + }, + "inputs": {}, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": { + "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01", + "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4", + "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc", + "description": null, + "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "version": "1", + "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "properties": { + "minCountInstances": null, + "maxCountInstances": null, + "initialCount": null, + "vfModuleLabel": "PASQUALE_vPFE_BV", + "baseModule" : false + }, + "inputs": {} + }, + "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": { + "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f", + "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589", + "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1", + "description": null, + "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "version": "1", + "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "PASQUALE_vRE_BV", + "baseModule" : false + }, + "inputs": {} + } + }, + "pnfs": {}, + "vnfGroups": {} +} diff --git a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json new file mode 100644 index 000000000..4097fd936 --- /dev/null +++ b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json @@ -0,0 +1,363 @@ +{ + "service": { + "uuid": "281b5f7d-c7ac-4ea9-92fb-2c1d625ca681", + "invariantUuid": "a977af77-db15-4375-a637-e9b994ecd569", + "name": "vMME_rVPMS_FE AIC3.0-11.2.1.7_SVC", + "version": "1.0", + "toscaModelURL": null, + "category": "Emanuel", + "serviceType": null, + "serviceRole": null, + "description": "New service for vMME vProbe Front End AIC3.0 VPMS Radcom 11.2.1.7. Front End includes Qrouter, vProbe aff, vLB Agent aff and vLB.", + "serviceEcompNaming": "true", + "instantiationType": null, + "inputs": {} + }, + "vnfs": { + "vMMEvProbe_FE_AIC3-11.2.1_VF 1": { + "uuid": "245562de-3984-49ef-a708-6c9d7cfcabd1", + "invariantUuid": "124216d6-71d0-41c8-ac81-0c5acfee514a", + "description": " New service for vMME vProbe Front End AIC3.0 VPMS Radcom 11.2.1.7. Front End includes Qrouter, vProbe aff, vLB Agent aff and vLB. ", + "name": "vMMEvProbe_FE_AIC3-11.2.1_VF", + "version": "1.0", + "customizationUuid": "8293273d-0e76-4661-926f-06a01ad2e683", + "inputs": {}, + "commands": {}, + "properties": {}, + "type": null, + "modelCustomizationName": "vMMEvProbe_FE_AIC3-11.2.1_VF 1", + "vfModules": { + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1": { + "uuid": "e67e5b39-1f3b-4692-beec-eda94a0375a5", + "invariantUuid": "21c1b57d-a618-4397-a7f4-9c37169ea09b", + "customizationUuid": "a7d59494-3710-4b05-b4cd-e45dadbdc7ac", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null, + "volumeGroupAllowed": true + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0": { + "uuid": "59bb7d14-278f-4ff5-bd5a-1a720c8b0d19", + "invariantUuid": "9b5589c2-e4d1-4456-a23b-e0001c349155", + "customizationUuid": "b9d6f6e8-e24a-4ad9-b863-1c3f6757bfe7", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": null, + "baseModule" : true + }, + "inputs": null, + "volumeGroupAllowed": false + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2": { + "uuid": "530e5e9f-2e82-4946-bf59-630f4d7ef4de", + "invariantUuid": "d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd", + "customizationUuid": "c1f95365-716c-4f6c-9477-a8f760a2edce", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null, + "volumeGroupAllowed": true + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4": { + "uuid": "064385f9-795b-4fcb-9e3b-51d7d0ccad80", + "invariantUuid": "603e8f71-88ad-4bbf-9992-2e9a72a91e29", + "customizationUuid": "3b5efcd3-d14d-4b0e-91cf-937db5aa65b5", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null, + "volumeGroupAllowed": true + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3": { + "uuid": "85b712e0-af62-4255-aeb6-ec9ae0f4eb13", + "invariantUuid": "cba59330-855a-460b-8856-f6bff0dac6c2", + "customizationUuid": "962479d7-b5b7-4129-bf9f-bfe4775e7921", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1": { + "uuid": "e67e5b39-1f3b-4692-beec-eda94a0375a5", + "invariantUuid": "21c1b57d-a618-4397-a7f4-9c37169ea09b", + "customizationUuid": "a7d59494-3710-4b05-b4cd-e45dadbdc7ac", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2": { + "uuid": "530e5e9f-2e82-4946-bf59-630f4d7ef4de", + "invariantUuid": "d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd", + "customizationUuid": "c1f95365-716c-4f6c-9477-a8f760a2edce", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4": { + "uuid": "064385f9-795b-4fcb-9e3b-51d7d0ccad80", + "invariantUuid": "603e8f71-88ad-4bbf-9992-2e9a72a91e29", + "customizationUuid": "3b5efcd3-d14d-4b0e-91cf-937db5aa65b5", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3": { + "uuid": "85b712e0-af62-4255-aeb6-ec9ae0f4eb13", + "invariantUuid": "cba59330-855a-460b-8856-f6bff0dac6c2", + "customizationUuid": "962479d7-b5b7-4129-bf9f-bfe4775e7921", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null + } + }, + "vfcInstanceGroups": {} + } + }, + "networks": {}, + "collectionResource": null, + "configurations": null, + "fabricConfigurations": {}, + "serviceProxies": null, + "vfModules": { + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1": { + "uuid": "e67e5b39-1f3b-4692-beec-eda94a0375a5", + "invariantUuid": "21c1b57d-a618-4397-a7f4-9c37169ea09b", + "customizationUuid": "a7d59494-3710-4b05-b4cd-e45dadbdc7ac", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null, + "volumeGroupAllowed": true + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0": { + "uuid": "59bb7d14-278f-4ff5-bd5a-1a720c8b0d19", + "invariantUuid": "9b5589c2-e4d1-4456-a23b-e0001c349155", + "customizationUuid": "b9d6f6e8-e24a-4ad9-b863-1c3f6757bfe7", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": null, + "baseModule" : true + }, + "inputs": null, + "volumeGroupAllowed": false + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2": { + "uuid": "530e5e9f-2e82-4946-bf59-630f4d7ef4de", + "invariantUuid": "d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd", + "customizationUuid": "c1f95365-716c-4f6c-9477-a8f760a2edce", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null, + "volumeGroupAllowed": true + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4": { + "uuid": "064385f9-795b-4fcb-9e3b-51d7d0ccad80", + "invariantUuid": "603e8f71-88ad-4bbf-9992-2e9a72a91e29", + "customizationUuid": "3b5efcd3-d14d-4b0e-91cf-937db5aa65b5", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null, + "volumeGroupAllowed": true + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3": { + "uuid": "85b712e0-af62-4255-aeb6-ec9ae0f4eb13", + "invariantUuid": "cba59330-855a-460b-8856-f6bff0dac6c2", + "customizationUuid": "962479d7-b5b7-4129-bf9f-bfe4775e7921", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1": { + "uuid": "e67e5b39-1f3b-4692-beec-eda94a0375a5", + "invariantUuid": "21c1b57d-a618-4397-a7f4-9c37169ea09b", + "customizationUuid": "a7d59494-3710-4b05-b4cd-e45dadbdc7ac", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2": { + "uuid": "530e5e9f-2e82-4946-bf59-630f4d7ef4de", + "invariantUuid": "d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd", + "customizationUuid": "c1f95365-716c-4f6c-9477-a8f760a2edce", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4": { + "uuid": "064385f9-795b-4fcb-9e3b-51d7d0ccad80", + "invariantUuid": "603e8f71-88ad-4bbf-9992-2e9a72a91e29", + "customizationUuid": "3b5efcd3-d14d-4b0e-91cf-937db5aa65b5", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null + }, + "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3": { + "uuid": "85b712e0-af62-4255-aeb6-ec9ae0f4eb13", + "invariantUuid": "cba59330-855a-460b-8856-f6bff0dac6c2", + "customizationUuid": "962479d7-b5b7-4129-bf9f-bfe4775e7921", + "description": null, + "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3", + "version": "1", + "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": null, + "baseModule" : false + }, + "inputs": null + } + }, + "pnfs": null, + "vnfGroups": null +} diff --git a/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json new file mode 100644 index 000000000..1bbddc11c --- /dev/null +++ b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json @@ -0,0 +1,31 @@ +{ + "serviceNetworks": [ + { + "networkId": "7989a6d2-ba10-4a5d-8f15-4520bc833090", + "name": "DDDEEEFFF", + "nodeType": "Provider Network", + "nodeStatus": "Failed", + "vlans": [ + { + "vlanIdOuter": "34612" + }, + { + "vlanIdOuter": "8568012" + } + ] + }, + { + "networkId": "e8e2332e-1f84-4237-bc97-3b5b842f52e4", + "name": "GGGHHHIII", + "nodeType": "Network", + "nodeStatus": "Assigned", + "vlans": [ + { + "vlanIdOuter": "4" + } + ] + } + ], + "vnfNetworks": [ + ] +} diff --git a/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json new file mode 100644 index 000000000..952e36e3e --- /dev/null +++ b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json @@ -0,0 +1,58 @@ +{ + "serviceNetworks": [ + ], + "vnfNetworks": [ + { + "vnfId": "c015cc0f-0f37-4488-aabf-53795fd93cd3", + "networks": [ + { + "networkId": "36517f3d-2bc2-48f5-aaf8-418520c54330", + "name": "AAAAABBBBCCCC", + "nodeType": "Provider Network", + "nodeStatus": "Assigned", + "vlans": [ + { + "vlanIdOuter": "34123" + }, + { + "vlanIdOuter": "65540" + } + ] + }, + { + "networkId": "12347f3d-2bc2-48f5-aaf8-418520c54330", + "name": "DDDEEEE", + "nodeType": "Provider Network", + "nodeStatus": "Created", + "vlans": [ + { + "vlanIdOuter": "12345" + }, + { + "vlanIdOuter": "67890" + } + ] + } + ] + }, + { + "vnfId": "c55da606-cf38-42c7-bc3c-be8e23b19299", + "networks": [ + { + "networkId": "12aa7f3d-2bc2-48f5-aaf8-418520c54330", + "name": "XXXYYYZZZ", + "nodeType": "Network", + "nodeStatus": "Created", + "vlans": [ + { + "vlanIdOuter": "417695" + }, + { + "vlanIdOuter": "783243" + } + ] + } + ] + } + ] +} diff --git a/vid-automation/src/test/resources/test_config.properties b/vid-automation/src/test/resources/test_config.properties index db876b7df..01342158b 100644 --- a/vid-automation/src/test/resources/test_config.properties +++ b/vid-automation/src/test/resources/test_config.properties @@ -1,3 +1,2 @@ -test.loginId=vid1 -test.loginPassword=Kp8bJ4SXszM0WX - +test.loginId=us16807000 +test.loginPassword=us16807000
\ No newline at end of file diff --git a/vid-automation/src/test/resources/viewEdit/aaiHomingDataResponse.json b/vid-automation/src/test/resources/viewEdit/aaiHomingDataResponse.json new file mode 100644 index 000000000..5dfd2644b --- /dev/null +++ b/vid-automation/src/test/resources/viewEdit/aaiHomingDataResponse.json @@ -0,0 +1,8 @@ +{ + "cloudRegionID": "olson5b", + "cloudOwner": "irma-aic", + "tenantName": null, + "tenantID": "db1818f7f2e34862b378bfb2cc520f91", + "is-permitted": false, + "isPermitted": false +}
\ No newline at end of file |