Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Dynamic Cloud Owner Support
[so.git] / bpmn / so-bpmn-infrastructure-flows / src / main / resources / subprocess / DoCreateServiceInstance.bpmn
diff --git a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn
index 2c6f5ee..e3f1d77 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn
+++ b/bpmn/so-bpmn-infrastructure-flows/src/main/resources/subprocess/DoCreateServiceInstance.bpmn
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <bpmn2:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:bpmn2="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" id="_MagIIMOUEeW8asg-vCEgWQ" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.10.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
-  <bpmn2:process id="DoCreateServiceInstance" name="DoCreateServiceInstance" isExecutable="true">
+  <bpmn2:process id="DoCreateServiceInstance" name="DoCreateServiceInstance&#10;" isExecutable="true">
     <bpmn2:startEvent id="createSI_startEvent" name="Start Flow">
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
     </bpmn2:startEvent>
@@ -12,7 +12,7 @@
 def dcsi = new DoCreateServiceInstance()
 dcsi.getAAICustomerById(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getAAICustomerById_scriptTask" targetRef="callGenericPutService" />
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="getAAICustomerById_scriptTask" targetRef="ScriptTask_0q37vn9" />
     <bpmn2:scriptTask id="preProcessRequest_ScriptTask" name="PreProcess Incoming Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_2</bpmn2:outgoing>
@@ -54,20 +54,6 @@ dcsi.postProcessSDNCAssign(execution)]]></bpmn2:script>
     <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="PreProcessSDNCAssignRequest" targetRef="CallSDNCAdapterServiceTopologyAssign" />
     <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="CallSDNCAdapterServiceTopologyAssign" targetRef="PostProcessSDNCAssignRequest" />
     <bpmn2:sequenceFlow id="SequenceFlow_10" name="" sourceRef="PostProcessSDNCAssignRequest" targetRef="EndEvent_3" />
-    <bpmn2:callActivity id="callGenericPutService" name="Call Generic Put Service" calledElement="GenericPutService">
-      <bpmn2:extensionElements>
-        <camunda:in source="globalSubscriberId" target="GENPS_globalSubscriberId" />
-        <camunda:in source="serviceInstanceId" target="GENPS_serviceInstanceId" />
-        <camunda:in source="subscriptionServiceType" target="GENPS_serviceType" />
-        <camunda:in sourceExpression="service-instance" target="GENPS_type" />
-        <camunda:in source="serviceInstanceData" target="GENPS_payload" />
-        <camunda:out source="GENPS_SuccessIndicator" target="GENPS_SuccessIndicator" />
-        <camunda:in source="msoRequestId" target="GENPS_requesId" />
-        <camunda:out source="WorkflowException" target="WorkflowException" />
-      </bpmn2:extensionElements>
-      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
-      <bpmn2:outgoing>SequenceFlow_1jhzmzn</bpmn2:outgoing>
-    </bpmn2:callActivity>
     <bpmn2:subProcess id="SubProcess_06d8lk8" name="Sub-process for Application Errors" triggeredByEvent="true">
       <bpmn2:startEvent id="StartEvent_0yljq9y">
         <bpmn2:outgoing>SequenceFlow_0tgrn11</bpmn2:outgoing>
@@ -120,12 +106,12 @@ dcsi.postProcessRollback(execution)
     <bpmn2:sequenceFlow id="SequenceFlow_00v4npo" name="yes" sourceRef="ExclusiveGateway_1nk6aol" targetRef="EndEvent_10659gr">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{!execution.getVariable("sendToSDNC")}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:scriptTask id="ScriptTask_0q37vn9" name="Post Process AAI PUT" scriptFormat="groovy">
