From c9f9e3c9733ad82d5537636f24d65ffdb6881876 Mon Sep 17 00:00:00 2001
From: seshukm <seshu.kumar.m@huawei.com>
Date: Tue, 17 Oct 2017 11:04:23 +0530
Subject: fix method name mismatch create E2E svc

IssueId: SO-222

Change-Id: Ibcdf8c95dfa789619214745edd54393e8340d5ee
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
---
 .../scripts/CreateCustomE2EServiceInstance.groovy  | 11 +++
 .../process/CreateCustomE2EServiceInstance.bpmn    | 82 +++++++++++-----------
 2 files changed, 53 insertions(+), 40 deletions(-)

(limited to 'bpmn/MSOInfrastructureBPMN/src')

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
index 7f4f78762e..8ada19c1f0 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
@@ -337,4 +337,15 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
         }
         utils.log("DEBUG", "======== COMPLETED prepareInitServiceOperationStatus Process ======== ", isDebugEnabled)    
 	}
+	
+	/**
+	 * send a request to SDNC 
+	 */
+	public void sendSdncSvc(Execution execution)
+	{ 
+	  def isDebugEnabled = execution.getVariable("isDebugLogEnabled")
+	  utils.log("DEBUG", "======== sendSdncSvc Process ======== ", isDebugEnabled)  
+	  //TODO
+	}
+	
 }
\ No newline at end of file
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
index b9d5e2c1d2..62ed844fe7 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateCustomE2EServiceInstance.bpmn
@@ -146,9 +146,16 @@ csi.sendSyncResponse(execution)]]></bpmn:script>
       <bpmn:outgoing>SequenceFlow_1euqjsp</bpmn:outgoing>
       <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
 def csi= new CreateCustomE2EServiceInstance()
-csi.InitServiceOperationStatus(execution)]]></bpmn:script>
+csi.prepareInitServiceOperationStatus(execution)]]></bpmn:script>
+    </bpmn:scriptTask>
+    <bpmn:sequenceFlow id="SequenceFlow_194rnud" sourceRef="Task_0in343a" targetRef="ScriptTask_0xupxj9" />
+    <bpmn:scriptTask id="Task_0in343a" name="Send SDNC Service" scriptFormat="java">
+      <bpmn:incoming>SequenceFlow_081z8l2</bpmn:incoming>
+      <bpmn:outgoing>SequenceFlow_194rnud</bpmn:outgoing>
+      <bpmn:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*
+def csi= new CreateCustomE2EServiceInstance()
+csi.sendSdncSvc(execution)]]></bpmn:script>
     </bpmn:scriptTask>
-    <bpmn:sequenceFlow id="SequenceFlow_081z8l2" sourceRef="Task_19mxcw3" targetRef="Task_0in343a" />
     <bpmn:serviceTask id="Task_19mxcw3" name="Update Service Operation Status">
       <bpmn:extensionElements>
         <camunda:connector>
@@ -171,27 +178,22 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
       <bpmn:incoming>SequenceFlow_1euqjsp</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_081z8l2</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:sequenceFlow id="SequenceFlow_194rnud" sourceRef="Task_0in343a" targetRef="ScriptTask_0xupxj9" />
-    <bpmn:scriptTask id="Task_0in343a" name="Send SDNC Service" scriptFormat="java">
-      <bpmn:incoming>SequenceFlow_081z8l2</bpmn:incoming>
-      <bpmn:outgoing>SequenceFlow_194rnud</bpmn:outgoing>
-      <bpmn:script></bpmn:script>
-    </bpmn:scriptTask>
+    <bpmn:sequenceFlow id="SequenceFlow_081z8l2" sourceRef="Task_19mxcw3" targetRef="Task_0in343a" />
   </bpmn:process>
   <bpmn:error id="Error_0nbdy47" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="CreateCustomE2EServiceInstance">
       <bpmndi:BPMNShape id="StartEvent_00qj6ro_di" bpmnElement="StartEvent_00qj6ro">
-        <dc:Bounds x="82" y="180" width="36" height="36" />
+        <dc:Bounds x="-39" y="180" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="64" y="221" width="73" height="24" />
+          <dc:Bounds x="-57" y="221" width="73" height="24" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_0ka59nc_di" bpmnElement="SubProcess_0ka59nc" isExpanded="true">
         <dc:Bounds x="463" y="632" width="394" height="188" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_0rhljy8_di" bpmnElement="DoCreateE2EServiceInstance">
