Pause Upon VF Module Failure

[vid.git] / vid-automation / src / main / java / org / onap / vid / api / CreateServiceWithFailedVnf.java

diff --git a/vid-automation/src/main/java/org/onap/vid/api/CreateServiceWithFailedVnf.java b/vid-automation/src/main/java/org/onap/vid/api/CreateServiceWithFailedVnf.java
index 30076a9..a8bcc9f 100644 (file)
--- a/vid-automation/src/main/java/org/onap/vid/api/CreateServiceWithFailedVnf.java
+++ b/vid-automation/src/main/java/org/onap/vid/api/CreateServiceWithFailedVnf.java
@@ -13,6 +13,7 @@ import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaMo
 import org.onap.vid.model.asyncInstantiation.ServiceInfo;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import vid.automation.test.infra.Features;
 import vid.automation.test.infra.ModelInfo;
 import vid.automation.test.model.JobStatus;
 import vid.automation.test.model.ServiceAction;
@@ -105,9 +106,13 @@ Legit Preset  ||  deploy 1 Service, 1 VNF which will fail
     public void firstTimeAssertion() {
         assertThat(uuids, hasSize(1));
         originalJobId = uuids.get(0);
+        boolean isPauseOnFailureFlagOn = Features.FLAG_2008_PAUSE_VFMODULE_INSTANTIATION_FAILURE.isActive();
 
-        asyncInstantiationBase.assertServiceInfoSpecific1(originalJobId, JobStatus.COMPLETED_WITH_ERRORS, names.get(SERVICE_NAME), "us16807000", firstIds.serviceId, ServiceAction.INSTANTIATE);
-        asyncInstantiationBase.assertAuditStatuses(originalJobId, asyncInstantiationBase.vidAuditStatusesCompletedWithErrors(originalJobId),null);
+        asyncInstantiationBase.assertServiceInfoSpecific1(originalJobId, isPauseOnFailureFlagOn ?
+                JobStatus.FAILED_AND_PAUSED : JobStatus.COMPLETED_WITH_ERRORS, names.get(SERVICE_NAME), "us16807000", firstIds.serviceId, ServiceAction.INSTANTIATE);
+        asyncInstantiationBase.assertAuditStatuses(originalJobId, isPauseOnFailureFlagOn ?
+                asyncInstantiationBase.vidAuditStatusesFailedAndPaused(originalJobId) :
+                asyncInstantiationBase.vidAuditStatusesCompletedWithErrors(originalJobId),null);
         assertThat(SimulatorApi.retrieveRecordedRequestsPathCounter(), allOf(
                 hasOrLacksOfEntry(createPresets.get(0).getReqPath(), 1L),
                 hasOrLacksOfEntry(createPresets.get(1).getReqPath(), 1L),