diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-07-08 15:46:44 +0300 |
|---|---|---|
| committer | Ittay Stern <ittay.stern@att.com> | 2019-07-08 18:50:38 +0300 |
| commit | f4dff328c0386c8901b5841943b11f0c13b3169f (patch) | |
| tree | 4e64c3ee540410b2593c1ebecd0dddd3a4780592 /vid-automation | |
| parent | f792671ae247a931f34d902e9276202b5016ef9a (diff) | |
Merge from ecomp 718fd196 - Integration Tests
Issue-ID: VID-378
Change-Id: Icc0bdb9ef37b1d429d47c2070f76d1ee63ad7489
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-automation')
206 files changed, 9168 insertions, 1717 deletions
diff --git a/vid-automation/TestNg-ApiTest.xml b/vid-automation/TestNg-ApiTest.xml index 440fed441..ddd0f7ba3 100644 --- a/vid-automation/TestNg-ApiTest.xml +++ b/vid-automation/TestNg-ApiTest.xml @@ -7,21 +7,43 @@ </listeners> <test name="test"> - <groups> - <run> - <!-- These tests require the settings in asdc.properties to be like - asdc.client.type=LOCAL so cannot run on pipeline--> - <exclude name="worksOnlyWithLocalASDC"/> + <method-selectors> + <method-selector> + <script language="beanshell"> + <![CDATA[ - <!-- these tests call to MaintenanceController which is restricted to - localhost, so it can not run on jenkins pipeline --> - <exclude name="worksOnlyWithLocalhostVID"/> + //these tests call to MaintenanceController which is restricted to localhost, so it can not run on jenkins pipeline - <!-- tests and features that are still under development but are pushed to develop --> - <exclude name="underDevelopment"/> + String [] exclusionGroups = new String [] { + "worksOnlyWithLocalASDC", + "worksOnlyWithLocalhostVID", + "underDevelopment" + }; - </run> - </groups> + String [] classes1 = new String [] { + "AsyncInstantiationALaCarteApiTest" + }; + int selectPart = 0; + + for (g: exclusionGroups) { + if (groups.containsKey(g)) return false; + } + if (selectPart == 0) return true; + + methodClass = method.getDeclaringClass().toString(); + + if (methodClass.contains("org.onap.vid.api.Base")) return true; + + for (c: classes1) { + if (methodClass.endsWith(c)) return selectPart==1; + } + + // else + return selectPart==2; + ]]> + </script> + </method-selector> + </method-selectors> <packages> <package name="org.onap.vid.*"/> </packages> diff --git a/vid-automation/TestNg-UI-half.xml b/vid-automation/TestNg-UI-half.xml index bc51c9fce..01cdfcc5e 100644 --- a/vid-automation/TestNg-UI-half.xml +++ b/vid-automation/TestNg-UI-half.xml @@ -59,29 +59,7 @@ </script> </method-selector> </method-selectors> - <groups> - <run> - <!-- These tests are legacy tests that should be converted from - working against IST to working against vid's 3rd party simulator--> - <exclude name="shouldBeMigratedToWorkWithSimulator"/> - <!-- These tests require the settings in asdc.properties to be like - asdc.client.type=LOCAL so cannot run on pipeline--> - <exclude name="worksOnlyWithLocalASDC"/> - - <!-- these tests call to MaintenanceController which is restricted to - localhost, so it can not run on jenkins pipeline --> - <exclude name="worksOnlyWithLocalhostVID"/> - - <!-- angular2 is not supported in CI yet. These tests can run only on - developers environment --> - <exclude name="Angular2Tests"/> - - <!-- tests and features that are still under development but are pushed to develop --> - <exclude name="underDevelopment"/> - - </run> - </groups> <packages> <package name="vid.automation.test.test.*"/> </packages> diff --git a/vid-automation/conf/categoryParams b/vid-automation/conf/categoryParams index 57cfcdc49..5c8049bfe 100644 --- a/vid-automation/conf/categoryParams +++ b/vid-automation/conf/categoryParams @@ -21,25 +21,33 @@ "categoryId": "1" }, { - "name": "DFW", + "name": "WATKINS", "categoryId": "2" }, { - "name": "ECOMP", + "name": "ONAP", "categoryId": "3" }, { - "name": "Wireline", + "name": "Melissa", "categoryId": "4" }, { - "name": "MetroPacketCore", + "name": "WayneHolland", "appId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "categoryId": "4" }, { "name": "x1", "categoryId": "2" + }, + { + "name": "1908.19", + "categoryId": "7" + }, + { + "name": "1908.27", + "categoryId": "7" } ] }
\ No newline at end of file diff --git a/vid-automation/conf/environments b/vid-automation/conf/environments index ad12be2be..c917ec087 100644 --- a/vid-automation/conf/environments +++ b/vid-automation/conf/environments @@ -1,23 +1,29 @@ { "headers": ["Environment ID", "Environment Name", "ECOMP Environment ID", "ECOMP Environment Name", "Tenant Context", "Environment Type", "Workload Context", "Status", "Action", "Attach Manifest"], "basicList": [ - ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""], - ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""], - ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""] + ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""], + ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""], + ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""] ], "fullList": [ - ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""], - ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""], - ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""], - ["f07ca256-96dd-40ad-b4d2-7a77e2a974ef", "New VNF Environment", "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "ECOMP Env Name", "ECOMP Test", "VNF", "VNF_TEST", "Inactive", "Activate", ""] + ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""], + ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""], + ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""], + ["f07ca256-96dd-40ad-b4d2-7a77e2a974ef", "New VNF Environment", "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "ECOMP Env Name", "ECOMP Test", "VNF", "VNF_TEST_1908.19", "INACTIVE", "Activate", ""] + ], + "fullListWithoutReleaseLabel": [ + ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""], + ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""], + ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""], + ["f07ca256-96dd-40ad-b4d2-7a77e2a974ef", "New VNF Environment", "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "ECOMP Env Name", "ECOMP Test", "VNF", "VNF_TEST", "INACTIVE", "Activate", ""] ], "sortedList": [ - ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""], - ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""], - ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""] + ["f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""], + ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""], + ["f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""] ], "filteredList": [ - ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "Active", "Deactivate", ""] + ["f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "Op Env Name", "UUID of the ECOMP Operational Environment", "Name of the ECOMP Operational Environment", "Test", "VNF", "VNF_Development", "ACTIVE", "Deactivate", ""] ] }
\ No newline at end of file diff --git a/vid-automation/conf/newEnvironment b/vid-automation/conf/newEnvironment index f34c0037e..0e7136b5b 100644 --- a/vid-automation/conf/newEnvironment +++ b/vid-automation/conf/newEnvironment @@ -5,5 +5,6 @@ "EcompEnvironmentId": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "EcompEnvironmentName": "ECOMP Env Name", "tenantContext": "ECOMP Test", - "workloadContext": "VNF_TEST" + "workloadContext": "VNF_TEST", + "release": "1908.19" }
\ No newline at end of file diff --git a/vid-automation/conf/serviceModels b/vid-automation/conf/serviceModels index 8271e77a0..23ea480f2 100644 --- a/vid-automation/conf/serviceModels +++ b/vid-automation/conf/serviceModels @@ -1,34 +1,34 @@ { "serviceModels": { "959a7ba0-89ee-4984-9af6-65d5bdda4b0e": { - "serviceName": "ServicevMMSCPID298109", - "subscriberName": "Mobility", + "serviceName": "ServicevWINIFREDPID298109", + "subscriberName": "Emanuel", "serviceInstanceName": "ggghhh", - "modelName": "VSP1710PID298109_vMMSC", + "modelName": "VSP1710PID298109_vWINIFRED", "modelInvariantUuid": "e7961100-cde6-4b5a-bcda-b8945086950a", "modelVersion": "1.0", "modelUuid": "959a7ba0-89ee-4984-9af6-65d5bdda4b0e", "modelCustomizationUuid": "6b8fc7dc-2db1-4283-a222-b07d10595495", - "resourceName": "VSP1710PID298109_vMMSC 0", - "nfType": "MOBILITY MESSAGING", - "nfRole": "VMMSC", + "resourceName": "VSP1710PID298109_vWINIFRED 0", + "nfType": "EMANUEL MESSAGING", + "nfRole": "VWINIFRED", "nfFunction": "Multimedia Message Service Center", "nfNamingCode": "MMSC" }, "d205e01d-e5da-4e68-8c52-f95cb0607959": { - "serviceName": "ServicevMMSCPID298109", - "subscriberName": "Mobility", + "serviceName": "ServicevWINIFREDPID298109", + "subscriberName": "Emanuel", "serviceInstanceName": "ggghhh", - "modelName": "Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8", + "modelName": "Vsp1710pid298109Vwinifred..mmsc_mod1_ltm..module-8", "modelInvariantUuid": "d9f9c851-9543-476e-b3c2-a2e5284a26aa", "modelVersion": "1", "modelUuid": "d205e01d-e5da-4e68-8c52-f95cb0607959", "modelCustomizationUuid": "e81b58ce-ae9b-4bde-9f81-9962a5007756" }, "13f022c4-651e-4326-b8e1-61e9a8c7a7ad": { - "serviceName": "ServicevMMSCPID298109", - "subscriberName": "Mobility", + "serviceName": "ServicevWINIFREDPID298109", + "subscriberName": "Emanuel", "serviceInstanceName": "ggghhh", - "modelName": "Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3", + "modelName": "Vsp1710pid298109Vwinifred..mmsc_mod6_eca_oam..module-3", "modelInvariantUuid": "6931e88a-fbcc-4ca9-8583-876b669c3106", "modelVersion": "1", "modelUuid": "13f022c4-651e-4326-b8e1-61e9a8c7a7ad", diff --git a/vid-automation/conf/users b/vid-automation/conf/users index 757b04c78..de18c38d7 100644 --- a/vid-automation/conf/users +++ b/vid-automation/conf/users @@ -13,8 +13,8 @@ "userId": "1", "password": "1" }, - "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"], + "roles": ["SILVIA ROBBINS___TYLER SILVIA", "SILVIA ROBBINS___DARREN MCGEE", "CAR_2020_ER___DARREN MCGEE", "CAR_2020_ER___MSO-dev-service-type", "CAR_2020_ER___TYLER SILVIA","READ___LOGS___PERMITTED","Emanuel___mySubType", "global-customer-id___service-instance-type"], + "subscriberNames": ["SILVIA ROBBINS", "CAR_2020_ER", "Emanuel", "global-customer-id"], "serviceTypes": ["TYLER SILVIA", "DARREN MCGEE", "MSO-dev-service-type"], "tenants": ["092eb9e8e4b7412e8787dd091bc58e86"] }, @@ -43,7 +43,7 @@ "userId": "4", "password": "4" }, - "roles": ["Emanuel___vWINIFRED", "Emanuel___vFlowLogic"], + "roles": ["Emanuel___vWINIFRED", "Emanuel___vRichardson"], "subscriberNames": ["Emanuel"], "serviceTypes": ["vWINIFRED", "vRichardson"], "tenants": ["092eb9e8e4b7412e8787dd091bc58e86"] @@ -55,20 +55,20 @@ }, "roles": [ "JULIO ERICKSON___Emanuel", - "JULIO ERICKSON___vFlowLogic" + "JULIO ERICKSON___vRichardson" ], "subscriberNames": ["JULIO ERICKSON"], "serviceTypes": ["Emanuel", "vRichardson"], "tenants": null }, - "Emanuel vFlowLogic": { + "Emanuel vRichardson": { "credentials": { "userId": "321", "password": "312" }, "roles": [ - "Emanuel___vFlowLogic" + "Emanuel___vRichardson" ], "subscriberNames": ["Emanuel"], "serviceTypes": ["vRichardson"], diff --git a/vid-automation/pom.xml b/vid-automation/pom.xml index fb51a4a31..246402682 100644 --- a/vid-automation/pom.xml +++ b/vid-automation/pom.xml @@ -169,6 +169,11 @@ </dependency> <dependency> <groupId>org.springframework</groupId> + <artifactId>spring-aop</artifactId> + <version>${springframework.version}</version> + </dependency> + <dependency> + <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> <version>${springframework.version}</version> <exclusions> @@ -189,6 +194,11 @@ <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> @@ -234,6 +244,12 @@ <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> diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java index f85225f36..987e09e61 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/api/BaseRestUtils.java @@ -26,6 +26,7 @@ import java.io.InputStreamReader; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.apache.commons.codec.binary.Base64; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java index 4f831b187..bc62e6673 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/datatypes/http/HttpRequest.java @@ -53,7 +53,6 @@ import org.apache.http.entity.mime.content.StringBody; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; import org.apache.http.util.EntityUtils; -import org.onap.sdc.ci.tests.datatypes.http.RestResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java index e8c386bb2..b7f6dfa9e 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/DriverFactory.java @@ -22,7 +22,6 @@ package org.onap.sdc.ci.tests.execute.setup; import java.io.File; -import java.io.FileNotFoundException; import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java index 501faa8de..95443bf0b 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WebDriverThread.java @@ -93,11 +93,7 @@ public class WebDriverThread { cap.setCapability("browserName","firefox"); cap.setCapability(FirefoxDriver.PROFILE, initFirefoxProfile()); cap.setCapability(MARIONETTE_CAPABILITY, true); - - firefoxProfile.setPreference("network.proxy.type", 2); - firefoxProfile.setPreference("network.proxy.autoconfig_url", "http://emea.onap.org:8001/"); - firefoxProfile.setPreference("network.proxy.no_proxies_on", "localhost"); - + webdriver = new FirefoxDriver(cap); } } else { diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java index 727876f27..cb6adc295 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/execute/setup/WindowTestManager.java @@ -22,8 +22,6 @@ package org.onap.sdc.ci.tests.execute.setup; import java.util.HashMap; -import com.aventstack.extentreports.ExtentTest; - public class WindowTestManager { private static HashMap<Long, WindowTest> windowMap = new HashMap<Long, WindowTest>(); diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java index eb93a619e..2ff28dabd 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/CanvasElement.java @@ -21,7 +21,6 @@ package org.onap.sdc.ci.tests.utilities; import org.apache.commons.lang3.tuple.ImmutablePair; -import org.onap.sdc.ci.tests.datatypes.DataTestIdEnum.LeftPanelCanvasItems; import org.openqa.selenium.WebElement; public final class CanvasElement { diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java index d5d5540a9..029555a91 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/FileHandling.java @@ -45,7 +45,6 @@ import java.util.zip.ZipFile; import java.util.zip.ZipInputStream; import org.apache.commons.io.FileUtils; -import org.onap.sdc.ci.tests.datatypes.UserCredentials; import org.onap.sdc.ci.tests.execute.setup.ExtentTestActions; import org.onap.sdc.ci.tests.execute.setup.SetupCDTest; import org.yaml.snakeyaml.Yaml; diff --git a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java index 8885e1c3f..b10636bf1 100644 --- a/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java +++ b/vid-automation/src/main/java/org/onap/sdc/ci/tests/utilities/GeneralUIUtils.java @@ -20,6 +20,7 @@ package org.onap.sdc.ci.tests.utilities; +//import com.automation.common.report_portal_integration.annotations.Step; import com.aventstack.extentreports.Status; import org.apache.commons.io.FileUtils; import org.junit.Assert; @@ -600,12 +601,14 @@ public final class GeneralUIUtils { wait.until(ExpectedConditions.textToBePresentInElementValue(element, text)); } + //@Step public static void waitForAngular(){ WebDriverWait wait = newWait(90); wait.until(AdditionalConditions.pageLoadWait()); wait.until(AdditionalConditions.angularHasFinishedProcessing()); } + //@Step public static void waitForAngular2(){ WebDriverWait wait = newWait(90); wait.until(AdditionalConditions.pageLoadWait()); @@ -645,6 +648,7 @@ public final class GeneralUIUtils { waitForElementVisibilityByTestId(dataTestId)); } + //@Step public static void ultimateWait(){ logger.info("ultimateWait: starting"); long startTime = System.nanoTime(); diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java index 4f4779d8e..8ad111849 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java @@ -1,8 +1,9 @@ package org.onap.simulator.presetGenerator.presets.BasePresets; -import java.util.Map; import vid.automation.test.infra.Features; +import java.util.Map; + /** * Created by itzikliderman on 27/12/2017. */ @@ -33,6 +34,13 @@ public abstract class BaseMSOPreset extends BasePreset { "\"cloudOwner\": \""+cloudOwner+"\"," : ""; } + protected String addPlatformIfNeeded(String platform) { + return platform != "" ? + " \"platform\": {" + + " \"platformName\": \""+platform+"\"," + + "}," : ""; + } + @Override protected String getRootPath() { return "/mso"; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java index 662677e83..aded77ccf 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java @@ -1,10 +1,11 @@ package org.onap.simulator.presetGenerator.presets.BasePresets; +import org.onap.simulator.presetGenerator.presets.model.RegistrationRequest; +import org.springframework.http.HttpMethod; + import java.util.HashMap; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.model.RegistrationRequest; -import org.springframework.http.HttpMethod; /** * Created by itzikliderman on 13/12/2017. diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/AAIBaseGetL3NetworksByCloudRegionPreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/AAIBaseGetL3NetworksByCloudRegionPreset.java new file mode 100644 index 000000000..e20c09ba1 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/AAIBaseGetL3NetworksByCloudRegionPreset.java @@ -0,0 +1,76 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + +import java.util.*; + +public class AAIBaseGetL3NetworksByCloudRegionPreset extends BaseAAIPreset { + + public static final String DEFAULT_TENANT_ID = "b530fc990b6d4334bd45518bebca6a51"; + public static final String DEFAULT_TENANT_NAME = "ecomp_ispt"; + public static final String DEFAULT_CLOUD_REGION_ID = PresetAAIGetCloudOwnersByCloudRegionId.AUK51A; + private static final String DEFAULT_CLOUD_OWNER = PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; + protected String tenantId; + protected String tenantName; + protected String cloudRegionId; + protected String cloudOwner; + protected String networkRole; + + public AAIBaseGetL3NetworksByCloudRegionPreset(String tenentId, String tenantName, String cloudRegionId, String cloudOwner, String networkRole) { + this.tenantId = tenentId; + this.tenantName = tenantName; + this.cloudRegionId = cloudRegionId; + this.cloudOwner = cloudOwner; + this.networkRole = networkRole; + } + + public AAIBaseGetL3NetworksByCloudRegionPreset() { + this.tenantId = DEFAULT_TENANT_ID; + this.tenantName = DEFAULT_TENANT_NAME; + this.cloudRegionId = DEFAULT_CLOUD_REGION_ID; + this.cloudOwner = DEFAULT_CLOUD_OWNER; + } + + public String getTenantName() { + return tenantName; + } + + public String getTenantId() { + return tenantId; + } + + public String getCloudRegionId() { + return cloudRegionId; + } + + public String getCloudOwner() { + return cloudOwner; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.PUT; + } + + @Override + public String getReqPath() { + return getRootPath() + "/query"; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of( + "format", Collections.singletonList("resource") + ); + } + + @Override + public Object getRequestBody() { + return ImmutableMap.of( + "start", "/cloud-infrastructure/cloud-regions/cloud-region/" + cloudOwner + "/" + cloudRegionId, + "query", "query/l3-networks-by-cloud-region?tenantId=" + tenantId + (networkRole == null ? "" : "&networkRole=" + networkRole) + ); + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/Placement.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/Placement.java new file mode 100644 index 000000000..b665fc30f --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/Placement.java @@ -0,0 +1,14 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +public class Placement { + public final String cloudOwner; + public final String lcpRegionId; + public final String tenantId; + + public Placement(String cloudOwner, String lcpRegionId, String tenantId) { + this.cloudOwner = cloudOwner; + this.lcpRegionId = lcpRegionId; + this.tenantId = tenantId; + } +} + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java index 66562ed63..c43843179 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAICloudRegionAndSourceFromConfigurationPut.java @@ -2,11 +2,12 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAICloudRegionAndSourceFromConfigurationPut extends BaseAAIPreset { diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudOwnersByCloudRegionId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudOwnersByCloudRegionId.java index be075b481..22c0cfef5 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudOwnersByCloudRegionId.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudOwnersByCloudRegionId.java @@ -1,15 +1,16 @@ package org.onap.simulator.presetGenerator.presets.aai; -import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; -import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; - import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; import java.util.UUID; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; + +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.apache.commons.lang3.RandomStringUtils.randomNumeric; public class PresetAAIGetCloudOwnersByCloudRegionId extends BaseAAIPreset { public static final String SOME_LEGACY_REGION = "some legacy region"; @@ -23,9 +24,10 @@ public class PresetAAIGetCloudOwnersByCloudRegionId extends BaseAAIPreset { public static final String olson3 = "olson3"; public static final String olson5B = "olson5b"; public static final String ATT_SABABA = "att-sababa"; - public static final String AAIAIC_25 = "JANET25"; + public static final String AAIAIC_25 = "AAIAIC25"; public static final String ONE = "One"; public static final String hvf6 = "hvf6"; + public static final String AUK51A = "auk51a"; private final String cloudRegionId; private final String cloudOwner; @@ -61,7 +63,10 @@ public class PresetAAIGetCloudOwnersByCloudRegionId extends BaseAAIPreset { public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_LCP_REGION_TEXT_TO_ATT_AIC = new PresetAAIGetCloudOwnersByCloudRegionId(LCP_REGION_TEXT, ATT_AIC); - private PresetAAIGetCloudOwnersByCloudRegionId(String cloudRegionId, String cloudOwnerResult) { + public static final PresetAAIGetCloudOwnersByCloudRegionId PRESET_AUK51A_TO_ATT_NC = + new PresetAAIGetCloudOwnersByCloudRegionId(AUK51A, ATT_NC); + + public PresetAAIGetCloudOwnersByCloudRegionId(String cloudRegionId, String cloudOwnerResult) { this.cloudRegionId = cloudRegionId; this.cloudOwner = cloudOwnerResult; } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudRegionFromVnf.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudRegionFromVnf.java index 976228bf0..06b853578 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudRegionFromVnf.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetCloudRegionFromVnf.java @@ -2,11 +2,12 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAIGetCloudRegionFromVnf extends BaseAAIPreset { diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegion.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegion.java new file mode 100644 index 000000000..6b47fe004 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegion.java @@ -0,0 +1,267 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; + +import java.util.*; +import java.util.stream.Collectors; + +public class PresetAAIGetL3NetworksByCloudRegion extends AAIBaseGetL3NetworksByCloudRegionPreset { + + private static final int NUMBER_OF_VALID_NETWORKS = 3; + private static final String NETWORK_NAME_TEMPLATE = "AUK51a_oam_calea_net_"; + private static final String NETWORK_TYPE_TEMPLATE = "SR-IOV-PROVIDER2-"; + private static final String NETWORK_PHYSICAL_NAME_TEMPLATE = "sriovnet"; + private static final String NETWORK_MODEL_ID = "77010093-df36-4dcb-8428-c3d02bf3f88d"; + private static final String ACTIVE = "Active"; + private static final String SERVICE_INSTANCE_NAME_TEMPLATE = "AUK51a_oam_calea_net_service_"; + private static final String NETWORK_ROLE_TEMPLATE = "oam_calea_net_"; + private List<Network> networks = new ArrayList<>(); + + + private void initNetworks() { + // Valid networks + for (int i=0; i <= NUMBER_OF_VALID_NETWORKS; i++) { + networks.add(new Network( + NETWORK_NAME_TEMPLATE + i, + UUID.randomUUID().toString(), + NETWORK_TYPE_TEMPLATE + i, + networkRole == null? NETWORK_ROLE_TEMPLATE + i : networkRole, + ACTIVE, + NETWORK_PHYSICAL_NAME_TEMPLATE + i, + NETWORK_MODEL_ID, + SERVICE_INSTANCE_NAME_TEMPLATE + i, + UUID.randomUUID().toString(), + tenantName, + cloudRegionId, + true + )); + } + // Not Active + int i = NUMBER_OF_VALID_NETWORKS + 1; + networks.add(new Network( + NETWORK_NAME_TEMPLATE + i, + UUID.randomUUID().toString(), + NETWORK_TYPE_TEMPLATE + i, + networkRole == null? NETWORK_ROLE_TEMPLATE + i : networkRole, + "Assigned", + NETWORK_PHYSICAL_NAME_TEMPLATE + i, + NETWORK_MODEL_ID, + SERVICE_INSTANCE_NAME_TEMPLATE + i, + UUID.randomUUID().toString(), + tenantName, + cloudRegionId, + true + )); + // Empty name + i++; + networks.add(new Network( + "", + UUID.randomUUID().toString(), + NETWORK_TYPE_TEMPLATE + i, + networkRole == null? NETWORK_ROLE_TEMPLATE + i : networkRole, + ACTIVE, + NETWORK_PHYSICAL_NAME_TEMPLATE + i, + NETWORK_MODEL_ID, + SERVICE_INSTANCE_NAME_TEMPLATE + i, + UUID.randomUUID().toString(), + tenantName, + cloudRegionId, + true + )); + // No name + i++; + networks.add(new Network( + null, + UUID.randomUUID().toString(), + NETWORK_TYPE_TEMPLATE + i, + networkRole == null? NETWORK_ROLE_TEMPLATE + i : networkRole, + ACTIVE, + NETWORK_PHYSICAL_NAME_TEMPLATE + i, + NETWORK_MODEL_ID, + SERVICE_INSTANCE_NAME_TEMPLATE + i, + UUID.randomUUID().toString(), + tenantName, + cloudRegionId, + true + )); + // Not related to VPN binding + i++; + networks.add(new Network( + NETWORK_NAME_TEMPLATE + i, + UUID.randomUUID().toString(), + NETWORK_TYPE_TEMPLATE + i, + networkRole == null? NETWORK_ROLE_TEMPLATE + i : networkRole, + ACTIVE, + NETWORK_PHYSICAL_NAME_TEMPLATE + i, + NETWORK_MODEL_ID, + SERVICE_INSTANCE_NAME_TEMPLATE + i, + UUID.randomUUID().toString(), + tenantName, + cloudRegionId, + false + )); + } + + public PresetAAIGetL3NetworksByCloudRegion(String tenentId, String tenantId, String cloudRegionId, String cloudOwner, String networkRole) { + super(tenantId, tenantId, cloudRegionId, cloudOwner, networkRole); + initNetworks(); + } + + public PresetAAIGetL3NetworksByCloudRegion() { + super(); + initNetworks(); + } + + public PresetAAIGetL3NetworksByCloudRegion(String networkRole) { + super(); + this.networkRole = networkRole; + initNetworks(); + } + + public String getActiveNetworksWithNameAndRelatedToVpnBindingAsJsonString() throws JsonProcessingException { + ObjectMapper mapper = new ObjectMapper(); + return mapper.writeValueAsString(networks.stream().filter(network -> network.networkName != null && !network.networkName.isEmpty() && network.orchStatus.equals(ACTIVE) && network.isBoundToVpn).collect(Collectors.toList())); + } + + @Override + public Object getResponseBody() { + StringJoiner stringJoiner = new StringJoiner(",", "[", "]"); + for (Network network : networks) { + stringJoiner.add(network.toString()); + } + return "{\"results\": " + stringJoiner.toString() + "}"; + } + + private class Network { + @JsonProperty("instanceName") + public String networkName; + @JsonProperty("instanceId") + public String networkId; + @JsonProperty("instanceType") + public String networkType; + public String role; + public String orchStatus; + public String physicalName; + @JsonProperty("uuid") + public String modelUUID; + public String serviceName; + public String serviceUUID; + public String tenantName; + @JsonProperty("lcpCloudRegionId") + public String region; + private boolean isBoundToVpn; + + + public Network(String networkName, String networkId, String networkType, String role, String orchStatus, String physicalName, + String modelUUID, String serviceName, String serviceUUID, String tenantName, String region, boolean isBoundToVpn) { + this.networkName = networkName; + this.networkId = networkId; + this.networkType = networkType; + this.role = role; + this.orchStatus = orchStatus; + this.physicalName = physicalName; + this.modelUUID = modelUUID; + this.serviceName = serviceName; + this.serviceUUID = serviceUUID; + this.tenantName = tenantName; + this.region = region; + this.isBoundToVpn = isBoundToVpn; + } + + @Override + public String toString (){ + return "{\"l3-network\": " + + "{\n" + + " \"network-id\": \"" + networkId + "\",\n" + + (networkName == null ? "" : " \"network-name\": \"" + networkName + "\",\n") + + " \"network-type\": \"" + networkType + "\",\n" + + " \"network-role\": \"" + role + "\",\n" + + " \"network-technology\": \"STANDARD-SR-IOV\",\n" + + " \"is-bound-to-vpn\": " + isBoundToVpn + ",\n" + + " \"resource-version\": \"1540925016770\",\n" + + " \"orchestration-status\": \"" + orchStatus + "\",\n" + + " \"model-invariant-id\": \"b9a9b549-0ee4-49fc-b4f2-5edc6701da68\",\n" + + " \"model-version-id\": \"" + modelUUID + "\",\n" + + " \"model-customization-id\": \"e5f33853-f84c-4cdd-99f2-93846957aa18\",\n" + + " \"physical-network-name\": \"" + physicalName + "\",\n" + + " \"is-provider-network\": true,\n" + + " \"is-shared-network\": true,\n" + + " \"is-external-network\": false,\n" + + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/" + serviceUUID + "/service-data/networks/network/" + networkId + "/network-data/network-topology/\",\n" + + " \"relationship-list\": {\n" + + " \"relationship\": [{\n" + + " \"related-to\": \"service-instance\",\n" + + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\",\n" + + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/" + serviceUUID + "\",\n" + + " \"relationship-data\": [{\n" + + " \"relationship-key\": \"customer.global-customer-id\",\n" + + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"\n" + + " }, {\n" + + " \"relationship-key\": \"service-subscription.service-type\",\n" + + " \"relationship-value\": \"Emanuel\"\n" + + " }, {\n" + + " \"relationship-key\": \"service-instance.service-instance-id\",\n" + + " \"relationship-value\": \"" + serviceUUID + "\"\n" + + " }],\n" + + " \"related-to-property\": [{\n" + + " \"property-key\": \"service-instance.service-instance-name\",\n" + + " \"property-value\": \"" + serviceName + "\"\n" + + " }]\n" + + " }, {\n" + + " \"related-to\": \"tenant\",\n" + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/" + cloudOwner + "/" + cloudRegionId + "/tenants/tenant/" + tenantId + "\",\n" + + " \"relationship-data\": [{\n" + + " \"relationship-key\": \"cloud-region.cloud-owner\",\n" + + " \"relationship-value\": \"" + cloudOwner + "\"\n" + + " }, {\n" + + " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" + + " \"relationship-value\": \"" + region + "\"\n" + + " }, {\n" + + " \"relationship-key\": \"tenant.tenant-id\",\n" + + " \"relationship-value\": \"" + tenantId + "\"\n" + + " }],\n" + + " \"related-to-property\": [{\n" + + " \"property-key\": \"tenant.tenant-name\",\n" + + " \"property-value\": \"" + tenantName +"\"\n" + + " }]\n" + + " }, {\n" + + " \"related-to\": \"cloud-region\",\n" + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\",\n" + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/" + cloudOwner + "/" + cloudRegionId + "\",\n" + + " \"relationship-data\": [{\n" + + " \"relationship-key\": \"cloud-region.cloud-owner\",\n" + + " \"relationship-value\": \"" + cloudOwner + "\"\n" + + " }, {\n" + + " \"relationship-key\": \"cloud-region.cloud-region-id\",\n" + + " \"relationship-value\": \"" + region + "\"\n" + + " }],\n" + + " \"related-to-property\": [{\n" + + " \"property-key\": \"cloud-region.owner-defined-type\",\n" + + " \"property-value\": \"lcp\"\n" + + " }]\n" + + " }, {\n" + + " \"related-to\":\"" + (isBoundToVpn ? "vpn-binding" : "something-else") + "\",\n" + + " \"relationship-label\":\"org.onap.relationships.inventory.Uses\",\n" + + " \"related-link\":\"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\",\n" + + " \"relationship-data\":[{\n" + + " \"relationship-key\":\"vpn-binding.vpn-id\",\n" + + " \"relationship-value\":\"3e7834fb-a8e0-4243-a837-5352ccab4602\"\n" + + " }],\n" + + " \"related-to-property\": [{\n" + + " \"property-key\":\"vpn-binding.vpn-name\",\n" + + " \"property-value\":\"LPPVPN\"\n" + + " }, {\n" + + " \"property-key\":\"vpn-binding.vpn-type\",\n" + + " \"property-value\":\"CUSTOMER\"\n" + + " }]\n" + + " }]\n" + + " }\n" + + " }\n" + + " }"; + } + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionSpecificState.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionSpecificState.java new file mode 100644 index 000000000..01a4fb9b4 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionSpecificState.java @@ -0,0 +1,776 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +public class PresetAAIGetL3NetworksByCloudRegionSpecificState extends AAIBaseGetL3NetworksByCloudRegionPreset { + private int stateNum = 1; + + public PresetAAIGetL3NetworksByCloudRegionSpecificState(int stateNum) { + super(); + this.stateNum = stateNum; + } + + public PresetAAIGetL3NetworksByCloudRegionSpecificState(String cloudOwner, String cloudRegionId, String tenantId) { + super(tenantId, null, cloudRegionId, cloudOwner, null); + } + + @Override + public Object getResponseBody() { + if (stateNum == 1) { + return STATE_1; + } else + return STATE_2; + } + + private static final String STATE_1 = "{ " + + " \"results\": [{ " + + " \"l3-network\": { " + + " \"network-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861131\", " + + " \"network-name\": \"AUK51a_oam_calea_net_0\", " + + " \"network-type\": \"SR-IOV-PROVIDER2-0\", " + + " \"network-role\": \"oam_calea_net_0\", " + + " \"network-technology\": \"STANDARD-SR-IOV\", " + + " \"is-bound-to-vpn\": true, " + + " \"resource-version\": \"1540925016770\", " + + " \"orchestration-status\": \"Active\", " + + " \"model-invariant-id\": \"b9a9b549-0ee4-49fc-b4f2-5edc6701da68\", " + + " \"model-version-id\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", " + + " \"model-customization-id\": \"e5f33853-f84c-4cdd-99f2-93846957aa18\", " + + " \"physical-network-name\": \"sriovnet0\", " + + " \"is-provider-network\": true, " + + " \"is-shared-network\": true, " + + " \"is-external-network\": false, " + + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/ddd91e3d-7cd1-4010-958d-94c729937d2d/service-data/networks/network/dbd80094-df1a-4831-8699-a96949dbca5c/network-data/network-topology/\", " + + " \"relationship-list\": { " + + " \"relationship\": [{ " + + " \"related-to\": \"service-instance\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", " + + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/ddd91e3d-7cd1-4010-958d-94c729937d2d\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"customer.global-customer-id\", " + + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" " + + " }, { " + + " \"relationship-key\": \"service-subscription.service-type\", " + + " \"relationship-value\": \"Emanuel\" " + + " }, { " + + " \"relationship-key\": \"service-instance.service-instance-id\", " + + " \"relationship-value\": \"1c98917b-8255-43c6-98f1-7a2942e75ce1\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"service-instance.service-instance-name\", " + + " \"property-value\": \"AUK51a_oam_calea_net_service_0\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"tenant\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"cloud-region.cloud-owner\", " + + " \"relationship-value\": \"att-nc\" " + + " }, { " + + " \"relationship-key\": \"cloud-region.cloud-region-id\", " + + " \"relationship-value\": \"auk51a\" " + + " }, { " + + " \"relationship-key\": \"tenant.tenant-id\", " + + " \"relationship-value\": \"b530fc990b6d4334bd45518bebca6a51\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"tenant.tenant-name\", " + + " \"property-value\": \"ecomp_ispt\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"cloud-region\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"cloud-region.cloud-owner\", " + + " \"relationship-value\": \"att-nc\" " + + " }, { " + + " \"relationship-key\": \"cloud-region.cloud-region-id\", " + + " \"relationship-value\": \"auk51a\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"cloud-region.owner-defined-type\", " + + " \"property-value\": \"lcp\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"vpn-binding\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"vpn-binding.vpn-id\", " + + " \"relationship-value\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"vpn-binding.vpn-name\", " + + " \"property-value\": \"LPPVPN\" " + + " }, { " + + " \"property-key\": \"vpn-binding.vpn-type\", " + + " \"property-value\": \"CUSTOMER\" " + + " } " + + " ] " + + " } " + + " ] " + + " } " + + " } " + + " }, { " + + " \"l3-network\": { " + + " \"network-id\": \"b45cdb14-7a80-4ebd-b979-b1d7c7620851\", " + + " \"network-name\": \"AUK51a_oam_calea_net_1\", " + + " \"network-type\": \"SR-IOV-PROVIDER2-1\", " + + " \"network-role\": \"oam_calea_net_1\", " + + " \"network-technology\": \"STANDARD-SR-IOV\", " + + " \"is-bound-to-vpn\": true, " + + " \"resource-version\": \"1540925016770\", " + + " \"orchestration-status\": \"Active\", " + + " \"model-invariant-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", " + + " \"model-version-id\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", " + + " \"model-customization-id\": \"3b45cdb14-7a80-4ebd-b979-b1d7c7620851\", " + + " \"physical-network-name\": \"sriovnet1\", " + + " \"is-provider-network\": true, " + + " \"is-shared-network\": true, " + + " \"is-external-network\": false, " + + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/ee1b756e-3c9c-4ee0-974b-6218f377b20d/service-data/networks/network/fa1d9589-478d-41ea-96e6-39714ddc6aa5/network-data/network-topology/\", " + + " \"relationship-list\": { " + + " \"relationship\": [{ " + + " \"related-to\": \"service-instance\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", " + + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/ee1b756e-3c9c-4ee0-974b-6218f377b20d\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"customer.global-customer-id\", " + + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" " + + " }, { " + + " \"relationship-key\": \"service-subscription.service-type\", " + + " \"relationship-value\": \"Emanuel\" " + + " }, { " + + " \"relationship-key\": \"service-instance.service-instance-id\", " + + " \"relationship-value\": \"fc21e453-7ff4-438e-bc69-df1f9474b00a\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"service-instance.service-instance-name\", " + + " \"property-value\": \"AUK51a_oam_calea_net_service_1\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"tenant\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"cloud-region.cloud-owner\", " + + " \"relationship-value\": \"att-nc\" " + + " }, { " + + " \"relationship-key\": \"cloud-region.cloud-region-id\", " + + " \"relationship-value\": \"auk51a\" " + + " }, { " + + " \"relationship-key\": \"tenant.tenant-id\", " + + " \"relationship-value\": \"b530fc990b6d4334bd45518bebca6a51\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"tenant.tenant-name\", " + + " \"property-value\": \"ecomp_ispt\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"cloud-region\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"cloud-region.cloud-owner\", " + + " \"relationship-value\": \"att-nc\" " + + " }, { " + + " \"relationship-key\": \"cloud-region.cloud-region-id\", " + + " \"relationship-value\": \"auk51a\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"cloud-region.owner-defined-type\", " + + " \"property-value\": \"lcp\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"vpn-binding\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"vpn-binding.vpn-id\", " + + " \"relationship-value\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"vpn-binding.vpn-name\", " + + " \"property-value\": \"LPPVPN\" " + + " }, { " + + " \"property-key\": \"vpn-binding.vpn-type\", " + + " \"property-value\": \"CUSTOMER\" " + + " } " + + " ] " + + " } " + + " ] " + + " } " + + " } " + + " }, { " + + " \"l3-network\": { " + + " \"network-id\": \"10a74149-c9d7-4918-bbcf-d5fb9b1799ce\", " + + " \"network-name\": \"AUK51a_oam_calea_net_2\", " + + " \"network-type\": \"SR-IOV-PROVIDER2-2\", " + + " \"network-role\": \"oam_calea_net_2\", " + + " \"network-technology\": \"STANDARD-SR-IOV\", " + + " \"is-bound-to-vpn\": true, " + + " \"resource-version\": \"1540925016770\", " + + " \"orchestration-status\": \"Active\", " + + " \"model-invariant-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", " + + " \"model-version-id\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", " + + " \"model-customization-id\": \"10a74149-c9d7-4918-bbcf-d5fb9b1799ce\", " + + " \"physical-network-name\": \"sriovnet2\", " + + " \"is-provider-network\": true, " + + " \"is-shared-network\": true, " + + " \"is-external-network\": false, " + + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/315ccdb4-5a11-499f-95dc-25ae4be37dad/service-data/networks/network/2d4f97f5-702a-4707-b9e5-aa9d3e35deeb/network-data/network-topology/\", " + + " \"relationship-list\": { " + + " \"relationship\": [{ " + + " \"related-to\": \"service-instance\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", " + + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/315ccdb4-5a11-499f-95dc-25ae4be37dad\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"customer.global-customer-id\", " + + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" " + + " }, { " + + " \"relationship-key\": \"service-subscription.service-type\", " + + " \"relationship-value\": \"Emanuel\" " + + " }, { " + + " \"relationship-key\": \"service-instance.service-instance-id\", " + + " \"relationship-value\": \"b28d8a84-7d93-4b56-b525-c239c1e780a4\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"service-instance.service-instance-name\", " + + " \"property-value\": \"AUK51a_oam_calea_net_service_2\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"tenant\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"cloud-region.cloud-owner\", " + + " \"relationship-value\": \"att-nc\" " + + " }, { " + + " \"relationship-key\": \"cloud-region.cloud-region-id\", " + + " \"relationship-value\": \"auk51a\" " + + " }, { " + + " \"relationship-key\": \"tenant.tenant-id\", " + + " \"relationship-value\": \"b530fc990b6d4334bd45518bebca6a51\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"tenant.tenant-name\", " + + " \"property-value\": \"ecomp_ispt\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"cloud-region\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"cloud-region.cloud-owner\", " + + " \"relationship-value\": \"att-nc\" " + + " }, { " + + " \"relationship-key\": \"cloud-region.cloud-region-id\", " + + " \"relationship-value\": \"auk51a\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"cloud-region.owner-defined-type\", " + + " \"property-value\": \"lcp\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"vpn-binding\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"vpn-binding.vpn-id\", " + + " \"relationship-value\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"vpn-binding.vpn-name\", " + + " \"property-value\": \"LPPVPN\" " + + " }, { " + + " \"property-key\": \"vpn-binding.vpn-type\", " + + " \"property-value\": \"CUSTOMER\" " + + " } " + + " ] " + + " } " + + " ] " + + " } " + + " } " + + " }, { " + + " \"l3-network\": { " + + " \"network-id\": \"95380967-0f1c-41e9-a47f-9baa3f90860c\", " + + " \"network-name\": \"AUK51a_oam_calea_net_3\", " + + " \"network-type\": \"SR-IOV-PROVIDER2-3\", " + + " \"network-role\": \"oam_calea_net_3\", " + + " \"network-technology\": \"STANDARD-SR-IOV\", " + + " \"is-bound-to-vpn\": true, " + + " \"resource-version\": \"1540925016770\", " + + " \"orchestration-status\": \"Active\", " + + " \"model-invariant-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", " + + " \"model-version-id\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", " + + " \"model-customization-id\": \"95380967-0f1c-41e9-a47f-9baa3f90860c\", " + + " \"physical-network-name\": \"sriovnet3\", " + + " \"is-provider-network\": true, " + + " \"is-shared-network\": true, " + + " \"is-external-network\": false, " + + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/c44ad6cc-639a-4c6b-a327-583afd656a0d/service-data/networks/network/cf18fbb3-ddcb-4774-bd30-e0e895c0e35e/network-data/network-topology/\", " + + " \"relationship-list\": { " + + " \"relationship\": [{ " + + " \"related-to\": \"service-instance\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", " + + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/c44ad6cc-639a-4c6b-a327-583afd656a0d\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"customer.global-customer-id\", " + + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" " + + " }, { " + + " \"relationship-key\": \"service-subscription.service-type\", " + + " \"relationship-value\": \"Emanuel\" " + + " }, { " + + " \"relationship-key\": \"service-instance.service-instance-id\", " + + " \"relationship-value\": \"f09bbb55-8942-4621-892f-4690a8e5570a\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"service-instance.service-instance-name\", " + + " \"property-value\": \"AUK51a_oam_calea_net_service_3\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"tenant\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"cloud-region.cloud-owner\", " + + " \"relationship-value\": \"att-nc\" " + + " }, { " + + " \"relationship-key\": \"cloud-region.cloud-region-id\", " + + " \"relationship-value\": \"auk51a\" " + + " }, { " + + " \"relationship-key\": \"tenant.tenant-id\", " + + " \"relationship-value\": \"b530fc990b6d4334bd45518bebca6a51\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"tenant.tenant-name\", " + + " \"property-value\": \"ecomp_ispt\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"cloud-region\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"cloud-region.cloud-owner\", " + + " \"relationship-value\": \"att-nc\" " + + " }, { " + + " \"relationship-key\": \"cloud-region.cloud-region-id\", " + + " \"relationship-value\": \"auk51a\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"cloud-region.owner-defined-type\", " + + " \"property-value\": \"lcp\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"vpn-binding\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"vpn-binding.vpn-id\", " + + " \"relationship-value\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"vpn-binding.vpn-name\", " + + " \"property-value\": \"LPPVPN\" " + + " }, { " + + " \"property-key\": \"vpn-binding.vpn-type\", " + + " \"property-value\": \"CUSTOMER\" " + + " } " + + " ] " + + " } " + + " ] " + + " } " + + " } " + + " }, { " + + " \"l3-network\": { " + + " \"network-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", " + + " \"network-name\": \"AUK51a_oam_calea_net_0\", " + + " \"network-type\": \"SR-IOV-PROVIDER2-0\", " + + " \"network-technology\": \"STANDARD-SR-IOV\", " + + " \"is-bound-to-vpn\": true, " + + " \"resource-version\": \"1540925016770\", " + + " \"orchestration-status\": \"Active\", " + + " \"model-invariant-id\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", " + + " \"model-version-id\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", " + + " \"model-customization-id\": \"95380967-0f1c-41e9-a47f-9baa3f90860c\", " + + " \"physical-network-name\": \"sriovnet0\", " + + " \"is-provider-network\": true, " + + " \"is-shared-network\": true, " + + " \"is-external-network\": false, " + + " \"selflink\": \"restconf/config/GENERIC-RESOURCE-API:services/service/74141179-b5b9-4383-aab4-45f5b9f70127/service-data/networks/network/62cecd1b-f4bf-4e16-add9-2b6f5181e595/network-data/network-topology/\", " + + " \"relationship-list\": { " + + " \"relationship\": [{ " + + " \"related-to\": \"service-instance\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.ComposedOf\", " + + " \"related-link\": \"/aai/v14/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/Emanuel/service-instances/service-instance/74141179-b5b9-4383-aab4-45f5b9f70127\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"customer.global-customer-id\", " + + " \"relationship-value\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\" " + + " }, { " + + " \"relationship-key\": \"service-subscription.service-type\", " + + " \"relationship-value\": \"Emanuel\" " + + " }, { " + + " \"relationship-key\": \"service-instance.service-instance-id\", " + + " \"relationship-value\": \"1c98917b-8255-43c6-98f1-7a2942e75ce1\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"service-instance.service-instance-name\", " + + " \"property-value\": \"AUK51a_oam_calea_net_service_0\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"tenant\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a/tenants/tenant/b530fc990b6d4334bd45518bebca6a51\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"cloud-region.cloud-owner\", " + + " \"relationship-value\": \"att-nc\" " + + " }, { " + + " \"relationship-key\": \"cloud-region.cloud-region-id\", " + + " \"relationship-value\": \"auk51a\" " + + " }, { " + + " \"relationship-key\": \"tenant.tenant-id\", " + + " \"relationship-value\": \"b530fc990b6d4334bd45518bebca6a51\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"tenant.tenant-name\", " + + " \"property-value\": \"ecomp_ispt\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"cloud-region\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/att-nc/auk51a\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"cloud-region.cloud-owner\", " + + " \"relationship-value\": \"att-nc\" " + + " }, { " + + " \"relationship-key\": \"cloud-region.cloud-region-id\", " + + " \"relationship-value\": \"auk51a\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"cloud-region.owner-defined-type\", " + + " \"property-value\": \"lcp\" " + + " } " + + " ] " + + " }, { " + + " \"related-to\": \"vpn-binding\", " + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\", " + + " \"related-link\": \"/aai/v14/network/vpn-bindings/vpn-binding/3e7834fb-a8e0-4243-a837-5352ccab4602\", " + + " \"relationship-data\": [{ " + + " \"relationship-key\": \"vpn-binding.vpn-id\", " + + " \"relationship-value\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\" " + + " } " + + " ], " + + " \"related-to-property\": [{ " + + " \"property-key\": \"vpn-binding.vpn-name\", " + + " \"property-value\": \"LPPVPN\" " + + " }, { " + + " \"property-key\": \"vpn-binding.vpn-type\", " + + " \"property-value\": \"CUSTOMER\" " + + " } " + + " ] " + + " } " + + " ] " + + " } " + + " } " + + " } " + + " ] " + + "}"; + + private static final String STATE_2 = "{\"results\": [" + + " {\"l3-network\": {" + + " \"network-id\": \"CC-l3network_1\"," + + " \"is-bound-to-vpn\": false," + + " \"resource-version\": \"1556206041065\"," + + " \"is-provider-network\": false," + + " \"is-shared-network\": false," + + " \"is-external-network\": false," + + " \"relationship-list\": {\"relationship\": [ {" + + " \"related-to\": \"tenant\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528T1\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"tenant.tenant-id\"," + + " \"relationship-value\": \"tenant-id-CC-ANAI-528T1\"" + + " }" + + " ]," + + " \"related-to-property\": [ {" + + " \"property-key\": \"tenant.tenant-name\"," + + " \"property-value\": \"tenant-name-CC-ANAI-528T1\"" + + " }]" + + " }]}" + + " }}," + + " {\"l3-network\": {" + + " \"network-id\": \"CC-l3network_3\"," + + " \"network-name\": \"DLLSTXRNDS3\"," + + " \"network-role\": \"Backup\"," + + " \"is-bound-to-vpn\": true," + + " \"resource-version\": \"1556139217403\"," + + " \"is-provider-network\": false," + + " \"is-shared-network\": false," + + " \"is-external-network\": false," + + " \"relationship-list\": {\"relationship\": [" + + " {" + + " \"related-to\": \"tenant\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528T1\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"tenant.tenant-id\"," + + " \"relationship-value\": \"tenant-id-CC-ANAI-528T1\"" + + " }" + + " ]," + + " \"related-to-property\": [ {" + + " \"property-key\": \"tenant.tenant-name\"," + + " \"property-value\": \"tenant-name-CC-ANAI-528T1\"" + + " }]" + + " }," + + " {" + + " \"related-to\": \"tenant\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528-T2\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"tenant.tenant-id\"," + + " \"relationship-value\": \"tenant-id-CC-ANAI-528-T2\"" + + " }" + + " ]," + + " \"related-to-property\": [ {" + + " \"property-key\": \"tenant.tenant-name\"," + + " \"property-value\": \"tenant-name-CC-ANAI-528T2\"" + + " }]" + + " }," + + " {" + + " \"related-to\": \"tenant\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528T3\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"tenant.tenant-id\"," + + " \"relationship-value\": \"tenant-id-CC-ANAI-528T3\"" + + " }" + + " ]," + + " \"related-to-property\": [ {" + + " \"property-key\": \"tenant.tenant-name\"," + + " \"property-value\": \"tenant-name-CC-ANAI-528T3\"" + + " }]" + + " }" + + " ]}" + + " }}," + + " {\"l3-network\": {" + + " \"network-id\": \"l3network2-550-as988q\"," + + " \"network-name\": \"CHICGIL01VDBE01_SubIntNtwk043\"," + + " \"network-type\": \"K6VD\"," + + " \"network-role\": \"X92XE0j\"," + + " \"network-technology\": \"ZYbPEnCjX6Oqd\"," + + " \"neutron-network-id\": \"fpFvDje\"," + + " \"is-bound-to-vpn\": false," + + " \"service-id\": \"NJnzYaRlz0Test\"," + + " \"network-role-instance\": 162," + + " \"resource-version\": \"1556823012443\"," + + " \"orchestration-status\": \"active\"," + + " \"heat-stack-id\": \"0GmDeg\"," + + " \"mso-catalog-key\": \"la5ylhZ5g0D\"," + + " \"contrail-network-fqdn\": \"EaeexDk47\"," + + " \"model-customization-id\": \"wgmn6PrJ5\"," + + " \"widget-model-id\": \"e0yNr\"," + + " \"widget-model-version\": \"yKpry3J0VVLn\"," + + " \"physical-network-name\": \"wq6OKbZMTY\"," + + " \"is-provider-network\": false," + + " \"is-shared-network\": false," + + " \"is-external-network\": false," + + " \"selflink\": \"9xtMu4EPuTi\"," + + " \"operational-status\": \"W8aj\"," + + " \"is-trunked\": true," + + " \"relationship-list\": {\"relationship\": [" + + " {" + + " \"related-to\": \"tenant\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528T1\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"tenant.tenant-id\"," + + " \"relationship-value\": \"tenant-id-CC-ANAI-528T1\"" + + " }" + + " ]," + + " \"related-to-property\": [ {" + + " \"property-key\": \"tenant.tenant-name\"," + + " \"property-value\": \"tenant-name-CC-ANAI-528T1\"" + + " }]" + + " }," + + " {" + + " \"related-to\": \"configuration\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.PartOf\"," + + " \"related-link\": \"/aai/v17/network/configurations/configuration/configuration2-550-as988q\"," + + " \"relationship-data\": [ {" + + " \"relationship-key\": \"configuration.configuration-id\"," + + " \"relationship-value\": \"configuration2-550-as988q\"" + + " }]" + + " }," + + " {" + + " \"related-to\": \"configuration\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.PartOf\"," + + " \"related-link\": \"/aai/v17/network/configurations/configuration/configuration1-550-as988q\"," + + " \"relationship-data\": [ {" + + " \"relationship-key\": \"configuration.configuration-id\"," + + " \"relationship-value\": \"configuration1-550-as988q\"" + + " }]" + + " }," + + " {" + + " \"related-to\": \"vpn-binding\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v17/network/vpn-bindings/vpn-binding/VPNbinding3-550-as988q\"," + + " \"relationship-data\": [ {" + + " \"relationship-key\": \"vpn-binding.vpn-id\"," + + " \"relationship-value\": \"VPNbinding3-550-as988q\"" + + " }]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"vpn-binding.vpn-name\"," + + " \"property-value\": \"SZ2A5L_VPNTest\"" + + " }," + + " {" + + " \"property-key\": \"vpn-binding.vpn-type\"," + + " \"property-value\": \"1903e94v\"" + + " }" + + " ]" + + " }" + + " ]}" + + " }}," + + " {\"l3-network\": {" + + " \"network-id\": \"CC-l3network_2\"," + + " \"network-name\": \"DLLSTXRNDS2\"," + + " \"network-role\": \"Primary\"," + + " \"is-bound-to-vpn\": true," + + " \"resource-version\": \"1556136783141\"," + + " \"is-provider-network\": true," + + " \"is-shared-network\": true," + + " \"is-external-network\": true," + + " \"relationship-list\": {\"relationship\": [" + + " {" + + " \"related-to\": \"tenant\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528T1\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"tenant.tenant-id\"," + + " \"relationship-value\": \"tenant-id-CC-ANAI-528T1\"" + + " }" + + " ]," + + " \"related-to-property\": [ {" + + " \"property-key\": \"tenant.tenant-name\"," + + " \"property-value\": \"tenant-name-CC-ANAI-528T1\"" + + " }]" + + " }," + + " {" + + " \"related-to\": \"tenant\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v17/cloud-infrastructure/cloud-regions/cloud-region/cloud-owner-CC-ANAI-528/cloud-region-id-CC-ANAI-528/tenants/tenant/tenant-id-CC-ANAI-528-T2\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \"cloud-owner-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"cloud-region-id-CC-ANAI-528\"" + + " }," + + " {" + + " \"relationship-key\": \"tenant.tenant-id\"," + + " \"relationship-value\": \"tenant-id-CC-ANAI-528-T2\"" + + " }" + + " ]," + + " \"related-to-property\": [ {" + + " \"property-key\": \"tenant.tenant-name\"," + + " \"property-value\": \"tenant-name-CC-ANAI-528T2\"" + + " }]" + + " }" + + " ]}" + + " }}" + + "]}"; + + + + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionWithError.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionWithError.java new file mode 100644 index 000000000..1d74b0f39 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetL3NetworksByCloudRegionWithError.java @@ -0,0 +1,23 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +public class PresetAAIGetL3NetworksByCloudRegionWithError extends AAIBaseGetL3NetworksByCloudRegionPreset { + private int errorCode; + private String errorText; + + + public PresetAAIGetL3NetworksByCloudRegionWithError(int errorCode, String errorText) { + super(); + this.errorCode = errorCode; + this.errorText = errorText; + } + + @Override + public int getResponseCode() { + return errorCode; + } + + @Override + public Object getResponseBody() { + return "{\"status\":\"Error\", \"text\":\"" + errorText + "\"}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java index 41c35b8a5..ae921fd79 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByOwningEntity.java @@ -1,11 +1,12 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAIGetModelsByOwningEntity extends BaseAAIPreset { String oeName; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java index cb80fd6ce..4da5c0567 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetModelsByProject.java @@ -1,12 +1,13 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; import java.util.UUID; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAIGetModelsByProject extends BaseAAIPreset { private String projectName; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java index b99f58bda..3758d3f3b 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetails.java @@ -2,11 +2,12 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAIGetNetworkCollectionDetails extends BaseAAIPreset { diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java index 0d447c2c2..31cd6fdd0 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsInvalidRequest.java @@ -2,11 +2,12 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAIGetNetworkCollectionDetailsInvalidRequest extends BaseAAIPreset { diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java index 23b35d204..b3f34bb3e 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetNetworkCollectionDetailsRequiredMissing.java @@ -2,11 +2,12 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAIGetNetworkCollectionDetailsRequiredMissing extends BaseAAIPreset { diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java index 0676217a1..8bc0fe63a 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPNFByRegionErrorPut.java @@ -11,8 +11,8 @@ public class PresetAAIGetPNFByRegionErrorPut extends BaseAAIPreset { @Override public Object getResponseBody() { return "{" + - " \"start\": \"/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911\"," + - " \"query\": \"query/pnf-fromModel-byRegion?cloudRegionId=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP\"" + + " \"start\": \"/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911\"," + + " \"query\": \"query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP\"" + " }"; } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java index fdb387d71..9fad964d8 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetPortMirroringSourcePorts.java @@ -1,11 +1,12 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAIGetPortMirroringSourcePorts extends BaseAAIPreset { public PresetAAIGetPortMirroringSourcePorts(String configurationId, String interfaceId, String interfaceName, boolean isPortMirrored) { diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java index da1a120b4..c75155273 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetRelatedInstanceGroupsByVnfId.java @@ -1,11 +1,12 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAIGetRelatedInstanceGroupsByVnfId extends BaseAAIPreset { diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java index 615879e18..2d59cd633 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetServicesGet.java @@ -10,17 +10,17 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet { private String responseBody = "{\"service\":[" + " {" + " \"service-id\":\"ebc3bc3d-62fd-4a3f-a037-f619df4ff034\"," + - " \"service-description\":\"DHV\"," + + " \"service-description\":\"ERICA\"," + " \"resource-version\":\"1494001985150\"" + " }," + " {" + " \"service-id\":\"17cc1042-527b-11e6-beb8-9e71128cae77\"," + - " \"service-description\":\"FLEXREACH\"," + + " \"service-description\":\"IGNACIO\"," + " \"resource-version\":\"1494001922171\"" + " }," + " {" + " \"service-id\":\"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e\"," + - " \"service-description\":\"Netbond\"," + + " \"service-description\":\"Christie\"," + " \"resource-version\":\"1494001855144\"" + " }," + " {" + @@ -50,7 +50,7 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet { " }," + " {" + " \"service-id\":\"db171b8f-115c-4992-a2e3-ee04cae357e0\"," + - " \"service-description\":\"FIRSTNET\"," + + " \"service-description\":\"LINDSEY\"," + " \"resource-version\":\"1490910095155\"" + " }," + " {" + @@ -85,12 +85,12 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet { " }," + " {" + " \"service-id\":\"0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1\"," + - " \"service-description\":\"WAN Bonding\"," + + " \"service-description\":\"CARA Griffin\"," + " \"resource-version\":\"1498053422512\"" + " }," + " {" + " \"service-id\":\"c7611ebe-c324-48f1-8085-94aef0c6ef3d\"," + - " \"service-description\":\"HOSTED COMMUNICATIONS\"," + + " \"service-description\":\"DARREN MCGEE\"," + " \"resource-version\":\"1494001913639\"" + " }," + " {" + @@ -105,7 +105,7 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet { " }," + " {" + " \"service-id\":\"d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4\"," + - " \"service-description\":\"uCPE-VMS\"," + + " \"service-description\":\"JOSEFINA\"," + " \"resource-version\":\"1494001941772\"" + " }," + " {" + @@ -115,7 +115,7 @@ public class PresetAAIGetServicesGet extends PresetAAIBaseGetServicesGet { " }," + " {" + " \"service-id\":\"12a96a9d-4b4c-4349-a950-fe1159602621\"," + - " \"service-description\":\"HOSTED COMMUNICATIONS\"," + + " \"service-description\":\"DARREN MCGEE\"," + " \"resource-version\":\"1494001817126\"" + " }" + " ]}"; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java index db41b9518..c14c1c7df 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGet.java @@ -1,13 +1,14 @@ package org.onap.simulator.presetGenerator.presets.aai; -import static vid.automation.test.utils.ReadFile.loadResourceAsString; - import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; + +import static vid.automation.test.utils.ReadFile.loadResourceAsString; public class PresetAAIGetSubDetailsGet extends BaseAAIPreset { private String subscriberId; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java index 615c196a9..291f0b722 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java @@ -1,15 +1,16 @@ package org.onap.simulator.presetGenerator.presets.aai; -import static vid.automation.test.infra.ModelInfo.serviceFabricSriovService; - import com.google.common.collect.ImmutableMap; -import java.util.Collections; -import java.util.List; -import java.util.Map; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; import org.springframework.http.HttpMethod; import vid.automation.test.infra.ModelInfo; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static vid.automation.test.infra.ModelInfo.serviceFabricSriovService; + public class PresetAAIGetSubDetailsGetSpecificService extends BaseAAIPreset { private String subscriberId; private String subscriberName = "Emanuel"; @@ -60,13 +61,13 @@ public class PresetAAIGetSubDetailsGetSpecificService extends BaseAAIPreset { " \"service-subscriptions\":{" + " \"service-subscription\":[" + " {" + - " \"service-type\":\"vFlowLogic\"," + + " \"service-type\":\"vRichardson\"," + " \"resource-version\":\"1501700976809\"," + " \"service-instances\":{" + " \"service-instance\":[" + " {" + " \"service-instance-id\":\"414db2d4-18d0-415e-aac2-f255b586cfb5\"," + - " \"service-instance-name\":\"vFlowLogic-vflf_080117\"," + + " \"service-instance-name\":\"vRichardson-vflf_080117\"," + " \"persona-model-id\":null," + " \"persona-model-version\":null," + " \"resource-version\":\"1502391806301\"," + @@ -76,7 +77,7 @@ public class PresetAAIGetSubDetailsGetSpecificService extends BaseAAIPreset { " }," + " {" + " \"service-instance-id\":\"769be44e-981a-4da8-af3b-ca5fa76b7fb1\"," + - " \"service-instance-name\":\"vFlowLogic-vflp_080117\"," + + " \"service-instance-name\":\"vRichardson-vflp_080117\"," + " \"persona-model-id\":null," + " \"persona-model-version\":null," + " \"resource-version\":\"1501712783617\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGet.java index f6ce3e86d..95a7c87d7 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGet.java @@ -1,11 +1,12 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset { private String subscriberId; @@ -52,7 +53,7 @@ public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset { " \"service-subscriptions\":{" + " \"service-subscription\":[" + " {" + - " \"service-type\":\"vFlowLogic\"," + + " \"service-type\":\"vRichardson\"," + " \"resource-version\":\"1501700976809\"," + " \"is-permitted\":false" + " }," + @@ -67,7 +68,7 @@ public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset { " \"is-permitted\":false" + " }," + " {" + - " \"service-type\":\"vBNG\"," + + " \"service-type\":\"vJamie\"," + " \"resource-version\":\"1498068165053\"," + " \"is-permitted\":false" + " }," + @@ -82,7 +83,7 @@ public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset { " \"is-permitted\":true" + " }," + " {" + - " \"service-type\":\"vSEGW\"," + + " \"service-type\":\"vPorfirio\"," + " \"resource-version\":\"1494254851983\"," + " \"is-permitted\":false" + " }," + @@ -97,7 +98,7 @@ public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset { " \"is-permitted\":false" + " }," + " {" + - " \"service-type\":\"vMME\"," + + " \"service-type\":\"vFLORENCE\"," + " \"resource-version\":\"1497729820723\"," + " \"is-permitted\":false" + " }," + @@ -132,17 +133,17 @@ public class PresetAAIGetSubDetailsWithoutInstancesGet extends BaseAAIPreset { " \"is-permitted\":false" + " }," + " {" + - " \"service-type\":\"FIRSTNET\"," + + " \"service-type\":\"LINDSEY\"," + " \"resource-version\":\"1509387060781\"," + " \"is-permitted\":false" + " }," + " {" + - " \"service-type\":\"ACTIVE_CHARGE\"," + + " \"service-type\":\"JOHANNA_SANTOS\"," + " \"resource-version\":\"1494255101364\"," + " \"is-permitted\":false" + " }," + " {" + - " \"service-type\":\"vHSS\"," + + " \"service-type\":\"vCarroll\"," + " \"resource-version\":\"1494254877333\"," + " \"is-permitted\":false" + " }" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGetSpecificService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGetSpecificService.java index 62a587001..44941ade8 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGetSpecificService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsWithoutInstancesGetSpecificService.java @@ -1,11 +1,12 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.springframework.http.HttpMethod; public class PresetAAIGetSubDetailsWithoutInstancesGetSpecificService extends BaseAAIPreset { private String subscriberId; @@ -49,7 +50,7 @@ public class PresetAAIGetSubDetailsWithoutInstancesGetSpecificService extends Ba " \"service-subscriptions\":{" + " \"service-subscription\":[" + " {" + - " \"service-type\":\"vFlowLogic\"," + + " \"service-type\":\"vRichardson\"," + " \"resource-version\":\"1501700976809\"," + " \"is-permitted\":false" + " }," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java index 0517fd788..c6a5f3063 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubscribersGet.java @@ -3,13 +3,14 @@ package org.onap.simulator.presetGenerator.presets.aai; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.onap.simulator.presetGenerator.presets.model.Subscriber; +import org.springframework.http.HttpMethod; + import java.io.IOException; import java.util.Collections; import java.util.List; import java.util.Map; -import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; -import org.onap.simulator.presetGenerator.presets.model.Subscriber; -import org.springframework.http.HttpMethod; public class PresetAAIGetSubscribersGet extends BaseAAIPreset { diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java index 638cc3911..0808eaba6 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetTenants.java @@ -1,10 +1,10 @@ package org.onap.simulator.presetGenerator.presets.aai; -import static vid.automation.test.utils.ReadFile.loadResourceAsString; - import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; import org.springframework.http.HttpMethod; +import static vid.automation.test.utils.ReadFile.loadResourceAsString; + public class PresetAAIGetTenants extends BaseAAIPreset { private final String subscriberId; private final String serviceType; diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetVpnsByType.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetVpnsByType.java new file mode 100644 index 000000000..70700f366 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetVpnsByType.java @@ -0,0 +1,370 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import com.google.common.collect.ImmutableMap; +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; +import org.springframework.http.HttpMethod; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +public class PresetAAIGetVpnsByType extends BaseAAIPreset { + + private String vpnType; + + public PresetAAIGetVpnsByType() { + this.vpnType = "SERVICE-INFRASTRUCTURE"; + } + + public PresetAAIGetVpnsByType(String vpnType) { + this.vpnType = vpnType; + } + + @Override + public Map<String, List> getQueryParams() { + return ImmutableMap.of("vpn-type", Collections.singletonList(vpnType)); + } + + @Override + public Object getResponseBody() { + return "{" + + " \"vpn-binding\": [" + + " {" + + " \"vpn-id\": \"120d39fb-3627-473d-913c-d228dd0f8e5b\"," + + " \"vpn-name\": \"LPPVPN\"," + + " \"vpn-platform\": \"AVPN\"," + + " \"vpn-type\": \"" + vpnType + "\"," + + " \"vpn-region\": \"USA,EMEA\"," + + " \"customer-vpn-id\": \"VPN1260\"," + + " \"resource-version\": \"1551904539767\"," + + " \"route-targets\" : [" + + " {" + + " \"global-route-target\":\"mock-global-1\"," + + " \"route-target-role\" : \"mock-role-x\"" + + " }," + + " {" + + " \"global-route-target\":\"mock-global-2\"," + + " \"route-target-role\" : \"mock-role-y\"" + + " }" + + " ],"+ + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"configuration\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v14/network/configurations/configuration/f1e81ceb-ce90-4d54-b181-e1ce8552250e\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"configuration.configuration-id\"," + + " \"relationship-value\": \"f1e81ceb-ce90-4d54-b181-e1ce8552250e\"" + + " }" + + " ]" + + " }," + + " {" + + " \"related-to\": \"customer\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"customer.global-customer-id\"," + + " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"customer.subscriber-name\"," + + " \"property-value\": \"SILVIA ROBBINS\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"vpn-id\": \"c70391f3-a6e3-4874-9834-cbe12d7bf8b6\"," + + " \"vpn-name\": \"LPPVPN\"," + + " \"vpn-platform\": \"AVPN\"," + + " \"vpn-type\": \"" + vpnType + "\"," + + " \"vpn-region\": \"USA,EMEA\"," + + " \"customer-vpn-id\": \"VPN1274\"," + + " \"resource-version\": \"1552507588857\"," + + " \"model-customization-id\" : \"cc3bff3f-cd4d-49bb-aac3-77e8e1168297\"," + + " \"model-invariant-id\" : \"e73127d5-c2de-43b2-bc02-602fa5c9aa29\"," + + " \"model-version-id\" : \"94209bf1-67fa-4741-96fe-a2b3f86f84b2\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"customer\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"customer.global-customer-id\"," + + " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"customer.subscriber-name\"," + + " \"property-value\": \"SILVIA ROBBINS\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"vpn-id\": \"4776516b-7da2-446c-9ba7-47ca8c30c571\"," + + " \"vpn-name\": \"LPPVPN\"," + + " \"vpn-platform\": \"AVPN\"," + + " \"vpn-type\": \"" + vpnType + "\"," + + " \"vpn-region\": \"USA,EMEA\"," + + " \"customer-vpn-id\": \"VPN1275\"," + + " \"resource-version\": \"1552591517864\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"customer\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"customer.global-customer-id\"," + + " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"customer.subscriber-name\"," + + " \"property-value\": \"SILVIA ROBBINS\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"vpn-id\": \"46fcb25a-e7ba-4d96-99ba-3bb6eae6aba7\"," + + " \"vpn-name\": \"LPPVPN\"," + + " \"vpn-platform\": \"AVPN\"," + + " \"vpn-type\": \"" + vpnType + "\"," + + " \"vpn-region\": \"USA,EMEA\"," + + " \"customer-vpn-id\": \"VPN1271\"," + + " \"resource-version\": \"1552331549256\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"customer\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"customer.global-customer-id\"," + + " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"customer.subscriber-name\"," + + " \"property-value\": \"SILVIA ROBBINS\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"vpn-id\": \"ffefbe38-3087-418a-87ae-f6582a15be78\"," + + " \"vpn-name\": \"LPPVPN\"," + + " \"vpn-platform\": \"AVPN\"," + + " \"vpn-type\": \"" + vpnType + "\"," + + " \"vpn-region\": \"USA,EMEA\"," + + " \"customer-vpn-id\": \"VPN1272\"," + + " \"resource-version\": \"1552469097776\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"customer\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"customer.global-customer-id\"," + + " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"customer.subscriber-name\"," + + " \"property-value\": \"SILVIA ROBBINS\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"vpn-id\": \"961d05be-ee41-40a2-8653-f603fc495175\"," + + " \"vpn-name\": \"LPPVPN\"," + + " \"vpn-platform\": \"AVPN\"," + + " \"vpn-type\": \"" + vpnType + "\"," + + " \"vpn-region\": \"USA,EMEA\"," + + " \"customer-vpn-id\": \"VPN1273\"," + + " \"resource-version\": \"1552481667950\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"customer\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"customer.global-customer-id\"," + + " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"customer.subscriber-name\"," + + " \"property-value\": \"SILVIA ROBBINS\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"vpn-id\": \"14bcfc2f-bbee-4fd9-89a5-42eb5dbb08d5\"," + + " \"vpn-name\": \"LPPVPN\"," + + " \"vpn-platform\": \"AVPN\"," + + " \"vpn-type\": \"" + vpnType + "\"," + + " \"vpn-region\": \"USA,EMEA\"," + + " \"customer-vpn-id\": \"913443\"," + + " \"resource-version\": \"1553182405707\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"customer\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"customer.global-customer-id\"," + + " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"customer.subscriber-name\"," + + " \"property-value\": \"SILVIA ROBBINS\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"vpn-id\": \"89d4c968-158c-4722-a22c-c5c2ccc17fd5\"," + + " \"vpn-name\": \"LPPVPN\"," + + " \"vpn-platform\": \"AVPN\"," + + " \"vpn-type\": \"" + vpnType + "\"," + + " \"vpn-region\": \"USA,EMEA\"," + + " \"customer-vpn-id\": \"VPN1276\"," + + " \"resource-version\": \"1553018006071\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"customer\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"customer.global-customer-id\"," + + " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"customer.subscriber-name\"," + + " \"property-value\": \"SILVIA ROBBINS\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"vpn-id\": \"3e7834fb-a8e0-4243-a837-5352ccab4602\"," + + " \"vpn-name\": \"LPPVPN\"," + + " \"vpn-platform\": \"AVPN\"," + + " \"vpn-type\": \"" + vpnType + "\"," + + " \"vpn-region\": \"USA,EMEA\"," + + " \"customer-vpn-id\": \"VPN1259\"," + + " \"resource-version\": \"1551967976427\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"customer\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v14/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"customer.global-customer-id\"," + + " \"relationship-value\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"customer.subscriber-name\"," + + " \"property-value\": \"SILVIA ROBBINS\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }," + + " {" + + " \"vpn-id\": \"844a1ea7-556a-4e49-8aa3-171f1db4ea02\"," + + " \"vpn-name\": \"LPPVPN\"," + + " \"vpn-platform\": \"AVPN\"," + + " \"vpn-type\": \"" + vpnType + "\"," + + " \"vpn-region\": \"USA,EMEA\"," + + " \"customer-vpn-id\": \"VPN1277\"," + + " \"resource-version\": \"1553086769917\"," + + " \"relationship-list\": {" + + " \"relationship\": [" + + " {" + + " \"related-to\": \"l3-network\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v15/network/l3-networks/l3-network/ac5224b1-71cc-4237-a401-c00b2fd65a78\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"l3-network.network-id\"," + + " \"relationship-value\": \"ac5224b1-71cc-4237-a401-c00b2fd65a78\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"l3-network.network-name\"," + + " \"property-value\": \"APP-C-24595-T-IST-04B_int_SUB-INTERFACE_net_051\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + "}"; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.GET; + } + + @Override + public String getReqPath() { + return getRootPath() + "/network/vpn-bindings"; + } + +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGet.java index 429d17647..d5a9bafb6 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGet.java @@ -118,6 +118,34 @@ public class PresetAAIModelsByInvariantIdGet extends BaseAAIPreset { " }" + " }," + " {" + + " \"model-version-id\": \"f028b2e2-7080-4b13-91b2-94944d4c42d8\"," + + " \"model-name\": \"Service with VRF\"," + + " \"model-version\": \"5.0\"," + + " \"model-description\": \"vEPDG\"," + + " \"resource-version\": \"1507472057702\"" + + " }," + + " {" + + " \"model-version-id\": \"9cac02be-2489-4374-888d-2863b4511a59\"," + + " \"model-name\": \"VRF Entry Configuration\"," + + " \"model-version\": \"5.0\"," + + " \"model-description\": \"vEPDG\"," + + " \"resource-version\": \"1507472057702\"" + + " }," + + " {" + + " \"model-version-id\": \"network-instance-model-version-id\"," + + " \"model-name\": \"Network Entry\"," + + " \"model-version\": \"6.0\"," + + " \"model-description\": \"vEPDG\"," + + " \"resource-version\": \"1507472057702\"" + + " }," + + " {" + + " \"model-version-id\": \"vpn-model-version-id\"," + + " \"model-name\": \"vf_vEPDG\"," + + " \"model-version\": \"6.0\"," + + " \"model-description\": \"vEPDG\"," + + " \"resource-version\": \"1507472057702\"" + + " }," + + " {" + " \"model-version-id\": \"eb5f56bf-5855-4e61-bd00-3e19a953bf02\"," + " \"model-name\": \"vf_vEPDG\"," + " \"model-version\": \"1.0\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGetForServiceWithCR.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGetForServiceWithCR.java new file mode 100644 index 000000000..b2e7b18aa --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIModelsByInvariantIdGetForServiceWithCR.java @@ -0,0 +1,908 @@ +package org.onap.simulator.presetGenerator.presets.aai; + +import com.google.common.collect.ImmutableList; + +public class PresetAAIModelsByInvariantIdGetForServiceWithCR extends PresetAAIModelsByInvariantIdGet { + public PresetAAIModelsByInvariantIdGetForServiceWithCR(ImmutableList<String> modelInvariantIds) { + super(modelInvariantIds); + } + + @Override + public Object getResponseBody() { + return "{" + + " \"model\": [{" + + " \"model-invariant-id\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"," + + " \"model-type\": \"service\"," + + " \"resource-version\": \"1534274421300\"," + + " \"model-vers\": {" + + " \"model-ver\": [{" + + " \"model-version-id\": \"a92f899d-a3ec-465b-baed-1663b0a5aee1\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"3.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1534788756086\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"901e2641-c66c-4178-a6e8-cbe2877b0a2a\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534463243387\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"d2fda667-e92e-4cfa-9620-5da5de01a319\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"1.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1534444087221\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"d291ed5e-4f50-4f57-956d-ce0e67a059e5\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534274421311\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"d4a447e5-9791-47b9-b365-1abb19b4b626\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"4.0\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1534863624237\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"0ef29f1f-836a-4fab-986c-5f1b96310a3d\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534863624242\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"0e97a118-b1b6-40d5-bbad-98cdd51b1c48\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"11.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1550783120267\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"0ea8ac21-64b8-4489-9d62-12e625d66995\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1543961990189\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"46093d8f-6dfa-4332-9c00-7e822c681b59\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"7.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1534885144462\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"d74a5dff-ef7f-4e32-9c13-d82fb2c617c9\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534885014144\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"12930bcc-5276-42bb-8ed6-1e43d7acae2c\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"10.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1539613511543\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"4d57798e-81b7-490e-bee8-48bd382a1349\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1539613450903\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"f8783bb2-6135-4c35-8320-64fa7deae76b\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"2.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1534450229751\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"c666f1dd-99ff-442a-9ba2-1ee2dabb9e25\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534450167963\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"0148e4c5-629b-4fef-9728-1e13fd630679\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"9.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1537901614540\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"6ae6fd91-2086-470d-8c36-9d668c41fd32\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1537882880185\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"1ceab842-7ded-49f1-a129-dce2ecef8c71\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"6.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1534883213652\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"5ca853fc-2984-45c7-b2e7-8514a56785ba\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534883154090\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"fd21f6b5-02f6-4ac0-9515-e1f01112da95\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"5.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1534872246413\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"0812b47d-7ef1-4a65-b6fb-9f3ff3bc3eee\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534872174141\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"6e0bec91-09f3-43aa-9cf3-e617cd0146be\"," + + " \"model-name\": \"NCM_VLAN_SVC_ym161f\"," + + " \"model-version\": \"8.0\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"model-description\": \"Network Collection service for vLAN tagging\"," + + " \"resource-version\": \"1536098608209\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"a0247d2e-3843-4753-be2f-4c252c99390e\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1536098548388\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"82194af1-3c2c-485a-8f44-420e22a9eaa4\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46b92144-923a-4d20-b85a-3cbd847668a9\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"service-instance\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-invariant-id\": \"868b109c-9481-4a18-891b-af974db7705a\"," + + " \"model-type\": \"resource\"," + + " \"resource-version\": \"1534795610752\"," + + " \"model-vers\": {" + + " \"model-ver\": [{" + + " \"model-version-id\": \"dd182d7d-6949-4b90-b3cc-5befe400742e\"," + + " \"model-name\": \"ncm_vlan_ym161f..NetworkCollection..0\"," + + " \"model-version\": \"1\"," + + " \"distribution-status\": \"DISTRIBUTION_COMPLETE_OK\"," + + " \"resource-version\": \"1534795610763\"" + + " }, {" + + " \"model-version-id\": \"e5fc56b7-e14c-45e5-b127-978c36a921c0\"," + + " \"model-name\": \"ncm_vlan_ym161f..NetworkCollection..0\"," + + " \"model-version\": \"1\"," + + " \"resource-version\": \"1543961989136\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"9001ff96-1142-49c6-af5b-df4e2b23a305\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1543961989136\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd/model-vers/model-ver/8e6ee9dc-9017-444a-83b3-219edb018128\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"3bf1e610-45f7-4ad6-b833-ca4c5ee6a3fd\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"8e6ee9dc-9017-444a-83b3-219edb018128\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"instance-group\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-element\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/081ceb56-eb71-4566-a72d-3e7cbee5cdf1/model-vers/model-ver/a580855f-8d1b-40d5-a75b-50709fbd17d3/model-elements/model-element/06014449-69d3-4aef-a96b-0a5130ba9483/model-elements/model-element/a050dc96-2c35-45c7-ba23-9279215d501e\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"081ceb56-eb71-4566-a72d-3e7cbee5cdf1\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"a580855f-8d1b-40d5-a75b-50709fbd17d3\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"06014449-69d3-4aef-a96b-0a5130ba9483\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"a050dc96-2c35-45c7-ba23-9279215d501e\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-invariant-id\": \"081ceb56-eb71-4566-a72d-3e7cbee5cdf1\"," + + " \"model-type\": \"resource\"," + + " \"resource-version\": \"1534788713816\"," + + " \"model-vers\": {" + + " \"model-ver\": [{" + + " \"model-version-id\": \"747d2a17-5771-4fd6-879d-c2e9e4c5cd4f\"," + + " \"model-name\": \"NCM_VLAN_ym161f\"," + + " \"model-version\": \"2.0\"," + + " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," + + " \"resource-version\": \"1534863623891\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"0dd28c63-cadf-48b2-afb0-a7bf7184ef5a\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534863623895\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"425b2158-e51d-4509-9945-dad4556474a3\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"2a160989-b202-47dd-874b-4a0f275998f7\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"cloud-region\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-element\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/d4a447e5-9791-47b9-b365-1abb19b4b626/model-elements/model-element/0ef29f1f-836a-4fab-986c-5f1b96310a3d/model-elements/model-element/700f890b-05c9-471a-b859-956655d28f47\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"d4a447e5-9791-47b9-b365-1abb19b4b626\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"0ef29f1f-836a-4fab-986c-5f1b96310a3d\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"700f890b-05c9-471a-b859-956655d28f47\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"a580855f-8d1b-40d5-a75b-50709fbd17d3\"," + + " \"model-name\": \"NCM_VLAN_ym161f\"," + + " \"model-version\": \"6.0\"," + + " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," + + " \"resource-version\": \"1543961989670\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"06014449-69d3-4aef-a96b-0a5130ba9483\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1543961989670\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/8bac3599-9a1c-4b7f-80e5-c1838f744c23/model-vers/model-ver/3f908abc-3a15-40d0-b674-2a639e52884d\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"8bac3599-9a1c-4b7f-80e5-c1838f744c23\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"3f908abc-3a15-40d0-b674-2a639e52884d\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"collection\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-element\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/0e97a118-b1b6-40d5-bbad-98cdd51b1c48/model-elements/model-element/0ea8ac21-64b8-4489-9d62-12e625d66995/model-elements/model-element/d614653c-5f19-4668-ad98-cfbe012308e1\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"0e97a118-b1b6-40d5-bbad-98cdd51b1c48\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"0ea8ac21-64b8-4489-9d62-12e625d66995\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"d614653c-5f19-4668-ad98-cfbe012308e1\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"b84e2233-37bf-4c8d-b613-eb8a8820b725\"," + + " \"model-name\": \"NCM_VLAN_ym161f\"," + + " \"model-version\": \"4.0\"," + + " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," + + " \"resource-version\": \"1534883153714\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"f7c3f5bb-777a-4d9f-9401-a652f5006152\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534883153720\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"425b2158-e51d-4509-9945-dad4556474a3\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"2a160989-b202-47dd-874b-4a0f275998f7\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"cloud-region\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-element\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/1ceab842-7ded-49f1-a129-dce2ecef8c71/model-elements/model-element/5ca853fc-2984-45c7-b2e7-8514a56785ba/model-elements/model-element/030553aa-8d82-4b03-a3dc-bc210daadd5e\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"1ceab842-7ded-49f1-a129-dce2ecef8c71\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"5ca853fc-2984-45c7-b2e7-8514a56785ba\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"030553aa-8d82-4b03-a3dc-bc210daadd5e\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"5ededaad-905c-4356-b30d-471b0ae2a12a\"," + + " \"model-name\": \"NCM_VLAN_ym161f\"," + + " \"model-version\": \"3.0\"," + + " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," + + " \"resource-version\": \"1534872173817\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"31f558c6-d73a-43e4-aab0-c863ccd6b110\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534872173821\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"425b2158-e51d-4509-9945-dad4556474a3\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"2a160989-b202-47dd-874b-4a0f275998f7\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"cloud-region\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-element\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/fd21f6b5-02f6-4ac0-9515-e1f01112da95/model-elements/model-element/0812b47d-7ef1-4a65-b6fb-9f3ff3bc3eee/model-elements/model-element/110a5ba4-997b-45f0-8e53-d64d6b342be1\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"fd21f6b5-02f6-4ac0-9515-e1f01112da95\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"0812b47d-7ef1-4a65-b6fb-9f3ff3bc3eee\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"110a5ba4-997b-45f0-8e53-d64d6b342be1\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"67b91dcd-4fa5-4111-80c9-60d524740667\"," + + " \"model-name\": \"NCM_VLAN_ym161f\"," + + " \"model-version\": \"1.0\"," + + " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," + + " \"resource-version\": \"1534788713822\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"6fdf228e-89ce-4cf6-9bd7-399aa1b690b3\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534788713833\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"425b2158-e51d-4509-9945-dad4556474a3\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"2a160989-b202-47dd-874b-4a0f275998f7\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"cloud-region\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }, {" + + " \"model-version-id\": \"ce8c98bc-4691-44fb-8ff0-7a47487c11c4\"," + + " \"model-name\": \"NCM_VLAN_ym161f\"," + + " \"model-version\": \"5.0\"," + + " \"model-description\": \"Network Collection Service VF for VLAN TAgging\"," + + " \"resource-version\": \"1534885013739\"," + + " \"model-elements\": {" + + " \"model-element\": [{" + + " \"model-element-uuid\": \"4bd10473-a9de-4399-abe7-c9b24e48e0ee\"," + + " \"new-data-del-flag\": \"T\"," + + " \"cardinality\": \"unbounded\"," + + " \"resource-version\": \"1534885013745\"," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-ver\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/425b2158-e51d-4509-9945-dad4556474a3/model-vers/model-ver/2a160989-b202-47dd-874b-4a0f275998f7\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"425b2158-e51d-4509-9945-dad4556474a3\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"2a160989-b202-47dd-874b-4a0f275998f7\"" + + " }" + + " ]," + + " \"related-to-property\": [{" + + " \"property-key\": \"model-ver.model-name\"," + + " \"property-value\": \"cloud-region\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }," + + " \"relationship-list\": {" + + " \"relationship\": [{" + + " \"related-to\": \"model-element\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/12930bcc-5276-42bb-8ed6-1e43d7acae2c/model-elements/model-element/4d57798e-81b7-490e-bee8-48bd382a1349/model-elements/model-element/93eafb42-11b5-471d-8f8a-333408114a9a\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"12930bcc-5276-42bb-8ed6-1e43d7acae2c\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"4d57798e-81b7-490e-bee8-48bd382a1349\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"93eafb42-11b5-471d-8f8a-333408114a9a\"" + + " }" + + " ]" + + " }, {" + + " \"related-to\": \"model-element\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/6e0bec91-09f3-43aa-9cf3-e617cd0146be/model-elements/model-element/a0247d2e-3843-4753-be2f-4c252c99390e/model-elements/model-element/cb986adf-5ca8-48a5-ac9b-b222d6d2e280\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"6e0bec91-09f3-43aa-9cf3-e617cd0146be\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"a0247d2e-3843-4753-be2f-4c252c99390e\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"cb986adf-5ca8-48a5-ac9b-b222d6d2e280\"" + + " }" + + " ]" + + " }, {" + + " \"related-to\": \"model-element\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/0148e4c5-629b-4fef-9728-1e13fd630679/model-elements/model-element/6ae6fd91-2086-470d-8c36-9d668c41fd32/model-elements/model-element/a520808b-b8bc-4969-9eba-c85e2797f3dd\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"0148e4c5-629b-4fef-9728-1e13fd630679\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"6ae6fd91-2086-470d-8c36-9d668c41fd32\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"a520808b-b8bc-4969-9eba-c85e2797f3dd\"" + + " }" + + " ]" + + " }, {" + + " \"related-to\": \"model-element\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/ca26a7e6-064d-4e90-a5b9-32ffe819f826/model-vers/model-ver/e9a290ca-41f0-4117-a1b5-8b7cd5595ff7/model-elements/model-element/ff3fdeb9-24e9-406f-8761-1334c9ea29d1/model-elements/model-element/bc6ddc86-f948-4f47-a4e6-bededd8d5780\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"ca26a7e6-064d-4e90-a5b9-32ffe819f826\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"e9a290ca-41f0-4117-a1b5-8b7cd5595ff7\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"ff3fdeb9-24e9-406f-8761-1334c9ea29d1\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"bc6ddc86-f948-4f47-a4e6-bededd8d5780\"" + + " }" + + " ]" + + " }, {" + + " \"related-to\": \"model-element\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.IsA\"," + + " \"related-link\": \"/aai/v14/service-design-and-creation/models/model/f6342be5-d66b-4d03-a1aa-c82c3094c4ea/model-vers/model-ver/46093d8f-6dfa-4332-9c00-7e822c681b59/model-elements/model-element/d74a5dff-ef7f-4e32-9c13-d82fb2c617c9/model-elements/model-element/f7bd32b4-bbbf-4788-9137-9dfa299e6111\"," + + " \"relationship-data\": [{" + + " \"relationship-key\": \"model.model-invariant-id\"," + + " \"relationship-value\": \"f6342be5-d66b-4d03-a1aa-c82c3094c4ea\"" + + " }, {" + + " \"relationship-key\": \"model-ver.model-version-id\"," + + " \"relationship-value\": \"46093d8f-6dfa-4332-9c00-7e822c681b59\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"d74a5dff-ef7f-4e32-9c13-d82fb2c617c9\"" + + " }, {" + + " \"relationship-key\": \"model-element.model-element-uuid\"," + + " \"relationship-value\": \"f7bd32b4-bbbf-4788-9137-9dfa299e6111\"" + + " }" + + " ]" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + " }" + + " }" + + " ]" + + "}"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIStandardQueryGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIStandardQueryGet.java index 13ee91e2b..642f941e8 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIStandardQueryGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIStandardQueryGet.java @@ -1,18 +1,23 @@ package org.onap.simulator.presetGenerator.presets.aai; -import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; -import static org.apache.commons.text.StringEscapeUtils.escapeJson; - import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; -import java.util.UUID; -import java.util.stream.Collectors; import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.text.StrSubstitutor; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset; import org.springframework.http.HttpMethod; +import java.util.UUID; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.apache.commons.lang3.ObjectUtils.defaultIfNull; +import static org.apache.commons.text.StringEscapeUtils.escapeJson; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.ATT_AIC; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.hvf6; + public class PresetAAIStandardQueryGet extends BaseAAIPreset { private final String instanceId; private final String instanceName; @@ -22,8 +27,9 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { private final String uri; private final String typeInResponse; private final Multimap<String, String> relationshipsUris; + private Placement placement; - private PresetAAIStandardQueryGet(String typeInResponse, String instanceId, String instanceName, String instanceType, String instanceRole, String uri, Multimap<String, String> relationshipsUris, String additionalProperties) { + private PresetAAIStandardQueryGet(String typeInResponse, String instanceId, String instanceName, String instanceType, String instanceRole, String uri, Multimap<String, String> relationshipsUris, String additionalProperties, Placement placement) { this.instanceId = defaultIfNull(instanceId, randomUUID()); this.instanceName = defaultIfNull(instanceName, randomAlphanumeric()); this.instanceType = defaultIfNull(instanceType, randomAlphanumeric()); @@ -32,15 +38,23 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { this.typeInResponse = typeInResponse; this.additionalProperties = additionalProperties; this.relationshipsUris = relationshipsUris; + this.placement = placement; } - private PresetAAIStandardQueryGet(String typeInResponse, String instanceId, String uri, Multimap<String, String> relationshipsUris, String additionalProperties) { - this(typeInResponse, instanceId, randomAlphanumeric(), randomAlphanumeric(), randomAlphanumeric(), uri, relationshipsUris, additionalProperties); + private PresetAAIStandardQueryGet(String typeInResponse, String instanceId, String uri, Multimap<String, String> relationshipsUris, String additionalProperties, Placement placement) { + this(typeInResponse, instanceId, randomAlphanumeric(), randomAlphanumeric(), randomAlphanumeric(), uri, relationshipsUris, additionalProperties, placement); } public static PresetAAIStandardQueryGet ofServiceInstance(String instanceId, final String modelVersionId, final String modelInvariantId, String subscriberId, String serviceType, Multimap<String, String> relationshipsUris) { + return ofServiceInstance(instanceId, "", "", modelVersionId, modelInvariantId, subscriberId, serviceType, "GARBAGE DATA", relationshipsUris); + } + + public static PresetAAIStandardQueryGet ofServiceInstance(String instanceId, String instanceType, String instanceRole, final String modelVersionId, final String modelInvariantId, String subscriberId, String serviceType, String orchStatus, Multimap<String, String> relationshipsUris) { return new PresetAAIStandardQueryGet( "service-instance", instanceId, + randomAlphanumeric(), + instanceType, + instanceRole, new StrSubstitutor(ImmutableMap.of( "global-customer-id", subscriberId, "service-type", serviceType, @@ -53,37 +67,44 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { "\"model-invariant-id\": \"" + modelInvariantId + "\", " + "\"model-version-id\": \"" + modelVersionId + "\", " + "\"resource-version\": \"GARBAGE DATA\", " + - "\"orchestration-status\": \"GARBAGE DATA\", " + "\"orchestration-status\": \"" + orchStatus + "\", ", null ); } public static PresetAAIStandardQueryGet ofInstanceGroup(String groupType, String groupRole, Multimap<String, String> relationshipsUris) { + return ofInstanceGroup(groupType, groupRole, relationshipsUris, "4bb2e27e-ddab-4790-9c6d-1f731bc14a45", "daeb6568-cef8-417f-9075-ed259ce59f48"); + } + + public static PresetAAIStandardQueryGet ofInstanceGroup(String groupType, String groupRole, Multimap<String, String> relationshipsUris, String modelInvariantId, String modelVersionId) { final String instanceId = randomUUID(); return new PresetAAIStandardQueryGet( "instance-group", instanceId, randomAlphanumeric(), groupType, groupRole, "/network/instance-groups/instance-group/" + instanceId, relationshipsUris, "" + " \"id\": \"" + instanceId + "\"," + - " \"model-invariant-id\": \"4bb2e27e-ddab-4790-9c6d-1f731bc14a45\"," + - " \"model-version-id\": \"daeb6568-cef8-417f-9075-ed259ce59f48\"," + + addModelIds(modelInvariantId, modelVersionId) + " \"description\": \"vTSBC Customer Landing Network Collection Desc\"," + " \"resource-version\": \"1536169790853\"," + - " \"instance-group-function\": \"vTSBC Customer Landing Network Collection\"," + " \"instance-group-function\": \"vTSBC Customer Landing Network Collection\",", null ); } - public static PresetAAIStandardQueryGet ofVnf(String instanceId, Multimap<String, String> relationshipsUris) { - return ofVnf(instanceId, "vnf-instance-model-version-id", "vnf-instance-model-customization-id", "", relationshipsUris); + public static PresetAAIStandardQueryGet ofVnf(String instanceId, Multimap<String, String> relationshipsUris, Placement placement) { + return ofVnf(instanceId, "vnf-instance-model-version-id", "vnf-instance-model-customization-id", "", relationshipsUris, placement); + } + + public static Placement defaultPlacement() { + return new Placement(ATT_AIC, hvf6, "bae71557c5bb4d5aac6743a4e5f1d054"); } - public static PresetAAIStandardQueryGet ofVnf(String instanceId, String modelVersionId,String modelCustomizationId, String additionalProperties, Multimap<String, String> relationshipsUris) { + public static PresetAAIStandardQueryGet ofVnf(String instanceId, String modelVersionId, String modelCustomizationId, String additionalProperties, Multimap<String, String> relationshipsUris, Placement placement) { return new PresetAAIStandardQueryGet( "vnf", instanceId, "/network/generic-vnfs/generic-vnf/" + instanceId, relationshipsUris, additionalProperties + "\"model-invariant-id\": \"vnf-instance-model-invariant-id\", " + - "\"model-customization-id\": \"" + modelCustomizationId + "\", "+ - "\"model-version-id\": \"" + modelVersionId + "\", " + "\"model-customization-id\": \"" + modelCustomizationId + "\", " + + "\"model-version-id\": \"" + modelVersionId + "\", ", placement ); } @@ -93,7 +114,7 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { "/network/generic-vnfs/generic-vnf/" + instanceId, relationshipsUris, additionalProperties + "\"model-invariant-id\": \"vnf-instance-model-invariant-id\", " + - "\"model-version-id\": \"" + modelVersionId + "\", " + "\"model-version-id\": \"" + modelVersionId + "\", ", null ); } @@ -109,7 +130,7 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { return ofL3Network(randomUUID(), randomAlphanumeric(), instanceType, relationshipsUris, orchStatus, "prov", "network-instance-model-version-id", "network-instance-model-customization-id"); } - public static PresetAAIStandardQueryGet ofL3Network(String instanceType, String orchStatus, String provStatus, String modelVersionId, String modelCustomizationId,Multimap<String, String> relationshipsUris) { + public static PresetAAIStandardQueryGet ofL3Network(String instanceType, String orchStatus, String provStatus, String modelVersionId, String modelCustomizationId, Multimap<String, String> relationshipsUris) { return ofL3Network(randomUUID(), randomAlphanumeric(), instanceType, relationshipsUris, orchStatus, provStatus, modelVersionId, modelCustomizationId); } @@ -130,7 +151,7 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { "\"is-external-network\": true, " + "\"model-invariant-id\": \"network-instance-model-invariant-id\", " + "\"model-customization-id\": \"" + modelCustomizationId + "\", " + - "\"model-version-id\": \"" + modelVersionId + "\", " + "\"model-version-id\": \"" + modelVersionId + "\", ", null ); } @@ -144,19 +165,59 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { " \"orchestration-status\": \"Active\"," + " \"model-customization-id\": \"bc3bbdcc-42f3-4682-b151-99c308d15255\"," + " \"vf-module-model-customization-id\": \"bc3bbdcc-42f3-4682-b151-99c308d15255\"," + - " \"resource-version\": \"1533679899735\"," + " \"resource-version\": \"1533679899735\",", null ); } - public static PresetAAIStandardQueryGet ofCollectionResource(String orchStatus, Multimap<String, String> relationshipsUris) { + + public static PresetAAIStandardQueryGet ofCollectionResource(String orchStatus, Multimap<String, String> relationshipsUris, String modelInvariantId, String modelVersionId) { final String instanceId = randomUUID(); return new PresetAAIStandardQueryGet( "collection", instanceId, randomAlphanumeric(), "L3-NETWORK", randomAlphanumeric(), "/network/collections/collection/" + instanceId, relationshipsUris, "" + "\"orchestration-status\": \"" + orchStatus + "\", " + - "\"model-invariant-id\": \"081ceb56-eb71-4566-a72d-3e7cbee5cdf1\", " + - "\"model-version-id\": \"ce8c98bc-4691-44fb-8ff0-7a47487c11c4\", " + addModelIds(modelInvariantId, modelVersionId), null + ); + } + + private static String addModelIds(String modelInvariantId, String modelVersionId) { + return "\"model-invariant-id\": \"" + modelInvariantId + "\", " + + "\"model-version-id\": \"" + modelVersionId + "\", "; + } + + public static PresetAAIStandardQueryGet ofVrf(String orchStatus, Multimap<String, String> relationshipsUris) { + final String instanceId = randomUUID(); + return new PresetAAIStandardQueryGet( + "configuration", instanceId, randomAlphanumeric(), "COLLECTION", randomAlphanumeric(), + "/network/configurations/configuration/" + instanceId, + relationshipsUris, "" + + "\"orchestration-status\": \"" + orchStatus + "\", " + + "\"model-invariant-id\": \"b67a289b-1688-496d-86e8-1583c828be0a\", " + + "\"model-customization-id\": \"dd024d73-9bd1-425d-9db5-476338d53433\", " + + "\"model-version-id\": \"9cac02be-2489-4374-888d-2863b4511a59\", ", null + ); + } + + public static PresetAAIStandardQueryGet ofVpn(String orchStatus, Multimap<String, String> relationshipsUris, String globalRoutTarget, String routeTargetRole, String customerId, String region) { + final String instanceId = randomUUID(); + return new PresetAAIStandardQueryGet( + "vpn", instanceId, randomAlphanumeric(), "SERVICE-INFRASTRUCTURE", randomAlphanumeric(), + "/network/collections/collection/" + instanceId, + relationshipsUris, "" + + "\"orchestration-status\": \"" + orchStatus + "\", " + + "\"prov-status\": \"" + "prov" + "\"," + + "\"model-invariant-id\": \"vpn-model-invariant-id\", " + + "\"model-customization-id\": \"vpn-model-customization-id\", " + + "\"customer-vpn-id\": \"" + customerId + "\", " + + "\"vpn-region\": \"" + region + "\", " + + "\"route-targets\" : [" + + " {" + + " \"global-route-target\":\"" + globalRoutTarget + "\"," + + " \"route-target-role\" : \"" + routeTargetRole + "\"" + + " }" + + " ],"+ + "\"model-version-id\": \"vpn-model-version-id\", ", null ); } @@ -171,7 +232,7 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { "\"vlan-id-outer\": " + vlanIdOuter + ", " + "\"resource-version\": \"1518934744675\", " + "\"in-maint\": false, " + - "\"is-ip-unnumbered\": false, " + "\"is-ip-unnumbered\": false, ", null ); } @@ -202,9 +263,10 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { additionalProperties + " \"relationship-list\": { " + " \"relationship\": [ " + - relationshipsUris.entries().stream().map( - entry -> buildRelationship(entry.getKey(), entry.getValue()) - ).collect(Collectors.joining(",")) + + Stream.concat( + placement !=null ? Stream.of(buildPlacementRelationship()) : Stream.empty(), + relationshipsUris.entries().stream().map(entry -> buildRelationship(entry.getKey(), entry.getValue()) + )).collect(Collectors.joining(",")) + " ] " + " } " + "} "; @@ -225,6 +287,40 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { "}"; } + private String buildPlacementRelationship() { + String relatedTo = StringUtils.equals(instanceType,"vf-module")? "vserver": "tenant"; + return "" + + " {" + + " \"related-to\": \"" + relatedTo + "\"," + + " \"relationship-label\": \"org.onap.relationships.inventory.Uses\"," + + " \"related-link\": \"/aai/v12/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/" + this.placement.lcpRegionId + "/tenants/tenant/" + this.placement.tenantId+ "/vservers/vserver/5eef9f6d-9933-4bc6-9a1a-862d61309437\"," + + " \"relationship-data\": [" + + " {" + + " \"relationship-key\": \"cloud-region.cloud-owner\"," + + " \"relationship-value\": \""+ this.placement.cloudOwner+"\"" + + " }," + + " {" + + " \"relationship-key\": \"cloud-region.cloud-region-id\"," + + " \"relationship-value\": \"" + this.placement.lcpRegionId + "\"" + + " }," + + " {" + + " \"relationship-key\": \"tenant.tenant-id\"," + + " \"relationship-value\": \"" + this.placement.tenantId + "\"" + + " }," + + " {" + + " \"relationship-key\": \"vserver.vserver-id\"," + + " \"relationship-value\": \"5eef9f6d-9933-4bc6-9a1a-862d61309437\"" + + " }" + + " ]," + + " \"related-to-property\": [" + + " {" + + " \"property-key\": \"vserver.vserver-name\"," + + " \"property-value\": \"zolson5bfapn01dns002\"" + + " }" + + " ]" + + " }" ; + } + @Override public HttpMethod getReqMethod() { return HttpMethod.GET; @@ -234,6 +330,4 @@ public class PresetAAIStandardQueryGet extends BaseAAIPreset { public String getReqPath() { return getRootPath() + uri; } - - -} +}
\ No newline at end of file diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/ecompportal_att/PresetGetSessionSlotCheckIntervalGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/ecompportal_att/PresetGetSessionSlotCheckIntervalGet.java index 02ff1c159..e32ed8b34 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/ecompportal_att/PresetGetSessionSlotCheckIntervalGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/ecompportal_att/PresetGetSessionSlotCheckIntervalGet.java @@ -13,6 +13,6 @@ public class PresetGetSessionSlotCheckIntervalGet extends BaseEcompPortalPreset } public String getReqPath() { - return getRootPath() + "/v3/getSessionSlotCheckInterval"; + return getRootPath() + "/*v3/getSessionSlotCheckInterval"; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java index 42b1578f4..0b7c6517f 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java @@ -54,7 +54,7 @@ public class PresetMSOCreateNetworkALaCarte5G extends PresetMSOBaseCreateInstanc " \"platformName\": \"platform\"" + " }," + " \"lineOfBusiness\": {" + - " \"lineOfBusinessName\": \"ECOMP\"" + + " \"lineOfBusinessName\": \"ONAP\"" + " }," + " \"relatedInstanceList\": [{" + " \"relatedInstance\": {" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java index bccb07251..307aef2c0 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java @@ -3,11 +3,13 @@ package org.onap.simulator.presetGenerator.presets.mso; public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCreateInstancePost { private final String networkInstanceName; private final String serviceInstanceId; + private final String platform; - public PresetMSOCreateNetworkALaCarteOldViewEdit(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String networkInstanceName) { + public PresetMSOCreateNetworkALaCarteOldViewEdit(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String networkInstanceName, String platform) { super(overrideRequestId, responseInstanceId); this.serviceInstanceId = serviceInstanceId; this.networkInstanceName = networkInstanceName; + this.platform = platform == null ? "" : platform; } @Override @@ -17,12 +19,12 @@ public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCrea @Override public Object getRequestBody() { - return "{\"requestDetails\": {" + + return "{\"requestDetails\": {" + " \"requestInfo\": {" + - " \"instanceName\": \""+networkInstanceName+"\"," + + " \"instanceName\": \"" + networkInstanceName + "\"," + " \"source\": \"VID\"," + " \"suppressRollback\": false," + - " \"requestorId\": \"mo57174000\"," + + " \"requestorId\": \"em1536000\"," + " \"productFamilyId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" + " }," + " \"modelInfo\": {" + @@ -40,16 +42,14 @@ public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCrea " }," + " \"cloudConfiguration\": {" + " \"lcpCloudRegionId\": \"One\"," + - addCloudOwnerIfNeeded() + + addCloudOwnerIfNeeded() + " \"tenantId\": \"c630e297a3ae486497d63eacec1d7c14\"" + " }," + - " \"platform\": {" + - " \"platformName\": \"xxx1\"" + - " }," + + addPlatformIfNeeded(platform) + " \"relatedInstanceList\": [" + " {" + " \"relatedInstance\": {" + - " \"instanceId\": \""+serviceInstanceId+"\"," + + " \"instanceId\": \"" + serviceInstanceId + "\"," + " \"modelInfo\": {" + " \"modelType\": \"service\"," + " \"modelName\": \"Using VID for VoIP Network Instantiations Shani\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java index afd96a46f..40c18fa55 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java @@ -1,9 +1,9 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; - import java.util.Map; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; + public class PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork extends PresetMSOCreateServiceInstanceGen2WithNames { private final String requestorId; @@ -31,13 +31,13 @@ public class PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork extends " }," + " \"owningEntity\": {" + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\"," + - " \"owningEntityName\": \"MetroPacketCore\"" + + " \"owningEntityName\": \"WayneHolland\"" + " }," + " \"subscriberInfo\": {" + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + " }," + " \"project\": {" + - " \"projectName\": \"DFW\"" + + " \"projectName\": \"WATKINS\"" + " }," + " \"requestInfo\": {" + " \"instanceName\": \""+names.get(SERVICE_NAME)+"\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java index 3a7b09b43..0fd70b765 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java @@ -26,13 +26,13 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateInsta " }, " + " \"owningEntity\": { " + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " + - " \"owningEntityName\": \"MetroPacketCore\" " + + " \"owningEntityName\": \"WayneHolland\" " + " }, " + " \"subscriberInfo\": { " + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + " }, " + " \"project\": { " + - " \"projectName\": \"DFW\" " + + " \"projectName\": \"WATKINS\" " + " }, " + " \"requestInfo\": { " + // " \"instanceName\": \"some instance name_0" + suffix + "\", " + @@ -73,7 +73,7 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateInsta " \"platformName\": \"platform\" " + " }, " + " \"lineOfBusiness\": { " + - " \"lineOfBusinessName\": \"ECOMP\" " + + " \"lineOfBusinessName\": \"ONAP\" " + " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [], " + @@ -82,7 +82,7 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateInsta " \"modelInfo\": { " + " \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " + " \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"6\" " + " }, " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java index f76293f1d..f80f6bb57 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java @@ -26,11 +26,11 @@ public class PresetMSOCreateServiceInstanceGen2AlacarteService extends PresetMSO " \"modelVersion\": \"1.0\" " + " }, " + " \"owningEntity\": { " + - " \"owningEntityName\": \"MetroPacketCore\", " + + " \"owningEntityName\": \"WayneHolland\", " + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\" " + " }, " + " \"project\": { " + - " \"projectName\": \"DFW\" " + + " \"projectName\": \"WATKINS\" " + " }, " + " \"subscriberInfo\": { " + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java index 8f0b14115..28705ad89 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java @@ -35,10 +35,10 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService " }, " + " \"owningEntity\": { " + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " + - " \"owningEntityName\": \"MetroPacketCore\" " + + " \"owningEntityName\": \"WayneHolland\" " + " }, " + " \"project\": { " + - " \"projectName\": \"DFW\" " + + " \"projectName\": \"WATKINS\" " + " }, " + " \"subscriberInfo\": { " + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java index a864b0d10..e4c14fc01 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java @@ -28,11 +28,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress e " \"modelVersion\": \"1.0\" " + " }, " + " \"owningEntity\": { " + - " \"owningEntityName\": \"MetroPacketCore\", " + + " \"owningEntityName\": \"WayneHolland\", " + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\" " + " }, " + " \"project\": { " + - " \"projectName\": \"DFW\" " + + " \"projectName\": \"WATKINS\" " + " }, " + " \"subscriberInfo\": { " + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java index 2a8d7586e..d983a6152 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java @@ -1,14 +1,10 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME1; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME2; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VG_NAME; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME2; +import vid.automation.test.infra.Features; import java.util.Map; -import vid.automation.test.infra.Features; + +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.*; public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends PresetMSOCreateServiceInstanceGen2WithNames { @@ -60,10 +56,6 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends } protected String getVnfInstanceParams() { - if (!Features.FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF.isActive()) { - return ""; - } - if (Features.FLAG_SUPPLEMENTARY_FILE.isActive()) { return INSTANCE_PARAMS_WITH_SUPP_FILE_VNF; } @@ -91,13 +83,13 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " }, " + " \"owningEntity\": { " + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " + - " \"owningEntityName\": \"MetroPacketCore\" " + + " \"owningEntityName\": \"WayneHolland\" " + " }, " + " \"subscriberInfo\": { " + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + " }, " + " \"project\": { " + - " \"projectName\": \"DFW\" " + + " \"projectName\": \"WATKINS\" " + " }, " + " \"requestInfo\": { " + " \"instanceName\": \"" + names.get(SERVICE_NAME) + suffix + "\", " + @@ -118,7 +110,7 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"modelType\": \"service\" " + " }, " + " \"instanceParams\": [{ " + - " \"2017488_PASQUALEvpe0_ASN\": \"AV_vPE\"" + + " \"2017488_pasqualevpe0_ASN\": \"AV_vPE\"" + " }" + " ], " + " \"resources\": { " + @@ -142,7 +134,7 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"platformName\": \"platform\" " + " }, " + " \"lineOfBusiness\": { " + - " \"lineOfBusinessName\": \"ECOMP\" " + + " \"lineOfBusinessName\": \"ONAP\" " + " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [" + INSTANCE_PARAMS_VNF + "] " + @@ -167,18 +159,18 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"platformName\": \"platform\" " + " }, " + " \"lineOfBusiness\": { " + - " \"lineOfBusinessName\": \"ECOMP\" " + + " \"lineOfBusinessName\": \"ONAP\" " + " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [" + getVnfInstanceParams() + "], " + " \"vfModules\": [{ " + " \"instanceName\": \"" + names.get(VFM_NAME1) + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelCustomizationId\": \"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\", " + " \"modelInvariantId\": \"b34833bb-6aa9-4ad6-a831-70b06367a091\", " + " \"modelVersionId\": \"f8360508-3f17-4414-a2ed-6bc71161e8db\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"5\" " + " }, " + @@ -187,11 +179,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"instanceName\": \"" + names.get(VFM_NAME2) + suffix + "\", " + " \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelCustomizationId\": \"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\", " + " \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " + " \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"6\" " + " }, " + @@ -212,10 +204,6 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends } private String addDuplicatedVnfIfFeatureOn() { - if (!Features.FLAG_DUPLICATE_VNF.isActive()) { - return ""; - } - return " ,{ " + //start of vnf " \"instanceName\": \"" + names.get(VNF_NAME)+ "_001" + suffix + "\", " + @@ -237,18 +225,18 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"platformName\": \"platform\" " + " }, " + " \"lineOfBusiness\": { " + - " \"lineOfBusinessName\": \"ECOMP\" " + + " \"lineOfBusinessName\": \"ONAP\" " + " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [" + getVnfInstanceParams() + "], " + " \"vfModules\": [{ " + " \"instanceName\": \"" + names.get(VFM_NAME1) + "_001" + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelCustomizationId\": \"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\", " + " \"modelInvariantId\": \"b34833bb-6aa9-4ad6-a831-70b06367a091\", " + " \"modelVersionId\": \"f8360508-3f17-4414-a2ed-6bc71161e8db\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"5\" " + " }, " + @@ -257,11 +245,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"instanceName\": \"" + names.get(VFM_NAME2) + "_001" + suffix + "\", " + " \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + "_001" + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelCustomizationId\": \"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\", " + " \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " + " \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"6\" " + " }, " + @@ -289,18 +277,18 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"platformName\": \"platform\" " + " }, " + " \"lineOfBusiness\": { " + - " \"lineOfBusinessName\": \"ECOMP\" " + + " \"lineOfBusinessName\": \"ONAP\" " + " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [" + getVnfInstanceParams() + "], " + " \"vfModules\": [{ " + " \"instanceName\": \"" + names.get(VFM_NAME1) + "_002" + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelCustomizationId\": \"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\", " + " \"modelInvariantId\": \"b34833bb-6aa9-4ad6-a831-70b06367a091\", " + " \"modelVersionId\": \"f8360508-3f17-4414-a2ed-6bc71161e8db\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"5\" " + " }, " + @@ -309,11 +297,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"instanceName\": \"" + names.get(VFM_NAME2) + "_002" + suffix + "\", " + " \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + "_002" + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelCustomizationId\": \"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\", " + " \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " + " \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"6\" " + " }, " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java index dabc526c7..7b434d559 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java @@ -1,6 +1,7 @@ package org.onap.simulator.presetGenerator.presets.mso; import com.google.common.collect.ImmutableMap; + import java.util.Map; public class PresetMSOCreateVfModuleALaCarteCypress extends PresetMSOBaseCreateInstancePost { @@ -16,20 +17,20 @@ public class PresetMSOCreateVfModuleALaCarteCypress extends PresetMSOBaseCreateI .put(Keys.instanceName, "mimazepubi") .put(Keys.modelInvariantId, "b34833bb-6aa9-4ad6-a831-70b06367a091") .put(Keys.modelVersionId, "f8360508-3f17-4414-a2ed-6bc71161e8db") - .put(Keys.modelName, "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0") + .put(Keys.modelName, "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0") .put(Keys.modelVersion, "5") .put(Keys.modelCustomizationId, "a55961b2-2065-4ab0-a5b7-2fcee1c227e3") - .put(Keys.modelCustomizationName, "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0") + .put(Keys.modelCustomizationName, "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0") .build(); public static final Map<Keys, String> module2Names = ImmutableMap.<Keys, String>builder() .put(Keys.instanceName, "bnmgtrx") .put(Keys.modelInvariantId, "eff8cc59-53a1-4101-aed7-8cf24ecf8339") .put(Keys.modelVersionId, "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a") - .put(Keys.modelName, "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2") + .put(Keys.modelName, "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2") .put(Keys.modelVersion, "6") .put(Keys.modelCustomizationId, "3cd946bb-50e0-40d8-96d3-c9023520b557") - .put(Keys.modelCustomizationName, "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2") + .put(Keys.modelCustomizationName, "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2") .build(); public PresetMSOCreateVfModuleALaCarteCypress(String overrideRequestId, String serviceInstanceId, String vnfInstanceId, Map<Keys, String> names, String testApi, boolean withTestApi) { diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java index bf085cae5..61601eef2 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java @@ -29,16 +29,16 @@ public class PresetMSOCreateVfModuleOldViewEdit extends PresetMSOBaseCreateInsta " \"instanceName\": \""+instanceName+"\"," + " \"source\": \"VID\"," + " \"suppressRollback\": false," + - " \"requestorId\": \"mo37915000\"" + + " \"requestorId\": \"em35993000\"" + " }," + " \"modelInfo\": {" + " \"modelType\": \"vfModule\"," + " \"modelInvariantId\": \"d9f9c851-9543-476e-b3c2-a2e5284a26aa\"," + " \"modelVersionId\": \"d205e01d-e5da-4e68-8c52-f95cb0607959\"," + - " \"modelName\": \"Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8\"," + + " \"modelName\": \"Vsp1710pid298109Vwinifred..mmsc_mod1_ltm..module-8\"," + " \"modelVersion\": \"1\"," + " \"modelCustomizationId\": \"e81b58ce-ae9b-4bde-9f81-9962a5007756\"," + - " \"modelCustomizationName\": \"Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8\"" + + " \"modelCustomizationName\": \"Vsp1710pid298109Vwinifred..mmsc_mod1_ltm..module-8\"" + " }," + " \"requestParameters\": {" + addTestApi() + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java index c8fb7fcf9..764237e18 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java @@ -44,10 +44,10 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese " \"modelType\":\"" + select("volumeGroup", "vfModule") + "\"," + " \"modelInvariantId\":\"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\"," + " \"modelVersionId\":\"25284168-24bb-4698-8cb4-3f509146eca5\"," + - " \"modelName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," + + " \"modelName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"," + " \"modelVersion\":\"6\"," + " \"modelCustomizationId\":\"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\"," + - " \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"" + + " \"modelCustomizationName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"" + " }," + " \"cloudConfiguration\":{" + " \"lcpCloudRegionId\":\"my region\"," + @@ -97,11 +97,11 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese " \"requestParameters\":{" + addTestApi()+ " \"userParams\":[{" + - " \"2017488_PASQUALEvpe0_vnf_instance_name\":\"mtnj309me6\"," + - " \"2017488_PASQUALEvpe0_vnf_config_template_version\":\"17.2\"," + - " \"PASQUALEvpe0_bandwidth\":\"10\"," + - " \"2017488_PASQUALEvpe0_AIC_CLLI\":\"ATLMY8GA\"," + - " \"PASQUALEvpe0_bandwidth_units\":\"Gbps\"" + + " \"2017488_pasqualevpe0_vnf_instance_name\":\"mtnj309me6\"," + + " \"2017488_pasqualevpe0_vnf_config_template_version\":\"17.2\"," + + " \"pasqualevpe0_bandwidth\":\"10\"," + + " \"2017488_pasqualevpe0_AIC_CLLI\":\"ATLMY8GA\"," + + " \"pasqualevpe0_bandwidth_units\":\"Gbps\"" + " }" + " ]," + " \"usePreload\":true" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java index 7947c5b83..d4eaa6dd5 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java @@ -21,7 +21,7 @@ public class PresetMSOCreateVnfALaCarteOldViewEdit extends PresetMSOCreateVnfBas " \"instanceName\": \""+vnfInstanceName+"\"," + " \"source\": \"VID\"," + " \"suppressRollback\": false," + - " \"requestorId\": \"mo37915000\"," + + " \"requestorId\": \"em35993000\"," + " \"productFamilyId\": \"ebc3bc3d-62fd-4a3f-a037-f619df4ff034\"" + " }," + " \"modelInfo\": {" + @@ -42,7 +42,7 @@ public class PresetMSOCreateVnfALaCarteOldViewEdit extends PresetMSOCreateVnfBas addCloudOwnerIfNeeded() + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" + " }," + - selectLob("\"lineOfBusiness\": {\"lineOfBusinessName\": \"ECOMP\"},", "") + + selectLob("\"lineOfBusiness\": {\"lineOfBusinessName\": \"ONAP\"},", "") + " \"platform\": {" + " \"platformName\": \"platform\"" + " }," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java index 9fd0a678f..d5faa3f1c 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java @@ -34,10 +34,10 @@ public class PresetMSOCreateVnfVlanTagging extends PresetMSOBaseCreateInstancePo " \"requestorId\": \"us16807000\"" + " }," + " \"lineOfBusiness\": {" + - " \"lineOfBusinessName\": \"ECOMP\"" + + " \"lineOfBusinessName\": \"ONAP\"" + " }," + " \"cloudConfiguration\": {" + - " \"lcpCloudRegionId\": \"JANET25\"," + + " \"lcpCloudRegionId\": \"AAIAIC25\"," + addCloudOwnerIfNeeded() + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" + " }," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java index ed5bee788..42e2a7097 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java @@ -27,16 +27,16 @@ public class PresetMSOCreateVolumeGroupOldViewEdit extends PresetMSOBaseCreateIn " \"instanceName\": \""+instanceName+"\"," + " \"source\": \"VID\"," + " \"suppressRollback\": false," + - " \"requestorId\": \"mo37915000\"" + + " \"requestorId\": \"em35993000\"" + " }," + " \"modelInfo\": {" + " \"modelType\": \"volumeGroup\"," + " \"modelInvariantId\": \"6931e88a-fbcc-4ca9-8583-876b669c3106\"," + " \"modelVersionId\": \"13f022c4-651e-4326-b8e1-61e9a8c7a7ad\"," + - " \"modelName\": \"Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3\"," + + " \"modelName\": \"Vsp1710pid298109Vwinifred..mmsc_mod6_eca_oam..module-3\"," + " \"modelVersion\": \"1\"," + " \"modelCustomizationId\": \"020af091-cc66-46db-876c-02f14b4a795f\"," + - " \"modelCustomizationName\": \"Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3\"" + + " \"modelCustomizationName\": \"Vsp1710pid298109Vwinifred..mmsc_mod6_eca_oam..module-3\"" + " }," + " \"requestParameters\": {" + addTestApi() + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java index fc9cc3c5c..2f8d218a6 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java @@ -15,16 +15,16 @@ public class PresetMSODeleteBaseVfModuleCypress extends PresetMSODeleteVfModule return "{" + " \"requestDetails\":{" + " \"modelInfo\":{" + - " \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\"," + + " \"modelCustomizationName\":\"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\"," + " \"modelCustomizationId\":\"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\"," + " \"modelInvariantId\":\"b34833bb-6aa9-4ad6-a831-70b06367a091\"," + " \"modelVersionId\":\"f8360508-3f17-4414-a2ed-6bc71161e8db\"," + - " \"modelName\":\"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\"," + + " \"modelName\":\"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\"," + " \"modelType\":\"vfModule\"," + " \"modelVersion\":\"5\"" + " }," + " \"cloudConfiguration\":{" + - " \"lcpCloudRegionId\":\"JANET25\"," + + " \"lcpCloudRegionId\":\"AAIAIC25\"," + addCloudOwnerIfNeeded() + " \"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"," + " }," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java index 9174cd2bb..bf18ab31b 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java @@ -22,7 +22,6 @@ public class PresetMSODeleteInstanceGroup extends PresetMSOBaseDelete { Map<String, String> map = super.getRequestHeaders(); map.put("X-RequestorID", userId); return map; - } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteMacroService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteMacroService.java new file mode 100644 index 000000000..10f1c04aa --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteMacroService.java @@ -0,0 +1,33 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSODeleteMacroService extends PresetMSODeleteService { + + public PresetMSODeleteMacroService(String requestId, String serviceInstanceId) + { + super(requestId, serviceInstanceId); + } + + @Override + public Object getRequestBody() + { + return "{ " + + " \"requestDetails\":{ " + + " \"modelInfo\":{ " + + " \"modelInvariantId\":\"dfc2c44c-2429-44ca-ae26-1e6dc1f207fb\"," + + " \"modelVersionId\":\"f028b2e2-7080-4b13-91b2-94944d4c42d8\"," + + " \"modelName\":\"Service with VRF\"," + + " \"modelType\":\"service\"," + + " \"modelVersion\":\"5.0\"" + + " }," + + " \"requestInfo\":{ " + + " \"source\":\"VID\"," + + " \"requestorId\":\"us16807000\"" + + " }," + + " \"requestParameters\":{ " + + " \"aLaCarte\":false" + + " }" + + " }" + + "}"; + + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java index b407b167a..c7b4fa899 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java @@ -1,7 +1,5 @@ package org.onap.simulator.presetGenerator.presets.mso; -import vid.automation.test.infra.Features; - public class PresetMSODeleteService extends PresetMSOBaseDelete { private final String serviceInstanceId; public static final String DEFAULT_SERVICE_INSTANCE_ID = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; @@ -22,9 +20,7 @@ public class PresetMSODeleteService extends PresetMSOBaseDelete { @Override protected String getRootPath() { - return Features.FLAG_UNASSIGN_SERVICE.isActive() ? - "/mso/serviceInstantiation/v./serviceInstances/" : - "/mso/serviceInstances/v./"; + return "/mso/serviceInstantiation/v./serviceInstances/" ; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java index d4a21cc36..c3ea07f2b 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java @@ -15,16 +15,16 @@ public class PresetMSODeleteVfModuleCypress extends PresetMSODeleteVfModule { return "{" + " \"requestDetails\":{" + " \"modelInfo\":{" + - " \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," + + " \"modelCustomizationName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"," + " \"modelCustomizationId\":\"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\"," + " \"modelInvariantId\":\"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\"," + " \"modelVersionId\":\"25284168-24bb-4698-8cb4-3f509146eca5\"," + - " \"modelName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," + + " \"modelName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"," + " \"modelType\":\"vfModule\"," + " \"modelVersion\":\"6\"" + " }," + " \"cloudConfiguration\":{" + - " \"lcpCloudRegionId\":\"JANET25\"," + + " \"lcpCloudRegionId\":\"AAIAIC25\"," + addCloudOwnerIfNeeded() + " \"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"," + " }," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java index 381ac856b..602e32df4 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java @@ -1,16 +1,23 @@ package org.onap.simulator.presetGenerator.presets.mso; +import com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.springframework.http.HttpMethod; +import vid.automation.test.infra.Features; import java.time.Instant; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.singletonList; /** * Created by itzikliderman on 13/12/2017. @@ -26,6 +33,7 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { private String statusMessage; private String requestState; private int startedHoursAgo = 1; + private boolean isDetailed = true; public PresetMSOOrchestrationRequestGet() { @@ -38,6 +46,16 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { this.requestId = DEFAULT_REQUEST_ID; } + /** + * @param requestState + * @param isDetailed - is expect to query param format=detail. Angular1 flows dont' expect it + */ + public PresetMSOOrchestrationRequestGet(String requestState, boolean isDetailed) { + this.requestState = requestState; + this.requestId = DEFAULT_REQUEST_ID; + this.isDetailed = isDetailed; + } + public PresetMSOOrchestrationRequestGet(String requestState, String overrideRequestId) { this.requestState = requestState; this.requestId = overrideRequestId; @@ -49,6 +67,16 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { this.statusMessage = statusMessage; } + /** + * @param isDetailed - is expect to query param format=detail. Angular1 flows dont' expect it + */ + public PresetMSOOrchestrationRequestGet(String requestState, String overrideRequestId, String statusMessage, boolean isDetailed) { + this.requestState = requestState; + this.requestId = overrideRequestId; + this.statusMessage = statusMessage; + this.isDetailed = isDetailed; + } + public PresetMSOOrchestrationRequestGet(String requestState, String overrideRequestId, String statusMessage, int startedHoursAgo) { this.requestState = requestState; this.requestId = overrideRequestId; @@ -72,6 +100,13 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { } @Override + public Map<String, List> getQueryParams() { + return (isDetailed && Features.FLAG_1908_RESUME_MACRO_SERVICE.isActive()) ? + ImmutableMap.of("format", singletonList("detail")) : + Collections.emptyMap(); + } + + @Override public Object getResponseBody() { String body = "{" + " \"request\": {" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java index 3d83ca55d..1d3b8c00a 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java @@ -1,13 +1,14 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static java.util.Collections.singletonList; - import com.google.common.collect.ImmutableMap; -import java.util.List; -import java.util.Map; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.springframework.http.HttpMethod; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.singletonList; + public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extends BaseMSOPreset { public PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork(ResponseDetails parentDetails, ResponseDetails childDetails, String parentInstanceId) { @@ -84,7 +85,7 @@ public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extend " \"testApi\": \"VNF_API\"" + " }," + " \"project\": {" + - " \"projectName\": \"DFW\"" + + " \"projectName\": \"WATKINS\"" + " }," + " \"owningEntity\": {" + " \"owningEntityId\": \"3f592a6f-459b-435e-b0d4-59959ab1d385\"," + @@ -155,7 +156,7 @@ public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extend " \"platformName\": \"plat1\"" + " }," + " \"lineOfBusiness\": {" + - " \"lineOfBusinessName\": \"ECOMP\"" + + " \"lineOfBusinessName\": \"ONAP\"" + " }" + " }," + " \"instanceReferences\": {" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java index 69780d0aa..8524d92cd 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java @@ -1,13 +1,14 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static java.util.Collections.singletonList; - import com.google.common.collect.ImmutableMap; -import java.util.List; -import java.util.Map; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.springframework.http.HttpMethod; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.singletonList; + public class PresetMSOOrchestrationRequestsGetByRequestId extends BaseMSOPreset { @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java index 58686f26b..921776569 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java @@ -1,15 +1,26 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static java.util.Collections.singletonList; - import com.google.common.collect.ImmutableMap; -import java.util.List; -import java.util.Map; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.springframework.http.HttpMethod; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.singletonList; + public class PresetMSOOrchestrationRequestsGetByServiceInstanceId extends BaseMSOPreset { + private final String instanceId; + + public PresetMSOOrchestrationRequestsGetByServiceInstanceId() { + this.instanceId = "bc305d54-75b4-431b-adb2-eb6b9e546014"; + } + + public PresetMSOOrchestrationRequestsGetByServiceInstanceId(String instanceId) { + this.instanceId = instanceId; + } + @Override public HttpMethod getReqMethod() { return HttpMethod.GET; @@ -22,7 +33,7 @@ public class PresetMSOOrchestrationRequestsGetByServiceInstanceId extends BaseMS @Override public Map<String, List> getQueryParams() { - return ImmutableMap.of("filter", singletonList("serviceInstanceId:EQUALS:bc305d54-75b4-431b-adb2-eb6b9e546014")); + return ImmutableMap.of("filter", singletonList("serviceInstanceId:EQUALS:" + instanceId)); } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOResumeRequest.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOResumeRequest.java new file mode 100644 index 000000000..ca13f6ad7 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOResumeRequest.java @@ -0,0 +1,48 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; + +import java.util.Map; + +public class PresetMSOResumeRequest extends BaseMSOPreset { + + private final String originalRequestId; + private final String requestId; + private final String instanceId; + private final String userId; + + public PresetMSOResumeRequest(String originalRequestId, String requestId, String instanceId, String userId) { + this.originalRequestId = originalRequestId; + this.requestId = requestId; + this.instanceId = instanceId; + this.userId = userId; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public String getReqPath() { + return super.getRootPath() + "/orchestrationRequests/v./" + originalRequestId + "/resume"; + } + + @Override + public int getResponseCode() { + return 202; + } + + @Override + public Object getResponseBody() { + return "{\"requestReferences\":{\"instanceId\":\"" + instanceId + "\",\"requestId\":\"" + requestId + "\"}}"; + } + + @Override + public Map<String, String> getRequestHeaders() { + Map<String, String> map = super.getRequestHeaders(); + map.put("X-RequestorID", userId); + return map; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java index b851da2d2..793037dbf 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java @@ -1,13 +1,8 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME1; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME2; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VG_NAME; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME; - import java.util.Map; -import vid.automation.test.infra.Features; + +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.*; public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBaseCreateInstancePost { @@ -42,9 +37,6 @@ public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBas } protected String getVnfInstanceParams() { - if (!Features.FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF.isActive()) { - return ""; - } return " {" + " \"vmx_int_net_len\": \"24\"," + " \"vre_a_volume_size_0\": \"100\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMsoCreateMacroCommonPre1806.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMsoCreateMacroCommonPre1806.java new file mode 100644 index 000000000..8a1e37f45 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMsoCreateMacroCommonPre1806.java @@ -0,0 +1,151 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.apache.commons.lang3.StringUtils; + +public class PresetMsoCreateMacroCommonPre1806 extends PresetMSOBaseCreateInstancePost { + + private String modelInfo; + private String cloudConfiguration; + private String relatedInstanceList; + private String instanceName; + + private PresetMsoCreateMacroCommonPre1806(String requestId, String responseInstanceId, String instanceName, String modelInfo, String relatedInstanceList, String cloudConfiguration) { + super(requestId, responseInstanceId); + this.modelInfo = modelInfo; + this.cloudConfiguration = cloudConfiguration; + this.relatedInstanceList = relatedInstanceList; + this.instanceName = instanceName; + } + + public static PresetMsoCreateMacroCommonPre1806 ofTransportService(String requestId, String responseInstanceId) { + return new PresetMsoCreateMacroCommonPre1806(requestId, responseInstanceId, "", transportServiceModelInfo(), "", ""); + } + + public static PresetMsoCreateMacroCommonPre1806 ofCollectionResource(String requestId, String responseInstanceId) { + return new PresetMsoCreateMacroCommonPre1806( + requestId, + responseInstanceId, + "", + collectionResourceModelInfo(), + "", + hvf6CloudConfiguration()); + } + + public static PresetMsoCreateMacroCommonPre1806 ofServiceWithVRF(String requestId, String responseInstanceId, String instanceName) { + return new PresetMsoCreateMacroCommonPre1806( + requestId, + responseInstanceId, + instanceName, + "" + + " \"modelInfo\": { " + + " \"modelInvariantId\": \"dfc2c44c-2429-44ca-ae26-1e6dc1f207fb\", " + + " \"modelVersionId\": \"f028b2e2-7080-4b13-91b2-94944d4c42d8\", " + + " \"modelName\": \"infraVPN\", " + + " \"modelType\": \"service\", " + + " \"modelVersion\": \"1.0\" " + + " }, ", + "" + + ", " + + " \"relatedInstanceList\": [{ " + + " \"relatedInstance\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"vpnBinding\" " + + " }, " + + " \"instanceId\": \"120d39fb-3627-473d-913c-d228dd0f8e5b\", " + + " \"instanceName\": \"LPPVPN\" " + + " } " + + " }, { " + + " \"relatedInstance\": { " + + " \"modelInfo\": { " + + " \"modelCustomizationId\": \"10a74149-c9d7-4918-bbcf-d5fb9b1799ce\", " + + " \"modelInvariantId\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", " + + " \"modelVersionId\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", " + + " \"modelType\": \"network\" " + + " }, " + + " \"instanceId\": \"10a74149-c9d7-4918-bbcf-d5fb9b1799ce\", " + + " \"instanceName\": \"AUK51a_oam_calea_net_2\" " + + " } " + + " } " + + " ] ", + hvf6CloudConfiguration()); + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances"; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + modelInfo + + " \"owningEntity\": {" + + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\"," + + " \"owningEntityName\": \"WayneHolland\"" + + " }," + + " \"subscriberInfo\": {" + + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"subscriberName\": \"SILVIA ROBBINS\"" + + " }," + + " \"project\": {" + + " \"projectName\": \"WATKINS\"" + + " }," + + " \"requestParameters\": {" + + " \"subscriptionServiceType\": \"TYLER SILVIA\"," + + " \"aLaCarte\": false," + + " \"userParams\": []" + + " }," + + " \"requestInfo\": {" + + (StringUtils.isEmpty(instanceName) ? "" : "\"instanceName\": \"" + instanceName + "\",") + + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"us16807000\"" + + " }" + + relatedInstanceList + + cloudConfiguration + + " }" + + "}"; + } + + private String addModelInfo() { + return modelInfo; + } + + private static String transportServiceModelInfo() { + return " \"modelInfo\": {" + + " \"modelInvariantId\": \"561faa57-7bbb-40ec-a81c-c0d4133e98d4\"," + + " \"modelVersionId\": \"12550cd7-7708-4f53-a09e-41d3d6327ebc\"," + + " \"modelName\": \"AIM Transport SVC_ym161f\"," + + " \"modelType\": \"service\"," + + " \"modelVersion\": \"1.0\"" + + " },"; + } + + private static String hvf6CloudConfiguration() { + return + ","+ + "\"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"hvf6\"," + + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\"," + + " \"cloudOwner\": \"irma-aic\"" + + " }"; + } + + private static String collectionResourceModelInfo() { + return + "\"modelInfo\": {" + + " \"modelInvariantId\": \"04bdd793-32ed-4045-adea-4e096304a067\"," + + " \"modelVersionId\": \"abd0cb02-5f97-42cd-be93-7dd3e31a6a64\"," + + " \"modelName\": \"CR_sanity\"," + + " \"modelType\": \"service\"," + + " \"modelVersion\": \"1.0\"" + + " },"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java index bba0f20d8..2a7e262a4 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java @@ -63,7 +63,7 @@ public class PresetMSOCreateConfiguration extends PresetMSOBaseCreateInstancePos " }," + " \"cloudConfiguration\": {" + addCloudOwnerIfNeeded() + - " \"lcpCloudRegionId\": \"JANET25\"" + + " \"lcpCloudRegionId\": \"AAIAIC25\"" + " }," + " \"requestInfo\": {" + " \"instanceName\": \"dummy_instance\"," + diff --git a/vid-automation/src/main/java/org/onap/vid/api/AsyncInstantiationBase.java b/vid-automation/src/main/java/org/onap/vid/api/AsyncInstantiationBase.java index 2a6b012fe..66bde727e 100644 --- a/vid-automation/src/main/java/org/onap/vid/api/AsyncInstantiationBase.java +++ b/vid-automation/src/main/java/org/onap/vid/api/AsyncInstantiationBase.java @@ -1,34 +1,8 @@ package org.onap.vid.api; -import static java.lang.Boolean.FALSE; -import static java.lang.Boolean.TRUE; -import static java.util.Collections.emptyList; -import static java.util.stream.Collectors.joining; -import static java.util.stream.Collectors.toMap; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.containsInAnyOrder; -import static org.hamcrest.Matchers.hasSize; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys; -import static org.testng.Assert.assertNotNull; -import static org.testng.AssertJUnit.assertEquals; -import static org.testng.AssertJUnit.assertTrue; -import static vid.automation.test.utils.ExtendedHamcrestMatcher.hasItemsFromCollection; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.Uninterruptibles; -import java.time.Instant; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Predicate; -import java.util.stream.Collectors; -import java.util.stream.IntStream; -import java.util.stream.Stream; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -64,6 +38,33 @@ import vid.automation.test.model.ServiceAction; import vid.automation.test.services.AsyncJobsService; import vid.automation.test.services.SimulatorApi; +import java.time.Instant; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import java.util.stream.Stream; + +import static java.lang.Boolean.FALSE; +import static java.lang.Boolean.TRUE; +import static java.util.Collections.emptyList; +import static java.util.stream.Collectors.joining; +import static java.util.stream.Collectors.toMap; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +import static org.hamcrest.Matchers.hasSize; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys; +import static org.testng.Assert.assertNotNull; +import static org.testng.AssertJUnit.assertEquals; +import static org.testng.AssertJUnit.assertTrue; +import static vid.automation.test.utils.ExtendedHamcrestMatcher.hasItemsFromCollection; + public class AsyncInstantiationBase extends BaseMsoApiTest { public static final String CREATE_BULK_OF_ALACARTE_REQUEST_WITH_VNF = "asyncInstantiation/vidRequestCreateALaCarteWithVnf.json"; @@ -408,10 +409,12 @@ public class AsyncInstantiationBase extends BaseMsoApiTest { } protected void assertExpectedStatusAndServiceInfo(JobStatus finalState, String jobId, ServiceInfo expectedServiceInfo) { - assertExpectedStatusAndServiceInfo(finalState, jobId, false, expectedServiceInfo); + assertExpectedStatusAndServiceInfo(finalState, jobId, PATIENCE_LEVEL.FAIL_FAST, expectedServiceInfo); } - protected void assertExpectedStatusAndServiceInfo(JobStatus finalState, String jobId, boolean longWait, ServiceInfo expectedServiceInfo) { + enum PATIENCE_LEVEL { FAIL_FAST, FAIL_SLOW, FAIL_VERY_SLOW } + + protected void assertExpectedStatusAndServiceInfo(JobStatus finalState, String jobId, PATIENCE_LEVEL patienceLevel, ServiceInfo expectedServiceInfo) { JobInfoChecker<Integer> jobInfoChecker = new JobInfoChecker<>( restTemplate, ImmutableSet.of(JobStatus.PENDING, JobStatus.IN_PROGRESS, finalState), jobId, expectedServiceInfo); boolean result = jobInfoChecker.test(null); @@ -421,10 +424,21 @@ public class AsyncInstantiationBase extends BaseMsoApiTest { if (ImmutableList.of(JobStatus.COMPLETED, JobStatus.PAUSE).contains(finalState) && expectedServiceInfo.serviceInstanceId==null) { expectedServiceInfo.serviceInstanceId = BaseMSOPreset.DEFAULT_INSTANCE_ID; } - result = Wait.waitFor(jobInfoChecker, null, 30, longWait ? 2 : 1); + result = Wait.waitFor(jobInfoChecker, null, 30, waitIntervalBy(patienceLevel)); assertTrue("service info of jobId: " + jobId + " was in status: " + jobInfoChecker.lastStatus, result); } + private int waitIntervalBy(PATIENCE_LEVEL patienceLevel) { + switch (patienceLevel) { + case FAIL_SLOW: + return 2; + case FAIL_VERY_SLOW: + return 3; + default: + return 1; + } + } + protected List<String> createBulkOfMacroInstances(ImmutableList<BasePreset> presets, boolean isPause, int bulkSize, Map<Keys, String> names) { SimulatorApi.registerExpectationFromPresets(presets, SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); return createBulkOfInstances(isPause, bulkSize, names, CREATE_BULK_OF_MACRO_REQUEST); diff --git a/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java b/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java index 5b7b1b214..7ce29446c 100644 --- a/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java +++ b/vid-automation/src/main/java/org/onap/vid/api/BaseApiTest.java @@ -8,6 +8,7 @@ import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.not; +//import com.automation.common.report_portal_integration.listeners.ReportPortalListener; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; @@ -33,10 +34,12 @@ import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.HttpStatusCodeException; import org.springframework.web.client.RestTemplate; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Listeners; import vid.automation.test.infra.FeaturesTogglingConfiguration; import vid.automation.test.services.UsersService; import vid.automation.test.utils.CookieAndJsonHttpHeadersInterceptor; +//@Listeners(ReportPortalListener.class) public class BaseApiTest { protected static final Logger LOGGER = LogManager.getLogger(BaseApiTest.class); @@ -63,7 +66,7 @@ public class BaseApiTest { } private URI getUri() { - String host = System.getProperty("VID_HOST", "10.0.0.10"); + String host = System.getProperty("VID_HOST", "127.0.0.1"); int port = Integer.valueOf(System.getProperty("VID_PORT", "8080")); return new JerseyUriBuilder().host(host).port(port).scheme("http").path("vid").build(); } diff --git a/vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java b/vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java index 175638008..caece3217 100644 --- a/vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java +++ b/vid-automation/src/main/java/org/onap/vid/api/BaseMsoApiTest.java @@ -1,5 +1,6 @@ package org.onap.vid.api; +//import com.automation.common.report_portal_integration.annotations.Step; import com.google.common.collect.ImmutableMap; import org.json.JSONException; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; @@ -82,6 +83,7 @@ public class BaseMsoApiTest extends BaseApiTest { } } + //@Step(description = "method: ${method}, uri: ${uri}, body: ${body}") protected MsoResponseWrapper2 callMsoForResponseWrapper(HttpMethod method, String uri, String body) { MsoResponseWrapper2 responseWrapper; switch (method) { 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 3df26f6ab..e3eeaca54 100644 --- a/vid-automation/src/main/java/vid/automation/test/Constants.java +++ b/vid-automation/src/main/java/vid/automation/test/Constants.java @@ -50,8 +50,8 @@ public class Constants { public static final String SERVICE_INSTANCEID_TH_ID = "service-instanceId-th-id"; public static final String MULTI_SELECT_UNSELECTED_CLASS = "item-unselected"; public static final String MULTI_SELECT_SELECTED_CLASS = "item-selected"; - public static final String ACTIVE = "Active"; - public static final String INACTIVE = "Inactive"; + public static final String ACTIVE = "ACTIVE"; + public static final String INACTIVE = "INACTIVE"; public static final String MSO_COMMIT_DIALOG_CLOSE_BUTTON = "msoCommitDialogCloseButton"; public static final String REQUIRED = "is required"; public static final String MISSING_DATA = "Missing data (\"%s\")"; @@ -182,6 +182,7 @@ public class Constants { public static final String STATUS_TEXT = "Designing a new service"; public static final String CONTEXT_MENU_BUTTON_HEADER = "openMenuBtn"; public static final String CONTEXT_MENU_HEADER_EDIT_ITEM = "context-menu-header-edit-item"; + public static final String CONTEXT_MENU_HEADER_RESUME_ITEM = "context-menu-header-resume-item"; 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"; @@ -241,6 +242,7 @@ public class Constants { public static final String ECOMP_NAME_INPUT = "ecomp-instance-name"; public static final String TENANT_CONTEXT_INPUT = "tenant-context"; public static final String ENVIRONMENT_TYPE_DROP_DOWN = "operational-environment-type"; + public static final String ENVIRONMENT_RELEASE = "operational-release"; public static final String WORKLOAD_CONTEXT_DROP_DOWN = "workload-context"; public static final String SUBMIT_BUTTON = "submit-button"; public static final String CANCEL_BUTTON = "cancel-button"; @@ -248,10 +250,12 @@ public class Constants { public static final String POPUP_ERROR_MESSAGE = "test-new-environment-error"; public static final String environmentCreatedSuccesfullyMessage = "Operational Environment successfully created"; + // json content public static final String HEADERS_LIST = "headers"; public static final String BASIC_LIST = "basicList"; public static final String FULL_LIST = "fullList"; + public static final String FULL_LIST_WITHOUT_RELEASE_LABEL = "fullListWithoutReleaseLabel"; public static final String FILTERED_LIST = "filteredList"; public static final String SORTED_LIST = "sortedList"; @@ -323,6 +327,7 @@ public class Constants { public class CreateNewInstance { public static final String SUBSCRIBER_NAME_OPTION_CLASS = "subscriberNameOption"; public static final String SERVICE_TYPE_OPTION_CLASS = "serviceTypeOption"; + public static final String OWNING_ENTITY_OPTION = "owningEntityOption"; public static final String SELECTED_SUBSCRIBER_NAME_TEST_ID = "selectedSubscriberName"; public static final String SELECTED_SERVICE_TYPE_NAME_TEST_ID = "selectedServiceTypeName"; public static final String SERVICE_INSTANCE_NAME_PREFIX = "vid-e2e-test_aai_service_"; @@ -403,6 +408,7 @@ public class Constants { public static final String SUBDETAILS_ERROR_MESSAGE_TEST_ID = "subDetailsErrMsg"; public static final String ERROR_CLASS = "error"; + public static final String COMMON_PORT_MIRRORING_PORT_NAME = "i am a port"; } public class PnfAssociation { public static final String PNF_NAME_TEST_ID = "pnfName"; 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 0b5f40b84..ec469d13a 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,5 +1,8 @@ package vid.automation.test.infra; +import static org.onap.sdc.ci.tests.utilities.GeneralUIUtils.getDriver; + +import java.util.List; import org.junit.Assert; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.Alert; @@ -8,10 +11,6 @@ import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.Select; 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); @@ -33,6 +32,11 @@ public class Click { clickWhenClickable(element); } + public static void byTestIdOnceItsAvailable(String testId, int timeout) { + GeneralUIUtils.clickElementUsingActions( + Get.byXpath("//*[@data-tests-id='" + testId + "']", timeout)); + } + public static void byClass(String className) { List<WebElement> elements = Get.byClass(className); Assert.assertTrue(elements != null && elements.size() > 0); 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 cd632ff12..005c06551 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,17 +7,12 @@ public enum Features implements Feature { CREATE_INSTANCE_TEST, EMPTY_DRAWING_BOARD_TEST, - FLAG_ASYNC_JOBS, FLAG_ADD_MSO_TESTAPI_FIELD, - FLAG_ASYNC_INSTANTIATION, - FLAG_UNASSIGN_SERVICE, FLAG_SERVICE_MODEL_CACHE, FLAG_NETWORK_TO_ASYNC_INSTANTIATION, - FLAG_COLLECTION_RESOURCE_SUPPORT, FLAG_SHOW_ASSIGNMENTS, FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS, FLAG_SHOW_VERIFY_SERVICE, - FLAG_DUPLICATE_VNF, FLAG_DEFAULT_VNF, FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD, FLAG_RESTRICTED_SELECT, @@ -27,7 +22,6 @@ public enum Features implements Feature { 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, @@ -40,6 +34,12 @@ public enum Features implements Feature { FLAG_VF_MODULE_RESUME_STATUS_CREATE, FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL, FLAG_1906_INSTANTIATION_API_USER_VALIDATION, + FLAG_1908_TRANSPORT_SERVICE_NEW_INSTANTIATION_UI, + FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI, + FLAG_1908_INFRASTRUCTURE_VPN, + FLAG_1908_RESUME_MACRO_SERVICE, + FLAG_1908_RELEASE_TENANT_ISOLATION, + FLAG_1908_VNF_FC_NEW_INSTANTIATION_UI, ; public boolean isActive() { 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 index 1284a8b42..59e48013c 100644 --- a/vid-automation/src/main/java/vid/automation/test/infra/ModelInfo.java +++ b/vid-automation/src/main/java/vid/automation/test/infra/ModelInfo.java @@ -51,12 +51,15 @@ public class ModelInfo { 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 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 ModelInfo infrastructureVpnService = new ModelInfo("f028b2e2-7080-4b13-91b2-94944d4c42d8", "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", "service-Infravpn-csar.zip"); + public static final ModelInfo collectionResourceService = new ModelInfo("abd0cb02-5f97-42cd-be93-7dd3e31a6a64", "04bdd793-32ed-4045-adea-4e096304a067", "csar_collection_resource.zip"); + public static final ModelInfo collectionResourceForResume = new ModelInfo("6e0bec91-09f3-43aa-9cf3-e617cd0146be", "f6342be5-d66b-4d03-a1aa-c82c3094c4ea", "csar_collection_resource_for_resume.zip"); + public static final ModelInfo transportWithPnfsService = new ModelInfo("12550cd7-7708-4f53-a09e-41d3d6327ebc", "561faa57-7bbb-40ec-a81c-c0d4133e98d4", "csarTransportWithPnfs.zip"); public static final ImmutableList<ModelInfo> superSetOfModelInfos = buildModelInfos(); public static ImmutableList<ModelInfo> buildModelInfos() { @@ -70,10 +73,14 @@ public class ModelInfo { .add(macroSriovWithDynamicFieldsEcompNamingFalsePartialModelDetailsVnfEcompNamingFalse) .add(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse) .add(aLaCarteNetworkProvider5G) - .add(PASQUALEVmxVpeBvService488Annotations) + .add(pasqualeVmxVpeBvService488Annotations) .add(macroDrawingBoardComplexService) .add(aLaCarteServiceCreationTest) .add(aLaCarteVnfGroupingService) + .add(infrastructureVpnService) + .add(transportWithPnfsService) + .add(collectionResourceService) + .add(collectionResourceForResume) .build(); } } diff --git a/vid-automation/src/main/java/vid/automation/test/model/Environment.java b/vid-automation/src/main/java/vid/automation/test/model/Environment.java index 9304dd998..a5df54a64 100644 --- a/vid-automation/src/main/java/vid/automation/test/model/Environment.java +++ b/vid-automation/src/main/java/vid/automation/test/model/Environment.java @@ -8,4 +8,5 @@ public class Environment { public String EcompEnvironmentName; public String tenantContext; public String workloadContext; + public String release; } 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 index a155c6c72..9a86d9144 100644 --- a/vid-automation/src/main/java/vid/automation/test/model/ServiceAction.java +++ b/vid-automation/src/main/java/vid/automation/test/model/ServiceAction.java @@ -3,5 +3,6 @@ package vid.automation.test.model; public enum ServiceAction { INSTANTIATE, DELETE, - UPDATE + UPDATE, + RESUME }
\ No newline at end of file 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 4b837a0ac..6f6b9f57d 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,8 +1,6 @@ package vid.automation.test.sections; -import org.junit.Assert; 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 68e673b68..11f570211 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 @@ -2,7 +2,6 @@ package vid.automation.test.sections; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import vid.automation.test.Constants; -import vid.automation.test.model.Service; /** * Created by itzikliderman on 13/06/2017. 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 acbb4d991..22e8136cf 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,34 @@ package vid.automation.test.sections; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.collection.IsEmptyCollection.empty; +import static org.testng.AssertJUnit.assertTrue; +import static vid.automation.test.Constants.DrawingBoard.DEPLOY_BUTTON; +import static vid.automation.test.Constants.DrawingBoard.HIGHLIGHTED_COLOR; +import static vid.automation.test.Constants.DrawingBoard.QUANTITY_LABEL_TEST_ID; +import static vid.automation.test.Constants.DrawingBoard.QUANTITY_LABEL_VALUE; +import static vid.automation.test.Constants.DrawingBoard.SERVICE_INSTANCE_TEST_ID; +import static vid.automation.test.Constants.DrawingBoard.SERVICE_INSTANCE_VALUE; +import static vid.automation.test.Constants.DrawingBoard.SERVICE_NAME; +import static vid.automation.test.Constants.DrawingBoard.SERVICE_QUANTITY; +import static vid.automation.test.Constants.DrawingBoard.SERVICE_STATUS; +import static vid.automation.test.Constants.DrawingBoard.STATUS_TEXT; + import com.google.common.collect.ImmutableList; import com.google.common.collect.Sets; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.By; import org.openqa.selenium.JavascriptExecutor; @@ -12,20 +39,12 @@ 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.util.*; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.stream.Collectors; - -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.collection.IsEmptyCollection.empty; -import static vid.automation.test.Constants.DrawingBoard.*; +import vid.automation.test.test.NewServiceInstanceTest; public class DrawingBoardPage extends VidBasePage { + private static final Logger logger = LogManager.getLogger(DrawingBoardPage.class); + public DrawingBoardPage(){ super(); } @@ -219,7 +238,7 @@ public class DrawingBoardPage extends VidBasePage { assertThat(webElement.getText(), is("Missing required information. Please open and fill in the details.")); } - public void clickDeployButton(){ + private void clickDeployButton(){ GeneralUIUtils.ultimateWait(); try { @@ -233,6 +252,22 @@ public class DrawingBoardPage extends VidBasePage { } + public void deploy() { + try { + logger.info("Redux state before deploy:"); + logger.info(getReduxState()); + } + catch (Exception e) { + //do nothing just logging + } + clickDeployButton(); + + VidBasePage.goOutFromIframe(); + GeneralUIUtils.ultimateWait(); + VidBasePage.goToIframe(); + GeneralUIUtils.ultimateWait(); + } + public void checkDeployButtonDisabled(){ Assert.assertFalse(Get.byTestId(DEPLOY_BUTTON).isEnabled(),"Deploy button is enabled and should be disabled"); } @@ -256,22 +291,22 @@ public class DrawingBoardPage extends VidBasePage { } public static class ServiceStatusChecker implements Predicate<Boolean> { - private String actualInstanceName; + private String uniqueText; private Set<String> expectedStatuses; private Set<String> columnClassesSet; - public ServiceStatusChecker(String actualInstanceName, Set<String> expectedStatuses) { - this.actualInstanceName = actualInstanceName; + public ServiceStatusChecker(String uniqueText, Set<String> expectedStatuses) { + this.uniqueText = uniqueText; this.expectedStatuses = expectedStatuses; } @Override public boolean test(Boolean noMeaning) { InstantiationStatusPage.clickRefreshButton(); - final WebElement row = InstantiationStatusPage.getInstantiationStatusRow(actualInstanceName); + final WebElement row = InstantiationStatusPage.getInstantiationStatusRow(uniqueText); if (row == null) { - System.err.println("**********************" + actualInstanceName + "************************************************"); - columnClassesSet = Collections.singleton(actualInstanceName + " NOT FOUND"); + System.err.println("**********************" + uniqueText + "************************************************"); + columnClassesSet = Collections.singleton(uniqueText + " NOT FOUND"); return false; // treat missing row as if test condition not fulfilled } else { columnClassesSet = new HashSet<>(Arrays.asList( @@ -284,4 +319,13 @@ public class DrawingBoardPage extends VidBasePage { return columnClassesSet; } } + + public void verifyServiceCompletedOnTime(String uniqueStatusText, String nameToDisplay) { + DrawingBoardPage.ServiceStatusChecker serviceStatusChecker = + new DrawingBoardPage.ServiceStatusChecker(uniqueStatusText, Collections.singleton(NewServiceInstanceTest.COMPLETED)); + boolean statusIsShown = Wait.waitFor(serviceStatusChecker, null, 20, 2); + assertTrue(nameToDisplay + " wasn't completed in time", statusIsShown); + VidBasePage.goOutFromIframe(); + } + } 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 2efb9f3c8..e56603f90 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,8 +1,6 @@ package vid.automation.test.sections; -import org.junit.Assert; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; -import org.openqa.selenium.WebElement; import vid.automation.test.Constants; public class PnfSearchAssociationPage extends VidBasePage { 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 82f45ce7f..b96a7d38d 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 @@ -4,6 +4,7 @@ import org.junit.Assert; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import vid.automation.test.Constants; +import vid.automation.test.Constants.ViewEdit; import vid.automation.test.infra.SelectOption; import static org.hamcrest.core.Is.is; @@ -40,18 +41,34 @@ public class ServiceProxyPage extends VidBasePage { } public ServiceProxyPage clickDeleteConfigurationButton() { - GeneralUIUtils.clickOnElementByTestId(Constants.DELETE_CONFIGURATION_BUTTON, 60); + GeneralUIUtils.clickOnElementByTestId(deleteConfigurationButtonTestId(), 60); return this; } + private String configurationInstanceName() { + return "dummy_instance"; + } + + private String deleteConfigurationButtonTestId() { + return Constants.DELETE_CONFIGURATION_BUTTON + "-" + configurationInstanceName(); + } + + private String activateDeactivateButtonTestId() { + return Constants.ACTIVATE_DEACTIVATE_BUTTON + "-" + configurationInstanceName(); + } + + private String enableDisableButtonTestId(String portName) { + return Constants.ENABLE_DISABLE_BUTTON + "-" + configurationInstanceName() + "-" + portName; + } + public ServiceProxyPage assertDeleteConfigurationButtonExists(boolean shouldExist){ if (shouldExist) { - WebElement selectedV = GeneralUIUtils.getWebElementByTestID(Constants.DELETE_CONFIGURATION_BUTTON, 3); + WebElement selectedV = GeneralUIUtils.getWebElementByTestID(deleteConfigurationButtonTestId(), 3); Assert.assertThat(selectedV != null, is(shouldExist)); Assert.assertThat(selectedV.isDisplayed(), is(shouldExist)); } else { - boolean webElementExistByTestId = GeneralUIUtils.isWebElementExistByTestId(Constants.DELETE_CONFIGURATION_BUTTON); + boolean webElementExistByTestId = GeneralUIUtils.isWebElementExistByTestId(deleteConfigurationButtonTestId()); Assert.assertThat(webElementExistByTestId, is(shouldExist)); } return this; @@ -86,12 +103,12 @@ public class ServiceProxyPage extends VidBasePage { } public ServiceProxyPage clickActivateDeactivateButton() { - GeneralUIUtils.clickOnElementByTestId(Constants.ACTIVATE_DEACTIVATE_BUTTON, 60); + GeneralUIUtils.clickOnElementByTestId(activateDeactivateButtonTestId(), 60); return this; } public ServiceProxyPage clickEnableDisableButton(){ - GeneralUIUtils.clickOnElementByTestId(Constants.ENABLE_DISABLE_BUTTON, 60); + GeneralUIUtils.clickOnElementByTestId(enableDisableButtonTestId(ViewEdit.COMMON_PORT_MIRRORING_PORT_NAME), 60); return this; } } 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 71c6e0bd4..5989fb658 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,14 +1,10 @@ package vid.automation.test.sections; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; -import org.openqa.selenium.By; import org.openqa.selenium.WebElement; -import org.testng.Assert; import vid.automation.test.Constants; -import vid.automation.test.infra.Click; import vid.automation.test.infra.Get; - -import java.util.List; +import vid.automation.test.infra.SelectOption; import static org.junit.Assert.assertEquals; @@ -36,4 +32,11 @@ public class TestEnvironmentPage extends VidBasePage { WebElement webElement = Get.byId(Constants.TestEnvironments.attachButtonIdPrefix + envId); return webElement; } + + public static String selectEnvRelease(String envRelease){ + GeneralUIUtils.ultimateWait(); + String selectedOption; + selectedOption = SelectOption.getSelectedOption(Constants.TestEnvironments.ENVIRONMENT_RELEASE); + return selectedOption; + } } 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 f749df02b..65d0fb6a0 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,33 +1,33 @@ package vid.automation.test.sections; -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; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.function.Function; 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.JavascriptExecutor; 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; +import vid.automation.test.Constants.ViewEdit; +import vid.automation.test.infra.*; + +import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import java.util.function.Function; + +import static java.util.stream.Collectors.toMap; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.onap.sdc.ci.tests.utilities.GeneralUIUtils.getDriver; +import static org.testng.Assert.assertEquals; public class VidBasePage { @@ -192,6 +192,12 @@ public class VidBasePage { return this; } + public VidBasePage selectLineOfBusiness(String lineOfBusines) { + GeneralUIUtils.ultimateWait(); + SelectOption.byValue(lineOfBusines, Constants.ViewEdit.LINE_OF_BUSINESS_SELECT_TESTS_ID); + return this; + } + public VidBasePage selectTenant(String tenant) { GeneralUIUtils.ultimateWait(); SelectOption.byValue(tenant, Constants.ViewEdit.TENANT_SELECT_TESTS_ID); @@ -213,10 +219,6 @@ public class VidBasePage { return this; } - public VidBasePage selectLineOfBusiness(String lob) { - SelectOption.byValue(lob, Constants.OwningEntity.LOB_SELECT_TEST_ID); - return this; - } public void assertButtonState(String dataTestId, boolean shouldBeEnabled) { assertButtonStateInternal(dataTestId, shouldBeEnabled, @@ -312,7 +314,7 @@ public class VidBasePage { if (checkPortMirroring) { Wait.byText("Add node instance"); - Wait.byText("i'm a port"); + Wait.byText(ViewEdit.COMMON_PORT_MIRRORING_PORT_NAME); } if (checkAddVnf) { @@ -334,5 +336,19 @@ public class VidBasePage { return new WebDriverWait(getDriver(), (long)time); } + public 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 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); + } } 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 e10c872ee..4edabf53d 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 @@ -76,6 +76,11 @@ public class ViewEditPage extends VidBasePage { return this; } + public ViewEditPage selectLineOfBusiness(String lineOfBusiness, String cloudOwner){ + selectLineOfBusiness(lineOfBusiness); + return this; + } + public ViewEditPage setLegacyRegion(String legacyRegionName){ setInputText(Constants.ViewEdit.LEGACY_REGION_INPUT_TESTS_ID, legacyRegionName); return this; @@ -126,16 +131,16 @@ public class ViewEditPage extends VidBasePage { return this; } - public ViewEditPage selectLineOfBusiness(String lineOfBusiness) { - try { - SelectOption.selectFirstTwoOptionsFromMultiselectById(Constants.ViewEdit.LINE_OF_BUSINESS_SELECT_TESTS_ID); - } catch (InterruptedException e) { - e.printStackTrace(); - return this; - } - //TODO multi SelectOption.byValue(lineOfBusiness, Constants.ViewEdit.LINE_OF_BUSINESS_SELECT_TESTS_ID); - return this; - } +// public ViewEditPage selectLineOfBusiness(String lineOfBusiness) { +// try { +// SelectOption.selectFirstTwoOptionsFromMultiselectById(Constants.ViewEdit.LINE_OF_BUSINESS_SELECT_TESTS_ID); +// } catch (InterruptedException e) { +// e.printStackTrace(); +// return this; +// } +// //TODO multi SelectOption.byValue(lineOfBusiness, Constants.ViewEdit.LINE_OF_BUSINESS_SELECT_TESTS_ID); +// return this; +// } public ViewEditPage selectPlatform(String platform) { SelectOption.byValue(platform, Constants.OwningEntity.PLATFORM_SELECT_TEST_ID); 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 0f0839537..2d04af9cb 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,35 +1,9 @@ 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.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; -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.aai.*; +import org.onap.simulator.presetGenerator.presets.mso.*; 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; @@ -37,6 +11,12 @@ import org.onap.simulator.presetGenerator.presets.mso.configuration.PresetMsoEna import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; import vid.automation.test.Constants; +import vid.automation.test.Constants.ViewEdit; + +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE; +import static vid.automation.test.infra.ModelInfo.serviceFabricSriovService; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; public class BulkRegistration { @@ -74,7 +54,7 @@ public class BulkRegistration { new PresetSDCGetServiceToscaModelGet(serviceFabricSriovService), new PresetAAIGetNetworkZones(), new PresetMSOActivateFabricConfiguration("c187e9fe-40c3-4862-b73e-84ff056205f61234"), - new PresetMSOOrchestrationRequestGet("COMPLETE", "318cc766-b673-4a50-b9c5-471f68914584", "Success")), + new PresetMSOOrchestrationRequestGet(COMPLETE, "318cc766-b673-4a50-b9c5-471f68914584", "Success", false)), SimulatorApi.RegistrationStrategy.APPEND); } @@ -137,11 +117,14 @@ public class BulkRegistration { public static void searchExistingServiceInstancePortMirroring(String orchStatus, boolean isMirrored, String desiredCloudRegionId) { genericSearchExistingServiceInstance(); final String configurationId = "9533-config-LB1113"; + final String configurationId2 = "9533-config-LB1114"; final String portInterfaceId = "d35bf534-7d8e-4cb4-87f9-0a8bb6cd47b2"; final String modelToReplaceWith ="pm1111_equip_model_rename.zip"; SimulatorApi.registerExpectationFromPreset(new PresetAAICloudRegionAndSourceFromConfigurationPut(configurationId, desiredCloudRegionId), APPEND); - SimulatorApi.registerExpectationFromPreset(new PresetAAIGetPortMirroringSourcePorts(configurationId, portInterfaceId, "i'm a port", isMirrored), APPEND); + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetPortMirroringSourcePorts(configurationId, portInterfaceId, ViewEdit.COMMON_PORT_MIRRORING_PORT_NAME, isMirrored), APPEND); + SimulatorApi.registerExpectationFromPreset(new PresetAAICloudRegionAndSourceFromConfigurationPut(configurationId2, desiredCloudRegionId), APPEND); + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetPortMirroringSourcePorts(configurationId2, portInterfaceId, "i'm not your port", isMirrored), APPEND); SimulatorApi.registerExpectationFromPreset(PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC, APPEND); SimulatorApi.registerExpectation( new String [] { @@ -284,7 +267,7 @@ public class BulkRegistration { SimulatorApi.registerExpectationFromPresets(ImmutableList.of( createInstancePreset, cloudOwnerPreset, - new PresetMSOOrchestrationRequestGet(PresetMSOOrchestrationRequestGet.COMPLETE, createInstancePreset.getRequestId(), "Success")), + new PresetMSOOrchestrationRequestGet(COMPLETE, createInstancePreset.getRequestId(), "Success", false)), SimulatorApi.RegistrationStrategy.APPEND); } @@ -423,7 +406,11 @@ public class BulkRegistration { 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)), + new PresetMSOOrchestrationRequestGet( + COMPLETE, + "c0011670-0e1a-4b74-945d-8bf5aede1d9c", + Constants.ViewEdit.VF_MODULE_CREATED_SUCCESSFULLY_TEXT, + false)), SimulatorApi.RegistrationStrategy.APPEND); } @@ -434,7 +421,11 @@ public class BulkRegistration { new PresetAAIGetTenants(), 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)), + new PresetMSOOrchestrationRequestGet( + COMPLETE, + "c0011670-0e1a-4b74-945d-8bf5aede1d9c", + Constants.ViewEdit.VF_MODULE_CREATED_SUCCESSFULLY_TEXT, + false)), SimulatorApi.RegistrationStrategy.APPEND); } 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 65ef3679c..087449624 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,26 +1,8 @@ package vid.automation.test.services; -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 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 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; @@ -32,6 +14,25 @@ import org.slf4j.LoggerFactory; import org.springframework.http.HttpStatus; import vid.automation.test.utils.ReadFile; +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.Function; +import java.util.function.UnaryOperator; +import java.util.stream.Collectors; + +import static org.testng.Assert.assertEquals; +import static vid.automation.test.services.DropTestApiField.dropFieldCloudOwnerFromString; +import static vid.automation.test.services.DropTestApiField.dropTestApiFieldFromString; + public class SimulatorApi { public enum RegistrationStrategy { @@ -62,7 +63,7 @@ public class SimulatorApi { ImmutableList.of(dropTestApiFieldFromString(), dropFieldCloudOwnerFromString()); static { - String host = System.getProperty("VID_HOST", "10.0.0.10" ); + String host = System.getProperty("VID_HOST", "127.0.0.1" ); 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(); @@ -116,6 +117,12 @@ public class SimulatorApi { registerToSimulatorAndAssertSuccess(preset.getClass().getCanonicalName(), content, registrationStrategy); } + public static void registerExpectationFromPresetsCollections(Collection<Collection<BasePreset>> presets, RegistrationStrategy registrationStrategy) { + registerExpectationFromPresets(presets.stream() + .flatMap(Collection::stream) + .collect(Collectors.toList()), registrationStrategy); + } + public static void registerExpectationFromPresets(Collection<BasePreset> presets, RegistrationStrategy registrationStrategy) { if (registrationStrategy == RegistrationStrategy.CLEAR_THEN_SET) { clearRegistrations(); 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 aae7917f7..84345ebd1 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,10 +1,13 @@ package vid.automation.test.services; -import static org.hamcrest.CoreMatchers.everyItem; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.greaterThan; - +//import com.automation.common.report_portal_integration.annotations.Step; 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 java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; @@ -13,11 +16,10 @@ import java.util.HashMap; import java.util.LinkedList; import java.util.List; import java.util.ListIterator; -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; /** * Created by itzikliderman on 08/09/2017. @@ -36,6 +38,7 @@ public class UsersService { return usersObject.users; } + //@Step("${method} with id: ${userId}") public User getUser(String userId) { User res = users.get(userId); System.out.println("getUser userId='" + userId + "' returned: " + res); @@ -52,7 +55,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 emanuel. + and two leading letters from the userId itself; e.g. "em97331000" 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). @@ -79,7 +82,6 @@ public class UsersService { "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"); ListIterator<String> iter = roles.listIterator(); while (iter.hasNext()) { 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 69c619b2a..63fe15000 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,33 +1,21 @@ 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.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.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; 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.Get; -import vid.automation.test.infra.SelectOption; import vid.automation.test.model.ServiceModel; import vid.automation.test.model.User; import vid.automation.test.sections.SideMenu; @@ -36,6 +24,12 @@ import vid.automation.test.sections.ViewEditPage; import vid.automation.test.services.ServicesService; import vid.automation.test.services.SimulatorApi; +import java.util.List; +import java.util.stream.Collectors; + +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.*; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; + public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { static final String SUBSCRIBER = "Emanuel"; @@ -49,7 +43,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { 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 = "JANET25"; + public static final String AAIAIC_25 = "AAIAIC25"; public static final String AIC = "AIC"; public static final String TENANT = "092eb9e8e4b7412e8787dd091bc58e86"; public static final String FALSE = "false"; @@ -100,7 +94,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { GeneralUIUtils.ultimateWait(); goToInstance(); ServiceModel serviceInstance = new ServicesService().getServiceModel(MODEL_UUID); - addVFModule("Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8", vfModuleName, AAIAIC_25, AIC, + addVFModule("Vsp1710pid298109Vwinifred..mmsc_mod1_ltm..module-8", vfModuleName, AAIAIC_25, AIC, TENANT, FALSE, MDT_1, getCurrentUser().tenants, serviceInstance); }); @@ -145,7 +139,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { goToInstance(); ServiceModel serviceInstance = new ServicesService().getServiceModel(MODEL_UUID); 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); + FALSE, SOME_LEGACY_REGION, "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", "platform", getCurrentUser().tenants, "ONAP", serviceInstance, instanceName); }); } @@ -171,7 +165,6 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { 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(); }); } @@ -182,11 +175,11 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { ViewEditPage viewEditPage = new ViewEditPage(); viewEditPage.selectNodeInstanceToAdd(NODE_INSTANCE); GeneralUIUtils.ultimateWait(); - SelectOption.selectOptionsFromMultiselectById(Constants.OwningEntity.LOB_SELECT_TEST_ID, new ArrayList<>(Arrays.asList(lobToSelect))); + viewEditPage.selectLineOfBusiness(lobToSelect); viewEditPage.clickCancelButtonByTestID(); viewEditPage.selectNodeInstanceToAdd(NODE_INSTANCE); GeneralUIUtils.ultimateWait(); - AssertUnselectedOptionInMultiselectById(Constants.OwningEntity.LOB_SELECT_TEST_ID, lobToSelect); + viewEditPage.selectLineOfBusiness(lobToSelect); viewEditPage.clickCancelButtonByTestID(); } @@ -212,7 +205,7 @@ public class ALaCarteflowTest extends CreateInstanceDialogBaseTest { GeneralUIUtils.ultimateWait(); goToInstance(); ServiceModel serviceInstance = new ServicesService().getServiceModel(MODEL_UUID); - addVolumeGroup("Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3", vgName, AAIAIC_25, AIC, TENANT, + addVolumeGroup("Vsp1710pid298109Vwinifred..mmsc_mod6_eca_oam..module-3", vgName, AAIAIC_25, AIC, TENANT, FALSE, SOME_LEGACY_REGION, getCurrentUser().tenants, serviceInstance); }); } 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 d53b5011a..a65d7bf9d 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,13 +1,11 @@ package vid.automation.test.test; 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.onap.sdc.ci.tests.datatypes.UserCredentials; import org.testng.annotations.Test; import vid.automation.test.Constants; import vid.automation.test.model.User; @@ -15,18 +13,41 @@ 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 User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); + private String instanceName = viewEditPage.generateInstanceName(Constants.ViewEdit.NETWORK_INSTANCE_NAME_PREFIX); @Test public void testAddNetworkFullFlow() { - User user = usersService.getUser(Constants.Users.EMANUEL_EMANUEL); + String platform = "xxx1"; + this.goToNetworkPopup(platform); + Map<String, String> networkMetadata= getNetworkExpectedMetadata(); + addNetwork(networkMetadata,instanceName, "AIC30_CONTRAIL_BASIC 0", "One", "FUSION", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", platform, "zzz1","c630e297a3ae486497d63eacec1d7c14", + "false", "some legacy region",user.tenants); + } + + + @Test + public void testAddNetworkFullFlowWithoutPlatform() { + this.goToNetworkPopup(null); + Map<String, String> networkMetadata= getNetworkExpectedMetadata(); + addNetwork(networkMetadata,instanceName, "AIC30_CONTRAIL_BASIC 0", "One", "FUSION", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",null, "zzz1","c630e297a3ae486497d63eacec1d7c14", + "false", "some legacy region",user.tenants); + } + + + private void goToNetworkPopup(String platform){ + SimulatorApi.clearAll(); BulkRegistration.genericSearchExistingServiceInstance(); BulkRegistration.addNetwork(); - String instanceName = viewEditPage.generateInstanceName(Constants.ViewEdit.NETWORK_INSTANCE_NAME_PREFIX); + SimulatorApi.registerExpectationFromPresets( ImmutableList.of( @@ -35,18 +56,17 @@ public class AddNetworkTest extends VidBaseTestCase { PresetMSOBaseCreateInstancePost.DEFAULT_REQUEST_ID, "d198cc45-158b-480e-8d2c-03943c51268e", "c187e9fe-40c3-4862-b73e-84ff056205f6", - instanceName + instanceName, + platform ), new PresetMSOOrchestrationRequestGet( PresetMSOOrchestrationRequestGet.COMPLETE, PresetMSOOrchestrationRequestGet.DEFAULT_REQUEST_ID, - "Success")), + "Success", + false)), SimulatorApi.RegistrationStrategy.APPEND); goToExistingInstanceById(serviceInstanceIdWithNetwork); - Map<String, String> networkMetadata= getNetworkExpectedMetadata(); - addNetwork(networkMetadata,instanceName, "AIC30_CONTRAIL_BASIC 0", "One", "FUSION", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb","xxx1", "y1","c630e297a3ae486497d63eacec1d7c14", - "false", "some legacy region",user.tenants); } private Map<String, String> getNetworkExpectedMetadata() { 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 2b5a09823..f082044fd 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,26 +1,16 @@ 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 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.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.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.Assert; @@ -29,23 +19,22 @@ 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.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.infra.*; import vid.automation.test.model.Service; import vid.automation.test.model.User; -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.sections.*; import vid.automation.test.services.ServicesService; import vid.automation.test.services.SimulatorApi; +import java.util.List; + +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_1908_TRANSPORT_SERVICE_NEW_INSTANTIATION_UI; +import static vid.automation.test.infra.Features.FLAG_5G_IN_NEW_INSTANTIATION_UI; +import static vid.automation.test.infra.ModelInfo.*; + public class BrowseASDCTest extends CreateInstanceDialogBaseTest { private final String invariantUUIDAlacarte = aLaCarteForBrowseSdc.modelInvariantId; @@ -193,7 +182,8 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { } @Test - private void browseServiceModel_deployServiceMacroWithCR_creationPopupIsOldMacro() throws Exception { + @FeatureTogglingTest(flagActive = false, value = FLAG_1908_TRANSPORT_SERVICE_NEW_INSTANTIATION_UI) + public void browseServiceModel_deployServiceMacroWithCR_creationPopupIsOldMacro() throws Exception { deployServiceAndAssertInstantiationType( "csar15782222_instantiationTypeMacroWithCR.zip", invariantUUIDMacro, @@ -204,7 +194,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { @Test private void browseServiceModel_deployServiceMacroWithNetwork_creationPopupIsMacroByFF() throws Exception { - String macroInstantiationAccordingFF = Features.FLAG_ASYNC_INSTANTIATION.isActive() && Features.FLAG_NETWORK_TO_ASYNC_INSTANTIATION.isActive() ? instantiationTypeNameMacro : oldMacro; + String macroInstantiationAccordingFF = Features.FLAG_NETWORK_TO_ASYNC_INSTANTIATION.isActive() ? instantiationTypeNameMacro : oldMacro; deployServiceAndAssertInstantiationType( "csar15782222_instantiationTypeMacroWithNetwork.zip", invariantUUIDMacro, @@ -406,7 +396,7 @@ public class BrowseASDCTest extends CreateInstanceDialogBaseTest { 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("JANET25", "AIC"); + viewEditPage.selectLcpRegion("AAIAIC25", "AIC"); viewEditPage.selectTenant("092eb9e8e4b7412e8787dd091bc58e86"); viewEditPage.setLegacyRegion("llkjhlkjhlkjh"); 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 179eb968c..2f5489f31 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,54 +1,42 @@ 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.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; 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.remote.RemoteWebElement; import org.openqa.selenium.support.ui.Select; import org.skyscreamer.jsonassert.JSONAssert; import org.skyscreamer.jsonassert.JSONCompareMode; -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 org.testng.annotations.*; 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; +import vid.automation.test.infra.*; 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"; 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 0837f79ca..df3b41d06 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 @@ -108,7 +108,7 @@ public class CreateInstanceDialogBaseTest extends VidBaseTestCase { } 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) { + String legacyRegion, String productFamily, String platform, ArrayList<String> permittedTenants, String lobs, ServiceModel serviceModel, String instanceName) { openAndFillVnfPopup(name, lcpRegion, cloudOwner, tenant, suppressRollback, legacyRegion, productFamily, platform,permittedTenants, lobs, serviceModel, instanceName); viewEditPage.clickConfirmButton(); successConfirmVnfAndClosePopup(); @@ -116,7 +116,7 @@ public class CreateInstanceDialogBaseTest extends VidBaseTestCase { } 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) { + String legacyRegion, String productFamily, String platform, ArrayList<String> permittedTenants, String lobs, ServiceModel serviceModel, String instanceName) { viewEditPage.selectNodeInstanceToAdd(name); GeneralUIUtils.ultimateWait(); if(serviceModel != null) { @@ -130,7 +130,7 @@ public class CreateInstanceDialogBaseTest extends VidBaseTestCase { Click.onFirstSelectOptionById(Constants.OwningEntity.PLATFORM_SELECT_TEST_ID); } if(lobs != null) { - SelectOption.selectOptionsFromMultiselectById(Constants.OwningEntity.LOB_SELECT_TEST_ID, lobs); + viewEditPage.selectLineOfBusiness(lobs); } fillDetailsInDialog(instanceName, lcpRegion, cloudOwner, tenant, suppressRollback, legacyRegion, permittedTenants); } @@ -144,7 +144,7 @@ public class CreateInstanceDialogBaseTest extends VidBaseTestCase { protected void assertConfirmShowMissingDataErrorOnCurrentPopup(String field) { viewEditPage.clickConfirmButton(); boolean byclassAndText = Exists.byClassAndText(Constants.ViewEdit.ERROR_CLASS, String.format(Constants.MISSING_DATA, field)); - Assert.assertFalse(field + " " + Constants.REQUIRED, byclassAndText); + Assert.assertTrue(field + " " + Constants.REQUIRED, byclassAndText); } protected void cancelPopup() { 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 bb13514bf..b57d18789 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,7 +1,5 @@ package vid.automation.test.test; -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; @@ -18,6 +16,9 @@ import vid.automation.test.services.BulkRegistration; import vid.automation.test.services.ServicesService; import vid.automation.test.services.SimulatorApi; +import java.io.IOException; +import java.util.List; + public class CreateNewInstanceTest extends CreateInstanceDialogBaseTest { private ServicesService servicesService = new ServicesService(); 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 89e28d7a6..835aacd3e 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,8 +1,6 @@ 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.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; @@ -18,6 +16,9 @@ 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(); @@ -311,7 +312,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("JANET25"); + createConfigurationPage.chooseRegion("AAIAIC25"); GeneralUIUtils.ultimateWait(); // Wait.waitByTestId(Constants.ConfigurationCreation.TENANT_DROPDOWN_TEST_ID, 30); createConfigurationPage.chooseTenant("USP-SIP-IC-24335-T-01"); @@ -319,7 +320,7 @@ public class CreatePortMirroringConfigurationTest extends VidBaseTestCase { } private void assertFormFields() { Assert.assertEquals("dummy_instance",createConfigurationPage.getInstanceName()); - Assert.assertEquals("JANET25", createConfigurationPage.getRegion()); + Assert.assertEquals("AAIAIC25", createConfigurationPage.getRegion()); Assert.assertEquals("USP-SIP-IC-24335-T-01",createConfigurationPage.getTenant()); createConfigurationPage.assertButtonState(Constants.ConfigurationCreation.NEXT_BUTTON_TEST_ID,true); 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 55ab567dc..a334646cc 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 @@ -16,7 +16,7 @@ public class DeleteResumeTest extends CreateInstanceDialogBaseTest { SimulatorApi.clearAll(); BulkRegistration.resumeVfModule(serviceInstanceId,vnfInstanceId); navigateToViewEditPageOfuspVoiceVidTest444("240376de-870e-48df-915a-31f140eedd2c"); - resumeVFModule("aa","JANET25", "AIC", "092eb9e8e4b7412e8787dd091bc58e86","mdt1",user.tenants); + resumeVFModule("aa","AAIAIC25", "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 bacd83155..fa7181c89 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,43 +1,27 @@ package vid.automation.test.test; -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.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; 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.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.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.infra.*; import vid.automation.test.model.User; import vid.automation.test.sections.BrowseASDCPage; import vid.automation.test.sections.DrawingBoardPage; import vid.automation.test.sections.VidBasePage; -@FeatureTogglingTest(FLAG_ASYNC_INSTANTIATION) +import static org.testng.AssertJUnit.assertFalse; +import static vid.automation.test.Constants.DrawingBoard.*; +import static vid.automation.test.infra.ModelInfo.macroDrawingBoardComplexService; +import static vid.automation.test.infra.ModelInfo.macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails; + public class DrawingBoardTest extends VidBaseTestCase { private DrawingBoardPage drawingBoardPage = new DrawingBoardPage(); 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 f21a76d83..03378b615 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 @@ -5,7 +5,6 @@ import org.junit.Assert; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import org.springframework.http.HttpStatus; -import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeMethod; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -71,7 +70,7 @@ public class EnvironmentsTest extends VidBaseTestCase { GET_STATUS_FAILURE } - @BeforeClass + @BeforeMethod //Sometimes we clear registration while we are in view/edit page //And there is alert so we can not navigate any more. //So we first navigate to welcome page, and only the, clear registration @@ -200,6 +199,10 @@ public class EnvironmentsTest extends VidBaseTestCase { String environmentTypeDefault = Get.selectedOptionText(Constants.TestEnvironments.ENVIRONMENT_TYPE_DROP_DOWN); Assert.assertEquals(environment.operationalEnvironmentType, environmentTypeDefault); + if (Features.FLAG_1908_RELEASE_TENANT_ISOLATION.isActive()) { + SelectOption.byTestIdAndVisibleText(environment.release, Constants.TestEnvironments.ENVIRONMENT_RELEASE); + environment.workloadContext = environment.workloadContext.concat("_" + environment.release); + } SelectOption.byTestIdAndVisibleText(environment.workloadContext, Constants.TestEnvironments.WORKLOAD_CONTEXT_DROP_DOWN); WebElement submitButton = Get.byTestId(Constants.TestEnvironments.SUBMIT_BUTTON); @@ -212,14 +215,14 @@ public class EnvironmentsTest extends VidBaseTestCase { GeneralUIUtils.ultimateWait(); // refresh table - Map <String, List<String>> file = ReadFile.getJsonFile(ENVIRONMENTS_CONF, Map.class); + Map <String, List<List<String>>> file = ReadFile.getJsonFile(ENVIRONMENTS_CONF, Map.class); String tableId = Constants.TestEnvironments.ENVIRONMENTS_TABLE; SimulatorApi.registerExpectation(GET_FULL_OPERATIONAL_ENVIRONMENT_JSON, ImmutableMap.of("new_name", environment.operationalEnvironmentName, "new_tenant", environment.tenantContext, "new_ecomp_id", environment.EcompEnvironmentId, "new_ecomp_name", environment.EcompEnvironmentName, "new_workload_context", environment.workloadContext), SimulatorApi.RegistrationStrategy.APPEND); Click.byTestId(REFRESH_BUTTON); Wait.angularHttpRequestsLoaded(); List<List<String>> body = Get.tableBodyValuesByTestId(tableId); - Assert.assertEquals(file.get(Constants.TestEnvironments.FULL_LIST), body); + Assert.assertEquals(file.get(fullListId()), body); GeneralUIUtils.ultimateWait(); } @@ -277,7 +280,7 @@ public class EnvironmentsTest extends VidBaseTestCase { Click.byId(Constants.generalSubmitButtonId); SimulatorApi.registerExpectation("environment/activate/get_operational_environments_aai1.json", - ImmutableMap.of("Deactivate", "Activate"), SimulatorApi.RegistrationStrategy.APPEND); + ImmutableMap.of("INACTIVE", "ACTIVE"), SimulatorApi.RegistrationStrategy.APPEND); boolean waitForTextResult = Wait.waitByClassAndText("status", Constants.TestEnvironments.environmentActivatedSuccesfullyMessage, 60); assertTrue(Constants.TestEnvironments.environmentActivatedSuccesfullyMessage + " message didn't appear on time", waitForTextResult); @@ -290,7 +293,7 @@ public class EnvironmentsTest extends VidBaseTestCase { assertTrue("Failed to find Deactivate button for test env with id: "+envId, deactivationButton.isDisplayed()); WebElement status = Get.byId(Constants.TestEnvironments.environmentStatusIdPrefix + envId); - assertEquals("Active", status.getText()); + assertEquals("ACTIVE", status.getText()); WebElement attachButton = TestEnvironmentPage.getTestEnvironmentAttachButton(envId); assertTrue("Failed to find Attach button for test env with id: "+envId, attachButton.isDisplayed()); @@ -321,7 +324,7 @@ public class EnvironmentsTest extends VidBaseTestCase { assertTrue("Failed to find Activate button for test env with id: "+envId, activationButton.isDisplayed()); WebElement status = Get.byId(Constants.TestEnvironments.environmentStatusIdPrefix + envId); - assertEquals("Inactive", status.getText()); + assertEquals("INACTIVE", status.getText()); WebElement attachButton = TestEnvironmentPage.getTestEnvironmentAttachButton(envId); assertFalse("attach button shouldn't be displayed for test env with id: "+envId, attachButton.isDisplayed()); @@ -500,5 +503,11 @@ public class EnvironmentsTest extends VidBaseTestCase { SideMenu.navigateToTestEnvironmentsPage(); } + private String fullListId() { + return Features.FLAG_1908_RELEASE_TENANT_ISOLATION.isActive() ? + Constants.TestEnvironments.FULL_LIST : Constants.TestEnvironments.FULL_LIST_WITHOUT_RELEASE_LABEL; + } + + } 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 a3480f8c2..4eb637a10 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,39 +1,34 @@ 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.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.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.AfterClass; 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.FeatureTogglingTest; -import vid.automation.test.infra.Features; -import vid.automation.test.infra.Get; -import vid.automation.test.infra.Wait; +import vid.automation.test.infra.*; 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; -@FeatureTogglingTest(FLAG_ASYNC_INSTANTIATION) +import java.util.Collections; + +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; + public class InstantiationStatusTest extends VidBaseTestCase { private final String serviceModelVersion = "5.1"; 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 42749c15f..9b1956d30 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,64 +1,19 @@ package vid.automation.test.test; -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.automation.common.report_portal_integration.annotations.Step; 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.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork; +import org.onap.simulator.presetGenerator.presets.aai.*; +import org.onap.simulator.presetGenerator.presets.mso.*; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.ResponseDetails; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys; +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.openqa.selenium.remote.RemoteWebElement; @@ -69,33 +24,44 @@ 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.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.infra.*; import vid.automation.test.model.Service; import vid.automation.test.model.User; -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.sections.*; import vid.automation.test.services.AsyncJobsService; import vid.automation.test.services.ServicesService; import vid.automation.test.services.SimulatorApi; +import vid.automation.test.test.NewServiceInstanceTest.ServiceData.IS_GENERATED_NAMING; import vid.automation.test.utils.ReadFile; -@FeatureTogglingTest(FLAG_ASYNC_INSTANTIATION) +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.stream.Collectors; + +import static junit.framework.TestCase.assertNull; +import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic; +import static org.hamcrest.CoreMatchers.startsWith; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.containsInAnyOrder; +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.*; +import static vid.automation.test.infra.ModelInfo.*; +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; + public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { - private static final String COMPLETED = "COMPLETED"; + public 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 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(); @@ -215,13 +181,13 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { ServiceData serviceData = new ServiceData( macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails.modelVersionId, new ArrayList<>(), - false, true, true, true, + IS_GENERATED_NAMING.FALSE, true, true, true, "2017-488_PASQUALE-vPE 0", - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", 0, 1, new ArrayList<>(), "25284168-24bb-4698-8cb4-3f509146eca5"); + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", 0, 1, new ArrayList<>(), "25284168-24bb-4698-8cb4-3f509146eca5"); prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails, false); - final String serviceInstanceName = createSriovService(serviceData, true); + final String serviceInstanceName = createMacroService(serviceData, true); createVnf(serviceData, true, true, serviceInstanceName); createVfModule(serviceData, serviceInstanceName, false, false); @@ -261,19 +227,19 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { ServiceData serviceData = new ServiceData( macroSriovWithDynamicFieldsEcompNamingFalsePartialModelDetailsVnfEcompNamingFalse.modelVersionId, - Collections.singletonList("2017488 PASQUALEvpe0 asn:"), - false, false, true, false, + Collections.singletonList("2017488 pasqualevpe0 asn:"), + IS_GENERATED_NAMING.FALSE, false, true, false, "2017-488_PASQUALE-vPE 0", - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", 0, 1, ImmutableList.of("Bandwidth", "Bandwidth units"), + "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 + // this is the instance-name that createMacroService is going to use String serviceInstanceName = randomAlphabetic + "instancename"; doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () -> { prepareServicePreset(macroSriovWithDynamicFieldsEcompNamingFalsePartialModelDetailsVnfEcompNamingFalse, false); - createSriovService(serviceData, false, randomAlphabetic); + createMacroService(serviceData, false, randomAlphabetic, true, 3); }); doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () -> @@ -295,9 +261,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { doReduxStep(reduxStates, randomAlphabetic, startInStep, reduxForStep, i, mode, () -> { editVfModuleAndJustSetName(vfModule0Name, vfModule0UUID); - if (Features.FLAG_DUPLICATE_VNF.isActive()) { - duplicateVnf(serviceData.vnfData, 2); - } + duplicateVnf(serviceData.vnfData, 2); vidBasePage.screenshotDeployDialog(serviceInstanceName); }); @@ -305,8 +269,8 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { prepareServicePreset(macroSriovWithDynamicFieldsEcompNamingFalsePartialModelDetailsVnfEcompNamingFalse, true); - final String vfModuleName1 = "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0"; - final String vfModuleName2 = "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1"; + 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() @@ -333,6 +297,97 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { } @Test + @FeatureTogglingTest(FLAG_1908_INFRASTRUCTURE_VPN) + public void createNewServiceInstance_infraStructureVpn() { + String requestId = UUID.randomUUID().toString(); + String instanceId = UUID.randomUUID().toString(); + + prepareServicePreset(infrastructureVpnService, false); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC, + new PresetAAIGetL3NetworksByCloudRegionSpecificState("irma-aic", "hvf6", "AIN Web Tool-15-D-testalexandria"), + new PresetAAIGetVpnsByType() + ), APPEND); + + ServiceData serviceData = new ServiceData( + infrastructureVpnService.modelVersionId, + new ArrayList<>(), + IS_GENERATED_NAMING.TRUE_BUT_GIVE_NAME_EITHER_WAY, true, true, false, + null, + null, 0, 1, new ArrayList<>(), null); + final String serviceInstanceName = createMacroService(serviceData, false); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + PresetMsoCreateMacroCommonPre1806.ofServiceWithVRF(requestId, instanceId, serviceInstanceName), + new PresetMSOOrchestrationRequestGet(COMPLETE, requestId) + ), APPEND); + + // Wizard pages of Network and VPN + Click.byTestIdOnceItsAvailable("10a74149-c9d7-4918-bbcf-d5fb9b1799ce", 20); + Click.byTestId("setMembersBtn"); + GeneralUIUtils.ultimateWait(); + + Click.byTestIdOnceItsAvailable("120d39fb-3627-473d-913c-d228dd0f8e5b", 20); + Click.byTestId("setMembersBtn"); + GeneralUIUtils.ultimateWait(); + + Assert.assertEquals(Get.byTestId("node-type-indicator").getText(),"VRF"); + + drawingBoardPage.deploy(); + drawingBoardPage.verifyServiceCompletedOnTime(serviceInstanceName, "Service "+serviceInstanceName); + } + + @Test + @FeatureTogglingTest(FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI) + public void createNewServiceInstance_collectionResource() { + prepareServicePreset(collectionResourceService, false); + String requestId = UUID.randomUUID().toString(); + String instanceId = UUID.randomUUID().toString(); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MTN6_TO_ATT_AIC, + PresetMsoCreateMacroCommonPre1806.ofCollectionResource(requestId, instanceId), + new PresetMSOOrchestrationRequestGet(COMPLETE, requestId) + ), APPEND); + + ServiceData serviceData = new ServiceData( + collectionResourceService.modelVersionId, + new ArrayList<>(), + IS_GENERATED_NAMING.TRUE, true, true, false, + null, + null, 0, 1, new ArrayList<>(), null); + createMacroService(serviceData, false, randomAlphabetic(5), true, 1); + + drawingBoardPage.deploy(); + drawingBoardPage.verifyServiceCompletedOnTime("CR_sanity", "service with collection resource"); + } + + @Test + @FeatureTogglingTest(FLAG_1908_TRANSPORT_SERVICE_NEW_INSTANTIATION_UI) + public void createNewServiceInstance_transportService() { + prepareServicePreset(transportWithPnfsService, false); + String requestId = UUID.randomUUID().toString(); + String instanceId = UUID.randomUUID().toString(); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + PresetMsoCreateMacroCommonPre1806.ofTransportService(requestId, instanceId), + new PresetMSOOrchestrationRequestGet(COMPLETE, requestId) + ), APPEND); + + ServiceData serviceData = new ServiceData( + transportWithPnfsService.modelVersionId, + new ArrayList<>(), + IS_GENERATED_NAMING.TRUE, true, true, false, + null, + null, 0, 1, new ArrayList<>(), null); + createMacroService(serviceData, false, randomAlphabetic(5), false, 1); + + drawingBoardPage.deploy(); + drawingBoardPage.verifyServiceCompletedOnTime("AIM Transport SVC_ym161f", "transport service"); + } + + @Test @FeatureTogglingTest(FLAG_1902_VNF_GROUPING) public void createNewServiceInstance_aLaCarte_VnfGrouping() { @@ -341,7 +396,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { ServiceData serviceData = new ServiceData( aLaCarteVnfGroupingService.modelVersionId, ImmutableList.of(), - false, false, true, false, + IS_GENERATED_NAMING.FALSE, false, true, false, null, null, 0, 1, ImmutableList.of(), null); prepareServicePreset(aLaCarteVnfGroupingService, false); @@ -360,7 +415,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { new PresetAAIPostNamedQueryForViewEdit(serviceInstanceId, serviceInstanceName, false, false) ), SimulatorApi.RegistrationStrategy.APPEND); - deploy(); + drawingBoardPage.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"); @@ -379,20 +434,20 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { return; } else if (currentStep.getValue() == startInStep) { - setReduxState(reduxForStep); + vidBasePage.setReduxState(reduxForStep); vidBasePage.navigateTo("serviceModels.htm#/servicePlanning?serviceModelId=6b528779-44a3-4472-bdff-9cd15ec93450"); vidBasePage.goToIframe(); } - reduxStates.put(String.valueOf(currentStep), getReduxState()); + reduxStates.put(String.valueOf(currentStep), vidBasePage.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()); + reduxStates.put(String.valueOf(currentStep), vidBasePage.getReduxState()); + logger.info("reduxGator runtime reduxState for step {}:\n{}", currentStep, vidBasePage.getReduxState()); break; } @@ -403,7 +458,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { "Current step: " + currentStep, "Random alphabetic: " + randomAlphabetic, "Starting reduxState: " + reduxStates.get(String.valueOf(currentStep)), - "Current reduxState: " + getReduxState() + "Current reduxState: " + vidBasePage.getReduxState() ), e); } } finally { @@ -412,6 +467,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { } } + //@Step("duplicate vnf") private void duplicateVnf(VnfData vnfData, int count) { hoverAndClickDuplicateButton(extractNodeToEdit(vnfData)); vidBasePage.screenshotDeployDialog("duplicateVnf-" + vnfData.vnfName); @@ -425,6 +481,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { return String.join("", s).replace(" ", ""); } + //@Step("edit vf module and just set name") private void editVfModuleAndJustSetName(String vfModuleName, String vfModuleUUID) { if (Features.FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD.isActive()) { hoverAndClickEditButton(vfModuleUUID + "-" + vfModuleName); @@ -432,7 +489,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { drawingBoardPage.clickAddButtonByNodeName(vfModuleName); } Input.text("VF instance name ZERO", "instanceName"); - Click.byTestId("form-set"); + Click.byTestId(VNF_SET_BUTTON_TEST_ID); } @Test @@ -440,13 +497,13 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { ServiceData serviceData = new ServiceData( macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails.modelVersionId, new ArrayList<>(), - false, true, false, true, + IS_GENERATED_NAMING.FALSE, true, false, true, "2017-488_PASQUALE-vPE 0", vfModule0Name, 1, 1, new ArrayList<>(), vfModule0UUID); prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetails, false); - final String serviceInstanceName = createSriovService(serviceData, true); + final String serviceInstanceName = createMacroService(serviceData, true); createVnf(serviceData, true, true, serviceInstanceName); createVfModule(serviceData, serviceInstanceName, true, false); @@ -457,13 +514,13 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { ServiceData serviceData = new ServiceData( macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse.modelVersionId, new ArrayList<>(), - false, false, false, false, + IS_GENERATED_NAMING.FALSE, false, false, false, "2017-488_PASQUALE-vPE 0", vfModule0Name, 1, 1, new ArrayList<>(), vfModule0UUID); prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse, false); - final String serviceInstanceName = createSriovService(serviceData, true); + final String serviceInstanceName = createMacroService(serviceData, true); createVnf(serviceData, true, true, serviceInstanceName); createVfModule(serviceData, serviceInstanceName, true, false); @@ -474,13 +531,13 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { ServiceData serviceData = new ServiceData( macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse.modelVersionId, new ArrayList<>(), - false, false, true, false, + IS_GENERATED_NAMING.FALSE, false, true, false, "2017-488_PASQUALE-vPE 0", - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", 0, 1, new ArrayList<>(), "25284168-24bb-4698-8cb4-3f509146eca5"); + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", 0, 1, new ArrayList<>(), "25284168-24bb-4698-8cb4-3f509146eca5"); prepareServicePreset(macroSriovNoDynamicFieldsEcompNamingFalseFullModelDetailsVnfEcompNamingFalse, false); - final String serviceInstanceName = createSriovService(serviceData, true); + final String serviceInstanceName = createMacroService(serviceData, true); createVnf(serviceData, true, true, serviceInstanceName); clickRemoveVfModule(vfModule0UUID, vfModule0Name); createVfModule(serviceData, serviceInstanceName, false, true); @@ -530,71 +587,47 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { browseASDCPage.goToIframe(); VnfData networkData = new VnfData("SR-IOV Provider-1", "840ffc47-e4cf-46de-8e23-525fd8c6fdc3", defactoNetworkInstanceName, false); createNetwork(networkData, false, false, serviceInstanceName); - drawingBoardPage.clickDeployButton(); - - VidBasePage.goOutFromIframe(); - GeneralUIUtils.ultimateWait(); - vidBasePage.goToIframe(); - GeneralUIUtils.ultimateWait(); - 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); - - VidBasePage.goOutFromIframe(); + drawingBoardPage.deploy(); + drawingBoardPage.verifyServiceCompletedOnTime(serviceInstanceName, "service "+serviceInstanceName); } @Test public void createNewServiceInstance_macro_validPopupDataAndUI() { - List<String> serviceDynamicFields = Arrays.asList("2017488 PASQUALEvpe0 asn:"); + List<String> serviceDynamicFields = Arrays.asList("2017488 pasqualevpe0 asn:"); ServiceData serviceData = new ServiceData( macroSriovWithDynamicFieldsEcompNamingTruePartialModelDetails.modelVersionId, serviceDynamicFields, - true, true, true, false, + IS_GENERATED_NAMING.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"); + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", 0, 1, new ArrayList<>(), "25284168-24bb-4698-8cb4-3f509146eca5"); prepareServicePreset(macroSriovWithDynamicFieldsEcompNamingTruePartialModelDetails, false); - final String serviceInstanceName = createSriovService(serviceData, true); + final String serviceInstanceName = createMacroService(serviceData, true); createVnf(serviceData, true, true, serviceInstanceName); clickRemoveVfModule(vfModule0UUID, vfModule0Name); createVfModule(serviceData, serviceInstanceName, false, false); } + //@Step("deploy and verify module in pending table") private void deployAndVerifyModuleInPendingTableMacro(String serviceInstanceName, String requestId1, String requestId2) { - deploy(); + drawingBoardPage.deploy(); boolean simulatorUpdated = false; 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]); + String actualInstanceName = getActualInstanceName(serviceInstanceName, ids[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(); - } - 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); @@ -622,15 +655,16 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { vidBasePage.screenshotDeployDialog(serviceInstanceName); } - private String getActualInstanceName(String serviceInstanceName, Integer i, String status) { + private String getActualInstanceName(String serviceInstanceName, Integer i) { return i==0 ? serviceInstanceName : serviceInstanceName + "_00" + i; } + //@Step("verify open view edit") private void verifyOpenViewEdit(String serviceInstanceName) { boolean[] openEnabled = {true, false, false}; String[] statuses = {COMPLETED, IN_PROGRESS, PENDING}; ImmutableList.of(0, 1, 2).forEach(i -> { - String actualInstanceName = getActualInstanceName(serviceInstanceName, i, statuses[i]); + String actualInstanceName = getActualInstanceName(serviceInstanceName, i); if (Features.FLAG_1902_NEW_VIEW_EDIT.isActive()) { InstantiationStatusPage.verifyOpenNewViewEdit(actualInstanceName, openEnabled[i], "EDIT"); } @@ -640,11 +674,12 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { }); } + //@Step("verify open audit info") private void verifyOpenAuditInfo(String serviceInstanceName) { boolean auditInfoEnabled = true; String[] statuses = {COMPLETED, IN_PROGRESS, PENDING}; for (Integer i : ImmutableList.of(0, 1, 2)) { - String actualInstanceName = getActualInstanceName(serviceInstanceName, i, statuses[i]); + String actualInstanceName = getActualInstanceName(serviceInstanceName, i); InstantiationStatusPage.checkMenuItem(actualInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_HEADER_AUDIT_INFO_ITEM, auditInfoEnabled, contextMenuOpen -> { Click.byTestId(contextMenuOpen); checkAuditInfoModal(actualInstanceName, i, statuses); @@ -672,8 +707,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { .collect(Collectors.toList()); List<String> serviceStatus = Arrays.asList(Arrays.copyOfRange(statuses, i, statuses.length)); - assertThat("statuses for " + actualInstanceName + " must be as expected", vidStatuses, is(Lists.reverse(serviceStatus))); - + assertThat("statuses for " + actualInstanceName + " must be as expected", vidStatuses, containsInAnyOrder(serviceStatus.toArray())); 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")); @@ -710,12 +744,14 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { return true; } + //@Step("verifyDeleteJob") private void verifyDeleteJob(String serviceInstanceName) { boolean[] deleteEnabled = {false, false, true}; String[] statuses = {COMPLETED, IN_PROGRESS, PENDING}; verifyDeleteOrHideOperation(serviceInstanceName, Constants.InstantiationStatus.CONTEXT_MENU_REMOVE, statuses, deleteEnabled, "deleted"); } + //@Step("verify hide job") private void verifyHideJob(String serviceInstanceName) { boolean[] hideEnabled = {true, false}; String[] statuses = {COMPLETED, IN_PROGRESS}; @@ -724,7 +760,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { private void verifyDeleteOrHideOperation(String serviceInstanceName, String contextMenuItem, String[] statuses, boolean[] operationEnabled, String operationName) { for (int i = 0; i < statuses.length; i++) { - String actualInstanceName = getActualInstanceName(serviceInstanceName, i, statuses[i]); + String actualInstanceName = getActualInstanceName(serviceInstanceName, i); InstantiationStatusPage.checkMenuItem(actualInstanceName, contextMenuItem, operationEnabled[i], contextMenuDelete -> { Click.byTestId(contextMenuDelete); GeneralUIUtils.ultimateWait(); @@ -766,11 +802,13 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { .build(); } - private String createSriovService(ServiceData serviceData, boolean tryCancelsAndReentries) { - return createSriovService(serviceData, tryCancelsAndReentries, randomAlphabetic(5)); + //@Step("create sriov service") + private String createMacroService(ServiceData serviceData, boolean tryCancelsAndReentries) { + return createMacroService(serviceData, tryCancelsAndReentries, randomAlphabetic(5), true, 3); } - private String createSriovService(ServiceData serviceData, boolean tryCancelsAndReentries, String randomAlphabetic) { + //@Step("create sriov service") + private String createMacroService(ServiceData serviceData, boolean tryCancelsAndReentries, String randomAlphabetic, boolean fillLcpRegionAndTenantAndZone, int bulkSize) { BrowseASDCPage browseASDCPage = new BrowseASDCPage(); User user = usersService.getUser(Constants.Users.SILVIA_ROBBINS_TYLER_SILVIA); @@ -788,14 +826,17 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { WebElement instanceName = Get.byId("instanceName"); boolean isRequired = isElementByIdRequired("instanceName-label"); - if (serviceData.isGeneratedNaming) { + if (serviceData.isGeneratedNaming == IS_GENERATED_NAMING.TRUE || serviceData.isGeneratedNaming == IS_GENERATED_NAMING.TRUE_BUT_GIVE_NAME_EITHER_WAY) { 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 { Assert.assertTrue(isRequired,"instance name input should be required when serviceEcompNaming == false."); + } + + if (serviceData.isGeneratedNaming == IS_GENERATED_NAMING.FALSE || serviceData.isGeneratedNaming == IS_GENERATED_NAMING.TRUE_BUT_GIVE_NAME_EITHER_WAY) { instanceName.sendKeys(serviceInstanceName); } + String setButtonTestId = "form-set"; //serviceType should be dependent on subscriber selection assertElementDisabled("serviceType-select"); @@ -816,38 +857,47 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { Wait.waitByClassAndText(Constants.CreateNewInstance.SERVICE_TYPE_OPTION_CLASS, serviceType, 30); browseASDCPage.selectServiceTypeByName(serviceType); - //tenant should be dependent on lcpRegion selection - assertElementDisabled("tenant-select"); + String owningEntity = "WayneHolland"; + GeneralUIUtils.ultimateWait(); + Wait.waitByClassAndText(Constants.CreateNewInstance.OWNING_ENTITY_OPTION, owningEntity, 30); + SelectOption.byTestIdAndVisibleText(owningEntity, (Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID)); + assertSetButtonDisabled(setButtonTestId); - String lcpRegion = "hvf6"; - Wait.waitByClassAndText("lcpRegionOption", lcpRegion, 30); - viewEditPage.selectLcpRegion(lcpRegion, AIC); + SelectOption.byTestIdAndVisibleText("ERICA", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); + browseASDCPage.selectProductFamily("e433710f-9217-458d-a79d-1c7aff376d89"); - GeneralUIUtils.ultimateWait(); - browseASDCPage.selectTenant("bae71557c5bb4d5aac6743a4e5f1d054"); + if (fillLcpRegionAndTenantAndZone) { - String setButtonTestId = "form-set"; - assertSetButtonDisabled(setButtonTestId); + //we assume that if fillLcpRegionAndTenantAndZone is true tenant and lcpRegion are required for this service model + //If you want to fill lcpRegionAndTenant where they are optional you can refactor this test... + assertSetButtonDisabled(setButtonTestId); - SelectOption.byTestIdAndVisibleText("WayneHolland", (Constants.OwningEntity.OWNING_ENTITY_SELECT_TEST_ID)); - assertSetButtonDisabled(setButtonTestId); + //tenant should be dependent on lcpRegion selection + assertElementDisabled("tenant-select"); - SelectOption.byTestIdAndVisibleText("ERICA", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); - assertSetButtonEnabled(setButtonTestId); + String lcpRegion = "hvf6"; + Wait.waitByClassAndText("lcpRegionOption", lcpRegion, 30); + viewEditPage.selectLcpRegion(lcpRegion, AIC); - browseASDCPage.selectProductFamily("e433710f-9217-458d-a79d-1c7aff376d89"); + GeneralUIUtils.ultimateWait(); + browseASDCPage.selectTenant("bae71557c5bb4d5aac6743a4e5f1d054"); - browseASDCPage.selectAicZone("NFT1"); + browseASDCPage.selectAicZone("NFT1"); + } - SelectOption.byTestIdAndVisibleText("WATKINS", Constants.OwningEntity.PROJECT_SELECT_TEST_ID); + assertSetButtonEnabled(setButtonTestId); - assertNotificationAreaVisibilityBehaviour(); + + SelectOption.byTestIdAndVisibleText("WATKINS", Constants.OwningEntity.PROJECT_SELECT_TEST_ID); + if (bulkSize!=1) { + assertNotificationAreaVisibilityBehaviourAndSetBulkSize(bulkSize); + } assertPauseOnPausePointsVisibility(serviceData.multiStageDesign); validateDynamicFields(serviceData.dynamicFields); - vidBasePage.screenshotDeployDialog("createSriovService-" + serviceInstanceName); + vidBasePage.screenshotDeployDialog("createMacroService-" + serviceInstanceName); if ("WILL_CANCEL".equals(cycle)) { Click.byTestId(Constants.CANCEL_BUTTON_TEST_ID); @@ -874,9 +924,10 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { loadServicePopup(serviceData.modelUuid); WebElement instanceName = Get.byId("instanceName"); - if (serviceData.isGeneratedNaming) { + if (serviceData.isGeneratedNaming == IS_GENERATED_NAMING.TRUE || serviceData.isGeneratedNaming == IS_GENERATED_NAMING.TRUE_BUT_GIVE_NAME_EITHER_WAY) { Assert.assertNull(instanceName, "instance name input should be invisible when serviceEcompNaming == true."); - } else { + } + if (serviceData.isGeneratedNaming == IS_GENERATED_NAMING.FALSE || serviceData.isGeneratedNaming == IS_GENERATED_NAMING.TRUE_BUT_GIVE_NAME_EITHER_WAY) { instanceName.sendKeys(serviceInstanceName); } @@ -922,6 +973,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { Assert.assertEquals(webElement.getTagName(), tag); } + //@Step("create vnf") private void createVnf(ServiceData serviceData, boolean tryCancelsAndReentries, boolean addedByDefault, String serviceInstanceName) { createVnf(serviceData.vnfData, tryCancelsAndReentries, addedByDefault, serviceInstanceName); } @@ -957,12 +1009,12 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { assertElementDisabled("tenant-select"); WebElement legacyRegion = Get.byTestId("lcpRegionText"); - Assert.assertNull(legacyRegion, "legacy region shouldn't be visible when lcp region isn't JANET25,olson3 or olson5a."); + Assert.assertNull(legacyRegion, "legacy region shouldn't be visible when lcp region isn't AAIAIC25,olson3 or olson5a."); - browseASDCPage.selectLcpRegion("JANET25"); + browseASDCPage.selectLcpRegion("AAIAIC25"); legacyRegion = Get.byTestId("lcpRegionText"); - Assert.assertNotNull(legacyRegion, "legacy region should be visible when lcp region is JANET25,olson3 or olson5a."); + Assert.assertNotNull(legacyRegion, "legacy region should be visible when lcp region is AAIAIC25,olson3 or olson5a."); browseASDCPage.selectTenant("092eb9e8e4b7412e8787dd091bc58e86"); @@ -970,10 +1022,11 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { browseASDCPage.selectPlatform("platform"); + browseASDCPage.selectLineOfBusiness("ONAP"); assertSetButtonEnabled(VNF_SET_BUTTON_TEST_ID); browseASDCPage.setLegacyRegion("some legacy region"); - browseASDCPage.selectLineOfBusiness("ONAP"); + Wait.waitByTestId("model-item-value-subscriberName", 10); Assert.assertEquals(Get.byTestId("model-item-value-subscriberName").getText(), "SILVIA ROBBINS", "Subscriber name should be shown in vf module"); @@ -993,7 +1046,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { Wait.byText("TYLER SILVIA"); GeneralUIUtils.ultimateWait(); - assertThat(Get.selectedOptionText(Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID), startsWith("JANET25")); + assertThat(Get.selectedOptionText(Constants.ViewEdit.LCP_REGION_SELECT_TESTS_ID), startsWith("AAIAIC25")); 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), "ONAP"); Assert.assertEquals(Get.selectedOptionText(Constants.OwningEntity.PLATFORM_SELECT_TEST_ID), "platform"); @@ -1053,6 +1106,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { } } + //@Step("create vf module") private void createVfModule(ServiceData serviceData, String serviceInstanceName, boolean addedByDefault, boolean addOpensPopup) { clickAddVfModule(serviceData, addedByDefault); if (!addOpensPopup) { @@ -1133,33 +1187,34 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { } } - private void assertNotificationAreaVisibilityBehaviour() { + private void assertNotificationAreaVisibilityBehaviourAndSetBulkSize(int size) { WebElement webElement = Get.byId("notification-area"); Assert.assertNull(webElement, "notification area should be invisible if only 1 qty."); - SelectOption.byIdAndVisibleText("quantity-select", "3"); + SelectOption.byIdAndVisibleText("quantity-select", String.valueOf(size)); webElement = Get.byId("notification-area"); Assert.assertNotNull(webElement, "notification area should be visible if more then 1 qty."); } + //@Step("prepare service preset") private void prepareServicePreset(ModelInfo modelInfo, boolean deploy) { String subscriberId = "e433710f-9217-458d-a79d-1c7aff376d89"; if (deploy) { registerExpectationForServiceDeployment( - ImmutableList.of( - modelInfo, - PASQUALEVmxVpeBvService488Annotations - ), - subscriberId, null); + ImmutableList.of( + modelInfo, + pasqualeVmxVpeBvService488Annotations + ), + subscriberId, null); } else { registerExpectationForServiceBrowseAndDesign(ImmutableList.of(modelInfo), subscriberId); } } - private class ServiceData { - 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) { + static class ServiceData { + ServiceData(String modelUuid, List<String> dynamicFields, IS_GENERATED_NAMING 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; @@ -1170,13 +1225,15 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { final String modelUuid; final List<String> dynamicFields; - final boolean isGeneratedNaming; + final IS_GENERATED_NAMING isGeneratedNaming; final boolean multiStageDesign; final VnfData vnfData; final VfData vfData; + + enum IS_GENERATED_NAMING { TRUE, FALSE, TRUE_BUT_GIVE_NAME_EITHER_WAY} } - private class VnfData { + private static class VnfData { VnfData(String vnfName, String vnfUuid, String vnfInstanceName, boolean isGeneratedNaming) { this.vnfName = vnfName; this.vnfUuid = vnfUuid; @@ -1191,7 +1248,7 @@ public class NewServiceInstanceTest extends CreateInstanceDialogBaseTest { } - private class VfData { + private static class VfData { VfData(String vfName, boolean vgEnabled, int vfMin, int vfMax, List<String> dynamicFields, String uuid) { this.vfName = vfName; this.vgEnabled = vgEnabled; 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 0741a4b38..59c132367 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,17 +1,13 @@ 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.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.onap.sdc.ci.tests.datatypes.UserCredentials; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -22,6 +18,10 @@ 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.ModelInfo.macroForBrowseSdc; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; + public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest { static final String NEW_INSTANCE_NAME = "New Instance Name"; 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 4ec3d4958..eb41c38e4 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,10 +1,9 @@ package vid.automation.test.test; -import java.io.IOException; import org.junit.Assert; +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.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.openqa.selenium.WebElement; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -16,6 +15,8 @@ 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 = "Emanuel"; 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 c8370a571..b1d31f8e2 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,10 +1,7 @@ package vid.automation.test.test; -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.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; import vid.automation.test.Constants; @@ -15,6 +12,9 @@ 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"; 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 c472793fc..ced874ee3 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 @@ -1,23 +1,19 @@ package vid.automation.test.test; +//import com.automation.common.report_portal_integration.annotations.Step; +//import com.automation.common.report_portal_integration.listeners.ReportPortalListener; +//import com.automation.common.report_portal_integration.screenshots.WebDriverScreenshotsProvider; 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.sdc.ci.tests.datatypes.Configuration; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; -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.aai.*; import org.onap.simulator.presetGenerator.presets.ecompportal_att.EcompPortalPresetsUtils; +import org.onap.simulator.presetGenerator.presets.ecompportal_att.PresetGetSessionSlotCheckIntervalGet; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstanceGen2; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateServiceInstancePost; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; @@ -35,8 +31,10 @@ import org.springframework.web.client.RestTemplate; import org.testng.ITestContext; import org.testng.annotations.BeforeMethod; import org.testng.annotations.BeforeSuite; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import vid.automation.test.Constants; +import vid.automation.test.Constants.ViewEdit; import vid.automation.test.infra.*; import vid.automation.test.model.Credentials; import vid.automation.test.model.User; @@ -66,11 +64,13 @@ 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.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE; 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; +//@Listeners(com.automation.common.report_portal_integration.listeners.ReportPortalListener.class) public class VidBaseTestCase extends SetupCDTest{ protected final UsersService usersService = new UsersService(); @@ -129,7 +129,7 @@ public class VidBaseTestCase extends SetupCDTest{ } @Override - protected org.onap.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { + protected Configuration getEnvConfiguration() { return TestConfigurationHelper.getEnvConfiguration(); } @@ -170,29 +170,14 @@ public class VidBaseTestCase extends SetupCDTest{ LoginExternalPage.performLoginExternal(userCredentials); } - 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; - } - - 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) + new PresetAAIGetPortMirroringSourcePorts("9533-config-LB1113", "myRandomInterfaceId", ViewEdit.COMMON_PORT_MIRRORING_PORT_NAME, true) )); presets.add(new PresetMSOCreateServiceInstancePost()); - presets.add(new PresetMSOOrchestrationRequestGet()); + presets.add(new PresetMSOOrchestrationRequestGet(COMPLETE, false)); presets.addAll(getPresetForServiceBrowseAndDesign(ImmutableList.of(modelInfo), subscriberId)); @@ -202,7 +187,7 @@ public class VidBaseTestCase extends SetupCDTest{ 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) + new PresetAAIGetPortMirroringSourcePorts("9533-config-LB1113", "myRandomInterfaceId", ViewEdit.COMMON_PORT_MIRRORING_PORT_NAME, true) )); if (createServiceInstancePreset != null) { @@ -222,6 +207,7 @@ public class VidBaseTestCase extends SetupCDTest{ protected List<BasePreset> getPresetForServiceBrowseAndDesign(List<ModelInfo> modelInfoList, String subscriberId) { List<BasePreset> presets = new ArrayList<>(Arrays.asList( + new PresetGetSessionSlotCheckIntervalGet(), new PresetAAIGetSubDetailsGet(subscriberId), new PresetAAIGetSubDetailsWithoutInstancesGet(subscriberId), new PresetAAIGetSubscribersGet(), @@ -342,9 +328,9 @@ public class VidBaseTestCase extends SetupCDTest{ viewEditPage.selectTenant(tenant); viewEditPage.selectSuppressRollback(suppressRollback); - viewEditPage.selectPlatform(platform); - //viewEditPage.setLegacyRegion(legacyRegion); - + if(platform != null){ + viewEditPage.selectPlatform(platform); + } viewEditPage.clickConfirmButton(); viewEditPage.assertMsoRequestModal(Constants.ViewEdit.MSO_SUCCESSFULLY_TEXT); viewEditPage.clickCloseButton(); @@ -371,6 +357,7 @@ public class VidBaseTestCase extends SetupCDTest{ Assert.assertTrue(Constants.ViewEdit.VF_MODULE_CREATION_FAILED_MESSAGE, byText); } + //@Step("${method}: ${instanceUUID}") void goToExistingInstanceById(String instanceUUID) { SearchExistingPage searchExistingPage = searchExistingInstanceById(instanceUUID); assertViewEditButtonState( Constants.VIEW_EDIT_BUTTON_TEXT, instanceUUID); @@ -498,13 +485,9 @@ public class VidBaseTestCase extends SetupCDTest{ } public DeployMacroDialogBase getMacroDialog(){ - if (Features.FLAG_ASYNC_INSTANTIATION.isActive()) { - VidBasePage vidBasePage =new VidBasePage(); - vidBasePage.goToIframe(); - return new DeployMacroDialog(); - } - else - return new DeployMacroDialogOld(); + VidBasePage vidBasePage =new VidBasePage(); + vidBasePage.goToIframe(); + return new DeployMacroDialog(); } protected void loadServicePopup(ModelInfo modelInfo) { @@ -591,8 +574,8 @@ public class VidBaseTestCase extends SetupCDTest{ SideMenu.navigateToWelcomePage(); vidBasePage.navigateTo("serviceModels.htm#/instantiate?" + "subscriberId=e433710f-9217-458d-a79d-1c7aff376d89&" + - "subscriberName=USP%20VOICE&" + - "serviceType=VIRTUAL%20USP&" + + "subscriberName=SILVIA%20ROBBINS&" + + "serviceType=TYLER%20SILVIA&" + "serviceInstanceId=" + serviceInstanceId + "&" + "aaiModelVersionId=" + aaiModelVersionId + "&" + "isPermitted=true"); 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 48f776406..1522c1057 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,5 +1,6 @@ package vid.automation.test.test; +import org.onap.sdc.ci.tests.datatypes.Configuration; import org.onap.sdc.ci.tests.datatypes.UserCredentials; import org.onap.sdc.ci.tests.execute.setup.DriverFactory; import vid.automation.test.utils.TestConfigurationHelper; @@ -12,7 +13,7 @@ public abstract class VidBaseTestWithoutLogin extends DriverFactory { } @Override - protected org.onap.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { + protected 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 ed64bba0a..a24ecb735 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,47 +1,42 @@ 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.onap.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.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.infra.*; 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.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.services.SimulatorApi.RegistrationStrategy.APPEND; + public class ViewEditServiceInstanceTest extends VidBaseTestCase { private ViewEditPage viewEditPage = new ViewEditPage(); @@ -67,9 +62,9 @@ public class ViewEditServiceInstanceTest extends VidBaseTestCase { /// Activate / Deactivate service instance /// ////////////////////////////////////////////// - @FeatureTogglingTest(value = FLAG_COLLECTION_RESOURCE_SUPPORT) + @FeatureTogglingTest(value = Features.FLAG_1908_RESUME_MACRO_SERVICE, flagActive = false) @Test - public void testViewEditCRServiceInstance()throws Exception { + public void testViewEditCRServiceInstance() { SimulatorApi.clearAll(); BulkRegistration.searchExistingCRServiceInstance("Created"); BulkRegistration.activateServiceInstance(ACTIVATE_ACTION); 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 index 724e68065..76cc7a44b 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/ViewEditWithDrawingBoardTest.java @@ -1,80 +1,77 @@ 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.aai.*; 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.mso.*; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; 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.Wait; +import vid.automation.test.infra.ModelInfo; import vid.automation.test.sections.DrawingBoardPage; -import vid.automation.test.sections.VidBasePage; import vid.automation.test.services.SimulatorApi; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.defaultPlacement; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; +import static vid.automation.test.Constants.DrawingBoard.CONTEXT_MENU_BUTTON_HEADER; +import static vid.automation.test.Constants.DrawingBoard.CONTEXT_MENU_HEADER_RESUME_ITEM; +import static vid.automation.test.infra.ModelInfo.aLaCarteVnfGroupingService; +import static vid.automation.test.infra.ModelInfo.collectionResourceForResume; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; + 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"; + private String serviceInstanceToDeleteName; + private String vnf1Name; + private String subscriberId = "e433710f-9217-458d-a79d-1c7aff376d89"; + private String serviceType = "TYLER SILVIA"; + private String serviceInstanceToResumeName; @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) + String serviceInstanceId = "b9af7c1d-a2d7-4370-b747-1b266849ad32"; + String serviceReqId = "3cf5ea96-6b34-4945-b5b1-4a7798b1caf2"; + + //createPresetsForServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name init serviceInstanceToDeleteName + final List<BasePreset> presetsForGetTopology = createPresetsForServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name(serviceInstanceId); + final ImmutableMap<PresetMSOServiceInstanceGen2WithNames.Keys, String> names = ImmutableMap.of(SERVICE_NAME, serviceInstanceToDeleteName); + SimulatorApi.registerExpectationFromPresetsCollections(ImmutableList.of( + presetsForSearchAndEdit(aLaCarteVnfGroupingService, subscriberId, serviceType, serviceInstanceId), + presetsForGetTopology, + ImmutableList.of( + new PresetAAIModelsByInvariantIdGet(ImmutableList.of(aLaCarteVnfGroupingService.modelInvariantId)), + new PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService(names, 0, serviceReqId) + ) + ), + CLEAR_THEN_SET); + + registerMsoPresetForRemoveInstanceGroupMember(); + searchEditAndWaitForCompletion( + serviceInstanceId, + serviceInstanceToDeleteName, + () -> hoverAndClickMenuByName(vnf1Name, "daeb6568-cef8-417f-9075-ed259ce59f48-groupingservicefortest..ResourceInstanceGroup..0", Constants.InstantiationStatus.CONTEXT_MENU_DELETE) ); + } - SimulatorApi.registerExpectationFromPresets(presets, APPEND); - registerMsoPreset(); + protected void searchEditAndWaitForCompletion(String serviceInstanceId, String serviceInstanceName, Runnable action) { GeneralUIUtils.ultimateWait(); goToExistingInstanceById(serviceInstanceId); GeneralUIUtils.ultimateWait(); @@ -82,23 +79,14 @@ public class ViewEditWithDrawingBoardTest extends VidBaseTestCase { 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(); + action.run(); 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); - + drawingBoardPage.screenshotDeployDialog(serviceInstanceId); + drawingBoardPage.deploy(); + drawingBoardPage.verifyServiceCompletedOnTime(serviceInstanceName, "Service " + serviceInstanceName); } - public void registerMsoPreset(){ + public void registerMsoPresetForRemoveInstanceGroupMember() { String vnfGroupRequestId = UUID.randomUUID().toString(); String firstMemberRequestId = UUID.randomUUID().toString(); String secondMemberRequestId = UUID.randomUUID().toString(); @@ -129,18 +117,23 @@ public class ViewEditWithDrawingBoardTest extends VidBaseTestCase { } - public String registerServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name() { + public List<BasePreset> createPresetsForServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name(String serviceInstanceId) { + + final String RELATED_VNF_UUID1 = "a9f1b136-11ed-471f-8d77-f123c7501a01"; + final String RELATED_VNF_UUID2 = "963b67e1-079a-404e-abef-b745d770bd85"; + final String RELATED_VNF_UUID3 = "5a34a4f4-81a4-4eed-871b-f0b1187160d4"; + PresetAAIStandardQueryGet relatedVnf1 = PresetAAIStandardQueryGet.ofVnf(RELATED_VNF_UUID1, "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "7a6ee536-f052-46fa-aa7e-2fca9d674c44", - "", ImmutableMultimap.of()); + "", ImmutableMultimap.of(), defaultPlacement()); PresetAAIStandardQueryGet relatedVnf2 = PresetAAIStandardQueryGet.ofVnf(RELATED_VNF_UUID2, "d6557200-ecf2-4641-8094-5393ae3aae60","d6557200-ecf2-4641-8094-5393ae3aae60", - "", ImmutableMultimap.of()); + "", ImmutableMultimap.of(), defaultPlacement()); PresetAAIStandardQueryGet relatedVnf3 = PresetAAIStandardQueryGet.ofVnf(RELATED_VNF_UUID3, "d6557200-ecf2-4641-8094-5393ae3aae60","d6557200-ecf2-4641-8094-5393ae3aae60", - "", ImmutableMultimap.of()); + "", ImmutableMultimap.of(), defaultPlacement()); final PresetAAIStandardQueryGet vnfGroup1 = PresetAAIStandardQueryGet.ofInstanceGroup("vnfGroup-type", "Teresa Bradley", @@ -158,21 +151,93 @@ public class ViewEditWithDrawingBoardTest extends VidBaseTestCase { .putAll("instance-group", vnfGroup1.getReqPath(), vnfGroup2.getReqPath()) .build() ); - SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + + serviceInstanceToDeleteName = serviceInstance.getInstanceName(); + vnfGroupInstanceId = vnfGroup1.getInstanceId(); + vnf1Name = vnfGroup1.getInstanceName(); + return ImmutableList.of( serviceInstance, - vnfGroup1,vnfGroup2, relatedVnf1, relatedVnf2, relatedVnf3, - new PresetAAIModelsByInvariantIdGet(ImmutableList.of(aLaCarteVnfGroupingService.modelInvariantId)), + vnfGroup1, vnfGroup2, relatedVnf1, relatedVnf2, relatedVnf3); + } + + private List<BasePreset> presetsForSearchAndEdit(ModelInfo modelInfo, String subscriberId, String serviceType, String serviceInstanceId) { + return ImmutableList.of( new PresetGetSessionSlotCheckIntervalGet(), new PresetAAIGetSubscribersGet(), - new PresetSDCGetServiceMetadataGet(aLaCarteVnfGroupingService), - new PresetSDCGetServiceToscaModelGet(aLaCarteVnfGroupingService) - ), CLEAR_THEN_SET); + new PresetSDCGetServiceMetadataGet(modelInfo), + new PresetSDCGetServiceToscaModelGet(modelInfo), + new PresetAAIGetServicesGet(), + new PresetAAIFilterServiceInstanceById(subscriberId, serviceType, serviceInstanceId), + new PresetAAIGetSubDetailsGetSpecificService(subscriberId, serviceType, "Assigned", modelInfo, serviceInstanceId), + new PresetAAIGetSubDetailsWithoutInstancesGetSpecificService(subscriberId, serviceType) + ); + } - serviceInstanceName = serviceInstance.getInstanceName(); - vnfGroupInstanceName = vnfGroup1.getInstanceName(); - vnfGroupInstanceId = vnfGroup1.getInstanceId(); - return vnfGroupInstanceName; + @FeatureTogglingTest({Features.FLAG_1908_COLLECTION_RESOURCE_NEW_INSTANTIATION_UI, Features.FLAG_1908_RESUME_MACRO_SERVICE}) + @Test + public void testResumeServiceInstanceWithCollectionResource() { + + String serviceInstanceId = "0d7b5429-da18-475b-8b67-1b8c0a596f68"; + String serviceReqId = "405652f4-ceb3-4a75-9474-8aea71480a77"; //from PresetMSOOrchestrationRequestsGetByServiceInstanceId + + //createPresetsForServiceInstanceTopologyExpectationOnAAIAndGetVnf1Name init serviceInstanceToDeleteName + final List<BasePreset> presetsForGetTopology = createPresetsForGetTopologyOfServiceInstanceWithCRandInstanceGroup(serviceInstanceId); + SimulatorApi.registerExpectationFromPresetsCollections(ImmutableList.of( + presetsForSearchAndEdit(collectionResourceForResume, subscriberId, serviceType, serviceInstanceId), + presetsForGetTopology, + createPresetsForResume(serviceInstanceId, serviceReqId) + ), + CLEAR_THEN_SET); + + searchEditAndWaitForCompletion( + serviceInstanceId, + serviceInstanceToResumeName, //side effect of createPresetsForGetTopologyOfServiceInstanceWithCRandInstanceGroup + () -> { + Click.byTestId(CONTEXT_MENU_BUTTON_HEADER); + Click.byTestId(CONTEXT_MENU_HEADER_RESUME_ITEM); + }); } + private List<BasePreset> createPresetsForResume(String serviceInstanceId, String serviceReqId) { + String resumeRequestId = UUID.randomUUID().toString(); + return ImmutableList.of( + new PresetMSOOrchestrationRequestsGetByServiceInstanceId(serviceInstanceId), + new PresetMSOResumeRequest(serviceReqId, resumeRequestId, serviceInstanceId, "us16807000"), + new PresetMSOOrchestrationRequestGet(MSO_COMPLETE_STATUS, resumeRequestId) + ); + } + + private List<BasePreset> createPresetsForGetTopologyOfServiceInstanceWithCRandInstanceGroup(String serviceInstanceId) { + PresetAAIStandardQueryGet instanceGroup = PresetAAIStandardQueryGet.ofInstanceGroup( + "L3-NETWORK", "SUB_INTERFACE", ImmutableMultimap.of(), + "868b109c-9481-4a18-891b-af974db7705a", "dd182d7d-6949-4b90-b3cc-5befe400742e"); + + PresetAAIStandardQueryGet cr = PresetAAIStandardQueryGet.ofCollectionResource( + "Assigned", + ImmutableMultimap.of("instance-group", instanceGroup.getReqPath()), + "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + "ce8c98bc-4691-44fb-8ff0-7a47487c11c4" + ); + + PresetAAIStandardQueryGet service = PresetAAIStandardQueryGet.ofServiceInstance( + serviceInstanceId, + "INFRASTRUCTURE", "", collectionResourceForResume.modelVersionId, + collectionResourceForResume.modelInvariantId, + subscriberId, + serviceType, + "Assigned", + ImmutableMultimap.of("collection", cr.getReqPath()) + ); + + PresetAAIModelsByInvariantIdGetForServiceWithCR aaiModelsPreset = new PresetAAIModelsByInvariantIdGetForServiceWithCR( + ImmutableList.of( + "868b109c-9481-4a18-891b-af974db7705a", + "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + collectionResourceForResume.modelInvariantId)); + + serviceInstanceToResumeName = service.getInstanceName(); + + return ImmutableList.of(service, cr, instanceGroup, aaiModelsPreset); + } } diff --git a/vid-automation/src/main/java/vid/automation/test/test/VlanTagSubInterfaceTest.java b/vid-automation/src/main/java/vid/automation/test/test/VlanTagSubInterfaceTest.java index 3f8db2a94..5f594cb97 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/VlanTagSubInterfaceTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/VlanTagSubInterfaceTest.java @@ -1,27 +1,10 @@ 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.aai.*; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateVnfVlanTagging; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet; +import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.ui.Select; import org.testng.Assert; @@ -30,7 +13,6 @@ import org.testng.annotations.DataProvider; 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.Get; import vid.automation.test.infra.SelectOption; import vid.automation.test.sections.SearchExistingPage; @@ -38,7 +20,19 @@ import vid.automation.test.sections.VidBasePage; import vid.automation.test.services.BulkRegistration; import vid.automation.test.services.SimulatorApi; -@FeatureTogglingTest(FLAG_COLLECTION_RESOURCE_SUPPORT) +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.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AAIAIC25_TO_ATT_AIC; +import static org.testng.AssertJUnit.assertEquals; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; +import static vid.automation.test.test.ALaCarteflowTest.AIC; + public class VlanTagSubInterfaceTest extends CreateInstanceDialogBaseTest { private final String ecompNamingFalseInstanceId = "dc3a893e-0104-4ef6-abfe-6c2932294a3e"; @@ -56,7 +50,7 @@ public class VlanTagSubInterfaceTest extends CreateInstanceDialogBaseTest { ); final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion1 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("irma-aic", "hvf6", "untraaa"); - final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion2 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("irma-aic", "JANET25", "untraaa"); + final PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest presetAAIGetInstanceGroupsByCloudRegion2 = new PresetAAIGetInstanceGroupsByCloudRegionInvalidRequest("irma-aic", "AAIAIC25", "untraaa"); SimulatorApi.registerExpectationFromPresets(ImmutableList.of( new PresetAAIGetServicesGet(), @@ -67,8 +61,8 @@ public class VlanTagSubInterfaceTest extends CreateInstanceDialogBaseTest { new PresetAAIGetTenants(), presetAAIGetInstanceGroupsByCloudRegion1, presetAAIGetInstanceGroupsByCloudRegion2, - new PresetMSOOrchestrationRequestGet("IN_PROGRESS"), - new PresetMSOOrchestrationRequestGet("COMPLETE") + new PresetMSOOrchestrationRequestGet("IN_PROGRESS", false), + new PresetMSOOrchestrationRequestGet("COMPLETE", false) ), APPEND); @@ -104,7 +98,7 @@ public class VlanTagSubInterfaceTest extends CreateInstanceDialogBaseTest { WebElement instanceNameInput = GeneralUIUtils.getInputElement(Constants.INSTANCE_NAME_SELECT_TESTS_ID); instanceNameInput.sendKeys("NewName"); SelectOption.byTestIdAndVisibleText("TYLER SILVIA", Constants.ViewEdit.PRODUCT_FAMILY_SELECT_TESTS_ID); - viewEditPage.selectLcpRegion("JANET25", AIC); + viewEditPage.selectLcpRegion("AAIAIC25", 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("xxx1", Constants.OwningEntity.PLATFORM_SELECT_TEST_ID); 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 717e2a746..18cda6bda 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 @@ -2,7 +2,7 @@ package vid.automation.test.utils; public class DB_CONFIG { public static String url = String.format("jdbc:mariadb://%s:%d/vid_portal", - System.getProperty("DB_HOST", System.getProperty("VID_HOST", "10.0.0.10" )), + System.getProperty("DB_HOST", System.getProperty("VID_HOST", "127.0.0.1" )), Integer.valueOf(System.getProperty("DB_PORT", "3306")) ); public static String username = "euser"; 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 0b2978dda..0d40a30e7 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 @@ -1,18 +1,19 @@ package vid.automation.test.utils; +import org.onap.sdc.ci.tests.datatypes.Configuration; import vid.automation.test.infra.FeaturesTogglingConfiguration; public class TestConfigurationHelper { private TestConfigurationHelper(){} - public static org.onap.sdc.ci.tests.datatypes.Configuration getEnvConfiguration() { + public static Configuration getEnvConfiguration() { try { String envUrl = System.getProperty("ENV_URL"); boolean isCustomLogin = Boolean.parseBoolean(System.getProperty("CUSTOM_LOGIN")); - org.onap.sdc.ci.tests.datatypes.Configuration configuration = new org.onap.sdc.ci.tests.datatypes.Configuration(envUrl, isCustomLogin); + Configuration configuration = new Configuration(envUrl, isCustomLogin); String geckoDriverPath = System.getProperty("GECKO_PATH"); if(geckoDriverPath == null){ diff --git a/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json b/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json index b5b5aaefc..25725db8e 100644 --- a/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json +++ b/vid-automation/src/main/resources/NewServiceInstanceTest/createNewServiceInstance_macro_validPopupDataAndUI__dynamicFieldsEcompNamingFalse.json @@ -1 +1,3252 @@ -{"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 +{ + "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_SHOW_VERIFY_SERVICE": true, + "FLAG_ASYNC_ALACARTE_VFMODULE": false, + "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true, + "FLAG_ASYNC_ALACARTE_VNF": true, + "FLAG_SERVICE_MODEL_CACHE": true, + "CREATE_INSTANCE_TEST": false, + "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD": 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": {}, + "collectionResources": {}, + "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": {}, + "collectionResources": {}, + "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": "AAIAIC25", + "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": "AAIAIC25", + "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": "AAIAIC25", + "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": "AAIAIC25", + "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": "AAIAIC25", + "name": "AAIAIC25", + "isPermitted": true + }, + { + "id": "hvf6", + "name": "hvf6", + "isPermitted": true + } + ], + "lcpRegionsTenantsMap": { + "AAIAIC25": [ + { + "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": "vFLORENCE", + "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/changeManagement/withoutConfigurationParameters.csv b/vid-automation/src/main/resources/changeManagement/withoutConfigurationParameters.csv index 8c9aa401f..f636496b0 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,10.2.3.4 +payload,request-parameters,[vm],[vnfc],ipaddress-v4-oam-vip,10.0.0.10 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 7045a3130..bc865d6e8 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,10.2.3.4 +request-parameters,[vm],[vnfc],ipaddress-v4-oam-vip,10.0.0.10 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/presets_templates/PresetAAIGetSubDetailsGet.json b/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json index ac62bb1e7..44f5766e6 100644 --- a/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json +++ b/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json @@ -12,7 +12,7 @@ "service-instance":[ { "service-instance-id":"414db2d4-18d0-415e-aac2-f255b586cfb5", - "service-instance-name":"vFlowLogic-vflf_080117", + "service-instance-name":"vRichardson-vflf_080117", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502391806301", @@ -22,7 +22,7 @@ }, { "service-instance-id":"769be44e-981a-4da8-af3b-ca5fa76b7fb1", - "service-instance-name":"vFlowLogic-vflp_080117", + "service-instance-name":"vRichardson-vflp_080117", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501712783617", @@ -1755,13 +1755,13 @@ "is-permitted":false }, { - "service-type":"vMME", + "service-type":"vFLORENCE", "resource-version":"1497729820723", "service-instances":{ "service-instance":[ { "service-instance-id":"26731151-6854-4936-8ddc-1eb2b28cef26", - "service-instance-name":"vMME_2017-33_Svc", + "service-instance-name":"vFLORENCE_2017-33_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152917", @@ -1771,7 +1771,7 @@ }, { "service-instance-id":"b75fb352-0719-465b-ba48-3aa7d781b394", - "service-instance-name":"vMME1610Svc", + "service-instance-name":"vFLORENCE1610Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148345", @@ -1781,7 +1781,7 @@ }, { "service-instance-id":"1d291ab5-0440-4263-8648-1846a09d6135", - "service-instance-name":"vMME_1610_Svc", + "service-instance-name":"vFLORENCE_1610_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148352", @@ -1801,7 +1801,7 @@ }, { "service-instance-id":"14ce9494-9a75-49bf-a898-3503697c29f1", - "service-instance-name":"vMME+Svc+Jul+14", + "service-instance-name":"vFLORENCE+Svc+Jul+14", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135820", @@ -1811,7 +1811,7 @@ }, { "service-instance-id":"72960ff3-a1e9-493d-93f4-ac026b22326b", - "service-instance-name":"vMME_CI_110216_Svc", + "service-instance-name":"vFLORENCE_CI_110216_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136021", @@ -1821,7 +1821,7 @@ }, { "service-instance-id":"c9bf0fc4-b621-40d1-8b89-7f8235171ffb", - "service-instance-name":"vMME1.8_LAB_8152017_Svc", + "service-instance-name":"vFLORENCE1.8_LAB_8152017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504727411210", @@ -1831,7 +1831,7 @@ }, { "service-instance-id":"aee4df10-4289-4ae1-acdc-7f8cffa61603", - "service-instance-name":"xx_2017_417_vMME_0622_Svc", + "service-instance-name":"xx_2017_417_vFLORENCE_0622_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1498675414340", diff --git a/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json b/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json index 0653899bf..039d2d558 100644 --- a/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json +++ b/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json @@ -5,7 +5,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -13,7 +13,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", 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 9c6552b32..3e31a39df 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 @@ -9,7 +9,7 @@ "instanceName": "<SERVICE_INSTANCE_NAME>", "source": "VID", "suppressRollback": false, - "requestorId": "mo57174000", + "requestorId": "em1536000", "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb" }, "modelInfo": { diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_filter_vfc_ig_service_instance_by_id.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_filter_vfc_ig_service_instance_by_id.json index d8ffb8095..d1e1a02be 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_filter_vfc_ig_service_instance_by_id.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_filter_vfc_ig_service_instance_by_id.json @@ -14,7 +14,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/dc3a893e-0104-4ef6-abfe-6c2932294a3f" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/dc3a893e-0104-4ef6-abfe-6c2932294a3f" } ] } @@ -35,7 +35,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/dc3a893e-0104-4ef6-abfe-6c2932294a3e" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/dc3a893e-0104-4ef6-abfe-6c2932294a3e" } ] } diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA-ROBBINS_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 4d3ee7226..b33835f8b 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA-ROBBINS_vfc_ig.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA-ROBBINS_vfc_ig.json @@ -7327,7 +7327,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -7335,7 +7335,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", @@ -8399,7 +8399,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -8407,7 +8407,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json index 42ab78f84..b13a7a481 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json +++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json @@ -6739,7 +6739,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -6747,7 +6747,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", @@ -9611,7 +9611,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -9619,7 +9619,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", 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 d55471fde..91413a070 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-vDOROTHEASrv-csar.zip" + "file": "service-VdorotheaSrv-csar.zip" } }, { @@ -16,7 +16,7 @@ }, "simulatorResponse": { "responseCode": 200, - "file": "service-vDOROTHEASrv-csar_ecomp_false6.zip" + "file": "service-VdorotheaSrv-csar_ecomp_false6.zip" } }, { @@ -34,7 +34,7 @@ "invariantUUID": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", "name": "Demo Service", "version": "1.0", - "toscaModelURL": "./service-vDOROTHEASrv-csar.zip", + "toscaModelURL": "./service-VdorotheaSrv-csar.zip", "category": "TYLER SILVIA", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", @@ -60,7 +60,7 @@ "invariantUUID": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", "name": "Demo Service", "version": "1.0", - "toscaModelURL": "./service-vDOROTHEASrv-csar_ecomp_false6.zip", + "toscaModelURL": "./service-VdorotheaSrv-csar_ecomp_false6.zip", "category": "TYLER SILVIA", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", 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 3c85f240f..72422f652 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-vDOROTHEASrv-csar.zip" + "file": "service-VdorotheaSrv-csar.zip" } }, { @@ -24,7 +24,7 @@ "invariantUUID": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", "name": "Demo Service", "version": "1.0", - "toscaModelURL": "./service-vDOROTHEASrv-csar.zip", + "toscaModelURL": "./service-VdorotheaSrv-csar.zip", "category": "TYLER SILVIA", "lifecycleState": "CERTIFIED", "lastUpdaterUserId": "rg276b", 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 defbb58e2..bf7720c6b 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 @@ -22,7 +22,7 @@ "service-instance":[ { "service-instance-id":"414db2d4-18d0-415e-aac2-f255b586cfb5", - "service-instance-name":"vFlowLogic-vflf_080117", + "service-instance-name":"vRichardson-vflf_080117", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502391806301", @@ -32,7 +32,7 @@ }, { "service-instance-id":"769be44e-981a-4da8-af3b-ca5fa76b7fb1", - "service-instance-name":"vFlowLogic-vflp_080117", + "service-instance-name":"vRichardson-vflp_080117", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501712783617", @@ -1718,13 +1718,13 @@ "is-permitted":false }, { - "service-type":"vMME", + "service-type":"vFLORENCE", "resource-version":"1497729820723", "service-instances":{ "service-instance":[ { "service-instance-id":"26731151-6854-4936-8ddc-1eb2b28cef26", - "service-instance-name":"vMME_2017-33_Svc", + "service-instance-name":"vFLORENCE_2017-33_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152917", @@ -1734,7 +1734,7 @@ }, { "service-instance-id":"b75fb352-0719-465b-ba48-3aa7d781b394", - "service-instance-name":"vMME1610Svc", + "service-instance-name":"vFLORENCE1610Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148345", @@ -1744,7 +1744,7 @@ }, { "service-instance-id":"1d291ab5-0440-4263-8648-1846a09d6135", - "service-instance-name":"vMME_1610_Svc", + "service-instance-name":"vFLORENCE_1610_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148352", @@ -1764,7 +1764,7 @@ }, { "service-instance-id":"14ce9494-9a75-49bf-a898-3503697c29f1", - "service-instance-name":"vMME+Svc+Jul+14", + "service-instance-name":"vFLORENCE+Svc+Jul+14", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135820", @@ -1774,7 +1774,7 @@ }, { "service-instance-id":"72960ff3-a1e9-493d-93f4-ac026b22326b", - "service-instance-name":"vMME_CI_110216_Svc", + "service-instance-name":"vFLORENCE_CI_110216_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136021", @@ -1784,7 +1784,7 @@ }, { "service-instance-id":"c9bf0fc4-b621-40d1-8b89-7f8235171ffb", - "service-instance-name":"vMME1.8_LAB_8152017_Svc", + "service-instance-name":"vFLORENCE1.8_LAB_8152017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504727411210", @@ -1794,7 +1794,7 @@ }, { "service-instance-id":"aee4df10-4289-4ae1-acdc-7f8cffa61603", - "service-instance-name":"xx_2017_417_vMME_0622_Svc", + "service-instance-name":"xx_2017_417_vFLORENCE_0622_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1498675414340", @@ -3970,7 +3970,7 @@ "is-permitted":false }, { - "service-type":"vMME", + "service-type":"vFLORENCE", "resource-version":"1497729820723", "is-permitted":false }, 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 a71270e72..18643d792 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//v3/getSessionSlotCheckInterval" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi//v[0-9]+/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, @@ -22,7 +22,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ecompportal_att/auxapi/v3/getSessionSlotCheckInterval" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi/v[0-9]+/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, 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 defbb58e2..bf7720c6b 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 @@ -22,7 +22,7 @@ "service-instance":[ { "service-instance-id":"414db2d4-18d0-415e-aac2-f255b586cfb5", - "service-instance-name":"vFlowLogic-vflf_080117", + "service-instance-name":"vRichardson-vflf_080117", "persona-model-id":null, "persona-model-version":null, "resource-version":"1502391806301", @@ -32,7 +32,7 @@ }, { "service-instance-id":"769be44e-981a-4da8-af3b-ca5fa76b7fb1", - "service-instance-name":"vFlowLogic-vflp_080117", + "service-instance-name":"vRichardson-vflp_080117", "persona-model-id":null, "persona-model-version":null, "resource-version":"1501712783617", @@ -1718,13 +1718,13 @@ "is-permitted":false }, { - "service-type":"vMME", + "service-type":"vFLORENCE", "resource-version":"1497729820723", "service-instances":{ "service-instance":[ { "service-instance-id":"26731151-6854-4936-8ddc-1eb2b28cef26", - "service-instance-name":"vMME_2017-33_Svc", + "service-instance-name":"vFLORENCE_2017-33_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255152917", @@ -1734,7 +1734,7 @@ }, { "service-instance-id":"b75fb352-0719-465b-ba48-3aa7d781b394", - "service-instance-name":"vMME1610Svc", + "service-instance-name":"vFLORENCE1610Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148345", @@ -1744,7 +1744,7 @@ }, { "service-instance-id":"1d291ab5-0440-4263-8648-1846a09d6135", - "service-instance-name":"vMME_1610_Svc", + "service-instance-name":"vFLORENCE_1610_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255148352", @@ -1764,7 +1764,7 @@ }, { "service-instance-id":"14ce9494-9a75-49bf-a898-3503697c29f1", - "service-instance-name":"vMME+Svc+Jul+14", + "service-instance-name":"vFLORENCE+Svc+Jul+14", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255135820", @@ -1774,7 +1774,7 @@ }, { "service-instance-id":"72960ff3-a1e9-493d-93f4-ac026b22326b", - "service-instance-name":"vMME_CI_110216_Svc", + "service-instance-name":"vFLORENCE_CI_110216_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1494255136021", @@ -1784,7 +1784,7 @@ }, { "service-instance-id":"c9bf0fc4-b621-40d1-8b89-7f8235171ffb", - "service-instance-name":"vMME1.8_LAB_8152017_Svc", + "service-instance-name":"vFLORENCE1.8_LAB_8152017_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1504727411210", @@ -1794,7 +1794,7 @@ }, { "service-instance-id":"aee4df10-4289-4ae1-acdc-7f8cffa61603", - "service-instance-name":"xx_2017_417_vMME_0622_Svc", + "service-instance-name":"xx_2017_417_vFLORENCE_0622_Svc", "persona-model-id":null, "persona-model-version":null, "resource-version":"1498675414340", @@ -3970,7 +3970,7 @@ "is-permitted":false }, { - "service-type":"vMME", + "service-type":"vFLORENCE", "resource-version":"1497729820723", "is-permitted":false }, 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 f0e1b5e7f..81c8ec8f6 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 @@ -7,7 +7,7 @@ "simple" ] }, - "body": "{\"start\": [\"business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances\"],\"query\": \"query/vnf-topology-fromServiceInstance\"}" + "body": "{\"start\": [\"business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances\"],\"query\": \"query/vnf-topology-fromServiceInstance\"}" }, "simulatorResponse": { "responseCode": 200, @@ -16,7 +16,7 @@ { "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", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", @@ -29,19 +29,19 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3481829392", "node-type": "generic-vnf", - "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", @@ -54,19 +54,19 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3484520464", "node-type": "generic-vnf", - "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", @@ -79,19 +79,19 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3783459064", "node-type": "generic-vnf", - "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", @@ -104,19 +104,19 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3892133896", "node-type": "generic-vnf", - "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", @@ -129,19 +129,19 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3418898432", "node-type": "generic-vnf", - "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org: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", @@ -164,34 +164,34 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org: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", @@ -214,54 +214,54 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", + "url": "https://aai.onap.org: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", @@ -284,14 +284,14 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", + "url": "https://aai.onap.org: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", @@ -314,14 +314,14 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", + "url": "https://aai.onap.org: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", @@ -344,24 +344,24 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org: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", @@ -384,24 +384,24 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", "properties": { "vnf-id": "8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", "vnf-name": "zolson3amdns02test2", @@ -424,59 +424,59 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org: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", @@ -499,59 +499,59 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org: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", @@ -574,52 +574,52 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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/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 bcfedebf2..467029dbf 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 @@ -7,7 +7,7 @@ }, "body": { "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" + "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&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 781dcb3f9..4740a6743 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 @@ -12,7 +12,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -20,7 +20,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", @@ -149,7 +149,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -157,7 +157,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "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 27d26f397..a03075db7 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=JANET25"} + "body": {"start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c", "query": "query/queryvnfFromModelbyRegion?cloudRegionId=AAIAIC25"} }, "simulatorResponse": { "responseCode": 200, diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json index af955a40b..d8216c817 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json @@ -9727,7 +9727,7 @@ } }, { - "model-name": "4-27_vMME_Service", + "model-name": "4-27_vFLORENCE_Service", "service-instance": { "service-instance-id": "5164a1ed-d7ba-4e33-b82d-3a5f90543c47", "service-instance-name": "Lital39887395", @@ -9742,7 +9742,7 @@ "extra-property": [ { "property-name": "model-ver.model-description", - "property-value": "4-27_vMME_Service" + "property-value": "4-27_vFLORENCE_Service" }, { "property-name": "model-ver.model-version-id", @@ -9750,7 +9750,7 @@ }, { "property-name": "model-ver.model-name", - "property-value": "4-27_vMME_Service" + "property-value": "4-27_vFLORENCE_Service" }, { "property-name": "model.model-type", diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json index 82ee8f555..07047cd70 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json +++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json @@ -6739,7 +6739,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -6747,7 +6747,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", @@ -9611,7 +9611,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -9619,7 +9619,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", 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 52b425bd8..43704f4de 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,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ecompportal_att/auxapi//v3/getSessionSlotCheckInterval" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi//v[0-9]+/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, @@ -22,7 +22,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ecompportal_att/auxapi/v3/getSessionSlotCheckInterval" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi/v[0-9]+/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 00bf8911f..137d0de30 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 @@ -10,7 +10,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -39,7 +39,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Deactivate", + "operational-environment-status": "INACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -68,7 +68,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", "operational-environment-type": "ONAP", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" @@ -77,7 +77,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", "operational-environment-type": "ONAP", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" 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 1977e6b71..ad8e3c09a 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 @@ -10,7 +10,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -39,7 +39,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -68,7 +68,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", "operational-environment-type": "ONAP", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" @@ -77,7 +77,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", "operational-environment-type": "ONAP", - "operational-environment-status": "Deactivate", + "operational-environment-status": "INACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" 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 8d6cd4ad7..fece3ffd1 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 @@ -10,7 +10,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -39,7 +39,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Deactivate", + "operational-environment-status": "INACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -68,7 +68,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", "operational-environment-type": "ONAP", - "operational-environment-status": "Deactivate", + "operational-environment-status": "INACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" @@ -77,7 +77,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", "operational-environment-type": "ONAP", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" diff --git a/vid-automation/src/main/resources/registration_to_simulator/get_full_operational_environment.json b/vid-automation/src/main/resources/registration_to_simulator/get_full_operational_environment.json index b25833bc2..7c97ce3c3 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/get_full_operational_environment.json +++ b/vid-automation/src/main/resources/registration_to_simulator/get_full_operational_environment.json @@ -13,7 +13,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -42,7 +42,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -72,7 +72,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -101,7 +101,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ef", "operational-environment-name": "new_name", "operational-environment-type": "VNF", - "operational-environment-status": "Deactivate", + "operational-environment-status": "INACTIVE", "tenant-context": "new_tenant", "workload-context": "new_workload_context", "resource-version": "1505228226913", 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 02938431c..2b5c92332 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 @@ -15,7 +15,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -44,7 +44,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -73,7 +73,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -118,7 +118,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec", "operational-environment-name": "ECOMP Env Name", "operational-environment-type": "ONAP", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" @@ -127,7 +127,7 @@ "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed", "operational-environment-name": "ECOMP Env Name", "operational-environment-type": "ONAP", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" 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 254c35e8f..b6d2fc329 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 @@ -12,7 +12,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -20,7 +20,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_cr_service_instance_by_id.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_cr_service_instance_by_id.json index 589a4ffa1..e8cc77d7d 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_cr_service_instance_by_id.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_cr_service_instance_by_id.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7testCR" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7testCR" } ] } diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id.json index 6f5107e52..1534746c0 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7b04f9d" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7b04f9d" } ] } diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id_test_sssdad.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id_test_sssdad.json index e5cabc754..e0fef6c89 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id_test_sssdad.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id_test_sssdad.json @@ -13,7 +13,7 @@ "result-data": [ { "resource-type": "service-instance", - "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f6" + "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f6" } ] } diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json index 897342b86..83a5dab2d 100644 --- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json +++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json @@ -8366,7 +8366,7 @@ }, { "service-instance-id": "8b5e21c0-6466-4ac5-919f-6469b2a65fe5", - "service-instance-name": "VIK_test_vDOROTHEA", + "service-instance-name": "VIK_test_VDOROTHEA", "service-type": "", "service-role": "", "environment-context": "General_Revenue-Bearing", @@ -27085,7 +27085,7 @@ }, { "service-instance-id": "f416d2f3-92c1-43e3-8d36-2adb10e180bc", - "service-instance-name": "oren-PASQUALE", + "service-instance-name": "oren-pasquale", "service-type": "", "service-role": "", "environment-context": "null", 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 index daf7d59f9..afc8f6853 100644 --- 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 @@ -1348,7 +1348,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -1356,7 +1356,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", @@ -1892,7 +1892,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -1900,7 +1900,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", 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 index 5708e6d09..f9794bcc5 100644 --- 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 @@ -1348,7 +1348,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -1356,7 +1356,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", @@ -1892,7 +1892,7 @@ "relationship": [ { "related-to": "tenant", - "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", + "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86", "relationship-data": [ { "relationship-key": "cloud-region.cloud-owner", @@ -1900,7 +1900,7 @@ }, { "relationship-key": "cloud-region.cloud-region-id", - "relationship-value": "JANET25" + "relationship-value": "AAIAIC25" }, { "relationship-key": "tenant.tenant-id", 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 23a37697b..c41be6563 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 @@ -55,6 +55,24 @@ }, "extra-properties": { } + }, + { + "model-name": "Proxy-Config-Instance", + "configuration": { + "configuration-id": "9533-config-LB1114", + "configuration-name": "dummy_instance_2", + "configuration-type": "configuration-type-9533", + "configuration-sub-type": "configuration-sub-type-9533", + "model-invariant-id": "model-invariant-id-9533", + "model-version-id": "model-version-id-9533", + "orchestration-status": "PendingDelete", + "operational-status": "", + "configuration-selflink": "", + "model-customization-id": "08a181aa-72eb-435f-9593-e88a3ad0a86b", + "resource-version": "1504038855716" + }, + "extra-properties": { + } } ] } 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 952aa522d..b7c6e0e46 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,44 +1,15 @@ 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.fasterxml.jackson.core.JsonProcessingException; 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.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; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetails; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetailsInvalidRequest; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetNetworkCollectionDetailsRequiredMissing; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetPortMirroringSourcePorts; -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.BasePresets.BasePreset; +import org.onap.simulator.presetGenerator.presets.aai.*; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceMetadataGet; import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaModelGet; import org.onap.vid.model.aai.AaiResponse; @@ -58,6 +29,24 @@ import vid.automation.test.infra.Features; import vid.automation.test.services.SimulatorApi; import vid.automation.test.utils.TestHelper; +import java.io.IOException; +import java.lang.reflect.Method; +import java.net.URISyntaxException; +import java.util.List; +import java.util.UUID; + +import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.*; +import static org.onap.simulator.presetGenerator.presets.ecompportal_att.EcompPortalPresetsUtils.getEcompPortalPresets; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; +import static org.testng.AssertJUnit.assertEquals; +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; + public class AaiApiTest extends BaseApiAaiTest { private static final String AAI_HOMING_DATA_RESPONSE = "viewEdit/aaiHomingDataResponse.json"; @@ -217,6 +206,7 @@ public class AaiApiTest extends BaseApiAaiTest { " }],\n" + " \"readOnly\": false\n" + "}"; + private static final String AAI_GET_ACTIVE_NETWORKS = "/aai_get_active_networks"; private String getGetOperationEnvironmentsUri() { return uri.toASCIIString() + "/get_operational_environments"; @@ -270,7 +260,7 @@ public class AaiApiTest extends BaseApiAaiTest { AaiResponse<OperationalEnvironmentList> response = loginAndDoGetWithUrl(url); assertEquals(HttpStatus.OK.value(), response.getHttpCode()); OperationalEnvironmentList list = response.getT(); - assertNotEquals(null, list.getOperationalEnvironment()); + assertNotNull(list.getOperationalEnvironment()); assertEquals(2, list.getOperationalEnvironment().size()); assertEquals(uuidOfOperationalEnvironment, list.getOperationalEnvironment().get(0).getOperationalEnvironmentId()); assertEquals(1, list.getOperationalEnvironment().get(0).getRelationshipList().getRelationship().size()); @@ -681,12 +671,14 @@ public class AaiApiTest extends BaseApiAaiTest { 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())); + ImmutableMultimap.of("l3-network", l3NetworkPreset1.getReqPath() , "l3-network", l3NetworkPreset2.getReqPath()), + defaultPlacement()); 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 vnfPreset2 = ofVnf("c55da606-cf38-42c7-bc3c-be8e23b19299", ImmutableMultimap.of("l3-network", l3NetworkPreset3.getReqPath()), + defaultPlacement()); PresetAAIStandardQueryGet serviceInstance = ofServiceInstance("9cdd1b2a-43a7-47bc-a88e-759ba2399f0b", "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "6e59c5de-f052-46fa-aa7e-2fca9d674c44", globalCustomerId, serviceType, @@ -716,7 +708,7 @@ public class AaiApiTest extends BaseApiAaiTest { 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"; + String url = uri + "/get_vnf_data_by_globalid_and_service_type/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/vRichardson"; ResponseEntity<String> response = restTemplate.getForEntity(url, String.class); //reduced_vnf_data_by_globalid_and_service_type.json @@ -727,6 +719,58 @@ public class AaiApiTest extends BaseApiAaiTest { } + @Test + public void getVpnList() { + SimulatorApi.registerExpectationFromPreset(new PresetAAIGetVpnsByType(), CLEAR_THEN_SET); + String url = uri + "/aai_get_vpn_list"; + ResponseEntity<String> response = restTemplate.getForEntity(url, String.class); + String expected = getResourceAsString("viewEdit/aaiGetVpnList.json"); + assertThat(response.getBody(), jsonEquals(expected).when(Option.IGNORING_ARRAY_ORDER).when(Option.IGNORING_EXTRA_FIELDS)); + } + + @DataProvider + public static Object[][] getActiveNetworkAaiStates() { + return new Object[][] { + {1, "viewEdit/aaiGetActiveNetworks.json"}, + {2, "viewEdit/aaiGetActiveNetworks2.json"} + }; + } + + @Test(dataProvider = "getActiveNetworkAaiStates") + public void getActiveNetworks_givenSpecificAAIState_cypressPresetMatch(int state, String expectedResultFileName) { + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + new PresetAAIGetL3NetworksByCloudRegionSpecificState(state), + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AUK51A_TO_ATT_NC + ), CLEAR_THEN_SET); + String url = uri + AAI_GET_ACTIVE_NETWORKS + + "?cloudRegion=" + AAIBaseGetL3NetworksByCloudRegionPreset.DEFAULT_CLOUD_REGION_ID + + "&tenantId=" + AAIBaseGetL3NetworksByCloudRegionPreset.DEFAULT_TENANT_ID; + String response = restTemplate.getForObject(url, String.class); + System.out.println("response = " + response); + String expected = getResourceAsString(expectedResultFileName); + assertThat(response, jsonEquals(expected)); + } + + @Test + public void getActiveNetworks() throws JsonProcessingException { + String networkRole = "Some role"; + PresetAAIGetL3NetworksByCloudRegion presetAAIGetL3NetworksByCloudRegion = new PresetAAIGetL3NetworksByCloudRegion(networkRole); + List<BasePreset> presets = ImmutableList.of( + presetAAIGetL3NetworksByCloudRegion, + PresetAAIGetCloudOwnersByCloudRegionId.PRESET_AUK51A_TO_ATT_NC + ); + SimulatorApi.registerExpectationFromPresets(presets, CLEAR_THEN_SET); + String url = uri + AAI_GET_ACTIVE_NETWORKS + + "?cloudRegion=" + presetAAIGetL3NetworksByCloudRegion.getCloudRegionId() + + "&tenantId=" + presetAAIGetL3NetworksByCloudRegion.getTenantId() + + "&networkRole=" + networkRole; + ResponseEntity<String> response = restTemplate.getForEntity(url, String.class); + + assertResponse(JsonAssert.when(Option.IGNORING_EXTRA_FIELDS, Option.IGNORING_ARRAY_ORDER), + presetAAIGetL3NetworksByCloudRegion.getActiveNetworksWithNameAndRelatedToVpnBindingAsJsonString(), + response.getBody()); + } + private void assertResponse(Object expected, String response) { assertResponse(Configuration.empty(), expected, response); } 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 index 539e857c9..1a93a23d0 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java @@ -1,39 +1,12 @@ 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.*; 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; @@ -51,7 +24,22 @@ 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}) +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +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; + +@FeatureTogglingTest({Features.FLAG_ASYNC_ALACARTE_VNF}) public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase { private static final String CREATE_BULK_OF_ALACARTE_REQUEST = "asyncInstantiation/vidRequestCreateALaCarte.json"; @@ -484,12 +472,12 @@ public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase { } private void assertServiceInfoSpecific2(String jobId, JobStatus jobStatus, String serviceInstanceName, ServiceAction serviceAction) { - assertExpectedStatusAndServiceInfo(jobStatus, jobId, true, new ServiceInfo( + assertExpectedStatusAndServiceInfo(jobStatus, jobId, PATIENCE_LEVEL.FAIL_VERY_SLOW, new ServiceInfo( "us16807000", jobStatus, false, "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "WayneHolland", "WATKINS", "JAG1", null, "092eb9e8e4b7412e8787dd091bc58e86", null, - "JANET25", null, + "AAIAIC25", null, "TYLER SILVIA", null, null, serviceInstanceName, "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", "action-data", "1.0", @@ -498,7 +486,7 @@ public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase { } private void assertServiceInfoSpecificDeletion(String jobId, JobStatus jobStatus, String serviceInstanceName, String serviceType) { - assertExpectedStatusAndServiceInfo(jobStatus, jobId, true, new ServiceInfo( + assertExpectedStatusAndServiceInfo(jobStatus, jobId, PATIENCE_LEVEL.FAIL_SLOW, new ServiceInfo( "us16807000", jobStatus, false, null, null, null, null, null, @@ -512,7 +500,7 @@ public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase { } private void assertServiceInfoSpecificUpdate(String jobId, JobStatus jobStatus, String serviceInstanceName) { - assertExpectedStatusAndServiceInfo(jobStatus, jobId, true, new ServiceInfo( + assertExpectedStatusAndServiceInfo(jobStatus, jobId, PATIENCE_LEVEL.FAIL_SLOW, new ServiceInfo( "us16807000", jobStatus, false, null, null, null, null, null, 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 index 54f2cc66f..b38d3da91 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest2.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest2.java @@ -1,34 +1,13 @@ 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.simulator.presetGenerator.presets.mso.*; import org.onap.vid.model.asyncInstantiation.JobAuditStatus; import org.onap.vid.model.asyncInstantiation.JobAuditStatus.SourceStatus; import org.onap.vid.model.asyncInstantiation.ServiceInfo; @@ -43,7 +22,22 @@ 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}) +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +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; + +@FeatureTogglingTest({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"; @@ -190,7 +184,7 @@ public class AsyncInstantiationALaCarteApiTest2 extends AsyncInstantiationBase { } private void assertServiceInfoSpecificDeletion(String jobId, JobStatus jobStatus, String serviceInstanceName, String serviceType) { - assertExpectedStatusAndServiceInfo(jobStatus, jobId, true, new ServiceInfo( + assertExpectedStatusAndServiceInfo(jobStatus, jobId, PATIENCE_LEVEL.FAIL_SLOW, new ServiceInfo( "us16807000", jobStatus, false, null, null, null, null, null, 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 index eed6ee90b..12ad325d5 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java @@ -1,50 +1,15 @@ 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.*; 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; @@ -61,7 +26,25 @@ 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}) +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.function.Function; + +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.*; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPreset; +import static vid.automation.test.services.SimulatorApi.registerExpectationFromPresets; + +@FeatureTogglingTest({Features.FLAG_ASYNC_ALACARTE_VNF}) public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase { private static final String CREATE_BULK_OF_ALACARTE_REQUEST = "asyncInstantiation/vidRequestCreateALaCarte.json"; @@ -385,12 +368,12 @@ public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase { assertThat(uuids, hasSize(1)); String jobId = uuids.get(0); - assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, true, new ServiceInfo( + assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, PATIENCE_LEVEL.FAIL_SLOW, 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, + "AAIAIC25", null, "TYLER SILVIA", null, null, "InstanceName", "6b528779-44a3-4472-bdff-9cd15ec93450", "action-data", "1.0", @@ -417,12 +400,12 @@ public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase { assertThat(uuids, hasSize(1)); String jobId = uuids.get(0); - assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, true, new ServiceInfo( + assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, PATIENCE_LEVEL.FAIL_SLOW, 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, + "AAIAIC25", null, "TYLER SILVIA", null, null, "InstanceName", "6b528779-44a3-4472-bdff-9cd15ec93450", "action-data", "1.0", @@ -460,7 +443,7 @@ public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase { assertThat(uuids, hasSize(1)); String jobId = uuids.get(0); - assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, true, new ServiceInfo( + assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, PATIENCE_LEVEL.FAIL_SLOW, new ServiceInfo( "us16807000", JobStatus.COMPLETED, false, "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "WayneHolland", "WATKINS", "NFT1", "NFTJSSSS-NFT1", @@ -492,7 +475,7 @@ public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase { assertThat(uuids, hasSize(1)); String jobId = uuids.get(0); - assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, true, new ServiceInfo( + assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, PATIENCE_LEVEL.FAIL_SLOW, new ServiceInfo( "us16807000", JobStatus.COMPLETED, false, "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "WayneHolland", "WATKINS", "NFT1", "NFTJSSSS-NFT1", @@ -549,7 +532,7 @@ public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase { } private void assertServiceInfoSpecific3(String jobId, JobStatus jobStatus, String serviceInstanceName) { - assertExpectedStatusAndServiceInfo(jobStatus, jobId, true, new ServiceInfo( + assertExpectedStatusAndServiceInfo(jobStatus, jobId, PATIENCE_LEVEL.FAIL_SLOW, new ServiceInfo( "us16807000", jobStatus, false, "aaa1", "aaa1", "yyy1", "YYY1", "UUUAIAAI-YYY1", diff --git a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationMacroApiTest.java index 5c4d8a876..1f0b0f3aa 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationMacroApiTest.java @@ -1,11 +1,13 @@ package org.onap.vid.api; import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; import net.bytebuddy.utility.RandomString; import net.javacrumbs.jsonunit.JsonAssert; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.hamcrest.collection.IsCollectionWithSize; import org.onap.simulator.presetGenerator.presets.BasePresets.BasePreset; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; @@ -21,9 +23,9 @@ import org.testng.Assert; 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.infra.Wait; import vid.automation.test.model.JobStatus; +import vid.automation.test.model.ServiceAction; import vid.automation.test.services.SimulatorApi; import java.util.*; @@ -35,15 +37,16 @@ import static java.util.stream.Collectors.*; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasSize; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE; import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys; 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.services.SimulatorApi.registerExpectationFromPresets; import static vid.automation.test.utils.ExtendedHamcrestMatcher.hasItemsFromCollection; -@FeatureTogglingTest({Features.FLAG_ASYNC_JOBS, Features.FLAG_ASYNC_INSTANTIATION}) -public class AsyncInstantiationApiTest extends AsyncInstantiationBase { - private static final Logger logger = LogManager.getLogger(AsyncInstantiationApiTest.class); +public class AsyncInstantiationMacroApiTest extends AsyncInstantiationBase { + private static final Logger logger = LogManager.getLogger(AsyncInstantiationMacroApiTest.class); private static final String MSO_BASE_ERROR = "Received error from SDN-C: java.lang.IllegalArgumentException: All keys must be specified for class org."+ @@ -55,6 +58,8 @@ public class AsyncInstantiationApiTest extends AsyncInstantiationBase { private static final String INSTANCE_GROUP_LABEL = "instanceGroup"; + private static final String DELETE_MACRO_SERVICE_FILE_NAME = "asyncInstantiation/vidRequestDeleteMacroService.json"; + @Test public void createBulkOfCreateInstances(){ Map<Keys, String> names = generateNames(); @@ -352,7 +357,7 @@ public class AsyncInstantiationApiTest extends AsyncInstantiationBase { @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)); + login(new UserCredentials("em1536000", "em1536000", null, null, null)); try { createBulkOfInstances(false, 1, Collections.EMPTY_MAP, requestDetailsFileName); } catch (HttpClientErrorException e){ @@ -365,4 +370,31 @@ public class AsyncInstantiationApiTest extends AsyncInstantiationBase { } + @Test + public void deleteMacroService_getAuditStatus_verifyCompleted() { + String deleteServiceRequestId = UUID.randomUUID().toString(); + String serviceInstanceId = "service-instance-id"; + registerExpectationFromPresets(ImmutableList.of( + new PresetAAIGetSubscribersGet(), + new PresetMSODeleteMacroService(deleteServiceRequestId, serviceInstanceId), + new PresetMSOOrchestrationRequestGet(COMPLETE, deleteServiceRequestId) + ), SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET); + + List<String> uuids = createBulkOfInstances(false, 1, ImmutableMap.of(), DELETE_MACRO_SERVICE_FILE_NAME); + assertThat(uuids, IsCollectionWithSize.hasSize(1)); + String jobId = uuids.get(0); + + assertExpectedStatusAndServiceInfo(JobStatus.COMPLETED, jobId, PATIENCE_LEVEL.FAIL_FAST, new ServiceInfo( + "us16807000", JobStatus.COMPLETED, false, + "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "WayneHolland", "WATKINS", + "JAG1", "YUDFJULP-JAG1", + "092eb9e8e4b7412e8787dd091bc58e86", "USP-SIP-IC-24335-T-01", + "AAIAIC25", null, + "service-instance-type", null, + null, "InstanceName", + "f028b2e2-7080-4b13-91b2-94944d4c42d8", "Service with VRF", "5.0", + jobId, null, ServiceAction.DELETE, false) + ); + } + } 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 c04d2ff0d..762a0091c 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,7 +17,6 @@ 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; @@ -27,8 +26,7 @@ import static org.testng.AssertJUnit.assertEquals; //This is integration test that require running tomcat public class CategoryParametersApiTest extends BaseApiTest { - public static final String GET_CATEGORY_PARAMETER_PROPERTIES = "maintenance/category_parameter"; - public static final String DELETE_CATEGORY_PARAMETER_PROPERTIES = "maintenance/delete_category_parameter"; + public static final String MAINTENANCE_CATEGORY_PARAMETER = "maintenance/category_parameter"; public static final String PROPERTY_NAME = "owningEntity"; public static final String PROPERTY_FAMILY = "PARAMETER_STANDARDIZATION"; @@ -56,7 +54,7 @@ public class CategoryParametersApiTest extends BaseApiTest { findPropertyNameInGetResponse(UPDATE_PARAMETER_PROPERTY_NAME); CategoryParameterOption deleteReq = new CategoryParameterOption(); deleteReq.setName(UPDATE_PARAMETER_PROPERTY_NAME); - deleteCPPropertiesRequest(HttpMethod.POST, deleteReq, HttpStatus.OK); + deleteCPPropertiesRequest(HttpMethod.DELETE, deleteReq, HttpStatus.OK); } @Test(groups = { "worksOnlyWithLocalhostVID" }) @@ -89,7 +87,7 @@ public class CategoryParametersApiTest extends BaseApiTest { } private Response getCPPropertiesRequest(String method, HttpStatus exceptedHttpStatus) throws IOException { - UriComponentsBuilder urlBuilder = UriComponentsBuilder.fromUri(uri).path("/"+GET_CATEGORY_PARAMETER_PROPERTIES) + UriComponentsBuilder urlBuilder = UriComponentsBuilder.fromUri(uri).path("/"+ MAINTENANCE_CATEGORY_PARAMETER) .queryParam("familyName", PROPERTY_FAMILY); WebTarget webTarget = client.target(urlBuilder.toUriString()); Response response = webTarget.request(MediaType.APPLICATION_JSON_TYPE).method(method, Entity.json(null)); @@ -98,22 +96,22 @@ public class CategoryParametersApiTest extends BaseApiTest { } private Response addCPPropertiesRequest(String method, AddCategoryOptionsRequest request, HttpStatus exceptedHttpStatus) throws IOException { - WebTarget webTarget = client.target(uri).path(GET_CATEGORY_PARAMETER_PROPERTIES+"/"+PROPERTY_NAME); + WebTarget webTarget = client.target(uri).path(MAINTENANCE_CATEGORY_PARAMETER +"/"+PROPERTY_NAME); Response response = webTarget.request(MediaType.APPLICATION_JSON_TYPE).method(method, Entity.json(request)); TestUtils.assertHttpStatus(request, webTarget, response, exceptedHttpStatus); return response; } private Response updateCPPropertiesRequest(String method, CategoryParameterOptionRep request, HttpStatus exceptedHttpStatus) throws IOException { - WebTarget webTarget = client.target(uri).path(GET_CATEGORY_PARAMETER_PROPERTIES+"/"+PROPERTY_NAME); + WebTarget webTarget = client.target(uri).path(MAINTENANCE_CATEGORY_PARAMETER +"/"+PROPERTY_NAME); Response response = webTarget.request(MediaType.APPLICATION_JSON_TYPE).method(method, Entity.json(request)); TestUtils.assertHttpStatus(request, webTarget, response, exceptedHttpStatus); return response; } private Response deleteCPPropertiesRequest(String method, CategoryParameterOption request, HttpStatus exceptedHttpStatus) throws IOException { - WebTarget webTarget = client.target(uri).path(DELETE_CATEGORY_PARAMETER_PROPERTIES+"/"+PROPERTY_NAME); - Response response = webTarget.request(MediaType.APPLICATION_JSON_TYPE).method(method, Entity.json(request)); + WebTarget webTarget = client.target(uri).path(MAINTENANCE_CATEGORY_PARAMETER+"/"+PROPERTY_NAME+"/"+request.getName()); + Response response = webTarget.request(MediaType.APPLICATION_JSON_TYPE).method(method, Entity.json(null)); TestUtils.assertHttpStatus(request, webTarget, response, exceptedHttpStatus); return response; } 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 e38617b39..a550cde4c 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,17 +1,6 @@ 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; @@ -21,13 +10,13 @@ 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.onap.simulator.presetGenerator.presets.scheduler.PresetGetSchedulerChangeManagementInvalidResponse; +import org.onap.simulator.presetGenerator.presets.scheduler.PresetGetSchedulerChangeManagements; import org.springframework.core.ParameterizedTypeReference; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; @@ -36,6 +25,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.Collection; +import java.util.List; + +import static org.hamcrest.CoreMatchers.*; +import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; + public class ProbeApiTest extends BaseApiTest { private static final String MSO_QUERY_PARAMS = "filter=requestExecutionDate:EQUALS:01-01-2100"; @@ -65,7 +61,7 @@ public class ProbeApiTest extends BaseApiTest { 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", + "{\"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\",\"relat", "OK" ) ), new ExternalComponentStatus(ExternalComponentStatus.Component.MSO, 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 9d7a08120..c57a90aef 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,7 +11,6 @@ import vid.automation.test.services.SimulatorApi; import java.io.IOException; -import static java.util.Collections.singletonList; import static org.hamcrest.core.Is.is; import static org.junit.Assert.assertThat; 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 7735d59af..329291838 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,16 +1,5 @@ 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; @@ -25,6 +14,17 @@ import org.testng.annotations.Test; import vid.automation.test.infra.FeatureTogglingTest; import vid.automation.test.infra.Features; +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; + public class SdcApiTest extends BaseApiTest { private static final String SDC_GET_SERVICE_MODEL = "/rest/models/services/"; @@ -170,7 +170,7 @@ public class SdcApiTest extends BaseApiTest { // using json-pointers instead of path, because vnf name has // dots and spaces - final String myVnf = "vMMEvProbe_FE_AIC3-11.2.1_VF 1"; + final String myVnf = "vFLORENCEvProbe_FE_AIC3-11.2.1_VF 1"; final String base = "/vnfs/" + myVnf; assertFalse(response.at(base).isMissingNode(), 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 40ce80ba6..ef582099d 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 @@ -2,8 +2,6 @@ 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; @@ -13,8 +11,9 @@ import org.onap.simulator.presetGenerator.presets.mso.PresetMSODeactivateAndClou 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{ @@ -64,7 +63,6 @@ public class ServiceInstanceMsoApiTest extends BaseMsoApiTest{ } @Test - @FeatureTogglingTest(Features.FLAG_UNASSIGN_SERVICE) public void testUnassignServiceInstanceSucceed() throws Exception { String requestBody = TestUtils.convertRequest(objectMapper, DELETE_AND_UNASSIGN_SERVICE_REQUEST_DETAILS); callMsoWithFineRequest(UNASSIGN_OK_JSON, ImmutableMap.of(), buildUri(MSO_UNASSIGN_SERVICE_INSTANCE), requestBody, @@ -73,7 +71,6 @@ public class ServiceInstanceMsoApiTest extends BaseMsoApiTest{ @Test - @FeatureTogglingTest(Features.FLAG_UNASSIGN_SERVICE) public void testDeleteServiceInstanceSucceed() throws Exception { String requestBody = TestUtils.convertRequest(objectMapper, DELETE_AND_UNASSIGN_SERVICE_REQUEST_DETAILS); callMsoWithFineRequest(UNASSIGN_OK_JSON, ImmutableMap.of( @@ -82,16 +79,7 @@ public class ServiceInstanceMsoApiTest extends BaseMsoApiTest{ HttpStatus.ACCEPTED.value(), EXPECTED_SUCCESS_MSO_RESPONSE, HttpMethod.POST); } - @Test - @FeatureTogglingTest(value = Features.FLAG_UNASSIGN_SERVICE, flagActive = false) - public void testUnassignServiceInstanceBecomesDelete() throws Exception { - String requestBody = TestUtils.convertRequest(objectMapper, DELETE_AND_UNASSIGN_SERVICE_REQUEST_DETAILS); - callMsoWithFineRequest(DELETE_SERVICE_REQUEST_DETAILS, ImmutableMap.of(), buildUri(MSO_DELETE_SERVICE_INSTANCE), requestBody, - HttpStatus.ACCEPTED.value(), EXPECTED_SUCCESS_MSO_RESPONSE, HttpMethod.POST); - } - @Test(dataProvider = "errorCodes") - @FeatureTogglingTest(Features.FLAG_UNASSIGN_SERVICE) public void testUnassignServiceInstanceFailed(int errorCode) throws IOException { String requestBody = TestUtils.convertRequest(objectMapper, DELETE_AND_UNASSIGN_SERVICE_REQUEST_DETAILS); callMsoWithSimulatedErrorResponse(DELETE_OR_UNASSIGN_FAILED_JSON, @@ -101,7 +89,6 @@ public class ServiceInstanceMsoApiTest extends BaseMsoApiTest{ } @Test(dataProvider = "errorCodes") - @FeatureTogglingTest(Features.FLAG_UNASSIGN_SERVICE) public void testDeleteServiceInstanceFailed(int errorCode) throws IOException { String requestBody = TestUtils.convertRequest(objectMapper, DELETE_AND_UNASSIGN_SERVICE_REQUEST_DETAILS); callMsoWithSimulatedErrorResponse(DELETE_OR_UNASSIGN_FAILED_JSON, 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 index 385ec9b0d..78fe143c9 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/ServicePermissionsApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/ServicePermissionsApiTest.java @@ -1,18 +1,19 @@ 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.onap.sdc.ci.tests.datatypes.UserCredentials; 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; +import java.util.Map; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; + public class ServicePermissionsApiTest extends BaseApiTest { private final String emanuelSubscriberId = "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"; 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 index 52aa2e388..4ece31dfc 100644 --- a/vid-automation/src/test/java/org/onap/vid/api/ServiceTreeApiTest.java +++ b/vid-automation/src/test/java/org/onap/vid/api/ServiceTreeApiTest.java @@ -16,10 +16,15 @@ import vid.automation.test.services.SimulatorApi; import java.util.UUID; +import static net.javacrumbs.jsonunit.JsonMatchers.jsonEquals; +import static net.javacrumbs.jsonunit.core.Option.IGNORING_ARRAY_ORDER; +import static net.javacrumbs.jsonunit.core.Option.IGNORING_EXTRA_FIELDS; 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 org.hamcrest.Matchers.containsString; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.*; +import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.defaultPlacement; import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET; public class ServiceTreeApiTest extends BaseApiTest { @@ -106,15 +111,15 @@ public class ServiceTreeApiTest extends BaseApiTest { "\"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(); + .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(); + .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", @@ -207,16 +212,22 @@ public class ServiceTreeApiTest extends BaseApiTest { PresetAAIStandardQueryGet instanceGroup1 = PresetAAIStandardQueryGet.ofInstanceGroup("L3-NETWORK", "Ruby Figueroa", ImmutableMultimap.of()); PresetAAIStandardQueryGet collection1 = - PresetAAIStandardQueryGet.ofCollectionResource("Assigned", - ImmutableMultimap.of("instance-group", instanceGroup1.getReqPath())); + PresetAAIStandardQueryGet.ofCollectionResource( + "Assigned", + ImmutableMultimap.of("instance-group", instanceGroup1.getReqPath()), + "081ceb56-eb71-4566-a72d-3e7cbee5cdf1", + "ce8c98bc-4691-44fb-8ff0-7a47487c11c4" + ); PresetAAIStandardQueryGet vnfPreset1 = PresetAAIStandardQueryGet.ofVnf(randUuid(), - ImmutableMultimap.of("l3-network", l3NetworkPreset1.getReqPath(), "l3-network", l3NetworkPreset2.getReqPath())); + ImmutableMultimap.of("l3-network", l3NetworkPreset1.getReqPath(), "l3-network", l3NetworkPreset2.getReqPath()), + new Placement(ATT_NC, olson3, "229bcdc6eaeb4ca59d55221141d01f8e")); PresetAAIStandardQueryGet vnfPreset2 = PresetAAIStandardQueryGet.ofVnf(randUuid(), "d6557200-ecf2-4641-8094-5393ae3aae60","91415b44-753d-494c-926a-456a9172bbb9", - "\"in-maint\": true,", ImmutableMultimap.of("volume-group", volumeGroup1.getReqPath())); + "\"in-maint\": true,", ImmutableMultimap.of("volume-group", volumeGroup1.getReqPath()), + new Placement(ATT_AIC, hvf6, "88a6ca3ee0394ade9403f075db23167e")); PresetAAIGetVfModulesByVnf vfModules2 = new PresetAAIGetVfModulesByVnf(vnfPreset2.getInstanceId()); @@ -264,12 +275,21 @@ public class ServiceTreeApiTest extends BaseApiTest { assertJsonEquals(response, expected); } + @Override + protected void assertJsonEquals(String actual, String expected) { + assertThat(actual, jsonEquals(expected) + .when(IGNORING_ARRAY_ORDER) + .when(IGNORING_EXTRA_FIELDS) + ); + } + @Test public void serviceWithVnfGotError_exceptionIsThrown() { PresetAAIStandardQueryGet vnfPreset = PresetAAIStandardQueryGet.ofVnf(randUuid(), - ImmutableMultimap.of("l3-network", "/aai/v../I'm a wrong path")); + ImmutableMultimap.of("l3-network", "/aai/v../I'm a wrong path"), + defaultPlacement()); final PresetAAIStandardQueryGet serviceInstance = PresetAAIStandardQueryGet.ofServiceInstance("service-instance-id", "7a6ee536-f052-46fa-aa7e-2fca9d674c44", "service-instance-model-invariant-id", "global-customer-id", "service-instance-type", @@ -364,7 +384,61 @@ public class ServiceTreeApiTest extends BaseApiTest { assertJsonEquals(response, expected); } + @Test + public void serviceWithVrf_resultAsExpected(){ + PresetAAIStandardQueryGet vpnBindingPreset = + PresetAAIStandardQueryGet.ofVpn("Active", ImmutableMultimap.of(), "mock-global-1", "mock-role-x", "VPN1260","USA,EMEA"); + + // in order to verify thst only one route target is parsed from the Vpn - binding of the network + PresetAAIStandardQueryGet vpnBindingPresetOnlyForTheNetwork = + PresetAAIStandardQueryGet.ofVpn("Active", ImmutableMultimap.of(), "shouldNotBeOnResult", "shouldNotBeOnResult","shouldNotBeOnResult","shouldNotBeOnResult"); + + PresetAAIStandardQueryGet l3NetworkPreset = + PresetAAIStandardQueryGet.ofL3Network("SR-IOV-PROVIDER2-2", "Assigned", + ImmutableMultimap.of("vpn-binding", vpnBindingPreset.getReqPath(), + "vpn-binding", vpnBindingPresetOnlyForTheNetwork.getReqPath())); + + PresetAAIStandardQueryGet vrfPreset = + PresetAAIStandardQueryGet.ofVrf("Create", + ImmutableMultimap.of( + "l3-network", l3NetworkPreset.getReqPath(), + "vpn-binding", vpnBindingPreset.getReqPath())); + + final PresetAAIStandardQueryGet serviceInstance = + PresetAAIStandardQueryGet.ofServiceInstance("service-instance-id", "BONDING", "INFRASTRUCTURE-VPN", "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", "global-customer-id", "service-instance-type", "GARBAGE DATA", + ImmutableMultimap.of("configuration", vrfPreset.getReqPath())); + + String expected = TestUtils.convertRequest(objectMapper, "aaiGetInstanceTopology/serviceWithVrfTopology.json"); + expected = expected + .replace("SERVICE_INSTANCE_NAME", serviceInstance.getInstanceName()) + .replace("VRF_INSTANCE_ID", vrfPreset.getInstanceId()) + .replace("VRF_INSTANCE_NAME", vrfPreset.getInstanceName()) + .replace("VPN_INSTANCE_ID", vpnBindingPreset.getInstanceId()) + .replace("VPN_INSTANCE_NAME", vpnBindingPreset.getInstanceName()) + .replace("NETWORK_INSTANCE_NAME", l3NetworkPreset.getInstanceName()) + .replace("NETWORK_INSTANCE_ROLE", l3NetworkPreset.getInstanceRole()) + .replace("NETWORK_INSTANCE_ID", l3NetworkPreset.getInstanceId()); + + SimulatorApi.registerExpectationFromPresets(ImmutableList.of( + serviceInstance, + vrfPreset, + vpnBindingPreset, + l3NetworkPreset, + new PresetAAIModelsByInvariantIdGet(ImmutableList.of("network-instance-model-invariant-id", "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", "b67a289b-1688-496d-86e8-1583c828be0a" )), + new PresetGetSessionSlotCheckIntervalGet(), + new PresetAAIGetSubscribersGet(), + new PresetSDCGetServiceMetadataGet("f028b2e2-7080-4b13-91b2-94944d4c42d8", "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", "service-Infravpn-csar.zip"), + new PresetSDCGetServiceToscaModelGet("f028b2e2-7080-4b13-91b2-94944d4c42d8", "service-Infravpn-csar.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, expected); + } + private String randUuid() { return UUID.randomUUID().toString(); } + } 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 ec479d900..38ce8613d 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,7 +4,6 @@ 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 db10fdc57..ff52f2b04 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,13 +1,6 @@ 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; @@ -16,6 +9,14 @@ 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 { @@ -35,7 +36,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/TYLER SILVIA/8a84e59b-45fe-4851-8ff1-34225a0b32c3/83b458fd-5dd3-419b-a9e3-7335814a0911/JANET25/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/AAIAIC25/Cisco/Nexus 3048-TP"; 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 7ca29f854..d72337f3d 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,14 +1,6 @@ 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; @@ -19,11 +11,20 @@ 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.Matchers.greaterThan; +import static org.hamcrest.Matchers.greaterThanOrEqualTo; +import static org.junit.Assert.assertThat; + public class LoggerFormatTest extends BaseApiTest { - // See: https://www.openecomp.org/KSAT/REST-based+Log+Checker - private final static String logChecker = "http://eelf.onap.org:31820/validate"; + // See: https://wiki.web.att.com/display/KSAT/REST-based+Log+Checker + private final static String logChecker = "http://eelflogcheck.it.att.com:31820/validate"; private final Logger logger = LogManager.getLogger(LoggerFormatTest.class); @BeforeClass 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 0a0045d4d..73ad53e19 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 @@ -20,7 +20,7 @@ import java.util.UUID; import static org.hamcrest.CoreMatchers.*; import static org.hamcrest.MatcherAssert.assertThat; -import static org.onap.vid.api.CategoryParametersApiTest.GET_CATEGORY_PARAMETER_PROPERTIES; +import static org.onap.vid.api.CategoryParametersApiTest.MAINTENANCE_CATEGORY_PARAMETER; import static org.onap.vid.api.pProbeMsoApiTest.MSO_CREATE_CONFIGURATION; import static org.springframework.http.HttpHeaders.AUTHORIZATION; import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND; @@ -90,7 +90,7 @@ public class RequestIdFilterInstalled extends BaseApiTest { final Pair<HttpEntity, String> responseAndUuid = makeRequest( HttpMethod.GET, - "/" + GET_CATEGORY_PARAMETER_PROPERTIES + "?familyName=PARAMETER_STANDARDIZATION", + "/" + MAINTENANCE_CATEGORY_PARAMETER + "?familyName=PARAMETER_STANDARDIZATION", null ); assertThatUuidInResponseAndUuidIsInARecentLog(responseAndUuid); diff --git a/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json index 08534ce49..d1a777028 100644 --- a/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json +++ b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json @@ -1,12 +1,14 @@ { "isDirty":true, "vnfs": {}, + "vrfs": {}, "instanceParams": [], "validationCounter": 0, "existingNames": { "wowservicewithvnfgroping": "" }, "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, "existingVnfGroupCounterMap": {}, "existingNetworksCounterMap": {}, "networks": {}, @@ -28,6 +30,12 @@ "projectName": null, "rollbackOnFailure": false, "isALaCarte": true, + "vidNotions": { + "instantiationUI": "serviceWithVnfGrouping", + "modelCategory": "other", + "viewEditUI": "serviceWithVnfGrouping", + "instantiationType": "ALaCarte" + }, "modelInfo": { "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", diff --git a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json index f1bbf1712..cb2f2011c 100644 --- a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json +++ b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json @@ -2,6 +2,7 @@ "action": "None", "isDirty": true, "vnfs": {}, + "vrfs": {}, "instanceParams": [], "validationCounter": 0, "existingNames": { @@ -9,6 +10,7 @@ "vnf_group3_instance_name": "" }, "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, "existingVnfGroupCounterMap": { "daeb6568-cef8-417f-9075-ed259ce59f48": 3 }, @@ -192,6 +194,12 @@ "projectName": null, "rollbackOnFailure": false, "isALaCarte": true, + "vidNotions": { + "instantiationUI": "serviceWithVnfGrouping", + "modelCategory": "other", + "viewEditUI": "serviceWithVnfGrouping", + "instantiationType": "ALaCarte" + }, "modelInfo": { "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", diff --git a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json index f43a1dd12..b7c6dc2a5 100644 --- a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json +++ b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json @@ -1,10 +1,12 @@ { "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, "existingVnfGroupCounterMap": { "daeb6568-cef8-417f-9075-ed259ce59f48": 2 }, "existingNetworksCounterMap": {}, "vnfs": {}, + "vrfs": {}, "vnfGroups": { "VNF_GROUP1_INSTANCE_ID": { "originalName": "groupingservicefortest..ResourceInstanceGroup..0", @@ -163,6 +165,12 @@ "rollbackOnFailure": false, "testApi": "VNF_API", "isALaCarte": true, + "vidNotions": { + "instantiationUI": "serviceWithVnfGrouping", + "modelCategory": "other", + "viewEditUI": "serviceWithVnfGrouping", + "instantiationType": "ALaCarte" + }, "action": "Delete", "isDirty": true, "instanceId": "service-instance-id", diff --git a/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json index f83799308..7f4aca906 100644 --- a/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json +++ b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json @@ -3,7 +3,8 @@ "vidNotions": { "instantiationUI": "serviceWithVnfGrouping", "modelCategory": "other", - "viewEditUI": "serviceWithVnfGrouping" + "viewEditUI": "serviceWithVnfGrouping", + "instantiationType": "ALaCarte" }, "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", "invariantUuid": "7ee41ce4-4827-44b0-a48e-2707a59905d2", @@ -19,12 +20,13 @@ "inputs": {} }, "vnfs": {}, + "vrfs": {}, "networks": {}, - "collectionResource": {}, + "collectionResources": {}, "configurations": {}, "fabricConfigurations": {}, "serviceProxies": { - "vDOROTHEA_svc_vprs_proxy 0": { + "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", @@ -80,7 +82,7 @@ "quantity": 4 }, "members": { - "vDOROTHEA_svc_vprs_proxy 0": { + "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", diff --git a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json index 734c13306..d6cf636de 100644 --- a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json +++ b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json @@ -2,12 +2,14 @@ "action": "None", "isDirty": true, "vnfs": {}, + "vrfs": {}, "instanceParams": [], "validationCounter": 0, "existingNames": { "service_instance_name": "" }, "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, "existingVnfGroupCounterMap": { "daeb6568-cef8-417f-9075-ed259ce59f48": 2 }, @@ -167,6 +169,12 @@ "projectName": null, "rollbackOnFailure": false, "isALaCarte": true, + "vidNotions": { + "instantiationUI": "serviceWithVnfGrouping", + "modelCategory": "other", + "viewEditUI": "serviceWithVnfGrouping", + "instantiationType": "ALaCarte" + }, "modelInfo": { "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2", "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json index 0f4bc3fa3..bb0334b7a 100644 --- a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json +++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json @@ -36,7 +36,7 @@ }, "instanceParams": [ { - "2017488_PASQUALEvpe0_ASN": "AV_vPE" + "2017488_pasqualevpe0_ASN": "AV_vPE" } ], "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", @@ -51,6 +51,12 @@ "modelName": "Grouping Service for Test", "modelVersion": "1.0" }, + "vidNotions": { + "instantiationUI": "serviceWithVnfGrouping", + "modelCategory": "other", + "viewEditUI": "serviceWithVnfGrouping", + "instantiationType": "ALaCarte" + }, "existingNames": { "abc": "" }, diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json index da9727e89..cabdbca38 100644 --- a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json +++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json @@ -8,6 +8,7 @@ }, "existingNetworksCounterMap": {}, "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, "existingVnfGroupCounterMap": { "daeb6568-cef8-417f-9075-ed259ce59f48": 2, "c2b300e6-45de-4e5e-abda-3032bee2de56": 0 @@ -17,6 +18,12 @@ "instanceName": "SERVICE_INSTANCE_NAME", "instanceParams": [], "isALaCarte": true, + "vidNotions": { + "instantiationUI": "serviceWithVnfGrouping", + "modelCategory": "other", + "viewEditUI": "serviceWithVnfGrouping", + "instantiationType": "ALaCarte" + }, "isDirty": true, "lcpCloudRegionId": null, "modelInfo": { @@ -205,5 +212,6 @@ "vnfs": {} } }, - "vnfs": {} + "vnfs": {}, + "vrfs": {} }
\ No newline at end of file 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 index 47643d21e..a6c4dc16f 100644 --- 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 @@ -9,8 +9,8 @@ "action": "Create", "rollbackOnFailure": "true", "vfModules": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { "instanceName": "mimazepubi", "lcpCloudRegionId": "hvf6", "tenantId": "624eb554b0d147c19ff8885341760481", @@ -21,50 +21,50 @@ "modelInfo": { "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", - "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", "modelUniqueId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "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": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { "instanceName": "puwesovabe", "volumeGroupName": "puwesovabe_vol", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "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" + "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", + "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", + "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": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": { "instanceName": "bnmgtrx", "volumeGroupName": "", "lcpCloudRegionId": "hvf6", @@ -76,11 +76,11 @@ "modelInfo": { "modelInvariantId": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", "modelVersionId": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", - "modelName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2", + "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", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a" }, "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", @@ -95,7 +95,7 @@ "instanceName": "2017-488_PASQUALE-vPE", "inMaint":false, "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "legacyRegion": "just another region", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "platformName": "xxx1", @@ -128,7 +128,7 @@ "inMaint":false, "legacyRegion": "lcpRegionText", "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "platformName": "xxx1", "lineOfBusiness": "zzz1", @@ -188,7 +188,7 @@ "tenantName": null, "aicZoneId": "JAG1", "aicZoneName": null, - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "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 index 7fcc9b1eb..cc1d5b566 100644 --- 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 @@ -9,8 +9,8 @@ "action": "Create", "rollbackOnFailure": "true", "vfModules": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { "instanceName": "mimazepubi", "lcpCloudRegionId": "hvf6", "tenantId": "624eb554b0d147c19ff8885341760481", @@ -21,50 +21,50 @@ "modelInfo": { "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", - "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", "modelUniqueId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "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": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { "instanceName": "puwesovabe", "volumeGroupName": "puwesovabe_vol", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "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" + "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", + "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", + "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": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": { "instanceName": "bnmgtrx", "volumeGroupName": "", "lcpCloudRegionId": "hvf6", @@ -76,11 +76,11 @@ "modelInfo": { "modelInvariantId": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", "modelVersionId": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", - "modelName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2", + "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", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2", "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a" }, "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", @@ -95,7 +95,7 @@ "instanceName": "2017-488_PASQUALE-vPE", "inMaint":false, "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "legacyRegion": "just another region", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "platformName": "xxx1", @@ -128,7 +128,7 @@ "inMaint":false, "legacyRegion": "lcpRegionText", "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "platformName": "xxx1", "lineOfBusiness": "zzz1", @@ -189,7 +189,7 @@ "tenantName": null, "aicZoneId": "JAG1", "aicZoneName": null, - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", "isMultiStepDesign": false }
\ 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 index a95573558..50786d36b 100644 --- a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json @@ -42,15 +42,15 @@ }, "uuid": "vnf-instance-model-version-id", "productFamilyId": null, - "lcpCloudRegionId": null, + "lcpCloudRegionId": "olson3", + "cloudOwner": "att-nc", "legacyRegion": null, - "tenantId": null, + "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", "lineOfBusiness": null, "platformName": null, "vfModules": {}, "networks": { "NETWORK1_INSTANCE_ID": { - "originalName": null, "trackById": "NETWORK1_INSTANCE_ID", "instanceName": "NETWORK1_INSTANCE_NAME", "action": "None", @@ -65,16 +65,9 @@ "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 + "uuid": "network-instance-model-version-id" }, "NETWORK2_INSTANCE_ID": { - "originalName": null, "trackById": "NETWORK2_INSTANCE_ID", "instanceName": "NETWORK2_INSTANCE_NAME", "action": "None", @@ -89,13 +82,7 @@ "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 + "uuid": "network-instance-model-version-id" } } }, @@ -118,15 +105,16 @@ }, "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60", "productFamilyId": null, - "lcpCloudRegionId": null, + "lcpCloudRegionId": "hvf6", + "cloudOwner": "irma-aic", "legacyRegion": null, - "tenantId": null, + "tenantId": "88a6ca3ee0394ade9403f075db23167e", "lineOfBusiness": null, "platformName": null, "vfModules": { "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": { "2c1ca484-cbc2-408b-ab86-25a2c15ce280": { - "originalName": "VfVgeraldine..vflorence_vlc..module-1", + "originalName": "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1", "trackById": "2c1ca484-cbc2-408b-ab86-25a2c15ce280", "instanceName": "ss820f_0918_db", "action": "None", @@ -203,13 +191,7 @@ "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 + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" }, "NETWORK4_INSTANCE_ID": { "originalName": "ExtVL 0", @@ -228,39 +210,9 @@ "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 + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" } }, - "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": { diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json index 0fbf83070..013745c90 100644 --- a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json @@ -15,7 +15,8 @@ "vidNotions": { "instantiationUI": "legacy", "modelCategory": "other", - "viewEditUI": "legacy" + "viewEditUI": "legacy", + "instantiationType": "Macro" } }, "vnfs": { @@ -292,7 +293,7 @@ "modelCustomizationName": "ExtVL 0" } }, - "collectionResource": {}, + "collectionResources": {}, "configurations": { "Port Mirroring Configuration By Policy 0": { "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50", diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json index b2ba2c7e9..7cf11c824 100644 --- a/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json @@ -32,7 +32,7 @@ "vfModules": {}, "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -51,44 +51,44 @@ }, "2017-488_PASQUALE-vPE 0": { "vfModules": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "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", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "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", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86" } }, - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "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", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "modelInfo": { "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", - "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -97,7 +97,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -118,8 +118,8 @@ }, "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": { + "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", @@ -127,27 +127,27 @@ "modelInfo": { "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", - "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "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": { + "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", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -157,7 +157,7 @@ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -176,34 +176,34 @@ }, "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": { + "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", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "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": { + "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", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -212,7 +212,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json new file mode 100644 index 000000000..fda51c25a --- /dev/null +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json @@ -0,0 +1,125 @@ +{ + "instanceName": "SERVICE_INSTANCE_NAME", + "action": "None", + "globalSubscriberId": "global-customer-id", + "subscriptionServiceType": "service-instance-type", + "owningEntityId": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "aicZoneId": null, + "projectName": null, + "rollbackOnFailure": null, + "aicZoneName": null, + "cloudOwner": null, + "owningEntityName": null, + "tenantName": null, + "instanceId": "service-instance-id", + "modelInfo": { + "modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelName": "Service with VRF", + "modelVersion": "5.0", + "modelType": "service" + }, + "isALaCarte": true, + "orchStatus": "GARBAGE DATA", + "collectionResources": { + }, + "networks": {}, + "vnfs": {}, + "vnfGroups": {}, + "vrfs": { + "VRF_INSTANCE_ID": { + "action": "None", + "cloudOwner": null, + "inMaint": false, + "instanceId": "VRF_INSTANCE_ID", + "instanceName": "VRF_INSTANCE_NAME", + "instanceType": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "modelInfo": { + "modelVersionId": "9cac02be-2489-4374-888d-2863b4511a59", + "modelInvariantId": "b67a289b-1688-496d-86e8-1583c828be0a", + "modelCustomizationId":"dd024d73-9bd1-425d-9db5-476338d53433", + "modelName": "VRF Entry Configuration", + "modelVersion": "5.0", + "modelType": "configuration" + }, + "vpns": { + "VPN_INSTANCE_ID": { + "action": "None", + "instanceId": "VPN_INSTANCE_ID", + "trackById": "VPN_INSTANCE_ID", + "instanceName": "VPN_INSTANCE_NAME", + "instanceType": "SERVICE-INFRASTRUCTURE", + "orchStatus": "Active", + "provStatus": "prov", + "inMaint": false, + "region": "USA,EMEA", + "customerId": "VPN1260", + "modelInfo": { + "modelVersionId": "vpn-model-version-id", + "modelInvariantId": "vpn-model-invariant-id", + "modelCustomizationId": "vpn-model-customization-id", + "modelName": "vf_vEPDG", + "modelVersion": "6.0", + "modelType": "vpnBinding" + }, + "routeTargets": [ + { + "globalRouteTarget": "mock-global-1", + "routeTargetRole": "mock-role-x" + } + ], + "uuid": "vpn-model-version-id" + } + }, + "networks": { + "NETWORK_INSTANCE_ID": { + "action": "None", + "boundToVpn": true, + "inMaint": false, + "instanceId": "NETWORK_INSTANCE_ID", + "instanceName": "NETWORK_INSTANCE_NAME", + "instanceType": "SR-IOV-PROVIDER2-2", + "modelInfo": { + "modelVersionId": "network-instance-model-version-id", + "modelInvariantId": "network-instance-model-invariant-id", + "modelCustomizationId": "network-instance-model-customization-id", + "modelType": "network", + "modelVersion": "6.0", + "modelName": "Network Entry" + }, + "orchStatus": "Assigned", + "provStatus": "prov", + "role": "NETWORK_INSTANCE_ROLE", + "trackById": "NETWORK_INSTANCE_ID", + "uuid": "network-instance-model-version-id", + "routeTarget": + { + "globalRouteTarget": "mock-global-1", + "routeTargetRole": "mock-role-x" + } + } + }, + "orchStatus": "Create", + "originalName": "VRF Entry Configuration 0", + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "trackById": "VRF_INSTANCE_ID", + "uuid": "9cac02be-2489-4374-888d-2863b4511a59" + } + }, + "validationCounter": 0, + "existingVNFCounterMap": {}, + "existingVRFCounterMap": { + "dd024d73-9bd1-425d-9db5-476338d53433": 1 + }, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {} +}
\ 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 index ccf095294..869ff2d96 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json +++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json @@ -6,6 +6,7 @@ "modelType": "service", "modelVersion": "5.1" }, + "vidNotions":null, "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", "owningEntityName": "Lucine Sarika", "projectName": "zasaki", @@ -47,6 +48,7 @@ } }, "networks": {}, + "vrfs": {}, "vnfGroups": {}, "instanceParams": [], "pause": false, diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json index d1c40594b..d27dd05cd 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json +++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json @@ -18,6 +18,7 @@ "modelVersion": "5.1", "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705" }, + "vidNotions":null, "networks": { }, "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489", @@ -35,6 +36,7 @@ "trackById": "TRACK_BY_ID", "vnfGroups": { }, + "vrfs": {}, "vnfs": { "vSAMP12 1": { "action": "Create", diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json index eeda4e59a..fe4aab145 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json @@ -4,9 +4,12 @@ "vnfs":{ }, + "vrfs":{ + + }, "instanceParams":[ { - "2017488_PASQUALEvpe0_ASN":"AV_vPE" + "2017488_pasqualevpe0_ASN":"AV_vPE" } ], "validationCounter":0, @@ -21,6 +24,9 @@ "existingVnfGroupCounterMap":{ }, + "existingVRFCounterMap":{ + + }, "existingNetworksCounterMap":{ "94fdd893-4a36-4d70-b16a-ec29c54c184f":1 }, @@ -87,7 +93,7 @@ "subscriptionServiceType":"TYLER SILVIA", "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77", - "lcpCloudRegionId":"JANET25", + "lcpCloudRegionId":"AAIAIC25", "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", "aicZoneId":"JAG1", "projectName":"WATKINS", @@ -104,6 +110,12 @@ "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450" }, "isALaCarte":true, + "vidNotions": { + "instantiationUI": "legacy", + "modelCategory": "other", + "viewEditUI": "legacy", + "instantiationType": "ALaCarte" + }, "name":"action-data", "version":"1.0", "description":"", diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json index 3ee4a2b20..f54419169 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json @@ -6,7 +6,7 @@ "vfModules": {}, "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -25,30 +25,30 @@ }, "2017-488_PASQUALE-vPE 0": { "vfModules": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "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", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "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", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86" } }, - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "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", @@ -56,15 +56,15 @@ "orchStatus": "Create", "provStatus": "Prov Status", "inMaint": false, - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "modelInfo": { "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", - "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -73,7 +73,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -95,8 +95,8 @@ }, "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": { + "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", @@ -104,27 +104,27 @@ "modelInfo": { "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", - "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "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": { + "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", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -133,7 +133,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -152,34 +152,34 @@ }, "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": { + "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", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "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": { + "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", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -188,7 +188,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -243,6 +243,7 @@ "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168" } }, + "vrfs": {}, "instanceParams": [], "validationCounter": 0, "existingNames": { @@ -254,6 +255,7 @@ "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1 }, "existingVnfGroupCounterMap": {}, + "existingVRFCounterMap": {}, "existingNetworksCounterMap": {}, "networks": {}, "vnfGroups": {}, @@ -280,6 +282,12 @@ "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450" }, "isALaCarte": true, + "vidNotions": { + "instantiationUI": "legacy", + "viewEditUI": "legacy", + "modelCategory": "other", + "instantiationType": "ALaCarte" + }, "orchStatus": "Active", "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450", "testApi": "VNF_API" diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json new file mode 100644 index 000000000..64f2b161d --- /dev/null +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json @@ -0,0 +1,139 @@ +{ + "action":"Delete", + "isDirty":true, + "vnfs":{ + + }, + "vrfs":{ + "VRF_INSTANCE_ID":{ + "action":"None_Delete", + "cloudOwner":null, + "inMaint":false, + "instanceId":"VRF_INSTANCE_ID", + "instanceName":"VRF_INSTANCE_NAME", + "instanceType":null, + "lcpCloudRegionId":"AAIAIC25", + "legacyRegion":null, + "lineOfBusiness":null, + "modelInfo":{ + "modelVersionId":"9cac02be-2489-4374-888d-2863b4511a59", + "modelInvariantId":"b67a289b-1688-496d-86e8-1583c828be0a", + "modelCustomizationId":"dd024d73-9bd1-425d-9db5-476338d53433", + "modelName":"VRF Entry Configuration", + "modelVersion":"5.0", + "modelType":"collection" + }, + "vpns":{ + "VPN_INSTANCE_ID":{ + "action":"None", + "instanceId":"VPN_INSTANCE_ID", + "trackById":"VPN_INSTANCE_ID", + "instanceName":"VPN_INSTANCE_NAME", + "instanceType":"SERVICE-INFRASTRUCTURE", + "orchStatus":"Active", + "provStatus":"prov", + "inMaint":false, + "modelInfo":{ + "modelVersionId":"vpn-model-version-id", + "modelInvariantId":"vpn-model-invariant-id", + "modelCustomizationId":"vpn-model-customization-id", + "modelName":"vf_vEPDG", + "modelVersion":"6.0", + "modelType":"vpnBinding" + }, + "routeTargets":[ + + ], + "uuid":"vpn-model-version-id" + } + }, + "networks":{ + "NETWORK_INSTANCE_ID":{ + "action":"None", + "boundToVpn":true, + "inMaint":false, + "instanceId":"NETWORK_INSTANCE_ID", + "instanceName":"NETWORK_INSTANCE_NAME", + "instanceType":"SR-IOV-PROVIDER2-2", + "modelInfo":{ + "modelVersionId":"network-instance-model-version-id", + "modelInvariantId":"network-instance-model-invariant-id", + "modelCustomizationId":"network-instance-model-customization-id", + "modelType":"network", + "modelVersion":"6.0", + "modelName":"Network Entry" + }, + "orchStatus":"Assigned", + "provStatus":"prov", + "role":"NETWORK_INSTANCE_ROLE", + "trackById":"NETWORK_INSTANCE_ID", + "uuid":"network-instance-model-version-id" + } + }, + "orchStatus":"Create", + "originalName":null, + "platformName":null, + "productFamilyId":null, + "provStatus":null, + "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", + "trackById":"VRF_INSTANCE_ID", + "uuid":"9cac02be-2489-4374-888d-2863b4511a59" + } + }, + "instanceParams":[ + + ], + "validationCounter":0, + "existingNames":{ + "service_instance_name":"" + }, + "existingVNFCounterMap":{ + + }, + "existingVRFCounterMap":{ + "dd024d73-9bd1-425d-9db5-476338d53433":1 + }, + "existingVnfGroupCounterMap":{ + + }, + "existingNetworksCounterMap":{ + + }, + "networks":{ + + }, + "vnfGroups":{ + + }, + "bulkSize":1, + "instanceName":"InstanceName", + "globalSubscriberId":"global-customer-id", + "subscriptionServiceType":"service-instance-type", + "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId":null, + "lcpCloudRegionId":"AAIAIC25", + "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", + "aicZoneId":"JAG1", + "projectName": "WATKINS", + "rollbackOnFailure":false, + "aicZoneName":"YUDFJULP-JAG1", + "cloudOwner":null, + "owningEntityName":"WayneHolland", + "tenantName":"USP-SIP-IC-24335-T-01", + "instanceId":"service-instance-id", + "modelInfo":{ + "modelInvariantId":"dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "modelVersionId":"f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelName":"Service with VRF", + "modelVersion":"5.0", + "modelType":"service" + }, + "isALaCarte":false, + "orchStatus":"GARBAGE DATA", + "vidNotions":{ + "instantiationUI":"infrastructureVpn", + "modelCategory":"other", + "viewEditUI":"infrastructureVpn", + "instantiationType":"Macro" + } +}
\ 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 index 171568b89..fe595360d 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json @@ -6,7 +6,7 @@ }, "instanceParams":[ { - "2017488_PASQUALEvpe0_ASN":"AV_vPE" + "2017488_pasqualevpe0_ASN":"AV_vPE" } ], "validationCounter":0, @@ -56,7 +56,7 @@ "subscriptionServiceType":"TYLER SILVIA", "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77", - "lcpCloudRegionId":"JANET25", + "lcpCloudRegionId":"AAIAIC25", "tenantId":"092eb9e8e4b7412e8787dd091bc58e86", "aicZoneId":"JAG1", "projectName":"WATKINS", diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json index 695ce343b..ac5f7faf9 100644 --- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json +++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json @@ -7,7 +7,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", 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 index 20831bec8..1f6a5eb2c 100644 --- 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 @@ -3,7 +3,7 @@ { "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", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", @@ -16,19 +16,19 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3481829392", "node-type": "generic-vnf", - "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", @@ -41,19 +41,19 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3484520464", "node-type": "generic-vnf", - "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", @@ -66,19 +66,19 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3783459064", "node-type": "generic-vnf", - "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", @@ -91,19 +91,19 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3892133896", "node-type": "generic-vnf", - "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", @@ -116,19 +116,19 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson" }, { "id": "3418898432", "node-type": "generic-vnf", - "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org: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", @@ -151,34 +151,34 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org: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", @@ -201,54 +201,54 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", + "url": "https://aai.onap.org: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", @@ -271,14 +271,14 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", + "url": "https://aai.onap.org: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", @@ -301,14 +301,14 @@ { "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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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", + "url": "https://aai.onap.org: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", @@ -331,24 +331,24 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org: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", @@ -371,24 +371,24 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", "properties": { "vnf-id": "8e5e3ba1-3fe6-4d86-966e-f9f03dab4855", "vnf-name": "zolson3amdns02test2", @@ -411,59 +411,59 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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", + "url": "https://aai.onap.org: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", @@ -486,52 +486,52 @@ { "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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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" + "url": "https://aai.onap.org: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/test/resources/cr/getTopologyWithCR.json b/vid-automation/src/test/resources/cr/getTopologyWithCR.json new file mode 100644 index 000000000..c25b759ff --- /dev/null +++ b/vid-automation/src/test/resources/cr/getTopologyWithCR.json @@ -0,0 +1,35 @@ +{ + "action": "None", + "instanceName": "DrorSvcNetworkCollector_9", + "instanceId": "d2abf307-5c7c-4271-b300-83be2787ef3b", + "orchStatus": "Assigned", + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "cloudOwner": null, + "modelInfo": { + "modelInvariantId": "fedbf04e-4af8-4e0f-b5f6-15eb8a68579a", + "modelVersionId": "b0650fa9-145f-4c4a-98d9-c035f9cc72b1", + "modelName": "Dror_SVC_Network_Collector", + "modelType": "service", + "modelVersion": "3.0" + }, + "globalSubscriberId": "21014aa2-526b-11e6-beb8-9e71128cae77", + "subscriptionServiceType": "VPE", + "owningEntityId": null, + "owningEntityName": null, + "tenantName": null, + "aicZoneId": null, + "aicZoneName": null, + "projectName": null, + "rollbackOnFailure": null, + "isALaCarte": false, + "vnfs": {}, + "vrfs": {}, + "networks": {}, + "vnfGroups": {}, + "validationCounter": 0, + "existingVNFCounterMap": {}, + "existingNetworksCounterMap": {}, + "existingVnfGroupCounterMap": {} +} diff --git a/vid-automation/src/test/resources/cr/serviceWithCrResponse.json b/vid-automation/src/test/resources/cr/serviceWithCrResponse.json new file mode 100644 index 000000000..29cdcde93 --- /dev/null +++ b/vid-automation/src/test/resources/cr/serviceWithCrResponse.json @@ -0,0 +1,70 @@ +{ + "service": { + "vidNotions": { + "instantiationUI": "serviceWithCollectionResource", + "modelCategory": "other", + "viewEditUI": "serviceWithCollectionResource", + "instantiationType": "Macro" + }, + "uuid":"b0650fa9-145f-4c4a-98d9-c035f9cc72b1", + "invariantUuid":"fedbf04e-4af8-4e0f-b5f6-15eb8a68579a", + "name":"Dror_SVC_Network_Collector", + "version":"3.0", + "toscaModelURL":null, + "category":"Network L1-3", + "serviceType":"INFRASTRUCTURE", + "serviceRole":"","description":"VT feature CR part Dror", + "serviceEcompNaming":"true", + "instantiationType":"Macro", + "inputs":{} + }, + "isDirty" : false, + "vnfs": {}, + "vrfs": { }, + "networks": {}, + "collectionResources": { + "Dror_CR_Network_1810 0": { + "uuid":"648d4e9f-74dc-46f2-aab4-c114ee8df24b", + "invariantUuid":"34f62a07-17c2-4f0d-a50e-3ad516e04658", + "description":"Testing VT feature on 1810. CR part. Dror", + "name":"Dror_CR_Network_1810","version":"4.0", + "customizationUuid":"a5e69ff2-119c-4aca-9c0c-fe653f9e419e", + "inputs":{}, + "commands":{}, + "properties":{ + "dror_cr_network_1810..NetworkCollection..0_network_collection_function":"vTSBC Customer Landing Network Collection", + "cr_role":"SUB-INTERFACE", + "cr_type":"L3-NETWORK", + "dror_cr_network_1810..NetworkCollection..0_network_collection_description":"Landing Networks for vTSBC Customer", + "ecomp_generated_naming":"false","dror_cr_network_1810..Fixed..1_quantity":"10" + }, + "type":"CR", + "category":"Generic", + "subcategory":"Infrastructure", + "resourceVendor":"AT&T", + "resourceVendorRelease":"0.1", + "resourceVendorModelNumber":"", + "customizationUUID":"a5e69ff2-119c-4aca-9c0c-fe653f9e419e", + "networksCollection":{ + "dror_cr_network_1810..NetworkCollection..0":{ + "uuid":"0c5e0919-3a6e-47dd-98e9-ad7c55c3552f", + "invariantUuid":"2434c82c-8607-46d2-a4fd-da91a75294e1", + "name":"dror_cr_network_1810..NetworkCollection..0", + "version":"1", + "networkCollectionProperties": + { + "networkCollectionFunction":"vTSBC Customer Landing Network Collection", + "networkCollectionDescription":"Landing Networks for vTSBC Customer" + } + } + } + } + }, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": {}, + "volumeGroups": {}, + "pnfs": {}, + "vnfGroups": {} +} diff --git a/vid-automation/src/test/resources/features.properties b/vid-automation/src/test/resources/features.properties index 6f4f4efd4..782d28908 100644 --- a/vid-automation/src/test/resources/features.properties +++ b/vid-automation/src/test/resources/features.properties @@ -1,15 +1,32 @@ -FLAG_ASYNC_INSTANTIATION = true -FLAG_ASYNC_JOBS = true -FLAG_REGION_ID_FROM_REMOTE = true CREATE_INSTANCE_TEST = false EMPTY_DRAWING_BOARD_TEST = false -FLAG_ADVANCED_PORTS_FILTER = true FLAG_ADD_MSO_TESTAPI_FIELD = true -FLAG_UNASSIGN_SERVICE = true -FLAG_COLLECTION_RESOURCE_SUPPORT = true -FLAG_NETWORK_TO_ASYNC_INSTANTIATION = true +FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false FLAG_SERVICE_MODEL_CACHE = true FLAG_SHOW_ASSIGNMENTS = true -FLAG_SHOW_VERIFY_SERVICE = false -FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = false -FLAG_HANDLE_SO_WORKFLOWS = false
\ No newline at end of file +FLAG_SHOW_VERIFY_SERVICE = true +FLAG_DEFAULT_VNF = true +FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = true +FLAG_RESTRICTED_SELECT = false +FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true +FLAG_A_LA_CARTE_AUDIT_INFO=true +FLAG_5G_IN_NEW_INSTANTIATION_UI = true +FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS = true +FLAG_ASYNC_ALACARTE_VNF = true +FLAG_ASYNC_ALACARTE_VFMODULE= true +FLAG_SUPPLEMENTARY_FILE = true +FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI=false +FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST=true +FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY=true +FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = true +FLAG_1810_AAI_LOCAL_CACHE = true +FLAG_1902_NEW_VIEW_EDIT= false +FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false +FLAG_1902_VNF_GROUPING = true +FLAG_1902_RETRY_JOB = true +FLAG_VF_MODULE_RESUME_STATUS_CREATE = true +FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL = false +FLAG_1906_COMPONENT_INFO = false +FLAG_1906_INSTANTIATION_API_USER_VALIDATION = true +FLAG_1908_RESUME_MACRO_SERVICE=true +FLAG_1908_RELEASE_TENANT_ISOLATION=true 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 74b8637aa..ef7396590 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 @@ -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=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP" + "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", + "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP" } } , "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 386c982c0..34ffff414 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 @@ -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=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP" + "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911", + "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP" } } , "simulatorResponse": { 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 c726590eb..ca175834b 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 @@ -10,7 +10,7 @@ "modelCustomizationName": "Port Mirroring Configuration By Policy 1" }, "cloudConfiguration": { - "lcpCloudRegionId": "JANET25" + "lcpCloudRegionId": "AAIAIC25" }, "requestInfo": { "instanceName": "dummy_instance", 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 a71270e72..18643d792 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//v3/getSessionSlotCheckInterval" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi//v[0-9]+/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, @@ -22,7 +22,7 @@ { "simulatorRequest": { "method": "GET", - "path": "/ecompportal_att/auxapi/v3/getSessionSlotCheckInterval" + "path": "/(ONAPPORTAL|ecompportal_att)/auxapi/v[0-9]+/getSessionSlotCheckInterval" }, "simulatorResponse": { "responseCode": 200, 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 596104b83..968f2d00c 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 @@ -10,7 +10,7 @@ "operational-environment-id": "UUID_of_Operational_Environment", "operational-environment-name": "Op Env Name", "operational-environment-type": "VNF", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "Test", "workload-context": "VNF_Development", "resource-version": "1505228226913", @@ -39,7 +39,7 @@ "operational-environment-id": "UUID of ECOMP Operational Environment", "operational-environment-name": "ECOMP Env Name", "operational-environment-type": "ONAP", - "operational-environment-status": "Activate", + "operational-environment-status": "ACTIVE", "tenant-context": "ECOMP Test", "workload-context": "ECOMP_Development", "resource-version": "1505228226912" diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json index 7fca48f10..d1bc1dbaf 100644 --- a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json +++ b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json @@ -22,7 +22,7 @@ "body": { "uuid": "245562de-3984-49ef-a708-6c9d7cfcabd1", "invariantUUID": "124216d6-71d0-41c8-ac81-0c5acfee514a", - "name": "vMMEvProbe_FE_AIC3-11.2.1_VF", + "name": "vFLORENCEvProbe_FE_AIC3-11.2.1_VF", "version": "1.0", "toscaModelURL": "./service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip", "category": "Application L4+", 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 index 3b3f878f7..b8aea08ba 100644 --- 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 @@ -1,7 +1,7 @@ { "simulatorRequest": { "method" : "GET", - "path" : "/ecompportal_att/auxapi//v3/user/1" + "path" : "/(ONAPPORTAL|ecompportal_att)/auxapi//v[0-9]+/user/1" } , "simulatorResponse": { "responseCode": 200, diff --git a/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json index ff4b6d1b6..e61769508 100644 --- a/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json +++ b/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json @@ -3,7 +3,8 @@ "vidNotions": { "instantiationUI": "legacy", "modelCategory": "other", - "viewEditUI": "legacy" + "viewEditUI": "legacy", + "instantiationType": "ALaCarte" }, "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e", "invariantUuid": "d27e42cf-087e-4d31-88ac-6c4b7585f800", @@ -19,6 +20,7 @@ "inputs": {} }, "vnfs": {}, + "vrfs": {}, "networks": { "MULTI_PROVIDER_PORT_GROUP 0": { "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2", @@ -43,7 +45,7 @@ "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0" } }, - "collectionResource": {}, + "collectionResources": {}, "configurations": {}, "fabricConfigurations": {}, "serviceProxies": {}, diff --git a/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json index 2136c84cb..582147ac2 100644 --- a/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json +++ b/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json @@ -3,7 +3,8 @@ "vidNotions": { "instantiationUI": "legacy", "modelCategory": "other", - "viewEditUI": "legacy" + "viewEditUI": "legacy", + "instantiationType": "ClientConfig" }, "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e", "invariantUuid": "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba", @@ -19,6 +20,7 @@ "inputs": {} }, "vnfs": {}, + "vrfs": {}, "networks": { "MULTI_PROVIDER_PORT_GROUP 0": { "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2", @@ -43,7 +45,7 @@ "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0" } }, - "collectionResource": {}, + "collectionResources": {}, "configurations": {}, "fabricConfigurations": {}, "serviceProxies": {}, diff --git a/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json index 07fd1d3a9..9f251ed7f 100644 --- a/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json +++ b/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json @@ -3,7 +3,8 @@ "vidNotions": { "instantiationUI": "legacy", "modelCategory": "other", - "viewEditUI": "legacy" + "viewEditUI": "legacy", + "instantiationType": "Macro" }, "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e", "invariantUuid": "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba", @@ -19,6 +20,7 @@ "inputs": {} }, "vnfs": {}, + "vrfs": {}, "networks": { "MULTI_PROVIDER_PORT_GROUP 0": { "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2", @@ -43,7 +45,7 @@ "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0" } }, - "collectionResource": {}, + "collectionResources": {}, "configurations": {}, "fabricConfigurations": {}, "serviceProxies": {}, diff --git a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json index 785635cd6..2b648c1ed 100644 --- a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json +++ b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json @@ -3,7 +3,8 @@ "vidNotions": { "instantiationUI": "legacy", "modelCategory": "other", - "viewEditUI": "legacy" + "viewEditUI": "legacy", + "instantiationType": "ClientConfig" }, "uuid": "43f13072-fe50-496b-b673-7af075d10143", "invariantUuid": "35fb95d8-d1f0-4e46-99ac-e01b423e8e3f", @@ -17,7 +18,7 @@ "serviceEcompNaming": "true", "instantiationType": "ClientConfig", "inputs": { - "2017488PASQUALEvpe20_ASN": { + "2017488pasqualevpe20_ASN": { "type": "string", "description": "AV/PE", "entry_schema": null, @@ -26,7 +27,7 @@ "required": true, "default": "AV_vPE" }, - "2017488PASQUALEvpe20_bandwidth": { + "2017488pasqualevpe20_bandwidth": { "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, @@ -35,7 +36,7 @@ "required": true, "default": "10" }, - "2017488PASQUALEvpe20_bandwidth_units": { + "2017488pasqualevpe20_bandwidth_units": { "type": "string", "description": "Units of bandwidth", "entry_schema": null, @@ -44,7 +45,7 @@ "required": true, "default": "Gbps" }, - "2017488PASQUALEvpe20_AIC_CLLI": { + "2017488pasqualevpe20_AIC_CLLI": { "type": "string", "description": "AIC Site CLLI", "entry_schema": null, @@ -53,7 +54,7 @@ "required": true, "default": "ATLMY8GA" }, - "2017488PASQUALEvpe20_vnf_config_template_version": { + "2017488pasqualevpe20_vnf_config_template_version": { "type": "string", "description": "VPE Software Version", "entry_schema": null, @@ -62,7 +63,7 @@ "required": true, "default": "17.2" }, - "2017488PASQUALEvpe20_vnf_instance_name": { + "2017488pasqualevpe20_vnf_instance_name": { "type": "string", "description": "The hostname assigned to the vpe.", "entry_schema": null, @@ -141,37 +142,37 @@ "vnf_config_template_version": { "displayName": "vnf_config_template_version", "command": "get_input", - "inputName": "2017488PASQUALEvpe20_vnf_config_template_version" + "inputName": "2017488pasqualevpe20_vnf_config_template_version" }, "bandwidth_units": { "displayName": "bandwidth_units", "command": "get_input", - "inputName": "2017488PASQUALEvpe20_bandwidth_units" + "inputName": "2017488pasqualevpe20_bandwidth_units" }, "bandwidth": { "displayName": "bandwidth", "command": "get_input", - "inputName": "2017488PASQUALEvpe20_bandwidth" + "inputName": "2017488pasqualevpe20_bandwidth" }, "AIC_CLLI": { "displayName": "AIC_CLLI", "command": "get_input", - "inputName": "2017488PASQUALEvpe20_AIC_CLLI" + "inputName": "2017488pasqualevpe20_AIC_CLLI" }, "ASN": { "displayName": "ASN", "command": "get_input", - "inputName": "2017488PASQUALEvpe20_ASN" + "inputName": "2017488pasqualevpe20_ASN" }, "vnf_instance_name": { "displayName": "vnf_instance_name", "command": "get_input", - "inputName": "2017488PASQUALEvpe20_vnf_instance_name" + "inputName": "2017488pasqualevpe20_vnf_instance_name" } }, "properties": { "vmxvre_retype": "RE-VMX", - "vnf_config_template_version": "get_input:2017488PASQUALEvpe20_vnf_config_template_version", + "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", @@ -217,7 +218,7 @@ "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", + "AIC_CLLI": "get_input:2017488pasqualevpe20_AIC_CLLI", "vnf_name": "mtnj309me6vre", "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", "vmxvre_volume_type_1": "HITACHI", @@ -225,14 +226,14 @@ "vmxvre_volume_type_0": "HITACHI", "vmxvpfe_volume_type_0": "HITACHI", "vmxvpfe_sriov43_0_port_broadcastallow": "true", - "bandwidth_units": "get_input:2017488PASQUALEvpe20_bandwidth_units", + "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", + "ASN": "get_input:2017488pasqualevpe20_ASN", "vmxvre_chassis_i2cid": "161", "vmxvpfe_name_0": "vPFEXI", - "bandwidth": "get_input:2017488PASQUALEvpe20_bandwidth", + "bandwidth": "get_input:2017488pasqualevpe20_bandwidth", "availability_zone_max_count": "1", "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", @@ -242,7 +243,7 @@ "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", "vmxvre_type": "0", - "vnf_instance_name": "get_input:2017488PASQUALEvpe20_vnf_instance_name", + "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", @@ -258,14 +259,14 @@ "type": "VF", "modelCustomizationName": "2017 488 PASQUALE vPE 2 0", "vfModules": { - "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": { + "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", + "name": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2", "version": "1", - "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2", "properties": { "minCountInstances": null, "maxCountInstances": null, @@ -276,14 +277,14 @@ "inputs": {}, "volumeGroupAllowed": true }, - "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": { + "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", + "name": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1", "version": "1", - "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1", "properties": { "minCountInstances": 0, "maxCountInstances": null, @@ -294,14 +295,14 @@ "inputs": {}, "volumeGroupAllowed": true }, - "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0": { + "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", + "name": "2017488PasqualeVpe2..PASQUALE_base_vPE_BV..module-0", "version": "1", - "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0", + "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_base_vPE_BV..module-0", "properties": { "minCountInstances": 1, "maxCountInstances": 1, @@ -314,14 +315,14 @@ } }, "volumeGroups": { - "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": { + "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", + "name": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2", "version": "1", - "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2", "properties": { "minCountInstances": null, "maxCountInstances": null, @@ -331,14 +332,14 @@ }, "inputs": {} }, - "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": { + "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", + "name": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1", "version": "1", - "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1", "properties": { "minCountInstances": 0, "maxCountInstances": null, @@ -352,20 +353,21 @@ "vfcInstanceGroups": {} } }, + "vrfs": {}, "networks": {}, - "collectionResource": {}, + "collectionResources": {}, "configurations": {}, "fabricConfigurations": {}, "serviceProxies": {}, "vfModules": { - "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": { + "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", + "name": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2", "version": "1", - "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2", "properties": { "minCountInstances": null, "maxCountInstances": null, @@ -376,14 +378,14 @@ "inputs": {}, "volumeGroupAllowed": true }, - "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0": { + "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", + "name": "2017488PasqualeVpe2..PASQUALE_base_vPE_BV..module-0", "version": "1", - "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0", + "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_base_vPE_BV..module-0", "properties": { "minCountInstances": 1, "maxCountInstances": 1, @@ -394,14 +396,14 @@ "inputs": {}, "volumeGroupAllowed": false }, - "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": { + "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", + "name": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1", "version": "1", - "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1", "properties": { "minCountInstances": 0, "maxCountInstances": null, @@ -414,14 +416,14 @@ } }, "volumeGroups": { - "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": { + "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", + "name": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2", "version": "1", - "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2", + "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2", "properties": { "minCountInstances": null, "maxCountInstances": null, @@ -431,14 +433,14 @@ }, "inputs": {} }, - "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": { + "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", + "name": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1", "version": "1", - "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1", "properties": { "minCountInstances": 0, "maxCountInstances": null, diff --git a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json index 4097fd936..11c6b184b 100644 --- a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json +++ b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json @@ -2,30 +2,30 @@ "service": { "uuid": "281b5f7d-c7ac-4ea9-92fb-2c1d625ca681", "invariantUuid": "a977af77-db15-4375-a637-e9b994ecd569", - "name": "vMME_rVPMS_FE AIC3.0-11.2.1.7_SVC", + "name": "vFLORENCE_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.", + "description": "New service for vFLORENCE 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": { + "vFLORENCEvProbe_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", + "description": " New service for vFLORENCE vProbe Front End AIC3.0 VPMS Radcom 11.2.1.7. Front End includes Qrouter, vProbe aff, vLB Agent aff and vLB. ", + "name": "vFLORENCEvProbe_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", + "modelCustomizationName": "vFLORENCEvProbe_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", @@ -191,8 +191,9 @@ "vfcInstanceGroups": {} } }, + "vrfs": null, "networks": {}, - "collectionResource": null, + "collectionResources": null, "configurations": null, "fabricConfigurations": {}, "serviceProxies": null, diff --git a/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks.json b/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks.json new file mode 100644 index 000000000..471cd854d --- /dev/null +++ b/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks.json @@ -0,0 +1,126 @@ +[ + { + "action": "None", + "boundToVpn": true, + "cloudOwner": "att-nc", + "inMaint": false, + "instanceId": "3b3308d4-0cd3-43e4-9a7b-d1925c861131", + "instanceName": "AUK51a_oam_calea_net_0", + "role": "oam_calea_net_0", + "instanceType": "SR-IOV-PROVIDER2-0", + "orchStatus": "Active", + "physicalName": "sriovnet0", + "lcpCloudRegionId": "auk51a", + "serviceUUID": "1c98917b-8255-43c6-98f1-7a2942e75ce1", + "serviceName": "AUK51a_oam_calea_net_service_0", + "tenantName": "ecomp_ispt", + "tenantId": "b530fc990b6d4334bd45518bebca6a51", + "trackById": "3b3308d4-0cd3-43e4-9a7b-d1925c861131", + "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelInfo" : { + "modelCustomizationId": "e5f33853-f84c-4cdd-99f2-93846957aa18", + "modelInvariantId": "b9a9b549-0ee4-49fc-b4f2-5edc6701da68", + "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelType": "network" + } + }, + { + "action": "None", + "boundToVpn": true, + "cloudOwner": "att-nc", + "inMaint": false, + "instanceId": "b45cdb14-7a80-4ebd-b979-b1d7c7620851", + "instanceName": "AUK51a_oam_calea_net_1", + "role": "oam_calea_net_1", + "instanceType": "SR-IOV-PROVIDER2-1", + "orchStatus": "Active", + "physicalName": "sriovnet1", + "lcpCloudRegionId": "auk51a", + "serviceUUID": "fc21e453-7ff4-438e-bc69-df1f9474b00a", + "serviceName": "AUK51a_oam_calea_net_service_1", + "tenantName": "ecomp_ispt", + "tenantId": "b530fc990b6d4334bd45518bebca6a51", + "trackById": "b45cdb14-7a80-4ebd-b979-b1d7c7620851", + "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelInfo" : { + "modelCustomizationId": "3b45cdb14-7a80-4ebd-b979-b1d7c7620851", + "modelInvariantId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135", + "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelType": "network" + } + }, + { + "action": "None", + "boundToVpn": true, + "cloudOwner": "att-nc", + "inMaint": false, + "instanceId": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce", + "instanceName": "AUK51a_oam_calea_net_2", + "role": "oam_calea_net_2", + "instanceType": "SR-IOV-PROVIDER2-2", + "orchStatus": "Active", + "physicalName": "sriovnet2", + "lcpCloudRegionId": "auk51a", + "serviceUUID": "b28d8a84-7d93-4b56-b525-c239c1e780a4", + "serviceName": "AUK51a_oam_calea_net_service_2", + "tenantName": "ecomp_ispt", + "tenantId": "b530fc990b6d4334bd45518bebca6a51", + "trackById": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce", + "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelInfo" : { + "modelCustomizationId": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce", + "modelInvariantId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135", + "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelType": "network" + } + }, + { + "action": "None", + "boundToVpn": true, + "cloudOwner": "att-nc", + "inMaint": false, + "instanceId": "95380967-0f1c-41e9-a47f-9baa3f90860c", + "instanceName": "AUK51a_oam_calea_net_3", + "role": "oam_calea_net_3", + "instanceType": "SR-IOV-PROVIDER2-3", + "orchStatus": "Active", + "physicalName": "sriovnet3", + "lcpCloudRegionId": "auk51a", + "serviceUUID": "f09bbb55-8942-4621-892f-4690a8e5570a", + "serviceName": "AUK51a_oam_calea_net_service_3", + "tenantName": "ecomp_ispt", + "tenantId": "b530fc990b6d4334bd45518bebca6a51", + "trackById": "95380967-0f1c-41e9-a47f-9baa3f90860c", + "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelInfo" : { + "modelCustomizationId": "95380967-0f1c-41e9-a47f-9baa3f90860c", + "modelInvariantId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135", + "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelType": "network" + } + }, + { + "action": "None", + "boundToVpn": true, + "cloudOwner": "att-nc", + "inMaint": false, + "instanceId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135", + "instanceName": "AUK51a_oam_calea_net_0", + "instanceType": "SR-IOV-PROVIDER2-0", + "orchStatus": "Active", + "physicalName": "sriovnet0", + "lcpCloudRegionId": "auk51a", + "serviceUUID": "1c98917b-8255-43c6-98f1-7a2942e75ce1", + "serviceName": "AUK51a_oam_calea_net_service_0", + "tenantName": "ecomp_ispt", + "tenantId": "b530fc990b6d4334bd45518bebca6a51", + "trackById": "3b3308d4-0cd3-43e4-9a7b-d1925c861135", + "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelInfo" : { + "modelCustomizationId": "95380967-0f1c-41e9-a47f-9baa3f90860c", + "modelInvariantId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135", + "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelType": "network" + } + } +]
\ No newline at end of file diff --git a/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks2.json b/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks2.json new file mode 100644 index 000000000..596a9f353 --- /dev/null +++ b/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks2.json @@ -0,0 +1,22 @@ +[ + { + "action":"None", + "instanceName":"CHICGIL01VDBE01_SubIntNtwk043", + "instanceId":"l3network2-550-as988q", + "orchStatus":"active", + "lcpCloudRegionId":"cloud-region-id-CC-ANAI-528", + "tenantId":"tenant-id-CC-ANAI-528T1", + "cloudOwner":"cloud-owner-CC-ANAI-528", + "modelInfo":{ + "modelCustomizationId":"wgmn6PrJ5", + "modelType":"network" + }, + "instanceType":"K6VD", + "inMaint":false, + "trackById":"l3network2-550-as988q", + "role":"X92XE0j", + "physicalName":"wq6OKbZMTY", + "tenantName":"tenant-name-CC-ANAI-528T1", + "boundToVpn":true + } +]
\ No newline at end of file diff --git a/vid-automation/src/test/resources/viewEdit/aaiGetVpnList.json b/vid-automation/src/test/resources/viewEdit/aaiGetVpnList.json new file mode 100644 index 000000000..bc1f655c4 --- /dev/null +++ b/vid-automation/src/test/resources/viewEdit/aaiGetVpnList.json @@ -0,0 +1,155 @@ +[ + { + "action": "None", + "inMaint": false, + "instanceId": "120d39fb-3627-473d-913c-d228dd0f8e5b", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "VPN1260", + "modelInfo": { + "modelType": "vpnBinding" + }, + "routeTargets": [ + { + "globalRouteTarget":"mock-global-1", + "routeTargetRole" : "mock-role-x" + }, + { + "globalRouteTarget":"mock-global-2", + "routeTargetRole" : "mock-role-y" + } + + ] + }, + { + "action": "None", + "inMaint": false, + "instanceId": "c70391f3-a6e3-4874-9834-cbe12d7bf8b6", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "VPN1274", + "modelInfo": { + "modelCustomizationId": "cc3bff3f-cd4d-49bb-aac3-77e8e1168297", + "modelInvariantId": "e73127d5-c2de-43b2-bc02-602fa5c9aa29", + "modelVersionId": "94209bf1-67fa-4741-96fe-a2b3f86f84b2", + "modelType": "vpnBinding" + }, + "routeTargets": [] + }, + { + "action": "None", + "inMaint": false, + "instanceId": "4776516b-7da2-446c-9ba7-47ca8c30c571", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "VPN1275", + "modelInfo": { + "modelType": "vpnBinding" + }, + "routeTargets": [] + }, + { + "action": "None", + "inMaint": false, + "instanceId": "46fcb25a-e7ba-4d96-99ba-3bb6eae6aba7", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "VPN1271", + "modelInfo": { + "modelType": "vpnBinding" + }, + "routeTargets": [] + }, + { + "action": "None", + "inMaint": false, + "instanceId": "ffefbe38-3087-418a-87ae-f6582a15be78", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "VPN1272", + "modelInfo": { + "modelType": "vpnBinding" + }, + "routeTargets": [] + }, + { + "action": "None", + "inMaint": false, + "instanceId": "961d05be-ee41-40a2-8653-f603fc495175", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "VPN1273", + "modelInfo": { + "modelType": "vpnBinding" + }, + "routeTargets": [] + }, + { + "action": "None", + "inMaint": false, + "instanceId": "14bcfc2f-bbee-4fd9-89a5-42eb5dbb08d5", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "913443", + "modelInfo": { + "modelType": "vpnBinding" + }, + "routeTargets": [] + }, + { + "action": "None", + "inMaint": false, + "instanceId": "89d4c968-158c-4722-a22c-c5c2ccc17fd5", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "VPN1276", + "modelInfo": { + "modelType": "vpnBinding" + }, + "routeTargets": [] + }, + { + "action": "None", + "inMaint": false, + "instanceId": "3e7834fb-a8e0-4243-a837-5352ccab4602", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "VPN1259", + "modelInfo": { + "modelType": "vpnBinding" + }, + "routeTargets": [] + }, + { + "action": "None", + "inMaint": false, + "instanceId": "844a1ea7-556a-4e49-8aa3-171f1db4ea02", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "VPN1277", + "modelInfo": { + "modelType": "vpnBinding" + }, + "routeTargets": [] + } +]
\ No newline at end of file diff --git a/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json b/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json new file mode 100644 index 000000000..a3fcd0e4e --- /dev/null +++ b/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json @@ -0,0 +1,213 @@ +{ + "action": "Create", + "isDirty": false, + "vrfs": { + "VRF Entry Configuration 0": { + "originalName": null, + "trackById": "VRF1_INSTANCE_ID", + "action": "None", + "instanceId": "VRF1_INSTANCE_ID", + "instanceType": "VRF1_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": "vrf" + }, + "uuid": "vnf-instance-model-version-id", + "productFamilyId": null, + "lcpCloudRegionId": "olson3", + "cloudOwner": "att-nc", + "legacyRegion": null, + "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", + "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", + "modelName": "modelName", + "modelType": "network" + }, + "uuid": "network-instance-model-version-id", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null + } + }, + "vpns": { + "VPN1_INSTANCE_ID": { + "originalName": null, + "trackById": "VPN1_INSTANCE_ID", + "instanceName": "VPN1_INSTANCE_NAME", + "action": "None", + "instanceId": "VPN1_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", + "modelName": "modelName", + "modelType": "vpnBinding" + }, + "uuid": "network-instance-model-version-id", + "productFamilyId": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "tenantId": null, + "lineOfBusiness": null, + "platformName": null + } + } + }, + "VRF Entry Configuration": { + "uuid": "9cac02be-2489-4374-888d-2863b4511a59", + "invariantUuid": "b67a289b-1688-496d-86e8-1583c828be0a", + "description": "VRF Entry configuration object", + "name": "VRF Entry Configuration", + "version": "30.0", + "customizationUuid": "dd024d73-9bd1-425d-9db5-476338d53433", + "inputs": {}, + "commands": {}, + "properties": { + "ecomp_generated_naming": "false" + }, + "type": "Configuration", + "modelCustomizationName": "VRF Entry Configuration 0", + "sourceNodes": [], + "collectorNodes": null, + "configurationByPolicy": false, + "vpns": { + "VRF Entry Configuration vpns 1": { + "instanceId": "120d39fb-3627-473d-913c-d228dd0f8e5b", + "instanceName": "LPPVPN", + "platformName": "AVPN", + "instanceType": "SERVICE-INFRASTRUCTURE", + "region": "USA,EMEA", + "customerId": "VPN1260", + "modelInfo": { + "modelCustomizationId": null, + "modelInvariantId": null, + "modelVersionId": null + }, + "routeTargets": [ + { + "globalRouteTarget": "globalRouteTarget_1", + "routeTargetRole": "routeTargetRole_1" + }, + { + "globalRouteTarget": "globalRouteTarget_2", + "routeTargetRole": "routeTargetRole_2" + }, + { + "globalRouteTarget": "globalRouteTarget_3", + "routeTargetRole": "routeTargetRole_3" + } + ], + "isSelected": true + } + }, + "networks": { + "VRF Entry Configuration networks 1": { + "action": "None", + "boundToVpn": true, + "cloudOwner": "att-nc", + "inMaint": false, + "instanceId": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce", + "instanceName": "AUK51a_oam_calea_net_2", + "role": "oam_calea_net_2", + "instanceType": "SR-IOV-PROVIDER2-2", + "orchStatus": "Active", + "physicalName": "sriovnet2", + "lcpCloudRegionId": "auk51a", + "serviceUUID": "b28d8a84-7d93-4b56-b525-c239c1e780a4", + "serviceName": "AUK51a_oam_calea_net_service_2", + "tenantName": "ecomp_ispt", + "tenantId": "b530fc990b6d4334bd45518bebca6a51", + "trackById": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce", + "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelInfo": { + "modelCustomizationId": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce", + "modelInvariantId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135", + "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d", + "modelType": "network" + }, + "isSelected": true + } + } + } + }, + "vnfs": {}, + "instanceParams": [ + {} + ], + "validationCounter": 0, + "existingNames": { + "dfd": "" + }, + "existingVNFCounterMap": {}, + "existingVRFCounterMap": {}, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "networks": {}, + "vnfGroups": {}, + "bulkSize": 1, + "instanceName": "dfd", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "lcpCloudRegionId": "lcpCloudRegionId", + "tenantName": "tenantName", + "projectName": "WATKINS", + "rollbackOnFailure": true, + "aicZoneName": null, + "owningEntityName": "WayneHolland", + "testApi": "VNF_API", + "modelInfo": { + "modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelName": "infraVPN", + "modelVersion": "1.0", + "uuid": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelUniqueId": "f028b2e2-7080-4b13-91b2-94944d4c42d8" + }, + "isALaCarte": true, + "name": "infraVPN", + "version": "1.0", + "description": "ddd", + "category": "Network Service", + "uuid": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "invariantUuid": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "serviceType": "BONDING", + "serviceRole": "INFRASTRUCTURE-VPN", + "vidNotions": { + "instantiationUI": "macroService", + "modelCategory": "other", + "viewEditUI": "legacy", + "instantiationType": "Macro" + }, + "isEcompGeneratedNaming": true, + "isMultiStepDesign": false, + "subscriberName": "SILVIA ROBBINS" +}
\ No newline at end of file diff --git a/vid-automation/src/test/resources/vrf/vrfServiceRoleResponse.json b/vid-automation/src/test/resources/vrf/vrfServiceRoleResponse.json new file mode 100644 index 000000000..d4a6b022e --- /dev/null +++ b/vid-automation/src/test/resources/vrf/vrfServiceRoleResponse.json @@ -0,0 +1,87 @@ +{ + "service": { + "vidNotions": { + "instantiationUI": "infrastructureVpn", + "modelCategory": "other", + "viewEditUI": "serviceWithVRF", + "instantiationType": "Macro" + }, + "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "invariantUuid": "7ee41ce4-4827-44b0-a48e-2707a59905d2", + "name": "VRF Service for Test", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L4+", + "serviceType": "INFRASTRUCTURE", + "serviceRole": "CONFIGURATION", + "description": "xxx", + "serviceEcompNaming": "true", + "instantiationType": "A-La-Carte", + "inputs": {} + }, + "vnfs": {}, + "vrfs": { + "VRF Entry Configuration 0": { + "uuid": "9cac02be-2489-4374-888d-2863b4511a59", + "invariantUuid": "b67a289b-1688-496d-86e8-1583c828be0a", + "description": "VRF Entry configuration object", + "name": "VRF Entry Configuration", + "version": "30.0", + "customizationUuid": "dd024d73-9bd1-425d-9db5-476338d53433", + "inputs": {}, + "commands": {}, + "properties": { + "ecomp_generated_naming": "false" + }, + "type": "Configuration", + "modelCustomizationName": "VRF Entry Configuration 0", + "sourceNodes": [], + "collectorNodes": null, + "configurationByPolicy": false + } + }, + "networks": {}, + "collectionResources": {}, + "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": { } +} |