-      <bpmn2:incoming>SequenceFlow_1jhzmzn</bpmn2:incoming>
+    <bpmn2:scriptTask id="ScriptTask_0q37vn9" name="&#10;AAI&#10;Create&#10;(svc instance)&#10;" scriptFormat="groovy">
+      <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_16sdyz9</bpmn2:outgoing>
       <bpmn2:script><![CDATA[import org.onap.so.bpmn.infrastructure.scripts.*
 def ddsi = new DoCreateServiceInstance()
-ddsi.postProcessAAIPUT(execution)]]></bpmn2:script>
+ddsi.putServiceInstance(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
     <bpmn2:sequenceFlow id="SequenceFlow_0k0wn03" sourceRef="Task_0wj9ajs" targetRef="Task_1g8wthf" />
     <bpmn2:scriptTask id="Task_0wj9ajs" name="Create Project" scriptFormat="groovy">
@@ -142,7 +128,6 @@ dcsi.createProject(execution)]]></bpmn2:script>
 def dcsi = new DoCreateServiceInstance()
 dcsi.createOwningEntity(execution)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1jhzmzn" sourceRef="callGenericPutService" targetRef="ScriptTask_0q37vn9" />
     <bpmn2:sequenceFlow id="SequenceFlow_0w5i6vf" sourceRef="Task_1g8wthf" targetRef="ExclusiveGateway_1nk6aol" />
     <bpmn2:sequenceFlow id="SequenceFlow_16sdyz9" sourceRef="ScriptTask_0q37vn9" targetRef="Task_0wj9ajs" />
     <bpmn2:subProcess id="SubProcess_1awd8cm" name="Sub-process for UnexpectedErrors" triggeredByEvent="true">
@@ -189,26 +174,25 @@ dcsi.processJavaException(execution)]]></bpmn2:script>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_ScriptTask_62">
         <di:waypoint xsi:type="dc:Point" x="493" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="97" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="206" />
+        <di:waypoint xsi:type="dc:Point" x="572" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="712.5" y="82" width="90" height="0" />
+          <dc:Bounds x="487.5" y="82" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_177" bpmnElement="EndEvent_3">
-        <dc:Bounds x="1004" y="1216" width="36" height="36" />
+        <dc:Bounds x="1057" y="660" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="977" y="1257" width="90" height="0" />
+          <dc:Bounds x="1030" y="701" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_334" bpmnElement="PreProcessSDNCAssignRequest">
-        <dc:Bounds x="972" y="810" width="100" height="80" />
+        <dc:Bounds x="1025" y="202" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_335" bpmnElement="PostProcessSDNCAssignRequest">
-        <dc:Bounds x="972" y="1054" width="100" height="80" />
+        <dc:Bounds x="1025" y="493" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_74" bpmnElement="CallSDNCAdapterServiceTopologyAssign">
-        <dc:Bounds x="972" y="930" width="100" height="80" />
+        <dc:Bounds x="1025" y="339" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_61" targetElement="_BPMNShape_ScriptTask_62">
         <di:waypoint xsi:type="dc:Point" x="345" y="97" />
