aboutsummaryrefslogtreecommitdiffstats
path: root/vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java
diff options
context:
space:
mode:
Diffstat (limited to 'vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java')
-rw-r--r--vid-automation/src/test/java/org/onap/vid/api/AsyncInstantiationALaCarteApiTest3.java17
1 files changed, 14 insertions, 3 deletions
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 07b81a46c..2e21653d0 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
@@ -135,7 +135,9 @@ public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase {
} else if (expectedStatus.equals("SERVICE_FAILED")){
vidAuditStatuses = vidAuditStatusesFailed(jobId);
} else {
- vidAuditStatuses = vidAuditStatusesCompletedWithErrors(jobId);
+ vidAuditStatuses = Features.FLAG_2008_PAUSE_VFMODULE_INSTANTIATION_FAILURE.isActive() ?
+ vidAuditStatusesFailedAndPaused(jobId) :
+ vidAuditStatusesCompletedWithErrors(jobId);
}
assertServiceInfoSpecific3(jobId, expectedJobStatus , names.get(SERVICE_NAME));
@@ -145,7 +147,12 @@ public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase {
@DataProvider
Object[][] multipleVnfDataProvider() {
- return new Object[][]{{MSO_FAILED_STATUS, JobStatus.COMPLETED_WITH_ERRORS},{MSO_COMPLETE_STATUS, JobStatus.COMPLETED}, {"SERVICE_FAILED", JobStatus.FAILED}};
+ return new Object[][]{
+ {
+ MSO_FAILED_STATUS, Features.FLAG_2008_PAUSE_VFMODULE_INSTANTIATION_FAILURE.isActive() ? JobStatus.FAILED_AND_PAUSED :
+ JobStatus.COMPLETED_WITH_ERRORS },
+ { MSO_COMPLETE_STATUS, JobStatus.COMPLETED },
+ { "SERVICE_FAILED", JobStatus.FAILED } };
}
@Test
@@ -197,7 +204,9 @@ public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase {
return new Object[][]{
{MSO_COMPLETE_STATUS, MSO_COMPLETE_STATUS, JobStatus.COMPLETED},
{MSO_FAILED_STATUS, MSO_FAILED_STATUS, JobStatus.FAILED},
- {MSO_COMPLETE_STATUS, MSO_FAILED_STATUS, JobStatus.COMPLETED_WITH_ERRORS}
+ {MSO_FAILED_STATUS, MSO_COMPLETE_STATUS,
+ Features.FLAG_2008_PAUSE_VFMODULE_INSTANTIATION_FAILURE.isActive() ?
+ JobStatus.FAILED_AND_PAUSED : JobStatus.COMPLETED_WITH_ERRORS }
};
}
@@ -535,6 +544,8 @@ public class AsyncInstantiationALaCarteApiTest3 extends AsyncInstantiationBase {
return vidAuditStatusesFailed(jobId);
case IN_PROGRESS:
return vidAuditStatusesInProgress(jobId);
+ case FAILED_AND_PAUSED:
+ return vidAuditStatusesFailedAndPaused(jobId);
}
return null;