Merge "fix ID in 3rd ONAP"

2 files changed, 114 insertions, 116 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustom3rdONAPServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustom3rdONAPServiceInstance.bpmn
index 71f4a28c88..7bc2a404f0 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustom3rdONAPServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustom3rdONAPServiceInstance.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3">
-  <bpmn:process id="CreateCustomE2EServiceInstance" name="CreateCustomE2EServiceInstance" isExecutable="true">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.16.2">
+  <bpmn:process id="CreateCustom3rdONAPServiceInstance" name="CreateCustom3rdONAPServiceInstance" isExecutable="true">
     <bpmn:startEvent id="StartEvent_00qj6ro" name="Create SI Start Flow">
       <bpmn:outgoing>SequenceFlow_0s2spoq</bpmn:outgoing>
     </bpmn:startEvent>
@@ -8,9 +8,7 @@
       <bpmn:scriptTask id="ScriptTask_0u3lw39" name="Handle Unexpected Error" scriptFormat="groovy">
         <bpmn:incoming>SequenceFlow_1dsbjjb</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_1yay321</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
-ExceptionUtil ex = new ExceptionUtil()
-ex.processJavaException(execution)]]></bpmn:script>
+        <bpmn:script>import org.openecomp.mso.bpmn.common.scripts.* ExceptionUtil ex = new ExceptionUtil() ex.processJavaException(execution)</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:startEvent id="StartEvent_0v1ffn4">
         <bpmn:outgoing>SequenceFlow_1dsbjjb</bpmn:outgoing>
@@ -54,16 +52,16 @@ ex.processJavaException(execution)]]></bpmn:script>
     <bpmn:scriptTask id="ScriptTask_1s09c7d" name="Pre Process Incoming Request" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_0s2spoq</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0z4faf9</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi= new CreateCustomE2EServiceInstance()
-csi.preProcessRequest(execution)]]></bpmn:script>
+csi.preProcessRequest(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:scriptTask id="ScriptTask_0ttvn8r" name="Prepare Completion Request" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_14zu6wr</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0je30si</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new CreateCustomE2EServiceInstance()
-csi.prepareCompletionRequest(execution)]]></bpmn:script>
+csi.prepareCompletionRequest(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:callActivity id="CallActivity_02fyxz0" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">
       <bpmn:extensionElements>
@@ -88,9 +86,9 @@ csi.prepareCompletionRequest(execution)]]></bpmn:script>
       <bpmn:scriptTask id="ScriptTask_0u8o9p2" name="Prepare Fallout Request" scriptFormat="groovy">
         <bpmn:incoming>SequenceFlow_0n9pexp</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_01umodj</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+        <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new CreateCustomE2EServiceInstance()
-csi.prepareFalloutRequest(execution)]]></bpmn:script>
+csi.prepareFalloutRequest(execution)</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:callActivity id="CallActivity_1ang7q8" name="Call FalloutHandler" calledElement="FalloutHandler">
         <bpmn:extensionElements>
@@ -107,9 +105,9 @@ csi.prepareFalloutRequest(execution)]]></bpmn:script>
       <bpmn:scriptTask id="ScriptTask_1rn6nqi" name="Send Error Response">
         <bpmn:incoming>SequenceFlow_0e1r62n</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_0n9pexp</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+        <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  CreateCustomE2EServiceInstance()
-csi.sendSyncError(execution)]]></bpmn:script>
+csi.sendSyncError(execution)</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:sequenceFlow id="SequenceFlow_0e1r62n" sourceRef="StartEvent_0dug28e" targetRef="ScriptTask_1rn6nqi" />
       <bpmn:sequenceFlow id="SequenceFlow_1ysapam" sourceRef="CallActivity_1ang7q8" targetRef="EndEvent_03wysuk" />
@@ -119,9 +117,9 @@ csi.sendSyncError(execution)]]></bpmn:script>
     <bpmn:scriptTask id="ScriptTask_0xupxj9" name="Send Sync Ack Response" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_081z8l2</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_19eilro</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  CreateCustomE2EServiceInstance()
