Identify whether the Service is of A-la-carte or macro type
[externalapi/nbi.git] / src / main / java / org / onap / nbi / apis / serviceorder / workflow / SOTaskProcessor.java
index 3f9b556..d63d122 100644 (file)
  * 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.
  */
+
 package org.onap.nbi.apis.serviceorder.workflow;
 
-import org.onap.nbi.apis.serviceorder.SoClient;
-import org.onap.nbi.apis.serviceorder.model.ServiceCharacteristic;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+import org.onap.nbi.apis.serviceorder.model.ActionType;
 import org.onap.nbi.apis.serviceorder.model.ServiceOrder;
 import org.onap.nbi.apis.serviceorder.model.ServiceOrderItem;
 import org.onap.nbi.apis.serviceorder.model.StateType;
-import org.onap.nbi.apis.serviceorder.model.consumer.*;
+import org.onap.nbi.apis.serviceorder.model.consumer.CreateE2EServiceInstanceResponse;
+import org.onap.nbi.apis.serviceorder.model.consumer.CreateServiceInstanceResponse;
 import org.onap.nbi.apis.serviceorder.model.orchestrator.ExecutionTask;
 import org.onap.nbi.apis.serviceorder.model.orchestrator.ServiceOrderInfo;
 import org.onap.nbi.apis.serviceorder.repositories.ExecutionTaskRepository;
 import org.onap.nbi.apis.serviceorder.service.ServiceOrderService;
 import org.onap.nbi.apis.serviceorder.utils.E2EServiceUtils;
 import org.onap.nbi.apis.serviceorder.utils.JsonEntityConverter;
+import org.onap.nbi.apis.serviceorder.utils.MacroServiceUtils;
 import org.onap.nbi.exceptions.TechnicalException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,31 +42,9 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.io.IOException;
