1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 148 insertions, 60 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn
index fecb720666..5383dc871e 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/DoCreateVfModule.bpmn
@@ -37,9 +37,7 @@
       <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>

     </bpmn2:exclusiveGateway>

     <bpmn2:sequenceFlow id="SequenceFlow_19" name="yes" sourceRef="IsVolumeGroupNameSpecified" targetRef="ConfirmVolumeName">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def doCreateVfModule = new DoCreateVfModule()

-return doCreateVfModule.isVolumeGroupNamePresent(execution)]]></bpmn2:conditionExpression>

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupName") != null && execution.getVariable("DCVFM_volumeGroupName") != "" }]]></bpmn2:conditionExpression>

     </bpmn2:sequenceFlow>

     <bpmn2:sequenceFlow id="SequenceFlow_21" name="no" sourceRef="IsVolumeGroupNameSpecified" targetRef="ExclusiveGateway_4" />

     <bpmn2:callActivity id="ConfirmVolumeName" name="Confirm Volume Group Name" calledElement="ConfirmVolumeGroupName">

@@ -180,9 +178,7 @@ doCreateVfModule.validateSDNCResponse(execution, response, "activate")]]></bpmn2
       <bpmn2:outgoing>SequenceFlow_30</bpmn2:outgoing>

     </bpmn2:exclusiveGateway>

     <bpmn2:sequenceFlow id="SequenceFlow_28" name="yes" sourceRef="ExclusiveGateway_5" targetRef="PrepareCreateAAIVfModuleVolumeGroupRequest">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def doCreateVfModule = new DoCreateVfModule()

-return doCreateVfModule.isVolumeGroupIdPresent(execution)]]></bpmn2:conditionExpression>

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" }]]></bpmn2:conditionExpression>

     </bpmn2:sequenceFlow>

     <bpmn2:sequenceFlow id="SequenceFlow_30" name="no" sourceRef="ExclusiveGateway_5" targetRef="ExclusiveGateway_6" />

     <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="PreProcessUpdateAAIVfModule_1" targetRef="UpdateAAIVfModule_1" />

@@ -314,29 +310,9 @@ def doCreateVfModule = new DoCreateVfModule()
 return doCreateVfModule.queryCloudRegion(execution)]]></bpmn2:script>

     </bpmn2:scriptTask>

     <bpmn2:sequenceFlow id="SequenceFlow_40" name="yes" sourceRef="IsVolumeGroupIdSpecified" targetRef="QueryCloudRegion">

-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression" language="groovy"><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def doCreateVfModule = new DoCreateVfModule()

-return doCreateVfModule.isVolumeGroupIdPresent(execution)]]></bpmn2:conditionExpression>

+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("DCVFM_volumeGroupId") != null && execution.getVariable("DCVFM_volumeGroupId") != "" }]]></bpmn2:conditionExpression>

     </bpmn2:sequenceFlow>

     <bpmn2:sequenceFlow id="SequenceFlow_43" name="" sourceRef="QueryCloudRegion" targetRef="ConfirmVolumeGroupTenant" />

-    <bpmn2:subProcess id="SubProcess_1" name="Error Handling Sub Process" triggeredByEvent="true">

-      <bpmn2:scriptTask id="ScriptTask_1" name="Process Error" scriptFormat="groovy">

-        <bpmn2:incoming>SequenceFlow_9</bpmn2:incoming>

-        <bpmn2:outgoing>SequenceFlow_38</bpmn2:outgoing>

-        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

-def doCreateVfModule = new DoCreateVfModule()

-doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>

-      </bpmn2:scriptTask>

-      <bpmn2:sequenceFlow id="SequenceFlow_38" name="" sourceRef="ScriptTask_1" targetRef="EndEvent_2" />

-      <bpmn2:startEvent id="StartEvent_2">

-        <bpmn2:outgoing>SequenceFlow_9</bpmn2:outgoing>

-        <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" />

-      </bpmn2:startEvent>

-      <bpmn2:sequenceFlow id="SequenceFlow_9" name="" sourceRef="StartEvent_2" targetRef="ScriptTask_1" />