-csi.sendSyncResponse(execution)]]></bpmn:script>
+csi.sendSyncResponse(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:exclusiveGateway id="ExclusiveGateway_0aqn64l" name="Success?">
       <bpmn:incoming>SequenceFlow_0klbpxx</bpmn:incoming>
@@ -138,19 +136,19 @@ csi.sendSyncResponse(execution)]]></bpmn:script>
     <bpmn:sequenceFlow id="SequenceFlow_0yayvrf" sourceRef="CallActivity_02fyxz0" targetRef="EndEvent_0bpd6c0" />
     <bpmn:sequenceFlow id="SequenceFlow_0z4faf9" sourceRef="ScriptTask_1s09c7d" targetRef="Task_1tqjch6" />
     <bpmn:sequenceFlow id="SequenceFlow_14zu6wr" name="yes" sourceRef="ExclusiveGateway_0aqn64l" targetRef="ScriptTask_0ttvn8r">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") == null}]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("WorkflowException") == null}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_0je30si" sourceRef="ScriptTask_0ttvn8r" targetRef="CallActivity_02fyxz0" />
     <bpmn:sequenceFlow id="SequenceFlow_1fueo69" name="no" sourceRef="ExclusiveGateway_0aqn64l" targetRef="EndEvent_07uk5iy">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") != null}]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("WorkflowException") != null}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_1euqjsp" sourceRef="Task_1tqjch6" targetRef="Task_19mxcw3" />
     <bpmn:scriptTask id="Task_1tqjch6" name="Init Service Operation Status" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_0z4faf9</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1euqjsp</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi= new CreateCustomE2EServiceInstance()
-csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
+csi.prepareInitServiceOperationStatus(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:serviceTask id="Task_19mxcw3" name="Update Service Operation Status">
       <bpmn:extensionElements>
@@ -178,7 +176,7 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
   </bpmn:process>
   <bpmn:error id="Error_0nbdy47" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateCustomE2EServiceInstance">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateCustom3rdONAPServiceInstance">
       <bpmndi:BPMNShape id="StartEvent_00qj6ro_di" bpmnElement="StartEvent_00qj6ro">
         <dc:Bounds x="-6" y="180" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -225,61 +223,61 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0s2spoq_di" bpmnElement="SequenceFlow_0s2spoq">
-        <di:waypoint xsi:type="dc:Point" x="30" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="115" y="198" />
+        <di:waypoint x="30" y="198" />
+        <di:waypoint x="115" y="198" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="27.5" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_19eilro_di" bpmnElement="SequenceFlow_19eilro">
-        <di:waypoint xsi:type="dc:Point" x="710" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="751" y="198" />
+        <di:waypoint x="710" y="198" />
+        <di:waypoint x="751" y="198" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="685.5" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0klbpxx_di" bpmnElement="SequenceFlow_0klbpxx">
-        <di:waypoint xsi:type="dc:Point" x="851" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="903" y="198" />
+        <di:waypoint x="851" y="198" />
+        <di:waypoint x="903" y="198" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="832" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0yayvrf_di" bpmnElement="SequenceFlow_0yayvrf">
-        <di:waypoint xsi:type="dc:Point" x="1276" y="238" />
-        <di:waypoint xsi:type="dc:Point" x="1276" y="286" />
+        <di:waypoint x="1276" y="238" />
+        <di:waypoint x="1276" y="286" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1246" y="262" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0z4faf9_di" bpmnElement="SequenceFlow_0z4faf9">
-        <di:waypoint xsi:type="dc:Point" x="215" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="273" y="198" />
+        <di:waypoint x="215" y="198" />
+        <di:waypoint x="273" y="198" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="199" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_14zu6wr_di" bpmnElement="SequenceFlow_14zu6wr">
-        <di:waypoint xsi:type="dc:Point" x="953" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="990" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="990" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="1038" y="198" />
+        <di:waypoint x="953" y="198" />
+        <di:waypoint x="990" y="198" />
+        <di:waypoint x="990" y="198" />
+        <di:waypoint x="1038" y="198" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="987" y="195" width="20" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0je30si_di" bpmnElement="SequenceFlow_0je30si">
-        <di:waypoint xsi:type="dc:Point" x="1138" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="1226" y="198" />
+        <di:waypoint x="1138" y="198" />
+        <di:waypoint x="1226" y="198" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1137" y="183" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1fueo69_di" bpmnElement="SequenceFlow_1fueo69">
-        <di:waypoint xsi:type="dc:Point" x="928" y="223" />
-        <di:waypoint xsi:type="dc:Point" x="928" y="250" />
-        <di:waypoint xsi:type="dc:Point" x="928" y="250" />
-        <di:waypoint xsi:type="dc:Point" x="928" y="286" />
+        <di:waypoint x="928" y="223" />
+        <di:waypoint x="928" y="250" />
+        <di:waypoint x="928" y="250" />
+        <di:waypoint x="928" y="286" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="901" y="228" width="15" height="12" />
         </bpmndi:BPMNLabel>
@@ -321,54 +319,54 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
         <dc:Bounds x="443" y="434" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1dsbjjb_di" bpmnElement="SequenceFlow_1dsbjjb">
-        <di:waypoint xsi:type="dc:Point" x="532" y="727" />
-        <di:waypoint xsi:type="dc:Point" x="611" y="727" />
+        <di:waypoint x="532" y="727" />
+        <di:waypoint x="611" y="727" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="529.5" y="727" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1yay321_di" bpmnElement="SequenceFlow_1yay321">
-        <di:waypoint xsi:type="dc:Point" x="711" y="727" />
-        <di:waypoint xsi:type="dc:Point" x="772" y="727" />
+        <di:waypoint x="711" y="727" />
+        <di:waypoint x="772" y="727" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="701.5" y="727" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0e1r62n_di" bpmnElement="SequenceFlow_0e1r62n">
-        <di:waypoint xsi:type="dc:Point" x="399" y="474" />
-        <di:waypoint xsi:type="dc:Point" x="421" y="474" />
-        <di:waypoint xsi:type="dc:Point" x="421" y="474" />
-        <di:waypoint xsi:type="dc:Point" x="442" y="474" />
+        <di:waypoint x="399" y="474" />
+        <di:waypoint x="421" y="474" />
+        <di:waypoint x="421" y="474" />
+        <di:waypoint x="442" y="474" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="391" y="474" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1ysapam_di" bpmnElement="SequenceFlow_1ysapam">
-        <di:waypoint xsi:type="dc:Point" x="898" y="474" />
-        <di:waypoint xsi:type="dc:Point" x="942" y="474" />
+        <di:waypoint x="898" y="474" />
+        <di:waypoint x="942" y="474" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="875" y="459" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0n9pexp_di" bpmnElement="SequenceFlow_0n9pexp">
-        <di:waypoint xsi:type="dc:Point" x="543" y="474" />
-        <di:waypoint xsi:type="dc:Point" x="570" y="474" />
-        <di:waypoint xsi:type="dc:Point" x="570" y="474" />
-        <di:waypoint xsi:type="dc:Point" x="621" y="474" />
+        <di:waypoint x="543" y="474" />
+        <di:waypoint x="570" y="474" />
+        <di:waypoint x="570" y="474" />
+        <di:waypoint x="621" y="474" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="540" y="474" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_01umodj_di" bpmnElement="SequenceFlow_01umodj">
-        <di:waypoint xsi:type="dc:Point" x="721" y="474" />
-        <di:waypoint xsi:type="dc:Point" x="798" y="474" />
+        <di:waypoint x="721" y="474" />
+        <di:waypoint x="798" y="474" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="715.5" y="459" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1euqjsp_di" bpmnElement="SequenceFlow_1euqjsp">
-        <di:waypoint xsi:type="dc:Point" x="373" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="446" y="198" />
+        <di:waypoint x="373" y="198" />
+        <di:waypoint x="446" y="198" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="364.5" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
@@ -380,8 +378,8 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
         <dc:Bounds x="446" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_081z8l2_di" bpmnElement="SequenceFlow_081z8l2">
-        <di:waypoint xsi:type="dc:Point" x="546" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="610" y="198" />
+        <di:waypoint x="546" y="198" />
+        <di:waypoint x="610" y="198" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="533" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustom3rdONAPServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustom3rdONAPServiceInstance.bpmn
index e0747eb32e..d33cb3edff 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustom3rdONAPServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteCustom3rdONAPServiceInstance.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3">
-  <bpmn:process id="DeleteCustomE2EServiceInstance" isExecutable="true">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.16.2">
+  <bpmn:process id="DeleteCustom3rdONAPServiceInstance" name="DeleteCustom3rdONAPServiceInstance" isExecutable="true">
     <bpmn:startEvent id="StartEvent_00m8zen" name="Delete SI Start Flow">
       <bpmn:outgoing>SequenceFlow_1wxumid</bpmn:outgoing>
     </bpmn:startEvent>
@@ -8,9 +8,9 @@
       <bpmn:scriptTask id="ScriptTask_1c6ogpt" name="Handle Unexpected Error" scriptFormat="groovy">
         <bpmn:incoming>SequenceFlow_0guajy5</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_0dbt753</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.common.scripts.*
+        <bpmn:script>import org.openecomp.mso.bpmn.common.scripts.*
 ExceptionUtil ex = new ExceptionUtil()
-ex.processJavaException(execution)]]></bpmn:script>
+ex.processJavaException(execution)</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:startEvent id="StartEvent_121296y">
         <bpmn:outgoing>SequenceFlow_0guajy5</bpmn:outgoing>