-import java.util.*;
-
 @Service
 public class SOTaskProcessor {
 
-    @Value("${nbi.callForVNF}")
-    private boolean enableCallForVNF;
-
-    @Value("${onap.lcpCloudRegionId}")
-    private String lcpCloudRegionId;
-
-    @Value("${onap.tenantId}")
-    private String tenantId;
-
-    @Value("${so.owning.entity.id}")
-    private String soOwningEntityId;
-
-    @Value("${so.owning.entity.name}")
-    private String soOwningEntityName;
-
-    @Value("${so.project.name}")
-    private String soProjectName;
-
-
     @Autowired
     private ServiceOrderService serviceOrderService;
 
@@ -66,53 +52,67 @@ public class SOTaskProcessor {
     private ExecutionTaskRepository executionTaskRepository;
 
     @Autowired
-    private SoClient soClient;
+    private PostSoProcessor postSoProcessor;
+
+    @Autowired
+    private SOGetStatusManager sOGetStatusManager;
 
+    @Value("${scheduler.pollingDurationInMins}")
+    private float pollingDurationInMins;
 
     private static final Logger LOGGER = LoggerFactory.getLogger(SOTaskProcessor.class);
 
     /**
      * Run the ServiceOrchestrator processing for a serviceOrderItem which with any sub relations
-     *
-     * @throws InterruptedException
      */
-    public void processOrderItem(ExecutionTask executionTask) throws InterruptedException {
+    public void processOrderItem(ExecutionTask executionTask) {
+
+        executionTask.setLastAttemptDate(new Date());
+        executionTaskRepository.save(executionTask);
 
         ServiceOrderInfo serviceOrderInfo = getServiceOrderInfo(executionTask);
 
-        ServiceOrder serviceOrder = serviceOrderService.findServiceOrderById(serviceOrderInfo.getServiceOrderId());
+        Optional<ServiceOrder> optionalServiceOrder =
+                serviceOrderService.findServiceOrderById(serviceOrderInfo.getServiceOrderId());
+        if (!optionalServiceOrder.isPresent()) {
+            throw new TechnicalException(
+                    "Unable to retrieve service order for id " + serviceOrderInfo.getServiceOrderId());
+        }
+        ServiceOrder serviceOrder = optionalServiceOrder.get();
         ServiceOrderItem serviceOrderItem = getServiceOrderItem(executionTask, serviceOrder);
-        boolean e2eService = E2EServiceUtils.isE2EService(serviceOrderInfo.getServiceOrderItemInfos().get(serviceOrderItem.getId()));
-        
-        if (StateType.ACKNOWLEDGED == serviceOrderItem.getState()) {
-               if (e2eService) {
-                ResponseEntity<CreateE2EServiceInstanceResponse> response = postE2EServiceOrderItem(serviceOrderInfo,
-                    serviceOrderItem, serviceOrder);
+        boolean e2eService =
+                E2EServiceUtils.isE2EService(serviceOrderInfo.getServiceOrderItemInfos().get(serviceOrderItem.getId()));
+        boolean macroService = MacroServiceUtils
+                .isMacroService(serviceOrderInfo.getServiceOrderItemInfos().get(serviceOrderItem.getId()));
+
+        if (shouldPostSo(serviceOrderItem)) {
+            if (e2eService) {
+                ResponseEntity<CreateE2EServiceInstanceResponse> response =
+                        postSoProcessor.postE2EServiceOrderItem(serviceOrderInfo, serviceOrderItem, serviceOrder);
                 updateE2EServiceOrderItem(response, serviceOrderItem, serviceOrder);
+            } else if (macroService) {
+              LOGGER.info("Mode type macro");
+              //TODO: Add logic to construct SO macro request body and call SO macro flow.(EXTAPI-368)
+
             } else {
 
-                ResponseEntity<CreateServiceInstanceResponse> response = postServiceOrderItem(serviceOrderInfo,serviceOrder,
-                    serviceOrderItem);
-                updateServiceOrderItem(response, serviceOrderItem,serviceOrder);
+                ResponseEntity<CreateServiceInstanceResponse> response =
+                        postSoProcessor.postServiceOrderItem(serviceOrderInfo, serviceOrderItem);
+                updateServiceOrderItem(response, serviceOrderItem, serviceOrder);
             }
         }
 
-        if (executionTask.getNbRetries() > 0 && StateType.FAILED != serviceOrderItem.getState()
-            ) {
+        boolean shouldStopPolling = shouldStopPolling(executionTask);
+        if (!shouldStopPolling && StateType.FAILED != serviceOrderItem.getState()) {
             // TODO lancer en asynchrone
-               if (e2eService)
-                pollE2ESoRequestStatus(serviceOrder, serviceOrderItem);
-            else
-                pollSoRequestStatus(serviceOrder, serviceOrderItem);
-            
+            sOGetStatusManager.pollRequestStatus(serviceOrder, serviceOrderItem, e2eService);
+
             if (serviceOrderItem.getState().equals(StateType.COMPLETED)) {
                 updateSuccessTask(executionTask);
-            } else {
-                int nbRetries = executionTask.getNbRetries();
-                executionTask.setNbRetries(--nbRetries);
-                executionTask.setLastAttemptDate(new Date());
-                executionTaskRepository.save(executionTask);
             }
+        } else if (shouldStopPolling && StateType.FAILED != serviceOrderItem.getState()) {
+            serviceOrderService.addOrderItemMessage(serviceOrder, serviceOrderItem, "504");
+            updateFailedTask(executionTask, serviceOrder);
         } else {
             updateFailedTask(executionTask, serviceOrder);
         }
@@ -120,30 +120,11 @@ public class SOTaskProcessor {
         updateServiceOrder(serviceOrder);
     }
 
-    private ResponseEntity<CreateServiceInstanceResponse> postServiceOrderItem(ServiceOrderInfo serviceOrderInfo,
-        ServiceOrder serviceOrder, ServiceOrderItem serviceOrderItem) {
-        ResponseEntity<CreateServiceInstanceResponse> response = null;
-        try {
-            response = postSORequest(serviceOrderItem,serviceOrder, serviceOrderInfo);
-        } catch (NullPointerException e) {
-            LOGGER.error("Unable to create service instance for serviceOrderItem.id=" + serviceOrderItem.getId(), e);
-            response = null;
-        }
-        return response;
+    private boolean shouldPostSo(ServiceOrderItem serviceOrderItem) {
+        return StateType.ACKNOWLEDGED == serviceOrderItem.getState()
+                || StateType.INPROGRESS_MODIFY_ITEM_TO_CREATE == serviceOrderItem.getState();
     }
 
-    private ResponseEntity<CreateE2EServiceInstanceResponse> postE2EServiceOrderItem(ServiceOrderInfo serviceOrderInfo,
-        ServiceOrderItem serviceOrderItem, ServiceOrder serviceOrder) {
-        ResponseEntity<CreateE2EServiceInstanceResponse> response;
-        try {
-            response = postE2ESORequest(serviceOrderItem, serviceOrderInfo, serviceOrder);
-        } catch (NullPointerException e) {
-            LOGGER.error("Unable to create service instance for serviceOrderItem.id=" + serviceOrderItem.getId(), e);
-            response = null;
-        }
-        return response;
-    }
-    
     private ServiceOrderItem getServiceOrderItem(ExecutionTask executionTask, ServiceOrder serviceOrder) {
         for (ServiceOrderItem item : serviceOrder.getOrderItem()) {
             if (item.getId().equals(executionTask.getOrderItemId())) {
@@ -151,69 +132,23 @@ public class SOTaskProcessor {
             }
         }
         throw new TechnicalException(
-            "Unable to retrieve serviceOrderItem forexecutionTaskId " + executionTask.getInternalId());
+                "Unable to retrieve serviceOrderItem for executionTaskId " + executionTask.getInternalId());
     }
 
     private ServiceOrderInfo getServiceOrderInfo(ExecutionTask executionTask) {
         String serviceOrderInfoJson = executionTask.getServiceOrderInfoJson();
         ServiceOrderInfo serviceOrderInfo = null;
         try {
-            serviceOrderInfo =
-                JsonEntityConverter.convertJsonToServiceOrderInfo(serviceOrderInfoJson);
+            serviceOrderInfo = JsonEntityConverter.convertJsonToServiceOrderInfo(serviceOrderInfoJson);
         } catch (IOException e) {
-            LOGGER
-                .error("Unable to read ServiceOrderInfo Json for executionTaskId " + executionTask.getInternalId(), e);
+            LOGGER.error("Unable to read ServiceOrderInfo Json for executionTaskId " + executionTask.getInternalId(),
+                    e);
             throw new TechnicalException(
-                "Unable to read ServiceOrderInfo Json for executionTaskId " + executionTask.getInternalId());
+                    "Unable to read ServiceOrderInfo Json for executionTaskId " + executionTask.getInternalId());
         }
         return serviceOrderInfo;
     }
 
-    private ResponseEntity<CreateServiceInstanceResponse> postSORequest(ServiceOrderItem serviceOrderItem,
-        ServiceOrder serviceOrder, ServiceOrderInfo serviceOrderInfo) {
-        RequestDetails requestDetails = buildSoRequest(serviceOrderItem,
-            serviceOrderInfo.getServiceOrderItemInfos().get(serviceOrderItem.getId()).getCatalogResponse(),
-            serviceOrderInfo.getSubscriberInfo());
-        MSOPayload msoPayload = new MSOPayload(requestDetails);
-        ResponseEntity<CreateServiceInstanceResponse> response = null;
-
-        switch (serviceOrderItem.getAction()) {
-            case ADD:
-                response = soClient.callCreateServiceInstance(msoPayload);
-                break;
-            case DELETE:
-                response = soClient.callDeleteServiceInstance(msoPayload,serviceOrderItem.getService().getId());
-                break;
-            default:
-                break;
-        }
-        if(response!=null && response.getStatusCode()== HttpStatus.INTERNAL_SERVER_ERROR) {
-            serviceOrderService.addOrderMessage(serviceOrder, "502");
-        }
-        return response;
-    }
-
-    private ResponseEntity<CreateE2EServiceInstanceResponse> postE2ESORequest(ServiceOrderItem serviceOrderItem,
-        ServiceOrderInfo serviceOrderInfo, ServiceOrder serviceOrder) {
-        ServiceModel service = buildE2ESoRequest(serviceOrderItem, serviceOrderInfo.getServiceOrderItemInfos().get(serviceOrderItem.getId()).getCatalogResponse(), serviceOrderInfo.getSubscriberInfo(), serviceOrder);
-        MSOE2EPayload msoE2EPayload = new MSOE2EPayload(service);
-        ResponseEntity<CreateE2EServiceInstanceResponse> response = null;
-        switch (serviceOrderItem.getAction()) {
-            case ADD:
-                response = soClient.callE2ECreateServiceInstance(msoE2EPayload);
-                break;
-            case DELETE:
-                response = soClient.callE2EDeleteServiceInstance(service.getGlobalSubscriberId(), service.getServiceType(),serviceOrderItem.getService().getId());
-                break;
-            default:
-                break;
-        }
-        if(response!=null && response.getStatusCode()== HttpStatus.INTERNAL_SERVER_ERROR) {
-            serviceOrderService.addOrderMessage(serviceOrder, "502");
-        }
-        return response;
-    }
-    
     private void updateServiceOrder(ServiceOrder serviceOrder) {
         boolean atLeastOneCompleted = false;
         boolean atLeastOneNotFinished = false;
@@ -236,242 +171,34 @@ public class SOTaskProcessor {
 
             }
         }
-
         if (atLeastOneNotFinished) {
-            serviceOrderService.updateOrderState(serviceOrder,StateType.INPROGRESS);
+            serviceOrderService.updateOrderState(serviceOrder, StateType.INPROGRESS);
         } else {
             StateType finalState;
             if (atLeastOneFailed) {
                 if (!atLeastOneCompleted) {
-                    finalState=StateType.FAILED;
-                } else {
-                    finalState=StateType.PARTIAL;
-                }
-            } else {
-                finalState=StateType.COMPLETED;
-            }
-            serviceOrderService.updateOrderState(serviceOrder,finalState);
-        }
-    }
-
-
-    /**
-     * * @param orderItem
-     */
-    private void pollSoRequestStatus(ServiceOrder serviceOrder,
-        ServiceOrderItem orderItem) throws InterruptedException {
-        boolean stopPolling = false;
-        String requestId = orderItem.getRequestId();
-        GetRequestStatusResponse response = null;
-        int nbRetries = 0;
-
-        while (!stopPolling) {
-            response = soClient.callGetRequestStatus(requestId);
-            if (response != null) {
-                if (response.getRequest().getRequestStatus().getPercentProgress() != 100) {
-                    nbRetries++;
-                    serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.INPROGRESS);
-                    Thread.sleep(1000);
-                    LOGGER.debug("orderitem id {} still in progress from so",orderItem.getId());
-                } else if (RequestState.COMPLETE != response.getRequest().getRequestStatus().getRequestState()) {
-                    serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.FAILED);
-                    stopPolling = true;
-                    LOGGER.debug("orderitem id {} failed, response from request status {}",orderItem.getId(),response.getRequest().getRequestStatus().getRequestState());
+                    finalState = StateType.FAILED;
                 } else {
-                    serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.COMPLETED);
-                    stopPolling = true;
-                    LOGGER.debug("orderitem id {} completed");
+                    finalState = StateType.PARTIAL;
                 }
             } else {
-                serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.INPROGRESS);
-                stopPolling = true;
-                LOGGER.debug("orderitem id {} still in progress from so",orderItem.getId());
-            }
-            if (nbRetries == 3) {
-                stopPolling = true;
-                LOGGER.debug("orderitem id {} stop polling from getrequeststatus, 3 retries done",orderItem.getId());
-
+                finalState = StateType.COMPLETED;
             }
+            serviceOrderService.updateOrderState(serviceOrder, finalState);
         }
     }
 
-    private void pollE2ESoRequestStatus(ServiceOrder serviceOrder, ServiceOrderItem orderItem) throws InterruptedException {
-        boolean stopPolling = false;
-        String operationId = orderItem.getRequestId();
-        String serviceId = orderItem.getService().getId();
-        int nbRetries = 0;
-        GetE2ERequestStatusResponse response = null;
-        final String ERROR = "error";
-        final String FINISHED = "finished";
-        final String PROCESSING = "processing";
-        String result = null;
-        while (!stopPolling) {
-            response = soClient.callE2EGetRequestStatus(operationId, serviceId);
-            if (response != null) {
-                result = response.getOperation().getResult();
-                if (PROCESSING.equals(result)) {
-                    nbRetries++;
-                    serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.INPROGRESS);
-                    Thread.sleep(1000);
-                    LOGGER.debug("orderitem id {} still in progress from so",orderItem.getId());
-                } else if (ERROR.equals(result)) {
-                       serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.FAILED);
-                    stopPolling = true;
-                    LOGGER.debug("orderitem id {} failed, response from request status {}",orderItem.getId(),response.getOperation().getResult());
-                } else if (FINISHED.equals(result)) {
-                       serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.COMPLETED);
-                    stopPolling = true;
-                    LOGGER.debug("orderitem id {} completed");
-                }
-            } else {
-               serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.INPROGRESS);
-                stopPolling = true;
-                LOGGER.debug("orderitem id {} still in progress from so",orderItem.getId());
-            }
-            if (nbRetries == 3) {
-                stopPolling = true;
-                LOGGER.debug("orderitem id {} stop polling from getrequeststatus, 3 retries done",orderItem.getId());
-
-            }
-        }
-    }
-    
-    /**
-     * Build SO CREATE request from the ServiceOrder and catalog informations from SDC
-     *
-     * @param orderItem
-     * @param sdcInfos
-     * @param subscriberInfo
-     * @return
-     */
-    private RequestDetails buildSoRequest(ServiceOrderItem orderItem, Map<String, Object> sdcInfos,
-        SubscriberInfo subscriberInfo) {
-        RequestDetails requestDetails = new RequestDetails();
-
-        requestDetails.setSubscriberInfo(subscriberInfo);
-
-        ModelInfo modelInfo = new ModelInfo();
-        modelInfo.setModelType("service");
-        modelInfo.setModelInvariantId((String) sdcInfos.get("invariantUUID"));
-        modelInfo.setModelNameVersionId(orderItem.getService().getServiceSpecification().getId());
-        modelInfo.setModelVersionId(orderItem.getService().getServiceSpecification().getId());
-        modelInfo.setModelName((String) sdcInfos.get("name"));
-        modelInfo.setModelVersion((String) sdcInfos.get("version"));
-        requestDetails.setModelInfo(modelInfo);
-
-        RequestInfo requestInfo = new RequestInfo();
-        requestInfo.setInstanceName(orderItem.getService().getName());
-        requestInfo.setSource("VID");
-        requestInfo.setSuppressRollback(false);
-        requestInfo.setRequestorId("NBI");
-        requestDetails.setRequestInfo(requestInfo);
-
-        RequestParameters requestParameters = new RequestParameters();
-        requestParameters.setSubscriptionServiceType((String) sdcInfos.get("name"));
-        requestParameters.setUserParams(
-            retrieveUserParamsFromServiceCharacteristics(orderItem.getService().getServiceCharacteristic()));
-        requestParameters.setaLaCarte(true);
-        requestDetails.setRequestParameters(requestParameters);
-
-        CloudConfiguration cloudConfiguration = new CloudConfiguration(lcpCloudRegionId, tenantId);
-        requestDetails.setCloudConfiguration(cloudConfiguration);
-
-        OwningEntity owningEntity = new OwningEntity();
-        owningEntity.setOwningEntityId(soOwningEntityId);
-        owningEntity.setOwningEntityName(soOwningEntityName);
-        requestDetails.setOwningEntity(owningEntity);
-
-        Project project = new Project();
-        project.setProjectName(soProjectName);
-
-        requestDetails.setProject(project);
-
-        return requestDetails;
-    }
-    
-    /**
-     * Build E2E SO CREATE request from the ServiceOrder and catalog informations from SDC
-     *
-     * @param serviceOrderItem
-     * @param serviceOrder
-     * @param sdcInfos
-     * @return
-     */
-    //ServiceOrderItem serviceOrderItem --> orderItem?
-    private ServiceModel buildE2ESoRequest(ServiceOrderItem serviceOrderItem, Map<String, Object> sdcInfos,
-            SubscriberInfo subscriberInfo, ServiceOrder serviceOrder) {
-
-        subscriberInfo.getGlobalSubscriberId();
-        ServiceModel service = new ServiceModel();
-        service.setName(serviceOrderItem.getService().getName());
-        service.setDescription(serviceOrder.getDescription());
-        service.setServiceUuid(serviceOrderItem.getService().getServiceSpecification().getId());
-        service.setServiceInvariantUuid((String) sdcInfos.get("invariantUUID"));
-        service.setGlobalSubscriberId(subscriberInfo.getGlobalSubscriberId());
-        service.setServiceType((String) sdcInfos.get("name"));
-
-        ParametersModel parameters = new ParametersModel();
-        ArrayList<ResourceModel> resources = new ArrayList();
-
-        ArrayList<Object> resourceObjects = (ArrayList<Object>)sdcInfos.get("resourceSpecification");
-
-        for(int i = 0; i < resourceObjects.size(); i++) {
-
-            ResourceModel resourceModel = new ResourceModel((Map<String, Object>)resourceObjects.get(i));
-            ParametersModel resourceParameters = new ParametersModel();
-            resourceModel.setParameters(resourceParameters);
-            resources.add(resourceModel);
-
-        }
-        parameters.setResources(resources);
-        List<UserParams> userParams = retrieveUserParamsFromServiceCharacteristics(serviceOrderItem.getService().getServiceCharacteristic());
-
-        // If there are ServiceCharacteristics add them to requestInputs
-        if (!userParams.isEmpty()){
-               Map<String, String> requestInputs = new HashMap<String, String>();
-               for (int i = 0; i < userParams.size(); i++) {
-                               requestInputs.put(userParams.get(i).getName(), userParams.get(i).getValue());
-                       }
-
-               parameters.setRequestInputs(requestInputs);
-        }
-        service.setParameters(parameters);
-
-        return service;
-    }
-
-    /**
-     * Build a list of UserParams for the SO request by browsing a list of ServiceCharacteristics from SDC
-     */
-    private List<UserParams> retrieveUserParamsFromServiceCharacteristics(List<ServiceCharacteristic> characteristics) {
-        List<UserParams> userParams = new ArrayList<>();
-
-        if (!CollectionUtils.isEmpty(characteristics)) {
-            for (ServiceCharacteristic characteristic : characteristics) {
-                UserParams userParam = new UserParams(characteristic.getName(),
-                    characteristic.getValue().getServiceCharacteristicValue());
-                userParams.add(userParam);
-            }
-        }
-
-        return userParams;
-    }
-
-
     /**
      * Update ServiceOrderItem with SO response by using serviceOrderRepository with the serviceOrderId
-     *  @param response
-     * @param orderItem
-     * @param serviceOrder
      */
     private void updateServiceOrderItem(ResponseEntity<CreateServiceInstanceResponse> response,
-        ServiceOrderItem orderItem, ServiceOrder serviceOrder) {
+            ServiceOrderItem orderItem, ServiceOrder serviceOrder) {
 
-        if (response==null || !response.getStatusCode().is2xxSuccessful()) {
+        if (response == null || !response.getStatusCode().is2xxSuccessful()) {
             LOGGER.warn("response ko for serviceOrderItem.id=" + orderItem.getId());
-            serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.FAILED);
-        }
-        else {
+            serviceOrderService.updateOrderItemState(serviceOrder, orderItem, StateType.FAILED);
+            buildOrderMessageIfNeeded(orderItem, serviceOrder, response);
+        else {
             CreateServiceInstanceResponse createServiceInstanceResponse = response.getBody();
             if (createServiceInstanceResponse != null && !orderItem.getState().equals(StateType.FAILED)) {
                 orderItem.getService().setId(createServiceInstanceResponse.getRequestReferences().getInstanceId());
@@ -479,29 +206,57 @@ public class SOTaskProcessor {
             }
 
             if (!response.getStatusCode().is2xxSuccessful() || response.getBody() == null
-                || response.getBody().getRequestReferences() == null) {
-                serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.FAILED);
-                LOGGER.warn("order item {} failed , status {} , response {}",orderItem.getId(),response.getStatusCode(),response.getBody());
+                    || response.getBody().getRequestReferences() == null) {
+                serviceOrderService.updateOrderItemState(serviceOrder, orderItem, StateType.FAILED);
+                LOGGER.warn("order item {} failed , status {} , response {}", orderItem.getId(),
+                        response.getStatusCode(), response.getBody());
             } else {
-                serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.INPROGRESS);
+                updateOrderItemToInProgress(serviceOrder, orderItem);
+            }
+        }
+    }
+
+    private void updateOrderItemToInProgress(ServiceOrder serviceOrder, ServiceOrderItem serviceOrderItem) {
+        if (serviceOrderItem.getAction() != ActionType.MODIFY) {
+            serviceOrderService.updateOrderItemState(serviceOrder, serviceOrderItem, StateType.INPROGRESS);
+        } else {
+            if (StateType.ACKNOWLEDGED == serviceOrderItem.getState()) {
+                serviceOrderService.updateOrderItemState(serviceOrder, serviceOrderItem,
+                        StateType.INPROGRESS_MODIFY_REQUEST_DELETE_SEND);
+            } else {
+                serviceOrderService.updateOrderItemState(serviceOrder, serviceOrderItem,
+                        StateType.INPROGRESS_MODIFY_REQUEST_CREATE_SEND);
+            }
+        }
+    }
+
+    private void buildOrderMessageIfNeeded(ServiceOrderItem serviceOrderItem, ServiceOrder serviceOrder,
+            ResponseEntity<?> response) {
+        if (response != null) {
+            if (response.getStatusCode() == HttpStatus.INTERNAL_SERVER_ERROR) {
+                serviceOrderService.addOrderMessage(serviceOrder, "502");
+            } else if (response.getStatusCode() == HttpStatus.BAD_REQUEST) {
+                ResponseEntity<?> messageError = response;
+                if (messageError.getBody().toString().toLowerCase().contains("serviceinstance already exists")) {
+                    serviceOrderService.addOrderItemMessage(serviceOrder, serviceOrderItem, "105");
+                } else {
+                    serviceOrderService.addOrderItemMessageRequestSo(serviceOrder, serviceOrderItem,
+                            messageError.getBody().toString());
+                }
             }
         }
     }
 
     /**
      * Update E2EServiceOrderItem with SO response by using serviceOrderRepository with the serviceOrderId
-     *  @param response
-     * @param orderItem
-     * @param serviceOrder
      */
     private void updateE2EServiceOrderItem(ResponseEntity<CreateE2EServiceInstanceResponse> response,
-        ServiceOrderItem orderItem, ServiceOrder serviceOrder) {
+            ServiceOrderItem orderItem, ServiceOrder serviceOrder) {
 
-       if (response==null || !response.getStatusCode().is2xxSuccessful()) {
+        if (response == null || !response.getStatusCode().is2xxSuccessful()) {
             LOGGER.warn("response ko for serviceOrderItem.id=" + orderItem.getId());
-            serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.FAILED);
-        }
-        else {
+            serviceOrderService.updateOrderItemState(serviceOrder, orderItem, StateType.FAILED);
+        } else {
             CreateE2EServiceInstanceResponse createE2EServiceInstanceResponse = response.getBody();
             if (createE2EServiceInstanceResponse != null && !orderItem.getState().equals(StateType.FAILED)) {
                 orderItem.getService().setId(createE2EServiceInstanceResponse.getService().getServiceId());
@@ -509,22 +264,22 @@ public class SOTaskProcessor {
             }
 
             if (!response.getStatusCode().is2xxSuccessful() || response.getBody() == null
-                || response.getBody().getService().getOperationId() == null || response.getBody().getService().getServiceId() == null) {
-               serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.FAILED);
-                LOGGER.warn("order item {} failed , status {} , response {}",orderItem.getId(),response.getStatusCode(),response.getBody());
+                    || response.getBody().getService().getOperationId() == null
+                    || response.getBody().getService().getServiceId() == null) {
+                serviceOrderService.updateOrderItemState(serviceOrder, orderItem, StateType.FAILED);
+                LOGGER.warn("order item {} failed , status {} , response {}", orderItem.getId(),
+                        response.getStatusCode(), response.getBody());
             } else {
-                serviceOrderService.updateOrderItemState(serviceOrder,orderItem,StateType.INPROGRESS);
+                serviceOrderService.updateOrderItemState(serviceOrder, orderItem, StateType.INPROGRESS);
             }
         }
     }
