From 01d865e89f94af25b477659608b7311b3ddadc1e Mon Sep 17 00:00:00 2001
From: zm330 <zhangminyj@chinamobile.com>
Date: Thu, 7 Jan 2021 20:14:45 +0800
Subject: Fix some deallocate issues

Issue-ID: SO-3411

Signed-off-by: zm330 <zhangminyj@chinamobile.com>
Change-Id: Ie61983b9e9567bd21e5cd12cda4d76ec422c5dee
---
 .../resources/subprocess/DoDeleteSliceService.bpmn | 27 +++++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

(limited to 'bpmn/so-bpmn-infrastructure-flows')

diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteSliceService.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteSliceService.bpmn
index 9edb6127f0..f1534a0360 100644
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteSliceService.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoDeleteSliceService.bpmn
@@ -34,9 +34,9 @@ ddss.getNSSIListFromAAI(execution)</bpmn:script>
       <bpmn:outgoing>SequenceFlow_0926ghe</bpmn:outgoing>
     </bpmn:exclusiveGateway>
     <bpmn:endEvent id="EndEvent_0jaitqv" name="End">
-      <bpmn:incoming>SequenceFlow_1c4fjbv</bpmn:incoming>
+      <bpmn:incoming>SequenceFlow_1odnvjl</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:sequenceFlow id="SequenceFlow_1c4fjbv" name="yes" sourceRef="ExclusiveGateway_1ogbunu" targetRef="EndEvent_0jaitqv">
+    <bpmn:sequenceFlow id="SequenceFlow_1c4fjbv" name="yes" sourceRef="ExclusiveGateway_1ogbunu" targetRef="Task_10yni6k">
       <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">#{(execution.getVariable("isAllNSSIFinished" )  == true)}</bpmn:conditionExpression>
     </bpmn:sequenceFlow>
     <bpmn:sequenceFlow id="SequenceFlow_0c58sw3" sourceRef="Task_1rc7mcw" targetRef="ScriptTask_159855t" />
@@ -96,6 +96,14 @@ dss.terminateNSIQuery(execution)</bpmn:script>
     <bpmn:sequenceFlow id="SequenceFlow_17tvomo" sourceRef="Task_1iomfas" targetRef="Task_1rc7mcw" />
     <bpmn:sequenceFlow id="SequenceFlow_1aa2ek0" sourceRef="Task_1u755sr" targetRef="Task_1iuls9p" />
     <bpmn:sequenceFlow id="SequenceFlow_1252rbf" sourceRef="Task_1iuls9p" targetRef="Task_1iomfas" />
+    <bpmn:sequenceFlow id="SequenceFlow_1odnvjl" sourceRef="Task_10yni6k" targetRef="EndEvent_0jaitqv" />
+    <bpmn:scriptTask id="Task_10yni6k" name="DeleteNSIFromAAI" scriptFormat="groovy">
+      <bpmn:incoming>SequenceFlow_1c4fjbv</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_1odnvjl</bpmn:outgoing>
+      <bpmn:script>import org.onap.so.bpmn.infrastructure.scripts.*
+def ddss= new DoDeleteSliceService()
+ddss.deleteNSIInstance(execution)</bpmn:script>
+    </bpmn:scriptTask>
   </bpmn:process>
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteSliceServiceV1">
@@ -138,9 +146,9 @@ dss.terminateNSIQuery(execution)</bpmn:script>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1c4fjbv_di" bpmnElement="SequenceFlow_1c4fjbv">
         <di:waypoint x="1765" y="140" />
-        <di:waypoint x="1802" y="140" />
+        <di:waypoint x="1830" y="140" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1771" y="118" width="17" height="14" />
+          <dc:Bounds x="1793" y="118" width="17" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1rgfzzy_di" bpmnElement="SequenceFlow_1rgfzzy">
@@ -177,9 +185,9 @@ dss.terminateNSIQuery(execution)</bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0jaitqv_di" bpmnElement="EndEvent_0jaitqv">
-        <dc:Bounds x="1802" y="122" width="36" height="36" />
+        <dc:Bounds x="2002" y="122" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1810" y="168" width="20" height="14" />
+          <dc:Bounds x="2010" y="168" width="20" height="14" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0icszw6_di" bpmnElement="Task_0etki1p">
@@ -200,6 +208,13 @@ dss.terminateNSIQuery(execution)</bpmn:script>
       <bpmndi:BPMNShape id="Activity_1iuls9p_di" bpmnElement="Task_1iuls9p">
         <dc:Bounds x="1050" y="100" width="100" height="80" />
       </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="SequenceFlow_1odnvjl_di" bpmnElement="SequenceFlow_1odnvjl">
+        <di:waypoint x="1930" y="140" />
+        <di:waypoint x="2002" y="140" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1qk9lnm_di" bpmnElement="Task_10yni6k">
+        <dc:Bounds x="1830" y="100" width="100" height="80" />
+      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
-- 
cgit 1.2.3-korg