-      <bpmn2:endEvent id="EndEvent_2">

-        <bpmn2:incoming>SequenceFlow_38</bpmn2:incoming>

-      </bpmn2:endEvent>

-    </bpmn2:subProcess>

     <bpmn2:scriptTask id="PreProcessRequest" name="Pre-Process Request" scriptFormat="groovy">

       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>

       <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>

@@ -354,7 +330,7 @@ doCreateVfModule.preProcessRequest(execution)]]></bpmn2:script>
       <bpmn2:extensionElements>

         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

         <camunda:in source="isVidRequest" target="isVidRequest" />

-        <camunda:in source="newVfModuleId" target="newVfModuleId" />

+        <camunda:in source="DCVFM_vfModuleId" target="newVfModuleId" />

         <camunda:out source="WorkflowException" target="WorkflowException" />

         <camunda:out source="CreateAAIVfModuleResponse" target="DCVFM_createVfModuleResponse" />

         <camunda:in source="DCVFM_vnfId" target="vnfId" />

@@ -498,6 +474,64 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri
       <bpmn2:incoming>SequenceFlow_05og7iw</bpmn2:incoming>

       <bpmn2:outgoing>SequenceFlow_1f53tby</bpmn2:outgoing>

     </bpmn2:callActivity>

+    <bpmn2:subProcess id="SubProcess_0ltzufk" name="Sub-process for Application Errors" triggeredByEvent="true">

+      <bpmn2:startEvent id="StartEvent_18lzc5m">

+        <bpmn2:outgoing>SequenceFlow_02lc25j</bpmn2:outgoing>

+        <bpmn2:errorEventDefinition errorRef="Error_1" />

+      </bpmn2:startEvent>

+      <bpmn2:endEvent id="EndEvent_0wsdptv">

+        <bpmn2:incoming>SequenceFlow_0z2rczk</bpmn2:incoming>

+        <bpmn2:incoming>SequenceFlow_1pgo10r</bpmn2:incoming>

+      </bpmn2:endEvent>

+      <bpmn2:callActivity id="CallDoCreateVfModuleRollback" name="Call DoCreateVfModuleRollback" calledElement="DoCreateVfModuleRollback">

+        <bpmn2:extensionElements>

+          <camunda:in source="rollbackData" target="rollbackData" />

+          <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />

+          <camunda:in source="isVidRequest" target="isVidRequest" />

+          <camunda:out source="rolledBack" target="rolledBack" />

+          <camunda:out source="rollbackError" target="rollbackError" />

+          <camunda:in source="disableRollback" target="disableRollback" />

+          <camunda:in source="sdncVersion" target="sdncVersion" />

+        </bpmn2:extensionElements>

+        <bpmn2:incoming>SequenceFlow_1i1q78e</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_0112l2c</bpmn2:outgoing>

+      </bpmn2:callActivity>

+      <bpmn2:scriptTask id="PreProcessRollback" name="Pre Process Rollback" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_04bd5in</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_1i1q78e</bpmn2:outgoing>

+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.preProcessRollback(execution)]]></bpmn2:script>

+      </bpmn2:scriptTask>

+      <bpmn2:scriptTask id="PostProcessRollback" name="Post Process Rollback" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_0112l2c</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_0z2rczk</bpmn2:outgoing>

+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.postProcessRollback(execution)]]></bpmn2:script>

+      </bpmn2:scriptTask>

+      <bpmn2:sequenceFlow id="SequenceFlow_02lc25j" sourceRef="StartEvent_18lzc5m" targetRef="ExclusiveGateway_039bib8" />

+      <bpmn2:sequenceFlow id="SequenceFlow_0z2rczk" sourceRef="PostProcessRollback" targetRef="EndEvent_0wsdptv" />

+      <bpmn2:sequenceFlow id="SequenceFlow_1i1q78e" sourceRef="PreProcessRollback" targetRef="CallDoCreateVfModuleRollback" />

+      <bpmn2:sequenceFlow id="SequenceFlow_0112l2c" sourceRef="CallDoCreateVfModuleRollback" targetRef="PostProcessRollback" />

