Merge "Fix retrieval of resourceInputObj in delete e2e"

diff --combined bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
index 727cb5c,8f77728..66479be
--- 1/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
--- 2/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeActivateSDNCNetworkResource.groovy
@@@ -145,7 -145,7 +145,7 @@@ public class DeActivateSDNCNetworkResou
              String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
              String source = execution.getVariable("source")
              String sdnc_service_id = execution.getVariable(Prefix + "sdncServiceId")
-             ResourceInput resourceInputObj = execution.getVariable(Prefix + "resourceInput")
+             ResourceInput resourceInputObj = ResourceRequestBuilder.getJsonObject(resourceInput, ResourceInput.class)
              String serviceType = resourceInputObj.getServiceType()
              String serviceModelInvariantUuid = resourceInputObj.getServiceModelInfo().getModelInvariantUuid()
              String serviceModelUuid = resourceInputObj.getServiceModelInfo().getModelUuid()
@@@ -339,7 -339,7 +339,7 @@@
      }
  
      public void prepareUpdateAfterDeActivateSDNCResource(DelegateExecution execution) {
-         ResourceInput resourceInputObj = execution.getVariable(Prefix + "resourceInput")
+         ResourceInput resourceInputObj = ResourceRequestBuilder.getJsonObject(resourceInput, ResourceInput.class)
          String operType = resourceInputObj.getOperationType()
          String resourceCustomizationUuid = resourceInputObj.getResourceModelInfo().getModelCustomizationUuid()
          String serviceInstanceId = resourceInputObj.getServiceInstanceId()
@@@ -352,7 -352,7 +352,7 @@@
  
          String body = """
                  <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
 -                        xmlns:ns="http://org.openecomp.mso/requestsdb">
 +                        xmlns:ns="http://org.onap.so/requestsdb">
                          <soapenv:Header/>
                  <soapenv:Body>
                      <ns:updateResourceOperationStatus>

diff --combined bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
index b66ba89,703a393..cf78193
--- 1/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
--- 2/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DeleteSDNCNetworkResource.groovy
@@@ -171,7 -171,7 +171,7 @@@ public class DeleteSDNCNetworkResource 
              String serviceInstanceId = execution.getVariable(Prefix + "serviceInstanceId")
              String source = execution.getVariable("source")
              String sdnc_service_id = execution.getVariable(Prefix + "sdncServiceId")
-             ResourceInput resourceInputObj = execution.getVariable(Prefix + "resourceInput")
+             ResourceInput resourceInputObj = ResourceRequestBuilder.getJsonObject(resourceInput, ResourceInput.class)
              String serviceType = resourceInputObj.getServiceType()
              String serviceModelInvariantUuid = resourceInputObj.getServiceModelInfo().getModelInvariantUuid()
              String serviceModelUuid = resourceInputObj.getServiceModelInfo().getModelUuid()
@@@ -371,7 -371,7 +371,7 @@@
      }
  
      public void prepareUpdateBeforeDeleteSDNCResource(DelegateExecution execution) {
-         ResourceInput resourceInputObj = execution.getVariable(Prefix + "resourceInput")
+         ResourceInput resourceInputObj = ResourceRequestBuilder.getJsonObject(resourceInput, ResourceInput.class)
          String operType = resourceInputObj.getOperationType()
          String resourceCustomizationUuid = resourceInputObj.getResourceModelInfo().getModelCustomizationUuid()
          String serviceInstanceId = resourceInputObj.getServiceInstanceId()
@@@ -384,7 -384,7 +384,7 @@@
  
          String body = """
                  <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
 -                        xmlns:ns="http://org.openecomp.mso/requestsdb">
 +                        xmlns:ns="http://org.onap.so/requestsdb">
                          <soapenv:Header/>
                  <soapenv:Body>
                      <ns:updateResourceOperationStatus>
@@@ -404,7 -404,7 +404,7 @@@
      }
  
      public void prepareUpdateAfterDeleteSDNCResource(DelegateExecution execution) {
-         ResourceInput resourceInputObj = execution.getVariable(Prefix + "resourceInput")
+         ResourceInput resourceInputObj = ResourceRequestBuilder.getJsonObject(resourceInput, ResourceInput.class)
          String operType = resourceInputObj.getOperationType()
          String resourceCustomizationUuid = resourceInputObj.getResourceModelInfo().getModelCustomizationUuid()
          String serviceInstanceId = resourceInputObj.getServiceInstanceId()
@@@ -417,7 -417,7 +417,7 @@@
  
          String body = """
                  <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
 -                        xmlns:ns="http://org.openecomp.mso/requestsdb">
 +                        xmlns:ns="http://org.onap.so/requestsdb">
                          <soapenv:Header/>
                  <soapenv:Body>
                      <ns:updateResourceOperationStatus>