Fix AAI Relationship read failed in delete flow 71/22471/1
authorc00149107 <chenchuanyu@huawei.com>
Tue, 7 Nov 2017 08:04:40 +0000 (16:04 +0800)
committerc00149107 <chenchuanyu@huawei.com>
Tue, 7 Nov 2017 08:04:40 +0000 (16:04 +0800)
Fix AAI Relationship read failed in delete flow

Change-Id: Ieb31f2088aba3d4bb2d4ad5c72aec061cf833069
Issue-ID:SO-311
Signed-off-by: c00149107 <chenchuanyu@huawei.com>
bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteCustomE2EServiceInstance.groovy
bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCustomDeleteE2EServiceInstance.groovy
bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteVFCNetworkServiceInstance.groovy
bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustomE2EServiceInstance.bpmn
bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCustomDeleteE2EServiceInstance.bpmn

index af63176..88eccf0 100644 (file)
@@ -64,7 +64,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                execution.setVariable("prefix",Prefix)\r
                String msg = ""\r
                \r
-               utils.log("DEBUG", " *** preProcessRequest Request *** ", isDebugEnabled)\r
+               utils.log("INFO", " *** preProcessRequest Request *** ", isDebugEnabled)\r
 \r
                try {\r
                        // check for incoming json message/input\r
@@ -74,7 +74,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 \r
                        String requestId = execution.getVariable("mso-request-id")\r
                        execution.setVariable("msoRequestId", requestId)\r
-                       utils.log("DEBUG", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)\r
+                       utils.log("INFO", "Input Request:" + siRequest + " reqId:" + requestId, isDebugEnabled)\r
                        \r
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")\r
                        if (isBlank(serviceInstanceId)) {\r
@@ -85,7 +85,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                        String serviceType = execution.getVariable("serviceType")\r
                        if (isBlank(serviceType)) {\r
                                msg = "Input serviceType' is null"\r
-                               utils.log("DEBUG", msg, isDebugEnabled)\r
+                               utils.log("INFO", msg, isDebugEnabled)\r
                        } else {\r
                                execution.setVariable("serviceType", serviceType)\r
                        }\r
@@ -94,7 +94,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                        String globalSubscriberId = jsonUtil.getJsonValue(siRequest, "globalSubscriberId")\r
                        if (isBlank(globalSubscriberId)) {\r
                                msg = "Input globalSubscriberId' is null"\r
-                               utils.log("DEBUG", msg, isDebugEnabled)\r
+                               utils.log("INFO", msg, isDebugEnabled)\r
                        } else {\r
                                execution.setVariable("globalSubscriberId", globalSubscriberId)\r
                        }\r
@@ -112,34 +112,34 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                        throw e;\r
                } catch (Exception ex){\r
                        msg = "Exception in preProcessRequest " + ex.getMessage()\r
-                       utils.log("DEBUG", msg, isDebugEnabled)\r
+                       utils.log("INFO", msg, isDebugEnabled)\r
                        exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)\r
                }\r
-               utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)\r
+               utils.log("INFO"," ***** Exit preProcessRequest *****",  isDebugEnabled)\r
        }\r
 \r
        public void sendSyncResponse (Execution execution) {\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
-               utils.log("DEBUG", " *** sendSyncResponse  *** ", isDebugEnabled)\r
+               utils.log("INFO", " *** sendSyncResponse  *** ", isDebugEnabled)\r
 \r
                try {\r
                        String operationId = execution.getVariable("operationId")\r
                        \r
                        // RESTResponse (for API Handler (APIH) Reply Task) :  :  \r
                        String syncResponse = """{"operationId":"${operationId}"}""".trim()\r
-                       utils.log("DEBUG", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)\r
+                       utils.log("INFO", " sendSynchResponse: xmlSyncResponse - " + "\n" + syncResponse, isDebugEnabled)\r
                        sendWorkflowResponse(execution, 202, syncResponse)\r
 \r
                } catch (Exception ex) {\r
                        String msg  = "Exception in sendSyncResponse: " + ex.getMessage()\r
                        exceptionUtil.buildAndThrowWorkflowException(execution, 7000, exceptionMessage)\r
                }\r
-               utils.log("DEBUG"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)\r
+               utils.log("INFO"," ***** Exit sendSyncResopnse *****",  isDebugEnabled)\r
        }\r
        \r
        public void sendSyncError (Execution execution) {\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
-               utils.log("DEBUG", " *** sendSyncError *** ", isDebugEnabled)\r
+               utils.log("INFO", " *** sendSyncError *** ", isDebugEnabled)\r
 \r
                try {\r
                        String errorMessage = ""\r
@@ -160,14 +160,14 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                        sendWorkflowResponse(execution, 500, buildworkflowException)\r
 \r
                } catch (Exception ex) {\r
-                       utils.log("DEBUG", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)\r
+                       utils.log("INFO", " Sending Sync Error Activity Failed. " + "\n" + ex.getMessage(), isDebugEnabled)\r
                }\r
 \r
        }\r
        \r
        public void prepareCompletionRequest (Execution execution) {\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
-               utils.log("DEBUG", " *** prepareCompletion *** ", isDebugEnabled)\r
+               utils.log("INFO", " *** prepareCompletion *** ", isDebugEnabled)\r
 \r
                try {\r
                        String requestId = execution.getVariable("msoRequestId")\r
@@ -188,23 +188,23 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                        String xmlMsoCompletionRequest = utils.formatXml(msoCompletionRequest)\r
 \r
                        execution.setVariable("completionRequest", xmlMsoCompletionRequest)\r
-                       utils.log("DEBUG", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)\r
+                       utils.log("INFO", " Overall SUCCESS Response going to CompleteMsoProcess - " + "\n" + xmlMsoCompletionRequest, isDebugEnabled)\r
 \r
                } catch (Exception ex) {\r
                        String msg = " Exception in prepareCompletion:" + ex.getMessage()\r
-                       utils.log("DEBUG", msg, isDebugEnabled)\r
+                       utils.log("INFO", msg, isDebugEnabled)\r
                        exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)\r
                }\r
