Added Delete Job Monitoring

Issue-ID: SO-1729
Change-Id: Ied97d2aafc481cf3fcdc27ee3b4e798c4fb86df4
Signed-off-by: Lathish <lathishbabu.ganesan@est.tech>

3 files changed, 208 insertions, 56 deletions

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/MonitorVnfmCreateJobTask.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/MonitorVnfmCreateJobTask.java
index f89931063c..59ff71ab0c 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/MonitorVnfmCreateJobTask.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/MonitorVnfmCreateJobTask.java
@@ -20,14 +20,11 @@
 package org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks;
 
 import static org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks.Constants.CREATE_VNF_RESPONSE_PARAM_NAME;
-import static org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks.Constants.OPERATION_FINISHED_STATES;
-import static org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks.Constants.OPERATION_RETRIEVAL_STATES;
 import static org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks.Constants.OPERATION_STATUS_PARAM_NAME;
 import org.onap.so.bpmn.common.BuildingBlockExecution;
 import org.onap.so.client.exception.ExceptionBuilder;
 import org.onap.vnfmadapter.v1.model.CreateVnfResponse;
 import org.onap.vnfmadapter.v1.model.OperationStateEnum;
-import org.onap.vnfmadapter.v1.model.QueryJobResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,17 +37,14 @@ import com.google.common.base.Optional;
  *
  */
 @Component
