diff options
author | Einat Vinouze <einat.vinouze@intl.att.com> | 2020-05-20 12:00:29 +0300 |
---|---|---|
committer | Einat Vinouze <einat.vinouze@intl.att.com> | 2020-05-21 08:32:30 +0300 |
commit | cb024eb027cb9e0776359a9ee06b1caec4592256 (patch) | |
tree | 0c264aa8b5461d88ab3eb40e2bd35989588145a6 /vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt | |
parent | 19016e3c0951ff994956e93b1c24e412a7ed542e (diff) |
Set JobStatus as COMPLETED_AND_PAUSED when needed so we can present it on instantiationStatus
Issue-ID: VID-821
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Change-Id: I19328ce643ea984a97dc04183626dea133be517d
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt')
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt b/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt index 9b4f8b985..3ecb4aed3 100644 --- a/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt +++ b/vid-app-common/src/main/java/org/onap/vid/job/command/ResourceCommand.kt @@ -230,7 +230,7 @@ abstract class ResourceCommand( InternalState.IN_PROGRESS -> { when { - jobStatus != JobStatus.COMPLETED -> InternalState.IN_PROGRESS + jobStatus !in setOf(JobStatus.COMPLETED, JobStatus.COMPLETED_AND_PAUSED) -> InternalState.IN_PROGRESS isDescendantHasAction(Action.Create) -> InternalState.CREATING_CHILDREN isDescendantHasAction(Action.Upgrade) -> InternalState.CREATING_CHILDREN else -> InternalState.TERMINAL @@ -385,9 +385,19 @@ abstract class ResourceCommand( protected open fun getExpiryChecker(): ExpiryChecker = ExpiryChecker {false} protected open fun handleInProgressStatus(jobStatus: JobStatus): JobStatus { - return if (jobStatus == JobStatus.PAUSE) JobStatus.IN_PROGRESS else jobStatus + if (jobStatus == JobStatus.PAUSE){ + return JobStatus.IN_PROGRESS + } else if (completedAndPaused(jobStatus)){ + return JobStatus.COMPLETED_AND_PAUSED + } + return jobStatus } + private fun completedAndPaused(jobStatus: JobStatus) = + jobStatus == JobStatus.COMPLETED && getRequest().pauseInstantiation == afterCompletion + && featureManager.isActive(Features.FLAG_2006_PAUSE_VFMODULE_INSTANTIATION_CREATION) + + protected open fun watchChildren():JobStatus { return watchChildrenJobsBL.retrieveChildrenJobsStatus(childJobs) } |