-               utils.log("DEBUG", "*** Exit prepareCompletionRequest ***", isDebugEnabled)\r
+               utils.log("INFO", "*** Exit prepareCompletionRequest ***", isDebugEnabled)\r
        }\r
        \r
        public void prepareFalloutRequest(Execution execution){\r
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
-               utils.log("DEBUG", " *** prepareFalloutRequest *** ", isDebugEnabled)\r
+               utils.log("INFO", " *** prepareFalloutRequest *** ", isDebugEnabled)\r
 \r
                try {\r
                        WorkflowException wfex = execution.getVariable("WorkflowException")\r
-                       utils.log("DEBUG", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)\r
+                       utils.log("INFO", " Input Workflow Exception: " + wfex.toString(), isDebugEnabled)\r
                        String requestId = execution.getVariable("msoRequestId")\r
                        String source = execution.getVariable("source")\r
                        String requestInfo =\r
@@ -217,7 +217,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                        String falloutRequest = exceptionUtil.processMainflowsBPMNException(execution, requestInfo)\r
                        execution.setVariable("falloutRequest", falloutRequest)\r
                } catch (Exception ex) {\r
-                       utils.log("DEBUG", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)\r
+                       utils.log("INFO", "Exception prepareFalloutRequest:" + ex.getMessage(), isDebugEnabled)\r
                        String errorException = "  Bpmn error encountered in CreateServiceInstance flow. FalloutHandlerRequest,  buildErrorResponse() - " + ex.getMessage()\r
                        String requestId = execution.getVariable("msoRequestId")\r
                        String falloutRequest =\r
@@ -237,7 +237,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
 \r
                        execution.setVariable("falloutRequest", falloutRequest)\r
                }\r
-               utils.log("DEBUG", "*** Exit prepareFalloutRequest ***", isDebugEnabled)\r
+               utils.log("INFO", "*** Exit prepareFalloutRequest ***", isDebugEnabled)\r
        }\r
        \r
 \r