@@ -48,16 +48,16 @@ ex.processJavaException(execution)]]></bpmn:script>
     <bpmn:scriptTask id="ScriptTask_0a63hms" name="Pre Process Incoming Request" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1wxumid</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0yowshs</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi= new DeleteCustomE2EServiceInstance()
-csi.preProcessRequest(execution)]]></bpmn:script>
+csi.preProcessRequest(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:scriptTask id="ScriptTask_1fzpbop" name="Prepare Completion Request" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_04urx2e</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1ii935p</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new DeleteCustomE2EServiceInstance()
-csi.prepareCompletionRequest(execution)]]></bpmn:script>
+csi.prepareCompletionRequest(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:callActivity id="CallActivity_1wx4ihe" name="Call CompleteMsoProcess" calledElement="CompleteMsoProcess">
       <bpmn:extensionElements>
@@ -82,9 +82,9 @@ csi.prepareCompletionRequest(execution)]]></bpmn:script>
       <bpmn:scriptTask id="ScriptTask_0so3xj0" name="Prepare Fallout Request" scriptFormat="groovy">
         <bpmn:incoming>SequenceFlow_1s1cbgf</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_1py6yqz</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+        <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new DeleteCustomE2EServiceInstance()
-csi.prepareFalloutRequest(execution)]]></bpmn:script>
+csi.prepareFalloutRequest(execution)</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:callActivity id="CallActivity_1qhekgt" name="Call FalloutHandler" calledElement="FalloutHandler">
         <bpmn:extensionElements>
@@ -101,9 +101,9 @@ csi.prepareFalloutRequest(execution)]]></bpmn:script>
       <bpmn:scriptTask id="ScriptTask_006nty7" name="Send Error Response">
         <bpmn:incoming>SequenceFlow_0for83z</bpmn:incoming>
         <bpmn:outgoing>SequenceFlow_1s1cbgf</bpmn:outgoing>
-        <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+        <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  DeleteCustomE2EServiceInstance()
-csi.sendSyncError(execution)]]></bpmn:script>
+csi.sendSyncError(execution)</bpmn:script>
       </bpmn:scriptTask>
       <bpmn:sequenceFlow id="SequenceFlow_0for83z" sourceRef="StartEvent_0jybicw" targetRef="ScriptTask_006nty7" />
       <bpmn:sequenceFlow id="SequenceFlow_0hrazlh" sourceRef="CallActivity_1qhekgt" targetRef="EndEvent_1jegbhy" />
@@ -113,9 +113,9 @@ csi.sendSyncError(execution)]]></bpmn:script>
     <bpmn:scriptTask id="ScriptTask_1mao77y" name="Send Sync Ack Response" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_1dkcu9o</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0zf2qyk</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi = new  DeleteCustomE2EServiceInstance()
-csi.sendSyncResponse(execution)]]></bpmn:script>
+csi.sendSyncResponse(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:exclusiveGateway id="ExclusiveGateway_0vu8gx6" name="Success?" default="SequenceFlow_1t6ekab">
       <bpmn:incoming>SequenceFlow_07hrbs0</bpmn:incoming>
@@ -132,7 +132,7 @@ csi.sendSyncResponse(execution)]]></bpmn:script>
     <bpmn:sequenceFlow id="SequenceFlow_1ab5l2q" sourceRef="CallActivity_1wx4ihe" targetRef="EndEvent_0db8bs6" />
     <bpmn:sequenceFlow id="SequenceFlow_0yowshs" sourceRef="ScriptTask_0a63hms" targetRef="Task_1jksf62" />
     <bpmn:sequenceFlow id="SequenceFlow_04urx2e" name="yes" sourceRef="ExclusiveGateway_0vu8gx6" targetRef="ScriptTask_1fzpbop">