-        <dc:Bounds x="701" y="158" width="100" height="80" />
+        <dc:Bounds x="751" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_0bpd6c0_di" bpmnElement="EndEvent_0bpd6c0">
         <dc:Bounds x="1258" y="286" width="36" height="36" />
@@ -200,7 +202,7 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1s09c7d_di" bpmnElement="ScriptTask_1s09c7d">
-        <dc:Bounds x="129" y="158" width="100" height="80" />
+        <dc:Bounds x="65" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0ttvn8r_di" bpmnElement="ScriptTask_0ttvn8r">
         <dc:Bounds x="1038" y="158" width="100" height="80" />
@@ -212,7 +214,7 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         <dc:Bounds x="348" y="370" width="679" height="194" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_0xupxj9_di" bpmnElement="ScriptTask_0xupxj9">
-        <dc:Bounds x="577" y="158" width="100" height="80" />
+        <dc:Bounds x="610" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ExclusiveGateway_0aqn64l_di" bpmnElement="ExclusiveGateway_0aqn64l" isMarkerVisible="true">
         <dc:Bounds x="903" y="173" width="50" height="50" />
@@ -227,24 +229,24 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0s2spoq_di" bpmnElement="SequenceFlow_0s2spoq">
-        <di:waypoint xsi:type="dc:Point" x="118" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="129" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="-3" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="65" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="78.5" y="177" width="90" height="12" />
+          <dc:Bounds x="-14" 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="677" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="701" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="710" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="751" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="644" y="177" width="90" height="12" />
+          <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="801" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="851" y="198" />
         <di:waypoint xsi:type="dc:Point" x="903" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="807" y="183" width="0" height="12" />
+          <dc:Bounds x="832" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0yayvrf_di" bpmnElement="SequenceFlow_0yayvrf">
@@ -255,10 +257,10 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0z4faf9_di" bpmnElement="SequenceFlow_0z4faf9">
-        <di:waypoint xsi:type="dc:Point" x="229" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="245" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="165" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="198" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="192" y="177" width="90" height="12" />
+          <dc:Bounds x="136.5" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_14zu6wr_di" bpmnElement="SequenceFlow_14zu6wr">
@@ -369,35 +371,35 @@ csi.InitServiceOperationStatus(execution)]]></bpmn:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1euqjsp_di" bpmnElement="SequenceFlow_1euqjsp">
-        <di:waypoint xsi:type="dc:Point" x="345" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="371" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="298" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="335" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="358" y="177" width="0" height="12" />
+          <dc:Bounds x="271.5" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1a3vwas_di" bpmnElement="Task_1tqjch6">
-        <dc:Bounds x="245" y="158" width="100" height="80" />
+        <dc:Bounds x="198" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_081z8l2_di" bpmnElement="SequenceFlow_081z8l2">
-        <di:waypoint xsi:type="dc:Point" x="497" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="522" y="198" />
+      <bpmndi:BPMNEdge id="SequenceFlow_194rnud_di" bpmnElement="SequenceFlow_194rnud">
+        <di:waypoint xsi:type="dc:Point" x="569" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="610" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="509.5" y="177" width="0" height="12" />
+          <dc:Bounds x="544.5" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
+      <bpmndi:BPMNShape id="ScriptTask_1u5yu0n_di" bpmnElement="Task_0in343a">
+        <dc:Bounds x="469" y="158" width="100" height="80" />
+      </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_1afiuuq_di" bpmnElement="Task_19mxcw3">
-        <dc:Bounds x="371" y="158" width="100" height="80" />
+        <dc:Bounds x="335" y="158" width="100" height="80" />
       </bpmndi:BPMNShape>
-      <bpmndi:BPMNEdge id="SequenceFlow_194rnud_di" bpmnElement="SequenceFlow_194rnud">
-        <di:waypoint xsi:type="dc:Point" x="597" y="198" />
-        <di:waypoint xsi:type="dc:Point" x="627" y="198" />
+      <bpmndi:BPMNEdge id="SequenceFlow_081z8l2_di" bpmnElement="SequenceFlow_081z8l2">
+        <di:waypoint xsi:type="dc:Point" x="435" y="198" />
+        <di:waypoint xsi:type="dc:Point" x="469" y="198" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="612" y="177" width="0" height="12" />
+          <dc:Bounds x="407" y="177" width="90" height="12" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
-      <bpmndi:BPMNShape id="ScriptTask_1u5yu0n_di" bpmnElement="Task_0in343a">
-        <dc:Bounds x="476" y="158" width="100" height="80" />
-      </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
 </bpmn:definitions>
-- 
cgit 1.2.3-korg