@@ -218,29 +202,30 @@ dcsi.processJavaException(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_ScriptTask_334" targetElement="_BPMNShape_CallActivity_74">
-        <di:waypoint xsi:type="dc:Point" x="1020" y="890" />
-        <di:waypoint xsi:type="dc:Point" x="1020" y="930" />
+        <di:waypoint xsi:type="dc:Point" x="1073" y="282" />
+        <di:waypoint xsi:type="dc:Point" x="1073" y="339" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="990" y="910" width="90" height="0" />
+          <dc:Bounds x="1043" y="310.5" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_CallActivity_74" targetElement="_BPMNShape_ScriptTask_335">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="1010" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="1054" />
+        <di:waypoint xsi:type="dc:Point" x="1075" y="419" />
+        <di:waypoint xsi:type="dc:Point" x="1075" y="459" />
+        <di:waypoint xsi:type="dc:Point" x="1075" y="459" />
+        <di:waypoint xsi:type="dc:Point" x="1075" y="493" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="992" y="1032" width="90" height="0" />
+          <dc:Bounds x="1045" y="459" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_10" sourceElement="_BPMNShape_ScriptTask_335">
-        <di:waypoint xsi:type="dc:Point" x="1023" y="1134" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="1216" />
+        <di:waypoint xsi:type="dc:Point" x="1076" y="573" />
+        <di:waypoint xsi:type="dc:Point" x="1076" y="617" />
+        <di:waypoint xsi:type="dc:Point" x="1075" y="617" />
+        <di:waypoint xsi:type="dc:Point" x="1075" y="660" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="977.5" y="1160" width="90" height="0" />
+          <dc:Bounds x="1030.5" y="602" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="CallActivity_0khp0qc_di" bpmnElement="callGenericPutService">
-        <dc:Bounds x="972" y="206" width="100" height="80" />
-      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_06d8lk8_di" bpmnElement="SubProcess_06d8lk8" isExpanded="true">
         <dc:Bounds x="99" y="531" width="783" height="195" />
       </bpmndi:BPMNShape>
@@ -274,31 +259,29 @@ dcsi.processJavaException(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ExclusiveGateway_1nk6aol_di" bpmnElement="ExclusiveGateway_1nk6aol" isMarkerVisible="true">
-        <dc:Bounds x="997" y="717" width="50" height="50" />
+        <dc:Bounds x="1050" y="72" width="50" height="50" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="898" y="729" width="86" height="36" />
+          <dc:Bounds x="1032" y="32" width="86" height="36" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_156ih25_di" bpmnElement="SequenceFlow_156ih25">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="767" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="810" />
+        <di:waypoint xsi:type="dc:Point" x="1075" y="122" />
+        <di:waypoint xsi:type="dc:Point" x="1075" y="202" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1039" y="770" width="12" height="12" />
+          <dc:Bounds x="1084" y="134.8139534883721" width="12" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="EndEvent_10659gr_di" bpmnElement="EndEvent_10659gr">
-        <dc:Bounds x="1105" y="724" width="36" height="36" />
+        <dc:Bounds x="1168" y="79" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1078" y="765" width="90" height="0" />
+          <dc:Bounds x="1141" y="120" width="90" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_00v4npo_di" bpmnElement="SequenceFlow_00v4npo">
-        <di:waypoint xsi:type="dc:Point" x="1047" y="742" />
-        <di:waypoint xsi:type="dc:Point" x="1075" y="742" />
-        <di:waypoint xsi:type="dc:Point" x="1075" y="742" />
-        <di:waypoint xsi:type="dc:Point" x="1105" y="742" />
+        <di:waypoint xsi:type="dc:Point" x="1100" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1168" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1050.5" y="718" width="18" height="12" />
+          <dc:Bounds x="1108.5" y="99.57142857142858" width="19" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0ocetux_di" bpmnElement="ScriptTask_0ocetux">
@@ -324,40 +307,33 @@ dcsi.processJavaException(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0q37vn9_di" bpmnElement="ScriptTask_0q37vn9">
-        <dc:Bounds x="972" y="336" width="100" height="80" />
+        <dc:Bounds x="572" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0k0wn03_di" bpmnElement="SequenceFlow_0k0wn03">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="541" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="589" />
+        <di:waypoint xsi:type="dc:Point" x="833" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="886" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="992" y="559" width="90" height="12" />
+          <dc:Bounds x="814.5" y="76" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_0v8y3ex_di" bpmnElement="Task_0wj9ajs">
-        <dc:Bounds x="972" y="461" width="100" height="80" />
+        <dc:Bounds x="733" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0lndrbk_di" bpmnElement="Task_1g8wthf">
-        <dc:Bounds x="972" y="589" width="100" height="80" />
+        <dc:Bounds x="886" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_1jhzmzn_di" bpmnElement="SequenceFlow_1jhzmzn">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="286" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="336" />
-        <bpmndi:BPMNLabel>
-          <dc:Bounds x="1037" y="305" width="0" height="12" />
-        </bpmndi:BPMNLabel>
-      </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0w5i6vf_di" bpmnElement="SequenceFlow_0w5i6vf">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="669" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="717" />
+        <di:waypoint xsi:type="dc:Point" x="986" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="1050" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1037" y="687" width="0" height="12" />
+          <dc:Bounds x="973" y="76" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_16sdyz9_di" bpmnElement="SequenceFlow_16sdyz9">
-        <di:waypoint xsi:type="dc:Point" x="1022" y="416" />
-        <di:waypoint xsi:type="dc:Point" x="1022" y="461" />
+        <di:waypoint xsi:type="dc:Point" x="672" y="97" />
+        <di:waypoint xsi:type="dc:Point" x="733" y="97" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="1037" y="432.5" width="0" height="12" />
+          <dc:Bounds x="657.5" y="76" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="SubProcess_1awd8cm_di" bpmnElement="SubProcess_1awd8cm" isExpanded="true">
Service Orchestrator