-      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{execution.getVariable("WorkflowException") == null}]]></bpmn:conditionExpression>
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{execution.getVariable("WorkflowException") == null}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_1ii935p" sourceRef="ScriptTask_1fzpbop" targetRef="CallActivity_1wx4ihe" />
     <bpmn:sequenceFlow id="SequenceFlow_1t6ekab" name="no" sourceRef="ExclusiveGateway_0vu8gx6" targetRef="EndEvent_1i1g9s6" />
@@ -140,9 +140,9 @@ csi.sendSyncResponse(execution)]]></bpmn:script>
     <bpmn:scriptTask id="Task_1jksf62" name="prepare init operation status" scriptFormat="groovy">
       <bpmn:incoming>SequenceFlow_0yowshs</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0c4t26p</bpmn:outgoing>
-      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+      <bpmn:script>import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi= new DeleteCustomE2EServiceInstance()
-csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
+csi.prepareInitServiceOperationStatus(execution)</bpmn:script>
     </bpmn:scriptTask>
     <bpmn:serviceTask id="ServiceTask_0j9q5xe" name="Update Service Operation Status">
       <bpmn:extensionElements>
@@ -170,7 +170,7 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
   </bpmn:process>
   <bpmn:error id="Error_1erlsmy" name="MSO Workflow Exception" errorCode="MSOWorkflowException" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
-    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteCustomE2EServiceInstance">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DeleteCustom3rdONAPServiceInstance">
       <bpmndi:BPMNShape id="StartEvent_00m8zen_di" bpmnElement="StartEvent_00m8zen">
         <dc:Bounds x="490" y="209" width="36" height="36" />
         <bpmndi:BPMNLabel>
@@ -217,59 +217,59 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1wxumid_di" bpmnElement="SequenceFlow_1wxumid">
-        <di:waypoint xsi:type="dc:Point" x="526" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="562" y="227" />
+        <di:waypoint x="526" y="227" />
+        <di:waypoint x="562" y="227" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="499" y="206" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0zf2qyk_di" bpmnElement="SequenceFlow_0zf2qyk">
-        <di:waypoint xsi:type="dc:Point" x="1070" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1121" y="227" />
+        <di:waypoint x="1070" y="227" />
+        <di:waypoint x="1121" y="227" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1050.5" y="206" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_07hrbs0_di" bpmnElement="SequenceFlow_07hrbs0">
-        <di:waypoint xsi:type="dc:Point" x="1221" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1318" y="227" />
+        <di:waypoint x="1221" y="227" />
+        <di:waypoint x="1318" y="227" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1225.5" y="212" width="0" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1ab5l2q_di" bpmnElement="SequenceFlow_1ab5l2q">
-        <di:waypoint xsi:type="dc:Point" x="1664" y="267" />
-        <di:waypoint xsi:type="dc:Point" x="1664" y="304" />
+        <di:waypoint x="1664" y="267" />
+        <di:waypoint x="1664" y="304" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1634" y="279.5" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0yowshs_di" bpmnElement="SequenceFlow_0yowshs">
-        <di:waypoint xsi:type="dc:Point" x="662" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="707" y="227" />
+        <di:waypoint x="662" y="227" />
+        <di:waypoint x="707" y="227" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="639.5" y="206" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_04urx2e_di" bpmnElement="SequenceFlow_04urx2e">
-        <di:waypoint xsi:type="dc:Point" x="1368" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1453" y="227" />
+        <di:waypoint x="1368" y="227" />
+        <di:waypoint x="1453" y="227" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1370.25" y="203" width="18" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1ii935p_di" bpmnElement="SequenceFlow_1ii935p">
-        <di:waypoint xsi:type="dc:Point" x="1553" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="1614" y="227" />
+        <di:waypoint x="1553" y="227" />
+        <di:waypoint x="1614" y="227" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1495" y="212" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1t6ekab_di" bpmnElement="SequenceFlow_1t6ekab">
-        <di:waypoint xsi:type="dc:Point" x="1343" y="252" />
-        <di:waypoint xsi:type="dc:Point" x="1343" y="277" />
-        <di:waypoint xsi:type="dc:Point" x="1343" y="277" />
-        <di:waypoint xsi:type="dc:Point" x="1343" y="304" />
+        <di:waypoint x="1343" y="252" />
+        <di:waypoint x="1343" y="277" />
+        <di:waypoint x="1343" y="277" />
+        <di:waypoint x="1343" y="304" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1352" y="277" width="12" height="12" />
         </bpmndi:BPMNLabel>
