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, 173 insertions, 172 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn
index 96c0681c48..15b5bc7fcf 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVfModuleVolumeInfraV1.bpmn
@@ -1,44 +1,45 @@
 <?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" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd" id="_ZBLUcCkQEeaY6ZhIaNLwzg" exporter="camunda modeler" exporterVersion="2.7.0" targetNamespace="http://camunda.org/schema/1.0/bpmn">
+<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="_ZBLUcCkQEeaY6ZhIaNLwzg" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="UpdateVfModuleVolumeInfraV1" name="UpdateVfModuleVolumeInfraV1" isExecutable="true">
     <bpmn2:endEvent id="EndEvent_4" name="TheEnd">
       <bpmn2:incoming>SequenceFlow_1</bpmn2:incoming>
-      <bpmn2:terminateEventDefinition id="TerminateEventDefinition_1"/>
+      <bpmn2:terminateEventDefinition id="TerminateEventDefinition_1" />
     </bpmn2:endEvent>
     <bpmn2:callActivity id="CallActivity_completionHandler" name="Completion Handler" calledElement="CompleteMsoProcess">
       <bpmn2:extensionElements>
-        <camunda:in source="UPDVfModVol_CompletionHandlerRequest" target="CompleteMsoProcessRequest"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:out source="CMSO_ResponseCode" target="UPDVfModVol_CMSO_ResponseCode"/>
-        <camunda:out source="CMSO_ErrorResponse" target="UPDVfModVol_CMSO_ErrorResponse"/>
+        <camunda:in source="UPDVfModVol_CompletionHandlerRequest" target="CompleteMsoProcessRequest" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:out source="CMSO_ResponseCode" target="UPDVfModVol_CMSO_ResponseCode" />
+        <camunda:out source="CMSO_ErrorResponse" target="UPDVfModVol_CMSO_ErrorResponse" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_13</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_14</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="CallActivity_completionHandler" targetRef="ScriptTask_postProcessTemp"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_14" name="" sourceRef="CallActivity_completionHandler" targetRef="ScriptTask_postProcessTemp" />
     <bpmn2:serviceTask id="ServiceTask_callUpdateInfraDb" name="Call Update Infra DB">
       <bpmn2:extensionElements>
         <camunda:connector>
-          <camunda:connectorId>http-connector</camunda:connectorId>
           <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">${UPDVfModVol_updateInfraRequest}</camunda:inputParameter>
             <camunda:inputParameter name="headers">
               <camunda:map>
                 <camunda:entry key="content-type">aapplication/soap+xml</camunda:entry>
+                <camunda:entry key="Authorization">#{BasicAuthHeaderValueDB}</camunda:entry>
               </camunda:map>
             </camunda:inputParameter>
             <camunda:inputParameter name="method">POST</camunda:inputParameter>
             <camunda:outputParameter name="UPDVfModVol_createDBResponse">${response}</camunda:outputParameter>
             <camunda:outputParameter name="UPDVfModVol_dbReturnCode">${statusCode}</camunda:outputParameter>
           </camunda:inputOutput>
+          <camunda:connectorId>http-connector</camunda:connectorId>
         </camunda:connector>
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_11</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_12</bpmn2:outgoing>
     </bpmn2:serviceTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="ServiceTask_callUpdateInfraDb" targetRef="ScriptTask_prepCompletionHandlerRequest"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_12" name="" sourceRef="ServiceTask_callUpdateInfraDb" targetRef="ScriptTask_prepCompletionHandlerRequest" />
     <bpmn2:scriptTask id="ScriptTask_prepVnfRest" name="Prepare VNF Adapter Rest Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_22</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_21</bpmn2:outgoing>
@@ -46,7 +47,7 @@
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('prepVnfAdapterRest', execution, isDebugLogEnabled)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ScriptTask_prepVnfRest" targetRef="CallActivity_callVNFAdapterRest"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_21" name="" sourceRef="ScriptTask_prepVnfRest" targetRef="CallActivity_callVNFAdapterRest" />
     <bpmn2:scriptTask id="ScriptTask_prepCompletionHandlerRequest" name="Prep Completion Handler Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_12</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_13</bpmn2:outgoing>
@@ -54,20 +55,20 @@ uvmv.executeMethod('prepVnfAdapterRest', execution, isDebugLogEnabled)]]></bpmn2
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('prepCompletionHandlerRequest', execution, UPDVfModVol_requestId, 'UPDATE', UPDVfModVol_source, isDebugLogEnabled)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ScriptTask_prepCompletionHandlerRequest" targetRef="CallActivity_completionHandler"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_13" name="" sourceRef="ScriptTask_prepCompletionHandlerRequest" targetRef="CallActivity_completionHandler" />
     <bpmn2:callActivity id="CallActivity_callVNFAdapterRest" name="VNFAdapterRest" calledElement="vnfAdapterRestV1">
       <bpmn2:extensionElements>
-        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-        <camunda:in source="mso-request-id" target="mso-request-id"/>
-        <camunda:out source="vnfAdapterRestV1Response" target="UPDVfModVol_vnfAdapterRestResponse"/>
-        <camunda:out source="WorkflowException" target="WorkflowException"/>
-        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-        <camunda:in source="UPDVfModVol_vnfAdapterRestRequest" target="vnfAdapterRestV1Request"/>
+        <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+        <camunda:in source="mso-request-id" target="mso-request-id" />
+        <camunda:out source="vnfAdapterRestV1Response" target="UPDVfModVol_vnfAdapterRestResponse" />
+        <camunda:out source="WorkflowException" target="WorkflowException" />
+        <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+        <camunda:in source="UPDVfModVol_vnfAdapterRestRequest" target="vnfAdapterRestV1Request" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_21</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_19</bpmn2:outgoing>
     </bpmn2:callActivity>
