update MSO volume group URL

[vid.git] / vid-automation / src / test / java / org / onap / vid / api / AsyncInstantiationALaCarteApiTest.java

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 539e857..b6fa0fb 100644 (file)
--- a/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java
+++ b/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest.java
@@ -51,7 +51,7 @@ 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})
+@FeatureTogglingTest({Features.FLAG_ASYNC_ALACARTE_VNF})
 public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase {
 
     private static final String CREATE_BULK_OF_ALACARTE_REQUEST = "asyncInstantiation/vidRequestCreateALaCarte.json";
@@ -452,7 +452,7 @@ public class AsyncInstantiationALaCarteApiTest extends AsyncInstantiationBase {
                 TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs",
                         pathCounterOverride.getOrDefault("vnfs", defaultValue)),
 
-                TestUtils.hasOrLacksOfEntry("/mso/serviceInstances/v./" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/volumeGroups",
+                TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/volumeGroups",
                         pathCounterOverride.getOrDefault("volumeGroups", defaultValue)),
 
                 TestUtils.hasOrLacksOfEntry("/mso/serviceInstantiation/v./serviceInstances/" + DEFAULT_INSTANCE_ID + "/vnfs/" + vnfRequestId + "/vfModules",
@@ -484,12 +484,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 +498,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 +512,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,