@@ -249,7 +249,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                execution.setVariable("prefix", Prefix)\r
 \r
                try {\r
-                       utils.log("DEBUG", " ***** Inside prepareDBRequest of DeleteCustomE2EServiceInstance ***** ", isDebugEnabled)\r
+                       utils.log("INFO", " ***** Inside prepareDBRequest of DeleteCustomE2EServiceInstance ***** ", isDebugEnabled)\r
 \r
                        String requestId = execution.getVariable("DELSI_requestId")\r
                        String statusMessage = "E2E Service Instance successfully deleted."\r
@@ -290,7 +290,7 @@ public class DeleteCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
                execution.setVariable("prefix", Prefix)\r
 \r
-               utils.log("DEBUG", " ***** Inside prepareDBRequestError of DeleteCustomE2EServiceInstance ***** ", isDebugEnabled)\r
+               utils.log("INFO", " ***** Inside prepareDBRequestError of DeleteCustomE2EServiceInstance ***** ", isDebugEnabled)\r
 \r
                try {\r
                        String requestId = execution.getVariable("DELSI_requestId")\r
index 9fcb6ac..a84a7ed 100644 (file)
@@ -51,6 +51,8 @@ import org.w3c.dom.Node
 import org.w3c.dom.NodeList
 import org.xml.sax.InputSource
 
+import com.fasterxml.jackson.jaxrs.json.annotation.JSONP.Def;
+
 /**
  * This groovy class supports the <class>DoDeleteE2EServiceInstance.bpmn</class> process.
  * 
@@ -78,7 +80,7 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
 
        public void preProcessRequest (Execution execution) {
                def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-               utils.log("DEBUG"," ***** preProcessRequest *****",  isDebugEnabled)
+               utils.log("INFO"," ***** preProcessRequest *****",  isDebugEnabled)
                String msg = ""
 
                try {
@@ -94,28 +96,28 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                        }
 
                        //requestDetails.requestParameters. for AAI PUT & SDNC assignTopology
-                       String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
-                       if (subscriptionServiceType == null)
+                       String serviceType = execution.getVariable("serviceType")
+                       if (serviceType == null)
                        {
-                               execution.setVariable("subscriptionServiceType", "")
+                               execution.setVariable("serviceType", "")
                        }
 
                        //Generated in parent for AAI PUT
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")
                        if (isBlank(serviceInstanceId)){
                                msg = "Input serviceInstanceId is null"
-                               utils.log("DEBUG", msg, isDebugEnabled)
+                               utils.log("INFO", msg, isDebugEnabled)
                                exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
                        }
 
                        String sdncCallbackUrl = execution.getVariable('URN_mso_workflow_sdncadapter_callback')
                        if (isBlank(sdncCallbackUrl)) {
                                msg = "URN_mso_workflow_sdncadapter_callback is null"
-                               utils.log("DEBUG", msg, isDebugEnabled)
+                               utils.log("INFO", msg, isDebugEnabled)
                                exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
                        }
                        execution.setVariable("sdncCallbackUrl", sdncCallbackUrl)
-                       utils.log("DEBUG","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
+                       utils.log("INFO","SDNC Callback URL: " + sdncCallbackUrl, isDebugEnabled)
 
                        StringBuilder sbParams = new StringBuilder()
                        Map<String, String> paramsMap = execution.getVariable("serviceInputParams")
@@ -145,10 +147,10 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                        throw e;
                } catch (Exception ex){
                        msg = "Exception in preProcessRequest " + ex.getMessage()
-                       utils.log("DEBUG", msg, isDebugEnabled)
+                       utils.log("INFO", msg, isDebugEnabled)
                        exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
                }
-               utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)
+               utils.log("INFO"," ***** Exit preProcessRequest *****",  isDebugEnabled)
        }
        
 
@@ -160,7 +162,7 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
        
        public void preProcessSDNCDelete (Execution execution) {
                def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
-               utils.log("DEBUG"," ***** preProcessSDNCDelete *****", isDebugEnabled)
+               utils.log("INFO"," ***** preProcessSDNCDelete *****", isDebugEnabled)
                String msg = ""
 
                try {
@@ -259,54 +261,54 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                        String sdncDeactivate = sdncDelete.replace(">delete<", ">deactivate<").replace(">${sdncRequestId}<", ">${sdncRequestId2}<")
                        execution.setVariable("sdncDelete", sdncDelete)
                        execution.setVariable("sdncDeactivate", sdncDeactivate)
-                       utils.log("DEBUG","sdncDeactivate:\n" + sdncDeactivate, isDebugEnabled)
-                       utils.log("DEBUG","sdncDelete:\n" + sdncDelete, isDebugEnabled)
+                       utils.log("INFO","sdncDeactivate:\n" + sdncDeactivate, isDebugEnabled)
+                       utils.log("INFO","sdncDelete:\n" + sdncDelete, isDebugEnabled)
 
                } catch (BpmnError e) {
                        throw e;
                } catch(Exception ex) {
                        msg = "Exception in preProcessSDNCDelete. " + ex.getMessage()
-                       utils.log("DEBUG", msg, isDebugEnabled)
+                       utils.log("INFO", msg, isDebugEnabled)
                        exceptionUtil.buildAndThrowWorkflowException(execution, 7000, "Exception Occured in preProcessSDNCDelete.\n" + ex.getMessage())
                }
-               utils.log("DEBUG"," *****Exit preProcessSDNCDelete *****", isDebugEnabled)
+               utils.log("INFO"," *****Exit preProcessSDNCDelete *****", isDebugEnabled)
        }
 
        public void postProcessSDNCDelete(Execution execution, String response, String method) {
 
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-               utils.log("DEBUG"," ***** postProcessSDNC " + method + " *****", isDebugEnabled)
+               utils.log("INFO"," ***** postProcessSDNC " + method + " *****", isDebugEnabled)
                String msg = ""
 
                try {
                        WorkflowException workflowException = execution.getVariable("WorkflowException")
                        boolean successIndicator = execution.getVariable("SDNCA_SuccessIndicator")
-                       utils.log("DEBUG", "SDNCResponse: " + response, isDebugEnabled)
-                       utils.log("DEBUG", "workflowException: " + workflowException, isDebugEnabled)
+                       utils.log("INFO", "SDNCResponse: " + response, isDebugEnabled)
+                       utils.log("INFO", "workflowException: " + workflowException, isDebugEnabled)
 
                        SDNCAdapterUtils sdncAdapterUtils = new SDNCAdapterUtils(this)
                        sdncAdapterUtils.validateSDNCResponse(execution, response, workflowException, successIndicator)
                        if(execution.getVariable(Prefix + 'sdncResponseSuccess') == "true"){
-                               utils.log("DEBUG","Good response from SDNC Adapter for service-instance " + method + "response:\n" + response, isDebugEnabled)
+                               utils.log("INFO","Good response from SDNC Adapter for service-instance " + method + "response:\n" + response, isDebugEnabled)
 
                        }else{
                                msg = "Bad Response from SDNC Adapter for service-instance " + method
-                               utils.log("DEBUG", msg, isDebugEnabled)
+                               utils.log("INFO", msg, isDebugEnabled)
                                exceptionUtil.buildAndThrowWorkflowException(execution, 3500, msg)
                        }
                } catch (BpmnError e) {
                        throw e;
                } catch(Exception ex) {
                        msg = "Exception in postProcessSDNC " + method + " Exception:" + ex.getMessage()
-                       utils.log("DEBUG", msg, isDebugEnabled)
+                       utils.log("INFO", msg, isDebugEnabled)
                        exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
                }
-               utils.log("DEBUG"," *** Exit postProcessSDNC " + method + " ***", isDebugEnabled)
+               utils.log("INFO"," *** Exit postProcessSDNC " + method + " ***", isDebugEnabled)
        }
 
        public void postProcessAAIGET(Execution execution) {
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-               utils.log("DEBUG"," ***** postProcessAAIGET ***** ", isDebugEnabled)
+               utils.log("INFO"," ***** postProcessAAIGET ***** ", isDebugEnabled)
                String msg = ""
 
                try {
@@ -315,56 +317,19 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                        String serviceType = ""
 
                        if(foundInAAI == true){
-                               utils.log("DEBUG","Found Service-instance in AAI", isDebugEnabled)
-
-                               //Extract GlobalSubscriberId
-                               String siRelatedLink = execution.getVariable("GENGS_siResourceLink")
-                               if (isBlank(siRelatedLink))
-                               {
-                                       msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId
-                                       utils.log("DEBUG", msg, isDebugEnabled)
-                                       exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-                               }
-                               else
-                               {
-                                       utils.log("DEBUG","Found Service-instance in AAI. link: " + siRelatedLink, isDebugEnabled)
-                                       String  globalSubscriberId = execution.getVariable("globalSubscriberId")
-                                       if(isBlank(globalSubscriberId)){
-                                               int custStart = siRelatedLink.indexOf("customer/")
-                                               int custEnd = siRelatedLink.indexOf("/service-subscriptions")
-                                               globalSubscriberId = siRelatedLink.substring(custStart + 9, custEnd)
-                                               execution.setVariable("globalSubscriberId", globalSubscriberId)
-                                       }
-
-                                       //Extract Service Type if not provided on request
-                                       String subscriptionServiceType = execution.getVariable("subscriptionServiceType")
-                                       if(isBlank(subscriptionServiceType)){
-                                               int serviceStart = siRelatedLink.indexOf("service-subscription/")
-                                               int serviceEnd = siRelatedLink.indexOf("/service-instances/")
-                                               String serviceTypeEncoded = siRelatedLink.substring(serviceStart + 21, serviceEnd)
-                                               subscriptionServiceType = UriUtils.decode(serviceTypeEncoded, "UTF-8")
-                                               execution.setVariable("subscriptionServiceType", subscriptionServiceType)
-                                       }
-
-                                       if (isBlank(globalSubscriberId) || isBlank(subscriptionServiceType))
-                                       {
-                                               msg = "Could not retrive global-customer-id & subscription-service-type from AAI to delete id:" + serviceInstanceId
-                                               utils.log("DEBUG", msg, isDebugEnabled)
-                                               exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-                                       }
-                               }
+                               utils.log("INFO","Found Service-instance in AAI", isDebugEnabled)
 
                                String siData = execution.getVariable("GENGS_service")
-                               utils.log("DEBUG", "SI Data", isDebugEnabled)
+                               utils.log("INFO", "SI Data", isDebugEnabled)
                                if (isBlank(siData))
                                {
                                        msg = "Could not retrive ServiceInstance data from AAI to delete id:" + serviceInstanceId
-                                       utils.log("DEBUG", msg, isDebugEnabled)
+                                       utils.log("INFO", msg, isDebugEnabled)
                                        exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
                                }
                                else
                                {
-                                       utils.log("DEBUG", "SI Data" + siData, isDebugEnabled)
+                                       utils.log("INFO", "SI Data" + siData, isDebugEnabled)
                                        serviceType = utils.getNodeText1(siData,"service-type")
                                        execution.setVariable("serviceType", serviceType)
                                        execution.setVariable("serviceRole", utils.getNodeText1(siData,"service-role"))
@@ -372,7 +337,7 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
 
                                        //Confirm there are no related service instances (vnf/network or volume)
                                        if (utils.nodeExists(siData, "relationship-list")) {
-                                               utils.log("DEBUG", "SI Data relationship-list exists:", isDebugEnabled)
+                                               utils.log("INFO", "SI Data relationship-list exists:", isDebugEnabled)
                                                InputSource source = new InputSource(new StringReader(siData));
                                                DocumentBuilderFactory docFactory = DocumentBuilderFactory.newInstance();
                                                DocumentBuilder docBuilder = docFactory.newDocumentBuilder()
@@ -380,63 +345,79 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                                                serviceXml.getDocumentElement().normalize()
                                                //test(siData)
                                                NodeList nodeList = serviceXml.getElementsByTagName("relationship")
+                           JSONArray jArray = new JSONArray()
                                                for (int x = 0; x < nodeList.getLength(); x++) {
                                                        Node node = nodeList.item(x)
                                                        if (node.getNodeType() == Node.ELEMENT_NODE) {
                                                                Element eElement = (Element) node
-                                                               def e = eElement.getElementsByTagName("related-to").item(0).getTextContent()
-                                                               if(e.equals("generic-vnf") || e.equals("l3-network") || e.equals("allotted-resource") ){
-                                                                       utils.log("DEBUG", "ServiceInstance still has relationship(s) to generic-vnfs, l3-networks or allotted-resources", isDebugEnabled)
-                                                                       execution.setVariable("siInUse", true)
-                                                                       //there are relationship dependencies to this Service Instance
-                                                                       msg = " Stopped deleting Service Instance, it has dependencies. Service instance id: " + serviceInstanceId
-                                                                       utils.log("DEBUG", msg, isDebugEnabled)
-                                                                       exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
-                                                               }else{
+                                                               def e = eElement.getElementsByTagName("related-to").item(0).getTextContent()                                                                    //for ns
+                                                               if(e.equals("service-instance")){
+                                                                   def relatedObject = eElement.getElementsByTagName("related-link").item(0).getTextContent()
+                                                                       utils.log("INFO", "ServiceInstance Related NS :" + relatedObject, isDebugEnabled)
+                                    NodeList dataList = node.getChildNodes()
+                                    if(null != dataList) {
+                                        JSONObject jObj = new JSONObject()
+                                        for (int i = 0; i < dataList.getLength(); i++) {
+                                            Node dNode = dataList.item(i)
+                                            if(dNode.getNodeName() == "relationship-data") {
+                                                Element rDataEle = (Element)dNode
+                                                def eKey =  rDataEle.getElementsByTagName("relationship-key").item(0).getTextContent()
+                                                def eValue = rDataEle.getElementsByTagName("relationship-value").item(0).getTextContent()
+                                                if(eKey.equals("service-instance.service-instance-id")){
+                                                    jObj.put("resourceInstanceId", eValue)
+                                                }
+                                            }
+                                            else if(dNode.getNodeName() == "related-to-property"){
+                                                 Element rDataEle = (Element)dNode
+                                                 def eKey =  rDataEle.getElementsByTagName("property-key").item(0).getTextContent()
+                                                 def eValue = rDataEle.getElementsByTagName("property-value").item(0).getTextContent()
+                                                 if(eKey.equals("service-instance.service-instance-name")){
+                                                        jObj.put("resourceType", eValue)
+                                                    }
+                                            }
+                                        }
+                                        utils.log("INFO", "Relationship related to Resource:" + jObj.toString(), isDebugEnabled)
+                                        jArray.put(jObj)
+                                    }
+                                                       //for overlay/underlay
+                                                               }else if (e.equals("configuration")){
+                                    def relatedObject = eElement.getElementsByTagName("related-link").item(0).getTextContent()
+                                    utils.log("INFO", "ServiceInstance Related Configuration :" + relatedObject, isDebugEnabled)
                                                                        NodeList dataList = node.getChildNodes()
                                                                        if(null != dataList) {
-                                                                               JSONArray jArray = new JSONArray()
+                                                                               JSONObject jObj = new JSONObject()
                                                                                for (int i = 0; i < dataList.getLength(); i++) {
                                                                                        Node dNode = dataList.item(i)
                                                                                        if(dNode.getNodeName() == "relationship-data") {
                                                                                                Element rDataEle = (Element)dNode
-
                                                                                                def eKey =  rDataEle.getElementsByTagName("relationship-key").item(0).getTextContent()
                                                                                                def eValue = rDataEle.getElementsByTagName("relationship-value").item(0).getTextContent()
-
-                                                                                               JSONObject jObj = new JSONObject()
-                                                                                               jObj.put("resourceInstanceId", eKey)
-                                                                                               jObj.put("resourceType", eValue)
-                                                                                               jArray.put(jObj)
+                                                                                               if(eKey.equals("configuration.configuration-id")){
+                                                                                                   jObj.put("resourceInstanceId", eValue)
+                                                                                               }
+                                                                                       }
+                                                                                       else if(dNode.getNodeName() == "related-to-property"){
+                                                    Element rDataEle = (Element)dNode
+                                                    def eKey =  rDataEle.getElementsByTagName("property-key").item(0).getTextContent()
+                                                    def eValue = rDataEle.getElementsByTagName("property-value").item(0).getTextContent()
+                                                    if(eKey.equals("configuration.configuration-type")){
+                                                           jObj.put("resourceType", eValue)
+                                                       }
                                                                                        }
                                                                                }
-                                                                               execution.setVariable("serviceRelationShip", jArray)
-                                                                       }
-                                                                       utils.log("DEBUG", "Relationship NOT related to OpenStack", isDebugEnabled)
+                                                                               utils.log("INFO", "Relationship related to Resource:" + jObj.toString(), isDebugEnabled)
+                                        jArray.put(jObj)
+                                                                       }                                                                       
                                                                }
                                                        }
                                                }
-                                       }
-
-                                       if ("TRANSPORT".equalsIgnoreCase(serviceType))
-                                       {
-                                               if ("PendingDelete".equals(orchestrationStatus))
-                                               {
-                                                       execution.setVariable("skipDeactivate", true)
-                                               }
-                                               else
-                                               {
-                                                       msg = "ServiceInstance of type TRANSPORT must in PendingDelete status to allow Delete. Orchestration-status:" + orchestrationStatus
-                                                       utils.log("DEBUG", msg, isDebugEnabled)
-                                                       exceptionUtil.buildAndThrowWorkflowException(execution, 500, msg)
-                                               }
-
+                        execution.setVariable("serviceRelationShip", jArray)
                                        }
                                }
                        }else{
                                boolean succInAAI = execution.getVariable("GENGS_SuccessIndicator")
                                if(succInAAI != true){
-                                       utils.log("DEBUG","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)
+                                       utils.log("INFO","Error getting Service-instance from AAI", + serviceInstanceId, isDebugEnabled)
                                        WorkflowException workflowException = execution.getVariable("WorkflowException")
                                        utils.logAudit("workflowException: " + workflowException)
                                        if(workflowException != null){
@@ -445,33 +426,33 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                                        else
                                        {
                                                msg = "Failure in postProcessAAIGET GENGS_SuccessIndicator:" + succInAAI
-                                               utils.log("DEBUG", msg, isDebugEnabled)
+                                               utils.log("INFO", msg, isDebugEnabled)
                                                exceptionUtil.buildAndThrowWorkflowException(execution, 2500, msg)
                                        }
                                }
 
-                               utils.log("DEBUG","Service-instance NOT found in AAI. Silent Success", isDebugEnabled)
+                               utils.log("INFO","Service-instance NOT found in AAI. Silent Success", isDebugEnabled)
                        }
-               } catch (BpmnError e) {
+               }catch (BpmnError e) {
                        throw e;
                } catch (Exception ex) {
                        msg = "Exception in DoDeleteE2EServiceInstance.postProcessAAIGET. " + ex.getMessage()
-                       utils.log("DEBUG", msg, isDebugEnabled)
+                       utils.log("INFO", msg, isDebugEnabled)
                        exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
                }
-               utils.log("DEBUG"," *** Exit postProcessAAIGET *** ", isDebugEnabled)
+               utils.log("INFO"," *** Exit postProcessAAIGET *** ", isDebugEnabled)
        }
 
        public void postProcessAAIDEL(Execution execution) {
                def isDebugEnabled=execution.getVariable("isDebugLogEnabled")
-               utils.log("DEBUG"," ***** postProcessAAIDEL ***** ", isDebugEnabled)
+               utils.log("INFO"," ***** postProcessAAIDEL ***** ", isDebugEnabled)
                String msg = ""
                try {
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")
                        boolean succInAAI = execution.getVariable("GENDS_SuccessIndicator")
                        if(succInAAI != true){
                                msg = "Error deleting Service-instance in AAI" + serviceInstanceId
-                               utils.log("DEBUG", msg, isDebugEnabled)
+                               utils.log("INFO", msg, isDebugEnabled)
                                WorkflowException workflowException = execution.getVariable("WorkflowException")
                                utils.logAudit("workflowException: " + workflowException)
                                if(workflowException != null){
@@ -486,16 +467,16 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                        throw e;
                } catch (Exception ex) {
                        msg = "Exception in DoDeleteE2EServiceInstance.postProcessAAIDEL. " + ex.getMessage()
-                       utils.log("DEBUG", msg, isDebugEnabled)
+                       utils.log("INFO", msg, isDebugEnabled)
                        exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)
                }
-               utils.log("DEBUG"," *** Exit postProcessAAIDEL *** ", isDebugEnabled)
+               utils.log("INFO"," *** Exit postProcessAAIDEL *** ", isDebugEnabled)
        }
        
        public void preInitResourcesOperStatus(Execution execution){
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
 
-        utils.log("DEBUG", " ======== STARTED preInitResourcesOperStatus Process ======== ", isDebugEnabled)
+        utils.log("INFO", " ======== STARTED preInitResourcesOperStatus Process ======== ", isDebugEnabled)
         try{
             String serviceId = execution.getVariable("serviceInstanceId")
             String operationId = execution.getVariable("operationId")
@@ -505,7 +486,7 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
             String progress = "0"
             String reason = ""
             String operationContent = "Prepare service creation"
-            utils.log("DEBUG", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId + " operationType:" + operationType, isDebugEnabled)
+            utils.log("INFO", "Generated new operation for Service Instance serviceId:" + serviceId + " operationId:" + operationId + " operationType:" + operationType, isDebugEnabled)
             serviceId = UriUtils.encode(serviceId,"UTF-8")
             execution.setVariable("serviceInstanceId", serviceId)
             execution.setVariable("operationId", operationId)
@@ -540,10 +521,7 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                     resourceTemplateUUIDs  = resourceTemplateUUIDs + it.resourceInstanceId + ":"
                 }
             }           
-
-            def dbAdapterEndpoint = execution.getVariable("URN_mso_openecomp_adapters_db_endpoint")
-            execution.setVariable("CVFMI_dbAdapterEndpoint", dbAdapterEndpoint)
-            utils.log("DEBUG", "DB Adapter Endpoint is: " + dbAdapterEndpoint, isDebugEnabled)
+            execution.setVariable("URN_mso_openecomp_adapters_db_endpoint","http://mso.mso.testlab.openecomp.org:8080/dbadapters/RequestsDbAdapter")
 
             String payload =
                 """<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
@@ -561,14 +539,14 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
 
             payload = utils.formatXml(payload)
             execution.setVariable("CVFMI_initResOperStatusRequest", payload)
-            utils.log("DEBUG", "Outgoing initResourceOperationStatus: \n" + payload, isDebugEnabled)
+            utils.log("INFO", "Outgoing initResourceOperationStatus: \n" + payload, isDebugEnabled)
             utils.logAudit("CreateVfModuleInfra Outgoing initResourceOperationStatus Request: " + payload)
 
         }catch(Exception e){
             utils.log("ERROR", "Exception Occured Processing preInitResourcesOperStatus. Exception is:\n" + e, isDebugEnabled)
             execution.setVariable("CVFMI_ErrorResponse", "Error Occurred during preInitResourcesOperStatus Method:\n" + e.getMessage())
         }
-        utils.log("DEBUG", "======== COMPLETED preInitResourcesOperStatus Process ======== ", isDebugEnabled)  
+        utils.log("INFO", "======== COMPLETED preInitResourcesOperStatus Process ======== ", isDebugEnabled)  
     }
     
    /**
@@ -594,6 +572,9 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
             "resourceType":"underlay"
         }
     ]*/
+       def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+
+       utils.log("INFO", " ======== STARTED preResourceDelete Process ======== ", isDebugEnabled)
        String serviceRelationShip = execution.getVariable("serviceRelationShip")       
        def jsonSlurper = new JsonSlurper()
        def jsonOutput = new JsonOutput()         
@@ -601,14 +582,17 @@ public class DoCustomDeleteE2EServiceInstance extends AbstractServiceTaskProcess
                
        if (relationShipList != null) {
            relationShipList.each {
-               if(resourceName.equals(it.resourceType)) {
+               if(StringUtils.containsIgnoreCase(it.resourceType, resourceName)) {
                                   String resourceInstanceUUID = it.resourceInstanceId
                                   String resourceTemplateUUID = it.resourceInstanceId
                                   execution.setVariable("resourceTemplateId", resourceTemplateUUID)
                                   execution.setVariable("resourceInstanceId", resourceInstanceUUID)
                                   execution.setVariable("resourceType", resourceName)
+                              utils.log("INFO", "Delete Resource Info resourceTemplate Id :" + resourceTemplateUUID + "  resourceInstanceId: " + resourceInstanceUUID + " resourceType: " + resourceName, isDebugEnabled)
                           }
            }
        }    
+       utils.log("INFO", " ======== END preResourceDelete Process ======== ", isDebugEnabled)
    }
 }
\ No newline at end of file
index bec1290..29c78fb 100644 (file)
@@ -64,21 +64,21 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
     public void preProcessRequest (Execution execution) {\r
         def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
         String msg = ""\r
-        utils.log("DEBUG", " *** preProcessRequest() *** ", isDebugEnabled)\r
+        utils.log("INFO", " *** preProcessRequest() *** ", isDebugEnabled)\r
         try {\r
             //deal with operation key\r
             String globalSubscriberId = execution.getVariable("globalSubscriberId")\r
-            utils.log("DEBUG", "globalSubscriberId:" + globalSubscriberId, isDebugEnabled)\r
+            utils.log("INFO", "globalSubscriberId:" + globalSubscriberId, isDebugEnabled)\r
             String serviceType = execution.getVariable("serviceType")\r
-            utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)\r
+            utils.log("INFO", "serviceType:" + serviceType, isDebugEnabled)\r
             String serviceId = execution.getVariable("serviceId")\r
-            utils.log("DEBUG", "serviceId:" + serviceId, isDebugEnabled)\r
+            utils.log("INFO", "serviceId:" + serviceId, isDebugEnabled)\r
             String operationId = execution.getVariable("operationId")\r
-            utils.log("DEBUG", "serviceType:" + serviceType, isDebugEnabled)\r
+            utils.log("INFO", "serviceType:" + serviceType, isDebugEnabled)\r
             String nodeTemplateUUID = execution.getVariable("resourceTemplateUUID")\r
-            utils.log("DEBUG", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)\r
+            utils.log("INFO", "nodeTemplateUUID:" + nodeTemplateUUID, isDebugEnabled)\r
             String nsInstanceId = execution.getVariable("resourceInstanceId")\r
-            utils.log("DEBUG", "nsInstanceId:" + nsInstanceId, isDebugEnabled)\r
+            utils.log("INFO", "nsInstanceId:" + nsInstanceId, isDebugEnabled)\r
             String nsOperationKey = "{\"globalSubscriberId\":\"" + globalSubscriberId + "\",\"serviceType:\""\r
                   + serviceType + "\",\"serviceId\":\"" + serviceId + "\",\"operationId\":\"" + operationId\r
                   +"\",\"nodeTemplateUUID\":\"" + nodeTemplateUUID + "\"}";\r
@@ -87,16 +87,18 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
             throw e;\r
         } catch (Exception ex){\r
             msg = "Exception in preProcessRequest " + ex.getMessage()\r
-            utils.log("DEBUG", msg, isDebugEnabled)\r
+            utils.log("INFO", msg, isDebugEnabled)\r
             exceptionUtil.buildAndThrowWorkflowException(execution, 7000, msg)\r
         }\r
-        utils.log("DEBUG"," ***** Exit preProcessRequest *****",  isDebugEnabled)\r
+        utils.log("INFO"," ***** Exit preProcessRequest *****",  isDebugEnabled)\r
        }\r
 \r
     /**\r
      * delete NS task\r
      */\r
     public void deleteNetworkService(Execution execution) {\r
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
+        utils.log("INFO", " *** deleteNetworkService  start *** ", isDebugEnabled)\r
         String nsOperationKey = excution.getVariable("nsOperationKey");\r
         String url = deleteUrl.replaceAll("{nsInstanceId}", execution.getVariable("nsInstanceId")) \r
         APIResponse apiResponse = deleteRequest(url, reqBody)\r
@@ -107,12 +109,16 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
             operationStatus = "finished"\r
         }\r
         execution.setVariable("operationStatus", operationStatus)\r