-    <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="CallActivity_callVNFAdapterRest" targetRef="ScriptTask_prepDbInfraRequest"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_19" name="" sourceRef="CallActivity_callVNFAdapterRest" targetRef="ScriptTask_prepDbInfraRequest" />
     <bpmn2:scriptTask id="ScriptTask_prepDbInfraRequest" name="Prep DB Infra Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_19</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_11</bpmn2:outgoing>
@@ -75,14 +76,14 @@ uvmv.executeMethod('prepCompletionHandlerRequest', execution, UPDVfModVol_reques
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('prepDbInfraDbRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_prepDbInfraRequest" targetRef="ServiceTask_callUpdateInfraDb"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_11" name="" sourceRef="ScriptTask_prepDbInfraRequest" targetRef="ServiceTask_callUpdateInfraDb" />
     <bpmn2:scriptTask id="ScriptTask_postProcessTemp" name="Set Success" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_14</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_1</bpmn2:outgoing>
       <bpmn2:script><![CDATA[// The following variable is checked by the unit test
 execution.setVariable("UpdateVfModuleVolumeSuccessIndicator", true)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="ScriptTask_postProcessTemp" targetRef="EndEvent_4"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_1" name="" sourceRef="ScriptTask_postProcessTemp" targetRef="EndEvent_4" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_2">
       <bpmn2:incoming>SequenceFlow_noVfModuleRelation</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_personaModelIdMatchYes</bpmn2:incoming>
@@ -91,13 +92,13 @@ execution.setVariable("UpdateVfModuleVolumeSuccessIndicator", true)]]></bpmn2:sc
     <bpmn2:subProcess id="SubProcess_errorHandler" name="Error Handler" triggeredByEvent="true">
       <bpmn2:startEvent id="StartEvent_catchAllErrors" name="Catch All Errors">
         <bpmn2:outgoing>SequenceFlow_7</bpmn2:outgoing>
-        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_77"/>
+        <bpmn2:errorEventDefinition id="_ErrorEventDefinition_77" />
       </bpmn2:startEvent>
       <bpmn2:endEvent id="EndEvent_3">
         <bpmn2:incoming>SequenceFlow_6</bpmn2:incoming>
-        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_11"/>
+        <bpmn2:terminateEventDefinition id="_TerminateEventDefinition_11" />
       </bpmn2:endEvent>
-      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="StartEvent_catchAllErrors" targetRef="ScriptTask_preFalloutHandler"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_7" name="" sourceRef="StartEvent_catchAllErrors" targetRef="ScriptTask_preFalloutHandler" />
       <bpmn2:scriptTask id="ScriptTask_preFalloutHandler" name="Fallout Handler (prep)" scriptFormat="groovy">
         <bpmn2:incoming>SequenceFlow_7</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_4</bpmn2:outgoing>
@@ -105,24 +106,24 @@ execution.setVariable("UpdateVfModuleVolumeSuccessIndicator", true)]]></bpmn2:sc
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('prepFalloutHandler', execution, isDebugLogEnabled)]]></bpmn2:script>
       </bpmn2:scriptTask>
-      <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_preFalloutHandler" targetRef="CallActivity_falloutHandler"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_4" name="" sourceRef="ScriptTask_preFalloutHandler" targetRef="CallActivity_falloutHandler" />
       <bpmn2:callActivity id="CallActivity_falloutHandler" name="Fallout Handler" calledElement="FalloutHandler">
         <bpmn2:extensionElements>
-          <camunda:in source="UPDVfModVol_FalloutHandlerRequest" target="FalloutHandlerRequest"/>
-          <camunda:in source="mso-request-id" target="mso-request-id"/>
-          <camunda:in source="mso-service-instance-id" target="mso-service-instance-id"/>
-          <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled"/>
-          <camunda:out source="FH_ResponseCode" target="UPDVfModVol_FH_ResponseCode"/>
-          <camunda:out source="FH_ErrorResponse" target="UPDVfModVol_FH_ErrorResponse"/>
-          <camunda:out source="FalloutHandlerResponse" target="UPDVfModVol_FalloutHandlerResponse"/>
+          <camunda:in source="UPDVfModVol_FalloutHandlerRequest" target="FalloutHandlerRequest" />
+          <camunda:in source="mso-request-id" target="mso-request-id" />
+          <camunda:in source="mso-service-instance-id" target="mso-service-instance-id" />
+          <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
+          <camunda:out source="FH_ResponseCode" target="UPDVfModVol_FH_ResponseCode" />
+          <camunda:out source="FH_ErrorResponse" target="UPDVfModVol_FH_ErrorResponse" />
+          <camunda:out source="FalloutHandlerResponse" target="UPDVfModVol_FalloutHandlerResponse" />
         </bpmn2:extensionElements>
         <bpmn2:incoming>SequenceFlow_4</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_6</bpmn2:outgoing>
       </bpmn2:callActivity>
