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, 26 insertions, 26 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn
index 52627a5e33..24a9a6d73c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/CreateNetworkInstance.bpmn
@@ -116,7 +116,7 @@ CreateNetworkInstance.prepareDBRequestError(execution)]]></bpmn2:script>
         <bpmn2:extensionElements>
           <camunda:connector>
             <camunda:inputOutput>
-              <camunda:inputParameter name="url">${URN_mso_adapters_db_endpoint}</camunda:inputParameter>
+              <camunda:inputParameter name="url">${URN_mso_openecomp_adapters_db_endpoint}</camunda:inputParameter>
               <camunda:inputParameter name="payload">${CRENI_createDBRequest}</camunda:inputParameter>
               <camunda:inputParameter name="headers">
                 <camunda:map>
@@ -273,10 +273,10 @@ CreateNetworkInstance.sendSyncResponse(execution)]]></bpmn2:script>
         <dc:Bounds x="1071" y="57" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ScriptTask_1akfe0b_di" bpmnElement="ScriptTask_1akfe0b">
-        <dc:Bounds x="189" y="525" width="100" height="80" />
+        <dc:Bounds x="258" y="520" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="ServiceTask_0sztuly_di" bpmnElement="ServiceTask_0sztuly">
-        <dc:Bounds x="384" y="525" width="100" height="80" />
+        <dc:Bounds x="453" y="520" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_0xxvjxq_di" bpmnElement="SequenceFlow_0xxvjxq">
         <di:waypoint xsi:type="dc:Point" x="1007" y="97" />
@@ -286,52 +286,52 @@ CreateNetworkInstance.sendSyncResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="ScriptTask_1hql91g_di" bpmnElement="ScriptTask_1hql91g">
-        <dc:Bounds x="563" y="525" width="100" height="80" />
+        <dc:Bounds x="632" y="520" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="CallActivity_1ksm1dz_di" bpmnElement="CallActivity_1ksm1dz">
-        <dc:Bounds x="738" y="525" width="100" height="80" />
+        <dc:Bounds x="807" y="520" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="SubProcess_1k2112i_di" bpmnElement="SubProcess_1k2112i" isExpanded="true">
-        <dc:Bounds x="-13" y="353" width="1021" height="404" />
+        <dc:Bounds x="56" y="348" width="1021" height="404" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="StartEvent_110xxgx_di" bpmnElement="StartEvent_110xxgx">
-        <dc:Bounds x="83" y="547" width="36" height="36" />
+        <dc:Bounds x="152" y="542" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="101" y="588" width="0" height="0" />
+          <dc:Bounds x="170" y="583" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="EndEvent_1rqikib_di" bpmnElement="EndEvent_1rqikib">
-        <dc:Bounds x="913" y="547" width="36" height="36" />
+        <dc:Bounds x="982" y="542" width="36" height="36" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="931" y="588" width="0" height="0" />
+          <dc:Bounds x="1000" y="583" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="SequenceFlow_1s5niqb_di" bpmnElement="SequenceFlow_1s5niqb">
-        <di:waypoint xsi:type="dc:Point" x="289" y="565" />
-        <di:waypoint xsi:type="dc:Point" x="384" y="565" />
+        <di:waypoint xsi:type="dc:Point" x="358" y="560" />
+        <di:waypoint xsi:type="dc:Point" x="453" y="560" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="337" y="550" width="0" height="0" />
+          <dc:Bounds x="406" y="545" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_06s5eu4_di" bpmnElement="SequenceFlow_06s5eu4">
-        <di:waypoint xsi:type="dc:Point" x="484" y="565" />
-        <di:waypoint xsi:type="dc:Point" x="563" y="565" />
+        <di:waypoint xsi:type="dc:Point" x="553" y="560" />
+        <di:waypoint xsi:type="dc:Point" x="632" y="560" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="524" y="550" width="0" height="0" />
+          <dc:Bounds x="593" y="545" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1reso2f_di" bpmnElement="SequenceFlow_1reso2f">
-        <di:waypoint xsi:type="dc:Point" x="663" y="565" />
-        <di:waypoint xsi:type="dc:Point" x="738" y="565" />
+        <di:waypoint xsi:type="dc:Point" x="732" y="560" />
+        <di:waypoint xsi:type="dc:Point" x="807" y="560" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="701" y="550" width="0" height="0" />
+          <dc:Bounds x="770" y="545" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_1ghqolv_di" bpmnElement="SequenceFlow_1ghqolv">
-        <di:waypoint xsi:type="dc:Point" x="838" y="565" />
-        <di:waypoint xsi:type="dc:Point" x="913" y="565" />
+        <di:waypoint xsi:type="dc:Point" x="907" y="560" />
+        <di:waypoint xsi:type="dc:Point" x="982" y="560" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="876" y="550" width="0" height="0" />
+          <dc:Bounds x="945" y="545" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_095crcd_di" bpmnElement="SequenceFlow_095crcd">
@@ -342,10 +342,10 @@ CreateNetworkInstance.sendSyncResponse(execution)]]></bpmn2:script>
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0n4umjf_di" bpmnElement="SequenceFlow_0n4umjf">
-        <di:waypoint xsi:type="dc:Point" x="119" y="565" />
-        <di:waypoint xsi:type="dc:Point" x="189" y="565" />
+        <di:waypoint xsi:type="dc:Point" x="188" y="560" />
+        <di:waypoint xsi:type="dc:Point" x="258" y="560" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds x="154" y="550" width="0" height="0" />
+          <dc:Bounds x="223" y="545" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="SequenceFlow_0rt8wax_di" bpmnElement="SequenceFlow_0rt8wax">
@@ -370,4 +370,4 @@ CreateNetworkInstance.sendSyncResponse(execution)]]></bpmn2:script>
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
+</bpmn2:definitions>