+        \r
+        utils.log("INFO", " *** deleteNetworkService  end *** ", isDebugEnabled)\r
     }\r
 \r
     /**\r
      * instantiate NS task\r
      */\r
     public void terminateNetworkService(Execution execution) {\r
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
+        utils.log("INFO", " *** terminateNetworkService  start *** ", isDebugEnabled)\r
         String nsOperationKey = execution.getVariable("nsOperationKey") \r
         String url = terminateUrl.replaceAll("{nsInstanceId}", execution.getVariable("nsInstanceId")) \r
         APIResponse apiResponse = postRequest(url, reqBody)\r
@@ -123,12 +129,15 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
             jobId =  jsonUtil.getJsonValue(aaiResponseAsString, "jobId")\r
         }\r
         execution.setVariable("jobId", nsInstanceId)   \r
+        utils.log("INFO", " *** terminateNetworkService  end *** ", isDebugEnabled)\r
     }\r
 \r
     /**\r
      * query NS task\r
      */\r
     public void queryNSProgress(Execution execution) {\r
+        def isDebugEnabled=execution.getVariable("isDebugLogEnabled")\r
+        utils.log("INFO", " *** queryNSProgress  start *** ", isDebugEnabled)\r
         String jobId = execution.getVariable("jobId")\r
         String nsOperationKey = excution.getVariable("nsOperationKey");\r
         String url = queryJobUrl.replaceAll("{jobId}", execution.getVariable("jobId")) \r
@@ -140,6 +149,7 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
             operationProgress = jsonUtil.getJsonValue(aaiResponseAsString, "responseDescriptor.progress")\r
         }\r
         exection.setVariable("operationProgress", operationProgress)\r