-      <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="CallActivity_falloutHandler" targetRef="EndEvent_3"/>
+      <bpmn2:sequenceFlow id="SequenceFlow_6" name="" sourceRef="CallActivity_falloutHandler" targetRef="EndEvent_3" />
     </bpmn2:subProcess>
-    <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_prepVnfRest"/>
-    <bpmn2:exclusiveGateway id="ExclusiveGateway_personaModelIdMatch" name="Persona Model ID match?">
+    <bpmn2:sequenceFlow id="SequenceFlow_22" name="" sourceRef="ExclusiveGateway_2" targetRef="ScriptTask_prepVnfRest" />
+    <bpmn2:exclusiveGateway id="ExclusiveGateway_personaModelIdMatch" name="Persona Model ID match?" default="SequenceFlow_personaModelidMatchNo">
       <bpmn2:incoming>SequenceFlow_8</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_personaModelIdMatchYes</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_personaModelidMatchNo</bpmn2:outgoing>
@@ -130,7 +131,7 @@ uvmv.executeMethod('prepFalloutHandler', execution, isDebugLogEnabled)]]></bpmn2
     <bpmn2:sequenceFlow id="SequenceFlow_personaModelIdMatchYes" name="Yes" sourceRef="ExclusiveGateway_personaModelIdMatch" targetRef="ExclusiveGateway_2">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{UPDVfModVol_modelInvariantId == UPDVfModVol_personaModelId}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_personaModelidMatchNo" name="No" sourceRef="ExclusiveGateway_personaModelIdMatch" targetRef="ScriptTask_handlePersonaModelIdMismatch"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_personaModelidMatchNo" name="No" sourceRef="ExclusiveGateway_personaModelIdMatch" targetRef="ScriptTask_handlePersonaModelIdMismatch" />
     <bpmn2:scriptTask id="ScriptTask_queryAaiForVfModule" name="Query AAI for VF Module" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_YesVfModuleRelation</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_8</bpmn2:outgoing>
@@ -138,7 +139,7 @@ uvmv.executeMethod('prepFalloutHandler', execution, isDebugLogEnabled)]]></bpmn2
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('queryAAIForVfModule', execution, isDebugLogEnabled)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ScriptTask_queryAaiForVfModule" targetRef="ExclusiveGateway_personaModelIdMatch"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_8" name="" sourceRef="ScriptTask_queryAaiForVfModule" targetRef="ExclusiveGateway_personaModelIdMatch" />
     <bpmn2:scriptTask id="ScriptTask_handlePersonaModelIdMismatch" name="Handle Persona Model ID Mismatch" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_personaModelidMatchNo</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_18</bpmn2:outgoing>
@@ -146,10 +147,10 @@ uvmv.executeMethod('queryAAIForVfModule', execution, isDebugLogEnabled)]]></bpmn
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('handlePersonaModelIdMismatch', execution, isDebugLogEnabled)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="ScriptTask_handlePersonaModelIdMismatch" targetRef="EndEvent_personaModelIdMismatch"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_18" name="" sourceRef="ScriptTask_handlePersonaModelIdMismatch" targetRef="EndEvent_personaModelIdMismatch" />
     <bpmn2:endEvent id="EndEvent_personaModelIdMismatch">
       <bpmn2:incoming>SequenceFlow_18</bpmn2:incoming>
-      <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" errorRef="Error_1"/>
+      <bpmn2:errorEventDefinition id="ErrorEventDefinition_1" errorRef="Error_1" />
     </bpmn2:endEvent>
     <bpmn2:scriptTask id="ScriptTask_preProcessRequest" name="Pre-process Request" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_3</bpmn2:incoming>
@@ -158,11 +159,11 @@ uvmv.executeMethod('handlePersonaModelIdMismatch', execution, isDebugLogEnabled)
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ScriptTask_preProcessRequest" targetRef="ScriptTask_sendSynchResponse"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_2" name="" sourceRef="ScriptTask_preProcessRequest" targetRef="ScriptTask_sendSynchResponse" />
     <bpmn2:startEvent id="StartEvent_1" name="Start">
       <bpmn2:outgoing>SequenceFlow_3</bpmn2:outgoing>
     </bpmn2:startEvent>
-    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_preProcessRequest"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_3" name="" sourceRef="StartEvent_1" targetRef="ScriptTask_preProcessRequest" />
     <bpmn2:scriptTask id="ScriptTask_sendSynchResponse" name="Send Synch Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_2</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_20</bpmn2:outgoing>
@@ -170,22 +171,22 @@ uvmv.executeMethod('preProcessRequest', execution, isDebugLogEnabled)]]></bpmn2:
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('sendSynchResponse', execution, isDebugLogEnabled)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="ScriptTask_sendSynchResponse" targetRef="ScriptTask_queryAaiGenricVnf"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_20" name="" sourceRef="ScriptTask_sendSynchResponse" targetRef="ScriptTask_queryAaiGenricVnf" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_1" name="VF-MODULE relation?" default="SequenceFlow_noVfModuleRelation">
       <bpmn2:incoming>SequenceFlow_tenantIsMatch</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_YesVfModuleRelation</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_noVfModuleRelation</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
     <bpmn2:sequenceFlow id="SequenceFlow_YesVfModuleRelation" name="Yes" sourceRef="ExclusiveGateway_1" targetRef="ScriptTask_queryAaiForVfModule">