-    
+
     /**
      * Update an executionTask in database when it's process with a success
-     *
-     * @param executionTask
      */
     private void updateSuccessTask(ExecutionTask executionTask) {
-        executionTaskRepository.delete(executionTask.getInternalId());
+        executionTaskRepository.deleteById(executionTask.getInternalId());
         executionTaskRepository.updateReliedTaskAfterDelete(executionTask.getInternalId());
 
     }
@@ -537,13 +292,16 @@ public class SOTaskProcessor {
         List<ExecutionTask> executionTasksToDelete = findExecutionTasksRecursively(executionTask);
         for (ExecutionTask taskId : executionTasksToDelete) {
             executionTaskRepository.delete(taskId);
-            LOGGER.warn("task {} with orderitem id {} deleted cause orderitem id {} failed ",taskId.getInternalId(),taskId.getOrderItemId(),executionTask.getOrderItemId());
+            LOGGER.warn("task {} with orderitem id {} deleted cause orderitem id {} failed ", taskId.getInternalId(),
+                    taskId.getOrderItemId(), executionTask.getOrderItemId());
         }
         for (ServiceOrderItem item : serviceOrder.getOrderItem()) {
             for (ExecutionTask taskToDelete : executionTasksToDelete) {
                 if (taskToDelete.getOrderItemId().equals(item.getId())) {
-                    serviceOrderService.updateOrderItemState(serviceOrder,item,StateType.FAILED);
-                    LOGGER.warn("task {} with orderitem id {}  to failed cause orderitem id {} failed ",taskToDelete.getInternalId(),taskToDelete.getOrderItemId(),executionTask.getOrderItemId());
+                    serviceOrderService.updateOrderItemState(serviceOrder, item, StateType.FAILED);
+                    LOGGER.warn("task {} with orderitem id {} failed cause orderitem id {} failed ",
+                            taskToDelete.getInternalId(), taskToDelete.getOrderItemId(),
+                            executionTask.getOrderItemId());
 
                 }
             }
@@ -559,7 +317,7 @@ public class SOTaskProcessor {
         List<ExecutionTask> executionTasks = new ArrayList<>();
 
         List<ExecutionTask> tasksReliedToAnOrderItemId =
-            executionTaskRepository.findTasksReliedToAnOrderItemId(executionTask.getInternalId());
+                executionTaskRepository.findTasksReliedToAnOrderItemId(executionTask.getInternalId());
 
         if (CollectionUtils.isEmpty(tasksReliedToAnOrderItemId)) {
             return Arrays.asList(executionTask);
@@ -572,5 +330,15 @@ public class SOTaskProcessor {
         return executionTasks;
     }
 
-
+    private boolean shouldStopPolling(ExecutionTask executionTask) {
+        long createTimeinMillis = executionTask.getCreateDate().getTime();
+        long lastAttemptTimeInMillis = executionTask.getLastAttemptDate().getTime();
+        long differenceInMillis = lastAttemptTimeInMillis - createTimeinMillis;
+        float pollingDurationInMillis = pollingDurationInMins * 60000;
+        LOGGER.debug("Task {} with orderitem id {}: Task create date: {} Task last attempt date: {}",
+                executionTask.getInternalId(), executionTask.getOrderItemId(), createTimeinMillis,
+                lastAttemptTimeInMillis);
+        LOGGER.debug("Difference {} and Polling Duration {}", differenceInMillis, pollingDurationInMins);
+        return (differenceInMillis > pollingDurationInMillis);
+    }
 }