Merge "Reorder modifiers"

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

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
index 447fa63..9a12a69 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
@@ -80,10 +80,10 @@ public class DeleteSDNCNetworkResource extends AbstractServiceTaskProcessor {
             
             //Deal with recipeParams
             String recipeParamsFromWf = execution.getVariable("recipeParamXsd")
-            String resourceName = resourceInputObj.getResourceInstanceName()            
+            String resourceModelName = resourceInputObj.getResourceModelInfo().getModelName()            
             //For sdnc requestAction default is "NetworkInstance"
             String operationType = "Network"    
-            if(!StringUtils.isBlank(recipeParamsFromRequest)){
+            if(!StringUtils.isBlank(recipeParamsFromRequest) && "null" != recipeParamsFromRequest){
                 //the operationType from worflow(first node) is second priority.
                 operationType = jsonUtil.getJsonValue(recipeParamsFromRequest, "operationType")
             }
@@ -95,12 +95,12 @@ public class DeleteSDNCNetworkResource extends AbstractServiceTaskProcessor {
             
             //For sdnc, generate svc_action and request_action
             String sdnc_svcAction = "delete"
-            if(StringUtils.containsIgnoreCase(resourceInputObj.getResourceInstanceName(), "overlay")){
+            if(StringUtils.containsIgnoreCase(resourceModelName, "overlay")){
                 //This will be resolved in R3.
                 sdnc_svcAction ="deactivate"
                 operationType = "NCINetwork"        
             }
-            if(StringUtils.containsIgnoreCase(resourceInputObj.getResourceInstanceName(), "underlay")){
+            if(StringUtils.containsIgnoreCase(resourceModelName, "underlay")){
                 //This will be resolved in R3.
                 operationType ="Network"
             }        
@@ -227,13 +227,13 @@ public class DeleteSDNCNetworkResource extends AbstractServiceTaskProcessor {
         ResourceInput resourceInputObj = execution.getVariable(Prefix + "resourceInput")
         String operType = resourceInputObj.getOperationType()
         String resourceCustomizationUuid = resourceInputObj.getResourceModelInfo().getModelCustomizationUuid()
-        String ServiceInstanceId = resourceInputObj.getServiceInstanceId()
+        String serviceInstanceId = resourceInputObj.getServiceInstanceId()
         String operationId = resourceInputObj.getOperationId()
         String progress = "20"
         String status = "processing"
         String statusDescription = "SDCN resource delete invoked"
 
-        execution.getVariable("operationId")
+        //String operationId = execution.getVariable("operationId")
 
         String body = """
                 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
@@ -245,7 +245,7 @@ public class DeleteSDNCNetworkResource 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>
@@ -256,17 +256,17 @@ public class DeleteSDNCNetworkResource extends AbstractServiceTaskProcessor {
 
     }
 
-    public void prepareUpdateAfterDeleteSDNCResource(execution) {
+    public void prepareUpdateAfterDeleteSDNCResource(DelegateExecution execution) {
         ResourceInput resourceInputObj = execution.getVariable(Prefix + "resourceInput")
         String operType = resourceInputObj.getOperationType()
         String resourceCustomizationUuid = resourceInputObj.getResourceModelInfo().getModelCustomizationUuid()
-        String ServiceInstanceId = resourceInputObj.getServiceInstanceId()
+        String serviceInstanceId = resourceInputObj.getServiceInstanceId()
         String operationId = resourceInputObj.getOperationId()
         String progress = "100"
         String status = "finished"
         String statusDescription = "SDCN resource delete completed"
 
-        execution.getVariable("operationId")
+        //String operationId = execution.getVariable("operationId")
 
         String body = """
                 <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
@@ -278,7 +278,7 @@ public class DeleteSDNCNetworkResource 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>