-      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{UPDVfModVol_relatedVfModuleLink != ''}</bpmn2:conditionExpression>
+      <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression"><![CDATA[#{UPDVfModVol_relatedVfModuleLink != ''}]]></bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
-    <bpmn2:sequenceFlow id="SequenceFlow_noVfModuleRelation" name="No" sourceRef="ExclusiveGateway_1" targetRef="ExclusiveGateway_2"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_noVfModuleRelation" name="No" sourceRef="ExclusiveGateway_1" targetRef="ExclusiveGateway_2" />
     <bpmn2:exclusiveGateway id="ExclusiveGateway_isTenantMatch" name="TenantId Match?" default="SequenceFlow_NoTenantMatch">
       <bpmn2:incoming>SequenceFlow_15</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_NoTenantMatch</bpmn2:outgoing>
       <bpmn2:outgoing>SequenceFlow_tenantIsMatch</bpmn2:outgoing>
     </bpmn2:exclusiveGateway>
-    <bpmn2:sequenceFlow id="SequenceFlow_NoTenantMatch" name="No" sourceRef="ExclusiveGateway_isTenantMatch" targetRef="ScriptTask_tenantIdMismatch"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_NoTenantMatch" name="No" sourceRef="ExclusiveGateway_isTenantMatch" targetRef="ScriptTask_tenantIdMismatch" />
     <bpmn2:sequenceFlow id="SequenceFlow_tenantIsMatch" name="Yes" sourceRef="ExclusiveGateway_isTenantMatch" targetRef="ExclusiveGateway_1">
       <bpmn2:conditionExpression xsi:type="bpmn2:tFormalExpression">#{UPDVfModVol_tenantId == UPDVfModVol_volumeGroupTenantId}</bpmn2:conditionExpression>
     </bpmn2:sequenceFlow>
@@ -196,10 +197,10 @@ uvmv.executeMethod('sendSynchResponse', execution, isDebugLogEnabled)]]></bpmn2:
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ScriptTask_tenantIdMismatch" targetRef="EndEvent_2"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_17" name="" sourceRef="ScriptTask_tenantIdMismatch" targetRef="EndEvent_2" />
     <bpmn2:endEvent id="EndEvent_2">
       <bpmn2:incoming>SequenceFlow_17</bpmn2:incoming>
-      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_76" errorRef="Error_1"/>
+      <bpmn2:errorEventDefinition id="_ErrorEventDefinition_76" errorRef="Error_1" />
     </bpmn2:endEvent>
     <bpmn2:scriptTask id="ScriptTask_queryAAI" name="Query AAI for Volume Group Info" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
@@ -208,7 +209,7 @@ uvmv.executeMethod('handleTenantIdMismatch', execution, isDebugLogEnabled)]]></b
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('queryAAIForVolumeGroup', execution, isDebugLogEnabled)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="ScriptTask_queryAAI" targetRef="ExclusiveGateway_isTenantMatch"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_15" name="" sourceRef="ScriptTask_queryAAI" targetRef="ExclusiveGateway_isTenantMatch" />
     <bpmn2:scriptTask id="ScriptTask_queryAaiGenricVnf" name="Query AAI for Generic VNF" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_20</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_5</bpmn2:outgoing>
@@ -216,301 +217,301 @@ uvmv.executeMethod('queryAAIForVolumeGroup', execution, isDebugLogEnabled)]]></b
 def uvmv = new UpdateVfModuleVolumeInfraV1()
 uvmv.executeMethod('queryAAIForGenericVnf', execution, isDebugLogEnabled)]]></bpmn2:script>
     </bpmn2:scriptTask>
-    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_queryAaiGenricVnf" targetRef="ScriptTask_queryAAI"/>
+    <bpmn2:sequenceFlow id="SequenceFlow_5" name="" sourceRef="ScriptTask_queryAaiGenricVnf" targetRef="ScriptTask_queryAAI" />
   </bpmn2:process>