-public class MonitorVnfmCreateJobTask {
+public class MonitorVnfmCreateJobTask extends MonitorVnfmJobTask{
 
   private static final Logger LOGGER = LoggerFactory.getLogger(MonitorVnfmCreateJobTask.class);
-  private final ExceptionBuilder exceptionUtil;
-  private final VnfmAdapterServiceProvider vnfmAdapterServiceProvider;
 
   @Autowired
   public MonitorVnfmCreateJobTask(final VnfmAdapterServiceProvider vnfmAdapterServiceProvider,
       final ExceptionBuilder exceptionUtil) {
-    this.vnfmAdapterServiceProvider = vnfmAdapterServiceProvider;
-    this.exceptionUtil = exceptionUtil;
+    super(vnfmAdapterServiceProvider, exceptionUtil);
   }
 
   /**
@@ -61,28 +55,11 @@ public class MonitorVnfmCreateJobTask {
   public void getCurrentOperationStatus(final BuildingBlockExecution execution) {
     LOGGER.debug("Executing getCurrentOperationStatus  ...");
     final CreateVnfResponse vnfInstantiateResponse = execution.getVariable(CREATE_VNF_RESPONSE_PARAM_NAME);
-    execution.setVariable(OPERATION_STATUS_PARAM_NAME, getOperationStatus(execution, vnfInstantiateResponse));
+    execution.setVariable(OPERATION_STATUS_PARAM_NAME, getOperationStatus(execution, vnfInstantiateResponse.getJobId()));
     LOGGER.debug("Finished executing getCurrentOperationStatus ...");
   }
 
   /**
-   * @param execution {@link org.onap.so.bpmn.common.DelegateExecutionImpl}
-   * @return boolean to indicate whether job has competed or not
-   */
-  public boolean hasOperationFinished(final BuildingBlockExecution execution) {
-    LOGGER.debug("Executing hasOperationFinished  ...");
-
-    final Optional<OperationStateEnum> operationStatusOption = execution.getVariable(OPERATION_STATUS_PARAM_NAME);
-    if (operationStatusOption != null && operationStatusOption.isPresent()) {
-      return OPERATION_FINISHED_STATES.contains(operationStatusOption.get());
-    }
-    LOGGER.debug("OperationStatus is not present yet... ");
-    LOGGER.debug("Finished executing hasOperationFinished ...");
-    return false;
-
-  }
-
-  /**
    * Log and throw exception on timeout for job status
    * 
    * @param execution {@link org.onap.so.bpmn.common.DelegateExecutionImpl}
@@ -121,34 +98,4 @@ public class MonitorVnfmCreateJobTask {
       LOGGER.debug("Successfully completed instatiation of job {}", vnfInstantiateResponse);
     }
   }
-
-  private Optional<OperationStateEnum> getOperationStatus(final BuildingBlockExecution execution,
-      final CreateVnfResponse vnfInstantiateResponse) {
-
-    final Optional<QueryJobResponse> instantiateOperationJobStatus =
-        vnfmAdapterServiceProvider.getInstantiateOperationJobStatus(vnfInstantiateResponse.getJobId());
-
-    if (instantiateOperationJobStatus.isPresent()) {
-      final QueryJobResponse queryJobResponse = instantiateOperationJobStatus.get();
-
-      if (!OPERATION_RETRIEVAL_STATES.contains(queryJobResponse.getOperationStatusRetrievalStatus())) {
-        final String message =
-            "Recevied invalid operation reterivel state: " + queryJobResponse.getOperationStatusRetrievalStatus();
-        LOGGER.error(message);
-        exceptionUtil.buildAndThrowWorkflowException(execution, 1203, message);
-      }
-
-      if (queryJobResponse.getOperationState() != null) {
-        final OperationStateEnum operationStatus = queryJobResponse.getOperationState();
-        LOGGER.debug("Operation {} with {} and operation retrieval status : {}", queryJobResponse.getId(),
-            operationStatus, queryJobResponse.getOperationStatusRetrievalStatus());
-        return Optional.of(queryJobResponse.getOperationState());
-      }
-
-      LOGGER.debug("Operation {} without operationStatus and operation retrieval status :{}", queryJobResponse.getId(),
-          queryJobResponse.getOperationStatusRetrievalStatus());
-
-    }
-    return Optional.absent();
-  }
 }
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/MonitorVnfmDeleteJobTask.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/MonitorVnfmDeleteJobTask.java
new file mode 100644
index 0000000000..c4804c05c2
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/MonitorVnfmDeleteJobTask.java
@@ -0,0 +1,101 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Ericsson. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks;
+
+import static org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks.Constants.DELETE_VNF_RESPONSE_PARAM_NAME;
+import static org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks.Constants.OPERATION_STATUS_PARAM_NAME;
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.client.exception.ExceptionBuilder;
+import org.onap.vnfmadapter.v1.model.DeleteVnfResponse;
+import org.onap.vnfmadapter.v1.model.OperationStateEnum;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import com.google.common.base.Optional;
+
+
+/**
+ * 
+ * @author Lathishbabu Ganesan (lathishbabu.ganesan@est.tech)
+ *
+ */
+@Component
+public class MonitorVnfmDeleteJobTask extends MonitorVnfmJobTask {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(MonitorVnfmDeleteJobTask.class);
+
+  @Autowired
+  public MonitorVnfmDeleteJobTask(final VnfmAdapterServiceProvider vnfmAdapterServiceProvider,
+      final ExceptionBuilder exceptionUtil) {
+    super(vnfmAdapterServiceProvider, exceptionUtil);
+  }
+
+  /**
+   * Get the current operation status of Delete job
+   * 
+   * @param execution {@link org.onap.so.bpmn.common.DelegateExecutionImpl}
+   */
+  public void getCurrentOperationStatus(final BuildingBlockExecution execution) {
+    LOGGER.debug("Executing getCurrentOperationStatus  ...");
+    final DeleteVnfResponse deleteVnfResponse = execution.getVariable(Constants.DELETE_VNF_RESPONSE_PARAM_NAME);
+    execution.setVariable(OPERATION_STATUS_PARAM_NAME, getOperationStatus(execution, deleteVnfResponse.getJobId()));
+    LOGGER.debug("Finished executing getCurrentOperationStatus ...");
+  }
+
+  /**
+   * Log and throw exception on timeout for job status
+   * 
+   * @param execution {@link org.onap.so.bpmn.common.DelegateExecutionImpl}
+   */
+  public void timeOutLogFailue(final BuildingBlockExecution execution) {
+    final String message = "Delete operation time out";
+    LOGGER.error(message);
+    exceptionUtil.buildAndThrowWorkflowException(execution, 1213, message);
+  }
+
+  /**
+   * Check the final status of delete throw exception if not completed successfully
+   * 
+   * @param execution {@link org.onap.so.bpmn.common.DelegateExecutionImpl}
+   */
+  public void checkIfOperationWasSuccessful(final BuildingBlockExecution execution) {
+    LOGGER.debug("Executing checkIfOperationWasSuccessful  ...");
+    final Optional<OperationStateEnum> operationStatusOption = execution.getVariable(OPERATION_STATUS_PARAM_NAME);
+    final DeleteVnfResponse deleteVnfResponse = execution.getVariable(DELETE_VNF_RESPONSE_PARAM_NAME);
+    if (operationStatusOption == null || !operationStatusOption.isPresent()) {
+      final String message = "Unable to delete jobId: "
+          + (deleteVnfResponse != null ? deleteVnfResponse.getJobId() : "null") + "Unable to retrieve OperationStatus";
+      LOGGER.error(message);
+      exceptionUtil.buildAndThrowWorkflowException(execution, 1214, message);
+    }
+    if (operationStatusOption.isPresent()) {
+      final OperationStateEnum operationStatus = operationStatusOption.get();
+      if (operationStatus != OperationStateEnum.COMPLETED) {
+        final String message =
+            "Unable to Delete jobId: " + (deleteVnfResponse != null ? deleteVnfResponse.getJobId() : "null")
+                + " OperationStatus: " + operationStatus;
+        LOGGER.error(message);
+        exceptionUtil.buildAndThrowWorkflowException(execution, 1215, message);
+      }
+      LOGGER.debug("Successfully completed Deletion of job {}", deleteVnfResponse);
+    }
+  }
+}
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/MonitorVnfmJobTask.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/MonitorVnfmJobTask.java
new file mode 100644
index 0000000000..e3992428cb
--- /dev/null
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/MonitorVnfmJobTask.java
@@ -0,0 +1,104 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2019 Ericsson. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+package org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks;
+
+import static org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks.Constants.OPERATION_FINISHED_STATES;
+import static org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks.Constants.OPERATION_RETRIEVAL_STATES;
+import static org.onap.so.bpmn.infrastructure.adapter.vnfm.tasks.Constants.OPERATION_STATUS_PARAM_NAME;
+import org.onap.so.bpmn.common.BuildingBlockExecution;
+import org.onap.so.client.exception.ExceptionBuilder;
+import org.onap.vnfmadapter.v1.model.OperationStateEnum;
+import org.onap.vnfmadapter.v1.model.QueryJobResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import com.google.common.base.Optional;
+
+
+/**
+ * 
+ * @author Lathishbabu Ganesan (lathishbabu.ganesan@est.tech)
+ *
+ */
+@Component
+public class MonitorVnfmJobTask {
+
+  private static final Logger LOGGER = LoggerFactory.getLogger(MonitorVnfmJobTask.class);
+  protected final ExceptionBuilder exceptionUtil;
+  protected final VnfmAdapterServiceProvider vnfmAdapterServiceProvider;
+
+  @Autowired
+  public MonitorVnfmJobTask(final VnfmAdapterServiceProvider vnfmAdapterServiceProvider,
+      final ExceptionBuilder exceptionUtil) {
+    this.vnfmAdapterServiceProvider = vnfmAdapterServiceProvider;
+    this.exceptionUtil = exceptionUtil;
+  }
+
+  /**
+   * @param execution {@link org.onap.so.bpmn.common.DelegateExecutionImpl}
+   * @return boolean to indicate whether job has competed or not
+   */
+  public boolean hasOperationFinished(final BuildingBlockExecution execution) {
+    LOGGER.debug("Executing hasOperationFinished  ...");
+
+    final Optional<OperationStateEnum> operationStatusOption = execution.getVariable(OPERATION_STATUS_PARAM_NAME);
+    if (operationStatusOption != null && operationStatusOption.isPresent()) {
+      return OPERATION_FINISHED_STATES.contains(operationStatusOption.get());
+    }
+    LOGGER.debug("OperationStatus is not present yet... ");
+    LOGGER.debug("Finished executing hasOperationFinished ...");
+    return false;
+  }
+
+  /**
+   * This method calls the Vnfm adapter and gets the Operation status of the job
+   * @param execution {@link org.onap.so.bpmn.common.DelegateExecutionImpl}
+   * @param jobId unique job id
+   * @return Operation State
+   */
+  protected Optional<OperationStateEnum> getOperationStatus(final BuildingBlockExecution execution,
+      final String jobId) {
+
+    final Optional<QueryJobResponse> instantiateOperationJobStatus =
+        vnfmAdapterServiceProvider.getInstantiateOperationJobStatus(jobId);
+
+    if (instantiateOperationJobStatus.isPresent()) {
+      final QueryJobResponse queryJobResponse = instantiateOperationJobStatus.get();
+
+      if (!OPERATION_RETRIEVAL_STATES.contains(queryJobResponse.getOperationStatusRetrievalStatus())) {
+        final String message =
+            "Recevied invalid operation reterivel state: " + queryJobResponse.getOperationStatusRetrievalStatus();
+        LOGGER.error(message);
+        exceptionUtil.buildAndThrowWorkflowException(execution, 1203, message);
+      }
+      if (queryJobResponse.getOperationState() != null) {
+        final OperationStateEnum operationStatus = queryJobResponse.getOperationState();
+        LOGGER.debug("Operation {} with {} and operation retrieval status : {}", queryJobResponse.getId(),
+            operationStatus, queryJobResponse.getOperationStatusRetrievalStatus());
+        return Optional.of(queryJobResponse.getOperationState());
+      }
+
+      LOGGER.debug("Operation {} without operationStatus and operation retrieval status :{}", queryJobResponse.getId(),
+          queryJobResponse.getOperationStatusRetrievalStatus());
+    }
+    return Optional.absent();
+  }
+}