+      <bpmn2:exclusiveGateway id="ExclusiveGateway_039bib8" name="Disable Rollback?" default="SequenceFlow_04bd5in">

+        <bpmn2:incoming>SequenceFlow_02lc25j</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_04bd5in</bpmn2:outgoing>

+        <bpmn2:outgoing>SequenceFlow_1nh7m8d</bpmn2:outgoing>

+      </bpmn2:exclusiveGateway>

+      <bpmn2:sequenceFlow id="SequenceFlow_04bd5in" name="no" sourceRef="ExclusiveGateway_039bib8" targetRef="PreProcessRollback" />

+      <bpmn2:sequenceFlow id="SequenceFlow_1nh7m8d" name="yes" sourceRef="ExclusiveGateway_039bib8" targetRef="Task_1fm09pi">

+        <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{execution.getVariable("disableRollback" )  == true}]]></bpmn2:conditionExpression>

+      </bpmn2:sequenceFlow>

+      <bpmn2:scriptTask id="Task_1fm09pi" name="Process Error" scriptFormat="groovy">

+        <bpmn2:incoming>SequenceFlow_1nh7m8d</bpmn2:incoming>

+        <bpmn2:outgoing>SequenceFlow_1pgo10r</bpmn2:outgoing>

+        <bpmn2:script><![CDATA[import org.openecomp.mso.bpmn.infrastructure.scripts.*

+def doCreateVfModule = new DoCreateVfModule()

+doCreateVfModule.processBPMNException(execution)]]></bpmn2:script>

+      </bpmn2:scriptTask>

+      <bpmn2:sequenceFlow id="SequenceFlow_1pgo10r" sourceRef="Task_1fm09pi" targetRef="EndEvent_0wsdptv" />

+    </bpmn2:subProcess>

   </bpmn2:process>

   <bpmn2:message id="Message_1" name="DoCreateVfModuleRequest" />

   <bpmn2:error id="Error_1" name="MSOWorkflowException" errorCode="MSOWorkflowException" />

@@ -925,38 +959,6 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri
           <dc:Bounds x="165" y="574" width="6" height="6" />

         </bpmndi:BPMNLabel>

       </bpmndi:BPMNEdge>

-      <bpmndi:BPMNShape id="_BPMNShape_SubProcess_21" bpmnElement="SubProcess_1" isExpanded="true">

-        <dc:Bounds x="29" y="1197" width="405" height="203" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_55" bpmnElement="StartEvent_2">

-        <dc:Bounds x="58" y="1281" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="76" y="1322" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_EndEvent_181" bpmnElement="EndEvent_2">

-        <dc:Bounds x="370" y="1281" width="36" height="36" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="388" y="1322" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_284" bpmnElement="ScriptTask_1">

-        <dc:Bounds x="165" y="1258" width="134" height="81" />

-      </bpmndi:BPMNShape>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_9" sourceElement="_BPMNShape_StartEvent_55" targetElement="_BPMNShape_ScriptTask_284">

-        <di:waypoint xsi:type="dc:Point" x="94" y="1299" />

-        <di:waypoint xsi:type="dc:Point" x="165" y="1298" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="118" y="1299" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

-      <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_38" bpmnElement="SequenceFlow_38" sourceElement="_BPMNShape_ScriptTask_284" targetElement="_BPMNShape_EndEvent_181">

-        <di:waypoint xsi:type="dc:Point" x="299" y="1298" />

-        <di:waypoint xsi:type="dc:Point" x="370" y="1299" />

-        <bpmndi:BPMNLabel>

-          <dc:Bounds x="329" y="1298" width="0" height="0" />

-        </bpmndi:BPMNLabel>

-      </bpmndi:BPMNEdge>

       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_156" bpmnElement="CreateAAIVfModule">

         <dc:Bounds x="696" y="348" width="121" height="92" />

       </bpmndi:BPMNShape>

@@ -1162,6 +1164,92 @@ doCreateVfModule.validateSDNCResponse(execution, response, "get")]]></bpmn2:scri
       <bpmndi:BPMNShape id="CallActivity_14nvmgk_di" bpmnElement="Task_0kuj2a1">

         <dc:Bounds x="378" y="242" width="100" height="80" />

       </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="SubProcess_0ltzufk_di" bpmnElement="SubProcess_0ltzufk" isExpanded="true">