-  <bpmn2:error id="Error_1" errorCode="MSOWorkflowException" name="MSOWorkflowException"/>
+  <bpmn2:error id="Error_1" name="MSOWorkflowException" errorCode="MSOWorkflowException" />
   <bpmndi:BPMNDiagram id="BPMNDiagram_1">
     <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="UpdateVfModuleVolumeInfraV1">
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_62" bpmnElement="StartEvent_1">
-        <dc:Bounds height="37.0" width="37.0" x="191.0" y="131.0"/>
+        <dc:Bounds x="191" y="131" width="37" height="37" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="34.0" x="192.0" y="173.0"/>
+          <dc:Bounds x="192" y="173" width="34" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_3" bpmnElement="SequenceFlow_3" sourceElement="_BPMNShape_StartEvent_62" targetElement="_BPMNShape_ScriptTask_231">
-        <di:waypoint xsi:type="dc:Point" x="227.0" y="149.0"/>
-        <di:waypoint xsi:type="dc:Point" x="268.0" y="149.0"/>
-        <di:waypoint xsi:type="dc:Point" x="268.0" y="150.0"/>
-        <di:waypoint xsi:type="dc:Point" x="295.0" y="150.0"/>
+        <di:waypoint xsi:type="dc:Point" x="227" y="149" />
+        <di:waypoint xsi:type="dc:Point" x="268" y="149" />
+        <di:waypoint xsi:type="dc:Point" x="268" y="150" />
+        <di:waypoint xsi:type="dc:Point" x="295" y="150" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="248.0" y="149.0"/>
+          <dc:Bounds x="248" y="149" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_42" bpmnElement="CallActivity_callVNFAdapterRest">
-        <dc:Bounds height="80.0" width="100.0" x="591.0" y="420.0"/>
+        <dc:Bounds x="591" y="420" width="100" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_230" bpmnElement="ScriptTask_postProcessTemp">
-        <dc:Bounds height="80.0" width="109.0" x="1318.0" y="420.0"/>
+        <dc:Bounds x="1318" y="420" width="109" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_231" bpmnElement="ScriptTask_preProcessRequest">
-        <dc:Bounds height="78.0" width="109.0" x="295.0" y="111.0"/>
+        <dc:Bounds x="295" y="111" width="109" height="78" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_232" bpmnElement="ScriptTask_sendSynchResponse">
-        <dc:Bounds height="76.0" width="109.0" x="454.0" y="112.0"/>
+        <dc:Bounds x="454" y="112" width="109" height="76" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_2" bpmnElement="SequenceFlow_2" sourceElement="_BPMNShape_ScriptTask_231" targetElement="_BPMNShape_ScriptTask_232">
-        <di:waypoint xsi:type="dc:Point" x="403.0" y="150.0"/>
-        <di:waypoint xsi:type="dc:Point" x="454.0" y="150.0"/>
+        <di:waypoint xsi:type="dc:Point" x="403" y="150" />
+        <di:waypoint xsi:type="dc:Point" x="454" y="150" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="418.0" y="150.0"/>
+          <dc:Bounds x="418" y="150" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_233" bpmnElement="ScriptTask_prepDbInfraRequest">
-        <dc:Bounds height="80.0" width="109.0" x="730.0" y="420.0"/>
+        <dc:Bounds x="730" y="420" width="109" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ServiceTask_101" bpmnElement="ServiceTask_callUpdateInfraDb">
-        <dc:Bounds height="80.0" width="109.0" x="868.0" y="420.0"/>
+        <dc:Bounds x="868" y="420" width="109" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_11" bpmnElement="SequenceFlow_11" sourceElement="_BPMNShape_ScriptTask_233" targetElement="_BPMNShape_ServiceTask_101">
-        <di:waypoint xsi:type="dc:Point" x="838.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="868.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="838" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="868" y="460" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="853.0" y="491.0"/>
+          <dc:Bounds x="853" y="491" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_12" bpmnElement="SequenceFlow_12" sourceElement="_BPMNShape_ServiceTask_101" targetElement="_BPMNShape_ScriptTask_234">
-        <di:waypoint xsi:type="dc:Point" x="976.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1014.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="976" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="1014" y="460" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="959.0" y="497.0"/>
+          <dc:Bounds x="959" y="497" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_234" bpmnElement="ScriptTask_prepCompletionHandlerRequest">
-        <dc:Bounds height="80.0" width="109.0" x="1014.0" y="420.0"/>
+        <dc:Bounds x="1014" y="420" width="109" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_43" bpmnElement="CallActivity_completionHandler">
-        <dc:Bounds height="61.0" width="109.0" x="1162.0" y="429.0"/>
+        <dc:Bounds x="1162" y="429" width="109" height="61" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_13" bpmnElement="SequenceFlow_13" sourceElement="_BPMNShape_ScriptTask_234" targetElement="_BPMNShape_CallActivity_43">
-        <di:waypoint xsi:type="dc:Point" x="1122.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1162.0" y="459.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1122" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="1162" y="459" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1134.0" y="477.0"/>
+          <dc:Bounds x="1134" y="477" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_14" bpmnElement="SequenceFlow_14" sourceElement="_BPMNShape_CallActivity_43" targetElement="_BPMNShape_ScriptTask_230">
-        <di:waypoint xsi:type="dc:Point" x="1270.0" y="459.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1318.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1270" y="459" />
+        <di:waypoint xsi:type="dc:Point" x="1318" y="460" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1216.0" y="521.0"/>
+          <dc:Bounds x="1216" y="521" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_235" bpmnElement="ScriptTask_queryAAI">
-        <dc:Bounds height="73.0" width="109.0" x="742.0" y="113.0"/>
+        <dc:Bounds x="742" y="113" width="109" height="73" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_126" bpmnElement="ExclusiveGateway_isTenantMatch" isMarkerVisible="true">
-        <dc:Bounds height="34.0" width="34.0" x="931.0" y="132.0"/>
+        <dc:Bounds x="931" y="132" width="34" height="34" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="102.0" x="898.0" y="113.0"/>
+          <dc:Bounds x="898" y="113" width="102" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_236" bpmnElement="ScriptTask_tenantIdMismatch">
-        <dc:Bounds height="75.0" width="97.0" x="1064.0" y="112.0"/>
+        <dc:Bounds x="1064" y="112" width="97" height="75" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_15" bpmnElement="SequenceFlow_15" sourceElement="_BPMNShape_ScriptTask_235" targetElement="_BPMNShape_ExclusiveGateway_126">
-        <di:waypoint xsi:type="dc:Point" x="850.0" y="149.0"/>
-        <di:waypoint xsi:type="dc:Point" x="931.0" y="149.0"/>
+        <di:waypoint xsi:type="dc:Point" x="850" y="149" />
+        <di:waypoint xsi:type="dc:Point" x="931" y="149" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="877.0" y="149.0"/>
+          <dc:Bounds x="877" y="149" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_16" bpmnElement="SequenceFlow_NoTenantMatch" sourceElement="_BPMNShape_ExclusiveGateway_126" targetElement="_BPMNShape_ScriptTask_236">
-        <di:waypoint xsi:type="dc:Point" x="965.0" y="149.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1064.0" y="149.0"/>
+        <di:waypoint xsi:type="dc:Point" x="965" y="149" />
+        <di:waypoint xsi:type="dc:Point" x="1064" y="149" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="986.0" y="149.0"/>
+          <dc:Bounds x="986" y="149" width="22" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_169" bpmnElement="EndEvent_2">
-        <dc:Bounds height="49.0" width="49.0" x="1225.0" y="125.0"/>
+        <dc:Bounds x="1225" y="125" width="49" height="49" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="1249.0" y="179.0"/>
+          <dc:Bounds x="1249" y="179" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_17" bpmnElement="SequenceFlow_17" sourceElement="_BPMNShape_ScriptTask_236" targetElement="_BPMNShape_EndEvent_169">
-        <di:waypoint xsi:type="dc:Point" x="1160.0" y="149.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1225.0" y="149.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1160" y="149" />
+        <di:waypoint xsi:type="dc:Point" x="1225" y="149" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1179.0" y="149.0"/>
+          <dc:Bounds x="1179" y="149" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_18" bpmnElement="SequenceFlow_tenantIsMatch" sourceElement="_BPMNShape_ExclusiveGateway_126" targetElement="_BPMNShape_ExclusiveGateway_254">
-        <di:waypoint xsi:type="dc:Point" x="948.0" y="166.0"/>
-        <di:waypoint xsi:type="dc:Point" x="948.0" y="244.0"/>
+        <di:waypoint xsi:type="dc:Point" x="948" y="166" />
+        <di:waypoint xsi:type="dc:Point" x="948" y="244" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="915.0" y="173.0"/>
+          <dc:Bounds x="915" y="173" width="29" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_19" bpmnElement="SequenceFlow_19" sourceElement="_BPMNShape_CallActivity_42" targetElement="_BPMNShape_ScriptTask_233">
-        <di:waypoint xsi:type="dc:Point" x="691.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="730.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="691" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="730" y="460" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="712.0" y="531.0"/>
+          <dc:Bounds x="712" y="531" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_20" bpmnElement="SequenceFlow_20" sourceElement="_BPMNShape_ScriptTask_232" targetElement="_BPMNShape_ScriptTask_318">
-        <di:waypoint xsi:type="dc:Point" x="562.0" y="150.0"/>
-        <di:waypoint xsi:type="dc:Point" x="581.0" y="150.0"/>
-        <di:waypoint xsi:type="dc:Point" x="581.0" y="149.0"/>
-        <di:waypoint xsi:type="dc:Point" x="612.0" y="149.0"/>
+        <di:waypoint xsi:type="dc:Point" x="562" y="150" />
+        <di:waypoint xsi:type="dc:Point" x="581" y="150" />
+        <di:waypoint xsi:type="dc:Point" x="581" y="149" />
+        <di:waypoint xsi:type="dc:Point" x="612" y="149" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="578.0" y="150.0"/>
+          <dc:Bounds x="578" y="150" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_237" bpmnElement="ScriptTask_prepVnfRest">
-        <dc:Bounds height="80.0" width="109.0" x="454.0" y="420.0"/>
+        <dc:Bounds x="454" y="420" width="109" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_21" bpmnElement="SequenceFlow_21" sourceElement="_BPMNShape_ScriptTask_237" targetElement="_BPMNShape_CallActivity_42">
-        <di:waypoint xsi:type="dc:Point" x="562.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="591.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="562" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="591" y="460" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="446.0" y="460.0"/>
+          <dc:Bounds x="446" y="460" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_SubProcess_18" bpmnElement="SubProcess_errorHandler" isExpanded="true">
-        <dc:Bounds height="187.0" width="781.0" x="250.0" y="786.0"/>
+        <dc:Bounds x="250" y="786" width="781" height="187" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_StartEvent_63" bpmnElement="StartEvent_catchAllErrors">
-        <dc:Bounds height="37.0" width="37.0" x="301.0" y="844.0"/>
+        <dc:Bounds x="301" y="844" width="37" height="37" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="98.0" x="270.0" y="886.0"/>
+          <dc:Bounds x="270" y="886" width="98" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_238" bpmnElement="ScriptTask_preFalloutHandler">
-        <dc:Bounds height="61.0" width="109.0" x="445.0" y="832.0"/>
+        <dc:Bounds x="445" y="832" width="109" height="61" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_CallActivity_44" bpmnElement="CallActivity_falloutHandler">
-        <dc:Bounds height="61.0" width="109.0" x="639.0" y="832.0"/>
+        <dc:Bounds x="639" y="832" width="109" height="61" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_4" bpmnElement="SequenceFlow_4" sourceElement="_BPMNShape_ScriptTask_238" targetElement="_BPMNShape_CallActivity_44">
-        <di:waypoint xsi:type="dc:Point" x="553.0" y="862.0"/>
-        <di:waypoint xsi:type="dc:Point" x="639.0" y="862.0"/>
+        <di:waypoint xsi:type="dc:Point" x="553" y="862" />
+        <di:waypoint xsi:type="dc:Point" x="639" y="862" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="573.0" y="946.0"/>
+          <dc:Bounds x="573" y="946" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_170" bpmnElement="EndEvent_3">
-        <dc:Bounds height="37.0" width="37.0" x="862.0" y="844.0"/>
+        <dc:Bounds x="862" y="844" width="37" height="37" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="880.0" y="886.0"/>
+          <dc:Bounds x="880" y="886" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_6" bpmnElement="SequenceFlow_6" sourceElement="_BPMNShape_CallActivity_44" targetElement="_BPMNShape_EndEvent_170">
-        <di:waypoint xsi:type="dc:Point" x="747.0" y="862.0"/>
-        <di:waypoint xsi:type="dc:Point" x="862.0" y="862.0"/>
+        <di:waypoint xsi:type="dc:Point" x="747" y="862" />
+        <di:waypoint xsi:type="dc:Point" x="862" y="862" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="765.0" y="1030.0"/>
+          <dc:Bounds x="765" y="1030" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_171" bpmnElement="EndEvent_4">
-        <dc:Bounds height="43.0" width="43.0" x="1461.0" y="438.0"/>
+        <dc:Bounds x="1461" y="438" width="43" height="43" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="50.0" x="1457.0" y="486.0"/>
+          <dc:Bounds x="1457" y="486" width="50" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_1" bpmnElement="SequenceFlow_1" sourceElement="_BPMNShape_ScriptTask_230" targetElement="_BPMNShape_EndEvent_171">
-        <di:waypoint xsi:type="dc:Point" x="1426.0" y="460.0"/>
-        <di:waypoint xsi:type="dc:Point" x="1461.0" y="459.0"/>
+        <di:waypoint xsi:type="dc:Point" x="1426" y="460" />
+        <di:waypoint xsi:type="dc:Point" x="1461" y="459" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="1442.0" y="467.0"/>
+          <dc:Bounds x="1442" y="467" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_7" bpmnElement="SequenceFlow_7" sourceElement="_BPMNShape_StartEvent_63" targetElement="_BPMNShape_ScriptTask_238">
-        <di:waypoint xsi:type="dc:Point" x="337.0" y="862.0"/>
-        <di:waypoint xsi:type="dc:Point" x="445.0" y="862.0"/>
+        <di:waypoint xsi:type="dc:Point" x="337" y="862" />
+        <di:waypoint xsi:type="dc:Point" x="445" y="862" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="385.0" y="1030.0"/>
+          <dc:Bounds x="385" y="1030" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_254" bpmnElement="ExclusiveGateway_1" isMarkerVisible="true">
-        <dc:Bounds height="34.0" width="34.0" x="931.0" y="244.0"/>
+        <dc:Bounds x="931" y="244" width="34" height="34" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="135.0" x="881.0" y="283.0"/>
+          <dc:Bounds x="881" y="283" width="135" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_5" bpmnElement="SequenceFlow_YesVfModuleRelation" sourceElement="_BPMNShape_ExclusiveGateway_254" targetElement="_BPMNShape_ScriptTask_313">
-        <di:waypoint xsi:type="dc:Point" x="931.0" y="261.0"/>
-        <di:waypoint xsi:type="dc:Point" x="634.0" y="261.0"/>
-        <di:waypoint xsi:type="dc:Point" x="634.0" y="262.0"/>
-        <di:waypoint xsi:type="dc:Point" x="405.0" y="262.0"/>
+        <di:waypoint xsi:type="dc:Point" x="931" y="261" />
+        <di:waypoint xsi:type="dc:Point" x="634" y="261" />
+        <di:waypoint xsi:type="dc:Point" x="634" y="262" />
+        <di:waypoint xsi:type="dc:Point" x="405" y="262" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="729.0" y="261.0"/>
+          <dc:Bounds x="729" y="261" width="29" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_313" bpmnElement="ScriptTask_queryAaiForVfModule">
-        <dc:Bounds height="80.0" width="109.0" x="297.0" y="222.0"/>
+        <dc:Bounds x="297" y="222" width="109" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_255" bpmnElement="ExclusiveGateway_personaModelIdMatch" isMarkerVisible="true">
-        <dc:Bounds height="34.0" width="34.0" x="333.0" y="346.0"/>
+        <dc:Bounds x="333" y="346" width="34" height="34" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="156.0" x="272.0" y="385.0"/>
+          <dc:Bounds x="272" y="385" width="156" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_8" bpmnElement="SequenceFlow_8" sourceElement="_BPMNShape_ScriptTask_313" targetElement="_BPMNShape_ExclusiveGateway_255">
-        <di:waypoint xsi:type="dc:Point" x="350.0" y="302.0"/>
-        <di:waypoint xsi:type="dc:Point" x="350.0" y="329.0"/>
-        <di:waypoint xsi:type="dc:Point" x="350.0" y="346.0"/>
+        <di:waypoint xsi:type="dc:Point" x="350" y="302" />
+        <di:waypoint xsi:type="dc:Point" x="350" y="329" />
+        <di:waypoint xsi:type="dc:Point" x="350" y="346" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="347.0" y="318.0"/>
+          <dc:Bounds x="347" y="318" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_9" bpmnElement="SequenceFlow_personaModelIdMatchYes" sourceElement="_BPMNShape_ExclusiveGateway_255" targetElement="_BPMNShape_ExclusiveGateway_256">
-        <di:waypoint xsi:type="dc:Point" x="367.0" y="363.0"/>
-        <di:waypoint xsi:type="dc:Point" x="491.0" y="363.0"/>
+        <di:waypoint xsi:type="dc:Point" x="367" y="363" />
+        <di:waypoint xsi:type="dc:Point" x="491" y="363" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="29.0" x="398.0" y="363.0"/>
+          <dc:Bounds x="398" y="363" width="29" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ExclusiveGateway_256" bpmnElement="ExclusiveGateway_2" isMarkerVisible="true">
-        <dc:Bounds height="34.0" width="34.0" x="491.0" y="346.0"/>
+        <dc:Bounds x="491" y="346" width="34" height="34" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="508.0" y="385.0"/>
+          <dc:Bounds x="508" y="385" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_10" bpmnElement="SequenceFlow_noVfModuleRelation" sourceElement="_BPMNShape_ExclusiveGateway_254" targetElement="_BPMNShape_ExclusiveGateway_256">
-        <di:waypoint xsi:type="dc:Point" x="948.0" y="278.0"/>
-        <di:waypoint xsi:type="dc:Point" x="948.0" y="363.0"/>
-        <di:waypoint xsi:type="dc:Point" x="701.0" y="363.0"/>
-        <di:waypoint xsi:type="dc:Point" x="525.0" y="363.0"/>
+        <di:waypoint xsi:type="dc:Point" x="948" y="278" />
+        <di:waypoint xsi:type="dc:Point" x="948" y="363" />
+        <di:waypoint xsi:type="dc:Point" x="701" y="363" />
+        <di:waypoint xsi:type="dc:Point" x="525" y="363" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="795.0" y="363.0"/>
+          <dc:Bounds x="795" y="363" width="22" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_22" bpmnElement="SequenceFlow_personaModelidMatchNo" sourceElement="_BPMNShape_ExclusiveGateway_255" targetElement="_BPMNShape_ScriptTask_315">
-        <di:waypoint xsi:type="dc:Point" x="350.0" y="380.0"/>
-        <di:waypoint xsi:type="dc:Point" x="350.0" y="401.0"/>
-        <di:waypoint xsi:type="dc:Point" x="351.0" y="460.0"/>
+        <di:waypoint xsi:type="dc:Point" x="350" y="380" />
+        <di:waypoint xsi:type="dc:Point" x="350" y="401" />
+        <di:waypoint xsi:type="dc:Point" x="351" y="460" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="22.0" width="22.0" x="350.0" y="409.0"/>
+          <dc:Bounds x="350" y="409" width="22" height="22" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_315" bpmnElement="ScriptTask_handlePersonaModelIdMismatch">
-        <dc:Bounds height="80.0" width="109.0" x="297.0" y="460.0"/>
+        <dc:Bounds x="297" y="460" width="109" height="80" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNShape id="_BPMNShape_EndEvent_172" bpmnElement="EndEvent_personaModelIdMismatch">
-        <dc:Bounds height="43.0" width="43.0" x="330.0" y="600.0"/>
+        <dc:Bounds x="330" y="600" width="43" height="43" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="0.0" width="0.0" x="351.0" y="648.0"/>
+          <dc:Bounds x="351" y="648" width="0" height="0" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_24" bpmnElement="SequenceFlow_18" sourceElement="_BPMNShape_ScriptTask_315" targetElement="_BPMNShape_EndEvent_172">
-        <di:waypoint xsi:type="dc:Point" x="351.0" y="540.0"/>
-        <di:waypoint xsi:type="dc:Point" x="351.0" y="600.0"/>
+        <di:waypoint xsi:type="dc:Point" x="351" y="540" />
+        <di:waypoint xsi:type="dc:Point" x="351" y="600" />
         <bpmndi:BPMNLabel>
