Merge "Reorder modifiers"

[so.git] / bpmn / MSOInfrastructureBPMN / src / main / groovy / org / openecomp / mso / bpmn / infrastructure / scripts / DoDeleteResourcesV1.groovy

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy
index f08a769..1a36a4e 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy
@@ -244,6 +244,7 @@ public class DoDeleteResourcesV1 extends AbstractServiceTaskProcessor {
         resourceInput.setResourceInstanceName(currentResource.getResourceInstanceName())
         resourceInput.setResourceInstancenUuid(currentResource.getResourceId())
         resourceInput.setOperationId(execution.getVariable("operationId"))
+        resourceInput.setOperationType(execution.getVariable("operationType"))
         String globalSubscriberId = execution.getVariable("globalSubscriberId") 
         resourceInput.setGlobalSubscriberId(globalSubscriberId)
         resourceInput.setResourceModelInfo(currentResource.getModelInfo());
@@ -273,7 +274,7 @@ public class DoDeleteResourcesV1 extends AbstractServiceTaskProcessor {
         utils.log("INFO", "======== COMPLETED parseNextResource Process ======== ", isDebugEnabled)
     }
     
-    public void prepareFinishedProgressForResource(execution) {
+    public void prepareFinishedProgressForResource(DelegateExecution execution) {
 
         String serviceInstanceId = execution.getVariable("serviceInstanceId")
         String serviceType = execution.getVariable("serviceType")
@@ -297,7 +298,7 @@ public class DoDeleteResourcesV1 extends AbstractServiceTaskProcessor {
                                <operationId>${operationId}</operationId>
                                <progress>${progress}</progress>
                                <resourceTemplateUUID>${resourceCustomizationUuid}</resourceTemplateUUID>
-                               <serviceId>${ServiceInstanceId}</serviceId>
+                               <serviceId>${serviceInstanceId}</serviceId>
                                <status>${status}</status>
                                <statusDescription>${statusDescription}</statusDescription>
                     </ns:updateResourceOperationStatus>