Change to sdncadapter for service call
Change to sdncadapter for service call
Change-Id: I9011e69fba20d4d0f83705455791b7357e2f5bb0
Issue-ID: SO-587
Signed-off-by: c00149107 <chenchuanyu@huawei.com>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteResourcesV1.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteResourcesV1.bpmn
index b74c169..24f1681 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteResourcesV1.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoDeleteResourcesV1.bpmn
@@ -1,5 +1,5 @@
<?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: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.10.0">
<bpmn:process id="DoDeleteResourcesV1" name="DoDeleteResourcesV1" isExecutable="true">
<bpmn:startEvent id="StartEvent_1" name="Start Resource Delete">
<bpmn:outgoing>SequenceFlow_0stqur4</bpmn:outgoing>
@@ -57,10 +57,6 @@
<bpmn:sequenceFlow id="SequenceFlow_0rkycoj" name="" sourceRef="StartEvent_1cjikl5" targetRef="ScriptTask_0plexin" />
<bpmn:sequenceFlow id="SequenceFlow_117fiux" name="" sourceRef="ScriptTask_0plexin" targetRef="EndEvent_0gh3mcj" />
</bpmn:subProcess>
- <bpmn:serviceTask id="ServiceTask_176j3rl" name="Call Delete SDNC Service Topology" camunda:class="org.openecomp.mso.bpmn.infrastructure.workflow.serviceTask.SdncServiceTopologyOperationTask">
- <bpmn:incoming>SequenceFlow_11h5pba</bpmn:incoming>
- <bpmn:outgoing>SequenceFlow_174yrgl</bpmn:outgoing>
- </bpmn:serviceTask>
<bpmn:exclusiveGateway id="ExclusiveGateway_1x63i6w" name="Is SDNC Service Contained">
<bpmn:incoming>SequenceFlow_1yrkxjm</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_1s1nnmj</bpmn:outgoing>
@@ -73,7 +69,6 @@
<bpmn:sequenceFlow id="SequenceFlow_1s1nnmj" name="yes" sourceRef="ExclusiveGateway_1x63i6w" targetRef="prepareSDNCServiceTopologyDelete">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("isContainsWanResource" ) == "true" )}]]></bpmn:conditionExpression>
</bpmn:sequenceFlow>
- <bpmn:sequenceFlow id="SequenceFlow_174yrgl" sourceRef="ServiceTask_176j3rl" targetRef="ExclusiveGateway_1jybr0n" />
<bpmn:sequenceFlow id="SequenceFlow_0lk19rm" name="no" sourceRef="ExclusiveGateway_1x63i6w" targetRef="ExclusiveGateway_1jybr0n">
<bpmn:conditionExpression xsi:type="bpmn:tFormalExpression"><![CDATA[#{(execution.getVariable("isContainsWanResource" ) == "false" )}]]></bpmn:conditionExpression>
</bpmn:sequenceFlow>
@@ -87,8 +82,8 @@
<bpmn:linkEventDefinition name="DeleteSDNCServiceTopology" />
</bpmn:intermediateCatchEvent>
<bpmn:exclusiveGateway id="ExclusiveGateway_1jybr0n">
- <bpmn:incoming>SequenceFlow_174yrgl</bpmn:incoming>
<bpmn:incoming>SequenceFlow_0lk19rm</bpmn:incoming>
+ <bpmn:incoming>SequenceFlow_14fx6hv</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_0o21fg8</bpmn:outgoing>
</bpmn:exclusiveGateway>
<bpmn:sequenceFlow id="SequenceFlow_0o21fg8" sourceRef="ExclusiveGateway_1jybr0n" targetRef="EndEvent_17bzayo" />
@@ -148,14 +143,50 @@
<bpmn:sequenceFlow id="SequenceFlow_11bgbsh" sourceRef="ScriptTask_0shhhxr" targetRef="ServiceTask_1bw1mjh" />
<bpmn:sequenceFlow id="SequenceFlow_19ccmqv" name="no" sourceRef="ExclusiveGateway_0khn1my" targetRef="ScriptTask_0shhhxr" />
<bpmn:sequenceFlow id="SequenceFlow_0djplpd" sourceRef="ServiceTask_1bw1mjh" targetRef="ScriptTask_1gf78zz" />
- <bpmn:sequenceFlow id="SequenceFlow_11h5pba" sourceRef="prepareSDNCServiceTopologyDelete" targetRef="ServiceTask_176j3rl" />
- <bpmn:scriptTask id="prepareSDNCServiceTopologyDelete" name="Prepare SDNC service Topology Delete" scriptFormat="groovy">
+ <bpmn:sequenceFlow id="SequenceFlow_11h5pba" sourceRef="prepareSDNCServiceTopologyDelete" targetRef="CallActivity_1ueonyc" />
+ <bpmn:scriptTask id="prepareSDNCServiceTopologyDelete" name="Prepare SDNC service Topology Deactivate" scriptFormat="groovy">
<bpmn:incoming>SequenceFlow_1s1nnmj</bpmn:incoming>
<bpmn:outgoing>SequenceFlow_11h5pba</bpmn:outgoing>
<bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
def ddr = new DoDeleteResourcesV1()
-ddr.prepareServiceTopologyDeletion(execution)]]></bpmn:script>
+ddr.prepareSDNCServiceDeactivateRequest(execution)]]></bpmn:script>
</bpmn:scriptTask>
+ <bpmn:callActivity id="CallActivity_1ueonyc" name="Call SDNC RSRC Adapter V1 " calledElement="sdncAdapter">
+ <bpmn:extensionElements>
+ <camunda:in source="sdncAdapterWorkflowRequest" target="sdncAdapterWorkflowRequest" />
+ <camunda:in source="msoRequestId" target="mso-request-id" />
+ <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
+ <camunda:out source="sdncAdapterResponse" target="DELSDNCRES_activateSDNCResponse" />
+ <camunda:out source="SDNCA_ResponseCode" target="DELSDNCRES_sdncDeleteReturnCode" />
+ <camunda:out source="SDNCA_SuccessIndicator" target="DELSDNCRES_SuccessIndicator" />
+ <camunda:out source="WorkflowException" target="WorkflowException" />
+ </bpmn:extensionElements>
+ <bpmn:incoming>SequenceFlow_11h5pba</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0gqlayv</bpmn:outgoing>
+ </bpmn:callActivity>
+ <bpmn:sequenceFlow id="SequenceFlow_0gqlayv" sourceRef="CallActivity_1ueonyc" targetRef="ScriptTask_0k6kwv7" />
+ <bpmn:callActivity id="CallActivity_0zuhttc" name="Call SDNC RSRC Adapter V1 " calledElement="sdncAdapter">
+ <bpmn:extensionElements>
+ <camunda:in source="sdncAdapterWorkflowRequest" target="sdncAdapterWorkflowRequest" />
+ <camunda:in source="msoRequestId" target="mso-request-id" />
+ <camunda:in source="serviceInstanceId" target="mso-service-instance-id" />
+ <camunda:out source="sdncAdapterResponse" target="DELSDNCRES_activateSDNCResponse" />
+ <camunda:out source="SDNCA_ResponseCode" target="DELSDNCRES_sdncDeleteReturnCode" />
+ <camunda:out source="SDNCA_SuccessIndicator" target="DELSDNCRES_SuccessIndicator" />
+ <camunda:out source="WorkflowException" target="WorkflowException" />
+ </bpmn:extensionElements>
+ <bpmn:incoming>SequenceFlow_0etaubw</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_14fx6hv</bpmn:outgoing>
+ </bpmn:callActivity>
+ <bpmn:sequenceFlow id="SequenceFlow_14fx6hv" sourceRef="CallActivity_0zuhttc" targetRef="ExclusiveGateway_1jybr0n" />
+ <bpmn:scriptTask id="ScriptTask_0k6kwv7" name="Prepare SDNC service Topology Delete" scriptFormat="groovy">
+ <bpmn:incoming>SequenceFlow_0gqlayv</bpmn:incoming>
+ <bpmn:outgoing>SequenceFlow_0etaubw</bpmn:outgoing>
+ <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def ddr = new DoDeleteResourcesV1()
+ddr.prepareSDNCServiceDeleteRequest(execution)]]></bpmn:script>
+ </bpmn:scriptTask>
+ <bpmn:sequenceFlow id="SequenceFlow_0etaubw" sourceRef="ScriptTask_0k6kwv7" targetRef="CallActivity_0zuhttc" />
</bpmn:process>
<bpmndi:BPMNDiagram id="BPMNDiagram_1">
<bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="DoDeleteResourcesV1">
@@ -249,9 +280,6 @@
<dc:Bounds x="639.5" y="887" width="0" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
- <bpmndi:BPMNShape id="ServiceTask_176j3rl_di" bpmnElement="ServiceTask_176j3rl">
- <dc:Bounds x="689" y="566" width="100" height="80" />
- </bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_1x63i6w_di" bpmnElement="ExclusiveGateway_1x63i6w" isMarkerVisible="true">
<dc:Bounds x="396" y="581" width="50" height="50" />
<bpmndi:BPMNLabel>
@@ -266,32 +294,25 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="EndEvent_17bzayo_di" bpmnElement="EndEvent_17bzayo">
- <dc:Bounds x="992.2009291521485" y="588" width="36" height="36" />
+ <dc:Bounds x="1194" y="588" width="36" height="36" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="977" y="628" width="72" height="24" />
+ <dc:Bounds x="1181" y="628" width="68" height="28" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_1s1nnmj_di" bpmnElement="SequenceFlow_1s1nnmj">
<di:waypoint xsi:type="dc:Point" x="446" y="606" />
- <di:waypoint xsi:type="dc:Point" x="525" y="606" />
+ <di:waypoint xsi:type="dc:Point" x="509" y="606" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="476" y="585" width="20" height="12" />
- </bpmndi:BPMNLabel>
- </bpmndi:BPMNEdge>
- <bpmndi:BPMNEdge id="SequenceFlow_174yrgl_di" bpmnElement="SequenceFlow_174yrgl">
- <di:waypoint xsi:type="dc:Point" x="789" y="606" />
- <di:waypoint xsi:type="dc:Point" x="827" y="606" />
- <bpmndi:BPMNLabel>
- <dc:Bounds x="763" y="585" width="90" height="12" />
+ <dc:Bounds x="468.8987341772152" y="585" width="18" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_0lk19rm_di" bpmnElement="SequenceFlow_0lk19rm">
<di:waypoint xsi:type="dc:Point" x="421" y="631" />
<di:waypoint xsi:type="dc:Point" x="421" y="721" />
- <di:waypoint xsi:type="dc:Point" x="852" y="721" />
- <di:waypoint xsi:type="dc:Point" x="852" y="631" />
+ <di:waypoint xsi:type="dc:Point" x="1130" y="721" />
+ <di:waypoint xsi:type="dc:Point" x="1130" y="631" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="629" y="700" width="15" height="12" />
+ <dc:Bounds x="770.322505800464" y="700" width="12" height="14" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_1d5mzit_di" bpmnElement="SequenceFlow_1d5mzit">
@@ -314,16 +335,16 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="ExclusiveGateway_1jybr0n_di" bpmnElement="ExclusiveGateway_1jybr0n" isMarkerVisible="true">
- <dc:Bounds x="827" y="581" width="50" height="50" />
+ <dc:Bounds x="1105" y="581" width="50" height="50" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="815" y="635" width="75" height="24" />
+ <dc:Bounds x="1086" y="635" width="90" height="24" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="SequenceFlow_0o21fg8_di" bpmnElement="SequenceFlow_0o21fg8">
- <di:waypoint xsi:type="dc:Point" x="877" y="606" />
- <di:waypoint xsi:type="dc:Point" x="992" y="606" />
+ <di:waypoint xsi:type="dc:Point" x="1155" y="606" />
+ <di:waypoint xsi:type="dc:Point" x="1194" y="606" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="934.5" y="585" width="0" height="12" />
+ <dc:Bounds x="1129.5" y="585" width="90" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_12460xo_di" bpmnElement="ScriptTask_12460xo">
@@ -390,15 +411,45 @@
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="SequenceFlow_11h5pba_di" bpmnElement="SequenceFlow_11h5pba">
- <di:waypoint xsi:type="dc:Point" x="625" y="606" />
- <di:waypoint xsi:type="dc:Point" x="689" y="606" />
+ <di:waypoint xsi:type="dc:Point" x="609" y="606" />
+ <di:waypoint xsi:type="dc:Point" x="654" y="606" />
<bpmndi:BPMNLabel>
- <dc:Bounds x="657" y="585" width="0" height="12" />
+ <dc:Bounds x="586.5" y="585" width="90" height="12" />
</bpmndi:BPMNLabel>
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="ScriptTask_0va5zgp_di" bpmnElement="prepareSDNCServiceTopologyDelete">
- <dc:Bounds x="525" y="566" width="100" height="80" />
+ <dc:Bounds x="509" y="566" width="100" height="80" />
</bpmndi:BPMNShape>
+ <bpmndi:BPMNShape id="CallActivity_1ueonyc_di" bpmnElement="CallActivity_1ueonyc">
+ <dc:Bounds x="654" y="566" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0gqlayv_di" bpmnElement="SequenceFlow_0gqlayv">
+ <di:waypoint xsi:type="dc:Point" x="754" y="606" />
+ <di:waypoint xsi:type="dc:Point" x="789" y="606" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="771.5" y="584" width="0" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="CallActivity_0zuhttc_di" bpmnElement="CallActivity_0zuhttc">
+ <dc:Bounds x="936" y="566" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_14fx6hv_di" bpmnElement="SequenceFlow_14fx6hv">
+ <di:waypoint xsi:type="dc:Point" x="1036" y="606" />
+ <di:waypoint xsi:type="dc:Point" x="1105" y="606" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="1070.5" y="584" width="0" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
+ <bpmndi:BPMNShape id="ScriptTask_0k6kwv7_di" bpmnElement="ScriptTask_0k6kwv7">
+ <dc:Bounds x="789" y="566" width="100" height="80" />
+ </bpmndi:BPMNShape>
+ <bpmndi:BPMNEdge id="SequenceFlow_0etaubw_di" bpmnElement="SequenceFlow_0etaubw">
+ <di:waypoint xsi:type="dc:Point" x="889" y="606" />
+ <di:waypoint xsi:type="dc:Point" x="936" y="606" />
+ <bpmndi:BPMNLabel>
+ <dc:Bounds x="912.5" y="584" width="0" height="14" />
+ </bpmndi:BPMNLabel>
+ </bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>