+        <dc:Bounds x="-50" y="1190" width="1047" height="338" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="StartEvent_18lzc5m_di" bpmnElement="StartEvent_18lzc5m">

+        <dc:Bounds x="93" y="1294" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="111" y="1335" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="EndEvent_0wsdptv_di" bpmnElement="EndEvent_0wsdptv">

+        <dc:Bounds x="861" y="1294" width="36" height="36" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="879" y="1335" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="CallActivity_1ehr5kq_di" bpmnElement="CallDoCreateVfModuleRollback">

+        <dc:Bounds x="509" y="1272" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ScriptTask_0upatdd_di" bpmnElement="PreProcessRollback">

+        <dc:Bounds x="329" y="1272" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNShape id="ScriptTask_0o1zc29_di" bpmnElement="PostProcessRollback">

+        <dc:Bounds x="694" y="1272" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_02lc25j_di" bpmnElement="SequenceFlow_02lc25j">

+        <di:waypoint xsi:type="dc:Point" x="129" y="1312" />

+        <di:waypoint xsi:type="dc:Point" x="196" y="1312" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="163" y="1297" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0z2rczk_di" bpmnElement="SequenceFlow_0z2rczk">

+        <di:waypoint xsi:type="dc:Point" x="794" y="1312" />

+        <di:waypoint xsi:type="dc:Point" x="826" y="1312" />

+        <di:waypoint xsi:type="dc:Point" x="826" y="1312" />

+        <di:waypoint xsi:type="dc:Point" x="861" y="1312" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="841" y="1312" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1i1q78e_di" bpmnElement="SequenceFlow_1i1q78e">

+        <di:waypoint xsi:type="dc:Point" x="429" y="1312" />

+        <di:waypoint xsi:type="dc:Point" x="509" y="1312" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="469" y="1297" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_0112l2c_di" bpmnElement="SequenceFlow_0112l2c">

+        <di:waypoint xsi:type="dc:Point" x="609" y="1312" />

+        <di:waypoint xsi:type="dc:Point" x="694" y="1312" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="652" y="1297" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ExclusiveGateway_039bib8_di" bpmnElement="ExclusiveGateway_039bib8" isMarkerVisible="true">

+        <dc:Bounds x="196" y="1287" width="50" height="50" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="177" y="1259" width="87" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_04bd5in_di" bpmnElement="SequenceFlow_04bd5in">

+        <di:waypoint xsi:type="dc:Point" x="246" y="1312" />

+        <di:waypoint xsi:type="dc:Point" x="329" y="1312" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="282" y="1297" width="12" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNEdge id="SequenceFlow_1nh7m8d_di" bpmnElement="SequenceFlow_1nh7m8d">

+        <di:waypoint xsi:type="dc:Point" x="221" y="1337" />

+        <di:waypoint xsi:type="dc:Point" x="221" y="1436" />

+        <di:waypoint xsi:type="dc:Point" x="509" y="1436" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="227" y="1386.5" width="18" height="12" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

+      <bpmndi:BPMNShape id="ScriptTask_05v20n0_di" bpmnElement="Task_1fm09pi">

+        <dc:Bounds x="509" y="1396" width="100" height="80" />

+      </bpmndi:BPMNShape>

+      <bpmndi:BPMNEdge id="SequenceFlow_1pgo10r_di" bpmnElement="SequenceFlow_1pgo10r">

+        <di:waypoint xsi:type="dc:Point" x="609" y="1436" />

+        <di:waypoint xsi:type="dc:Point" x="879" y="1436" />

+        <di:waypoint xsi:type="dc:Point" x="879" y="1330" />

+        <bpmndi:BPMNLabel>

+          <dc:Bounds x="744" y="1421" width="0" height="0" />

+        </bpmndi:BPMNLabel>

+      </bpmndi:BPMNEdge>

     </bpmndi:BPMNPlane>

   </bpmndi:BPMNDiagram>

 </bpmn2:definitions>
\ No newline at end of file