+        utils.log("INFO", " *** queryNSProgress  end *** ", isDebugEnabled)\r
     }\r
 \r
     /**\r
@@ -148,8 +158,8 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
     public void timeDelay(Execution execution) {\r
         try {\r
             Thread.sleep(5000);\r
-        } catch(InterruptedException e) {           \r
-            taskProcessor.utils.log("ERROR", "Time Delay exception" + e , isDebugEnabled)\r
+        } catch(InterruptedException e) {     \r
+            utils.log("INFO", "Time Delay exception" + e, isDebugEnabled)\r
         }\r
     }\r
 \r
@@ -167,17 +177,17 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
      */\r
     private APIResponse postRequest(String url, String requestBody){\r
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")\r
-        taskProcessor.logDebug( " ======== Started Execute VFC adapter Post Process ======== ", isDebugEnabled)\r
-        taskProcessor.logDebug( "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled)\r
+        utils.log("INFO", " ======== Started Execute VFC adapter Post Process ======== ", isDebugEnabled)\r
+        utils.log("INFO", "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled)\r
         APIResponse apiResponse = null\r
         try{\r
             RESTConfig config = new RESTConfig(url);\r
             RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/json");\r
             apiResponse = client.httpPost(requestBody)\r
-            taskProcessor.logDebug( "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled)\r
-            taskProcessor.logDebug( "======== Completed Execute VF-C adapter Post Process ======== ", isDebugEnabled)\r
+            utils.log("INFO", "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled)\r
+            utils.log("INFO", "======== Completed Execute VF-C adapter Post Process ======== ", isDebugEnabled)\r
         }catch(Exception e){\r
-            taskProcessor.utils.log("ERROR", "Exception occured while executing VF-C Post Call. Exception is: \n" + e, isDebugEnabled)\r
+            utils.log("ERROR", "Exception occured while executing VF-C Post Call. Exception is: \n" + e, isDebugEnabled)\r
             throw new BpmnError("MSOWorkflowException")\r
         }        \r
         return apiResponse\r
@@ -189,17 +199,17 @@ public class DODeleteVFCNetworkServiceInstance extends AbstractServiceTaskProces
      */\r
     private APIResponse deleteRequest(String url, String requestBody){\r
         def isDebugEnabled = execution.getVariable("isDebugLogEnabled")\r
-        taskProcessor.logDebug( " ======== Started Execute VFC adapter Delete Process ======== ", isDebugEnabled)\r
-        taskProcessor.logDebug( "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled)\r
+        utils.log("INFO", " ======== Started Execute VFC adapter Delete Process ======== ", isDebugEnabled)       \r
+        utils.log("INFO", "url:"+url +"\nrequestBody:"+ requestBody, isDebugEnabled) \r
         APIResponse apiResponse = null\r
         try{\r
             RESTConfig config = new RESTConfig(url);\r
             RESTClient client = new RESTClient(config).addHeader("X-FromAppId", "MSO").addHeader("X-TransactionId", uuid).addHeader("Accept","application/json");\r
             apiResponse = client.httpDelete(requestBody)\r
-            taskProcessor.logDebug( "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled)\r
-            taskProcessor.logDebug( "======== Completed Execute VF-C adapter Delete Process ======== ", isDebugEnabled)\r
+            utils.log("INFO", "response code:"+ apiResponse.getStatusCode() +"\nresponse body:"+ apiResponse.getResponseBodyAsString(), isDebugEnabled) \r
+            utils.log("INFO", "======== Completed Execute VF-C adapter Delete Process ======== ", isDebugEnabled) \r
         }catch(Exception e){\r
-            taskProcessor.utils.log("ERROR", "Exception occured while executing VF-C Post Call. Exception is: \n" + e, isDebugEnabled)\r
+            utils.log("ERROR", "Exception occured while executing VF-C Post Call. Exception is: \n" + e, isDebugEnabled) \r
             throw new BpmnError("MSOWorkflowException")\r
         }        \r
         return apiResponse\r
index c6a6d02..bc2b95c 100644 (file)
@@ -34,8 +34,9 @@ ex.processJavaException(execution)]]></bpmn:script>
         <camunda:in source="serviceInputParams" target="serviceInputParams" />
         <camunda:in source="failIfExists" target="failIfExists" />
         <camunda:in source="globalSubscriberId" target="globalSubscriberId" />
-        <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" />
+        <camunda:in source="serviceType" target="serviceType" />
         <camunda:in sourceExpression="1610" target="sdncVersion" />
+        <camunda:in source="operationId" target="operationId" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0zf2qyk</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_07hrbs0</bpmn:outgoing>
index ecdfd62..897ffff 100644 (file)
@@ -182,7 +182,7 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn:script>
             <camunda:inputParameter name="headers">
               <camunda:map>
                 <camunda:entry key="content-type">application/soap+xml</camunda:entry>
-                <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry>
+                <camunda:entry key="Authorization">Basic QlBFTENsaWVudDpwYXNzd29yZDEk</camunda:entry>
               </camunda:map>
             </camunda:inputParameter>
             <camunda:inputParameter name="payload">${CVFMI_initResOperStatusRequest}</camunda:inputParameter>
@@ -207,6 +207,8 @@ ddsi.preInitResourcesOperStatus(execution)]]></bpmn:script>
         <camunda:out source="WorkflowException" target="WorkflowException" />
         <camunda:out source="GENGS_siResourceLink" target="GENGS_siResourceLink" />
         <camunda:out source="GENGS_service" target="GENGS_service" />
+        <camunda:in source="globalSubscriberId" target="GENGS_globalCustomerId" />
+        <camunda:in source="serviceType" target="GENGS_serviceType" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_11e6bfy</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_188ejvu</bpmn:outgoing>