@@ -311,54 +311,54 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
         <dc:Bounds x="832" y="438" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0guajy5_di" bpmnElement="SequenceFlow_0guajy5">
-        <di:waypoint xsi:type="dc:Point" x="903" y="755" />
-        <di:waypoint xsi:type="dc:Point" x="982" y="755" />
+        <di:waypoint x="903" y="755" />
+        <di:waypoint x="982" y="755" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="856" y="755" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0dbt753_di" bpmnElement="SequenceFlow_0dbt753">
-        <di:waypoint xsi:type="dc:Point" x="1082" y="755" />
-        <di:waypoint xsi:type="dc:Point" x="1143" y="755" />
+        <di:waypoint x="1082" y="755" />
+        <di:waypoint x="1143" y="755" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1028" y="755" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0for83z_di" bpmnElement="SequenceFlow_0for83z">
-        <di:waypoint xsi:type="dc:Point" x="788" y="478" />
-        <di:waypoint xsi:type="dc:Point" x="810" y="478" />
-        <di:waypoint xsi:type="dc:Point" x="810" y="478" />
-        <di:waypoint xsi:type="dc:Point" x="831" y="478" />
+        <di:waypoint x="788" y="478" />
+        <di:waypoint x="810" y="478" />
+        <di:waypoint x="810" y="478" />
+        <di:waypoint x="831" y="478" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="735" y="478" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0hrazlh_di" bpmnElement="SequenceFlow_0hrazlh">
-        <di:waypoint xsi:type="dc:Point" x="1287" y="478" />
-        <di:waypoint xsi:type="dc:Point" x="1331" y="478" />
+        <di:waypoint x="1287" y="478" />
+        <di:waypoint x="1331" y="478" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1219" y="463" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1s1cbgf_di" bpmnElement="SequenceFlow_1s1cbgf">
-        <di:waypoint xsi:type="dc:Point" x="932" y="478" />
-        <di:waypoint xsi:type="dc:Point" x="959" y="478" />
-        <di:waypoint xsi:type="dc:Point" x="959" y="478" />
-        <di:waypoint xsi:type="dc:Point" x="1010" y="478" />
+        <di:waypoint x="932" y="478" />
+        <di:waypoint x="959" y="478" />
+        <di:waypoint x="959" y="478" />
+        <di:waypoint x="1010" y="478" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="884" y="478" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1py6yqz_di" bpmnElement="SequenceFlow_1py6yqz">
-        <di:waypoint xsi:type="dc:Point" x="1110" y="478" />
-        <di:waypoint xsi:type="dc:Point" x="1187" y="478" />
+        <di:waypoint x="1110" y="478" />
+        <di:waypoint x="1187" y="478" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="1060" y="463" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0c4t26p_di" bpmnElement="SequenceFlow_0c4t26p">
-        <di:waypoint xsi:type="dc:Point" x="807" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="833" y="227" />
+        <di:waypoint x="807" y="227" />
+        <di:waypoint x="833" y="227" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="820" y="206" width="0" height="12" />
         </bpmndi:BPMNLabel>
@@ -370,8 +370,8 @@ csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
         <dc:Bounds x="833" y="187" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1dkcu9o_di" bpmnElement="SequenceFlow_1dkcu9o">
-        <di:waypoint xsi:type="dc:Point" x="933" y="227" />
-        <di:waypoint xsi:type="dc:Point" x="970" y="227" />
+        <di:waypoint x="933" y="227" />
+        <di:waypoint x="970" y="227" />
         <bpmndi:BPMNLabel>
           <dc:Bounds x="951.5" y="206" width="0" height="12" />
         </bpmndi:BPMNLabel>