-          <dc:Bounds height="6.0" width="6.0" x="348.0" y="560.0"/>
+          <dc:Bounds x="348" y="560" width="6" height="6" />
         </bpmndi:BPMNLabel>
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_25" bpmnElement="SequenceFlow_22" sourceElement="_BPMNShape_ExclusiveGateway_256" targetElement="_BPMNShape_ScriptTask_237">
-        <di:waypoint xsi:type="dc:Point" x="508.0" y="380.0"/>
-        <di:waypoint xsi:type="dc:Point" x="508.0" y="420.0"/>
+        <di:waypoint xsi:type="dc:Point" x="508" y="380" />
+        <di:waypoint xsi:type="dc:Point" x="508" y="420" />
       </bpmndi:BPMNEdge>
       <bpmndi:BPMNShape id="_BPMNShape_ScriptTask_318" bpmnElement="ScriptTask_queryAaiGenricVnf">
-        <dc:Bounds height="75.0" width="97.0" x="612.0" y="112.0"/>
+        <dc:Bounds x="612" y="112" width="97" height="75" />
       </bpmndi:BPMNShape>
       <bpmndi:BPMNEdge id="BPMNEdge_SequenceFlow_23" bpmnElement="SequenceFlow_5" sourceElement="_BPMNShape_ScriptTask_318" targetElement="_BPMNShape_ScriptTask_235">
-        <di:waypoint xsi:type="dc:Point" x="708.0" y="149.0"/>
-        <di:waypoint xsi:type="dc:Point" x="742.0" y="149.0"/>
+        <di:waypoint xsi:type="dc:Point" x="708" y="149" />
+        <di:waypoint xsi:type="dc:Point" x="742" y="149" />
       </bpmndi:BPMNEdge>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn2:definitions>
\ No newline at end of file
+</bpmn2:definitions>