Merge "ControllerType update for CM flows"

5 files changed, 39 insertions, 6 deletions

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/ReplaceVnfInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/ReplaceVnfInfra.bpmn
index c15c391558..0e849a8a7b 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/ReplaceVnfInfra.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/ReplaceVnfInfra.bpmn
@@ -1,5 +1,5 @@
 <?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="_F0omAMXGEeW834CKd-K10Q" 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: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="_F0omAMXGEeW834CKd-K10Q" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="ReplaceVnfInfra" name="ReplaceVnfInfra" isExecutable="true">
     <bpmn2:scriptTask id="ScriptTask_1" name="Send Synch Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
@@ -109,6 +109,7 @@ uvfm.postProcessRollback(execution)]]></bpmn2:script>
           <camunda:in source="errorCode" target="errorCode" />
           <camunda:in source="rollbackQuiesceTraffic" target="rollbackQuiesceTraffic" />
           <camunda:out source="rollbackSuccessful" target="rollbackSuccessful" />
+          <camunda:in source="controllerType" target="controllerType" />
         </bpmn2:extensionElements>
         <bpmn2:incoming>SequenceFlow_0msgw6c</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0uhssvq</bpmn2:outgoing>
@@ -394,7 +395,8 @@ uvfm.prepDoCreateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="errorText" target="errorText" />
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
-        <camunda:out source="rollbackVnfLock" target="rollbackVnfLock" />        
+        <camunda:out source="rollbackVnfLock" target="rollbackVnfLock" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1bkhs8m</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1qfjlt7</bpmn2:incoming>
@@ -414,6 +416,7 @@ uvfm.prepDoCreateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:in source="vnfHostIpAddress" target="vnfHostIpAddress" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0qy68ib</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0x7iupc</bpmn2:incoming>
@@ -431,6 +434,7 @@ uvfm.prepDoCreateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="aicIdentity" target="aicIdentity" />
         <camunda:out source="rollbackVnfStop" target="rollbackVnfStop" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0q0qan8</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0hp0w6k</bpmn2:incoming>
@@ -448,6 +452,7 @@ uvfm.prepDoCreateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="aicIdentity" target="aicIdentity" />
         <camunda:out source="rollbackVnfStop" target="rollbackVnfStop" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_04zwhw4</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1lrbndo</bpmn2:incoming>
@@ -467,6 +472,7 @@ uvfm.prepDoCreateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:in source="vnfHostIpAddress" target="vnfHostIpAddress" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_162mm0m</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_14mblvp</bpmn2:incoming>
@@ -574,6 +580,7 @@ uvfm.prepDoCreateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:out source="rollbackVnfLock" target="rollbackVnfLock" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_197t3qk</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_18e0jz0</bpmn2:incoming>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVnfInfra.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVnfInfra.bpmn
index fa58c0b21b..4b805f87ab 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVnfInfra.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVnfInfra.bpmn
@@ -1,5 +1,5 @@
 <?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="_F0omAMXGEeW834CKd-K10Q" 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: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="_F0omAMXGEeW834CKd-K10Q" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="UpdateVnfInfra" name="UpdateVnfInfra" isExecutable="true">
     <bpmn2:scriptTask id="ScriptTask_1" name="Send Synch Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
@@ -109,6 +109,7 @@ uvfm.postProcessRollback(execution)]]></bpmn2:script>
           <camunda:in source="errorCode" target="errorCode" />
           <camunda:in source="rollbackQuiesceTraffic" target="rollbackQuiesceTraffic" />
           <camunda:out source="rollbackSuccessful" target="rollbackSuccessful" />
+          <camunda:in source="controllerType" target="controllerType" />
         </bpmn2:extensionElements>
         <bpmn2:incoming>SequenceFlow_0a0lfh8</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_0r0o5yt</bpmn2:outgoing>
@@ -366,6 +367,7 @@ uvfm.prepDoUpdateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:out source="rollbackVnfLock" target="rollbackVnfLock" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1bkhs8m</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0qmpjgv</bpmn2:incoming>
@@ -385,6 +387,7 @@ uvfm.prepDoUpdateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:in source="vnfHostIpAddress" target="vnfHostIpAddress" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0qy68ib</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0tld38t</bpmn2:incoming>
@@ -402,6 +405,7 @@ uvfm.prepDoUpdateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="aicIdentity" target="aicIdentity" />
         <camunda:out source="rollbackVnfStop" target="rollbackVnfStop" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0q0qan8</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_08dyt3l</bpmn2:incoming>
@@ -419,6 +423,7 @@ uvfm.prepDoUpdateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="aicIdentity" target="aicIdentity" />
         <camunda:out source="rollbackVnfStop" target="rollbackVnfStop" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_04zwhw4</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0ye8oij</bpmn2:incoming>
@@ -438,6 +443,7 @@ uvfm.prepDoUpdateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:in source="vnfHostIpAddress" target="vnfHostIpAddress" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_162mm0m</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_08kn9ok</bpmn2:incoming>
@@ -454,6 +460,7 @@ uvfm.prepDoUpdateVnfAndModules(execution)]]></bpmn2:script>
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:out source="rollbackVnfLock" target="rollbackVnfLock" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_197t3qk</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_02uiht9</bpmn2:incoming>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/VnfConfigUpdate.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/VnfConfigUpdate.bpmn
index 5915b9b592..01307b35b7 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/VnfConfigUpdate.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/VnfConfigUpdate.bpmn
@@ -1,5 +1,5 @@
 <?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="_F0omAMXGEeW834CKd-K10Q" 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: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="_F0omAMXGEeW834CKd-K10Q" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="VnfConfigUpdate" name="VnfConfigUpdate" isExecutable="true">
     <bpmn2:scriptTask id="ScriptTask_1" name="Send Synch Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
@@ -109,6 +109,7 @@ uvfm.postProcessRollback(execution)]]></bpmn2:script>
           <camunda:in source="errorCode" target="errorCode" />
           <camunda:in source="rollbackQuiesceTraffic" target="rollbackQuiesceTraffic" />
           <camunda:out source="rollbackSuccessful" target="rollbackSuccessful" />
+          <camunda:in source="controllerType" target="controllerType" />
         </bpmn2:extensionElements>
         <bpmn2:incoming>SequenceFlow_1vxpbd0</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_03ayqeh</bpmn2:outgoing>
@@ -562,6 +563,7 @@ uvfm.setClosedLoopDisabledInAAI(execution, false)
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:in source="vnfHostIpAddress" target="vnfHostIpAddress" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1cjiv6i</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1colra4</bpmn2:incoming>
@@ -581,6 +583,7 @@ uvfm.setClosedLoopDisabledInAAI(execution, false)
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:in source="vnfHostIpAddress" target="vnfHostIpAddress" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_16igl7b</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0q1skau</bpmn2:incoming>
@@ -597,6 +600,7 @@ uvfm.setClosedLoopDisabledInAAI(execution, false)
         <camunda:out source="errorText" target="errorText" />
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_188a7lk</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1wqinjh</bpmn2:incoming>
@@ -644,6 +648,7 @@ execution.getVariable(retryVariableName) < execution.getVariable("maxRetryCount"
         <camunda:in source="rollbackVnfLock" target="rollbackVnfLock" />
         <camunda:in source="errorCode" target="errorCode" />
         <camunda:out source="rollbackSuccessful" target="rollbackSuccessful" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1qr8msw</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_18lemf9</bpmn2:outgoing>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/VnfInPlaceUpdate.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/VnfInPlaceUpdate.bpmn
index b6361aaa20..362eb1ac05 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/VnfInPlaceUpdate.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/VnfInPlaceUpdate.bpmn
@@ -1,5 +1,5 @@
 <?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="_F0omAMXGEeW834CKd-K10Q" 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: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="_F0omAMXGEeW834CKd-K10Q" targetNamespace="http://camunda.org/schema/1.0/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3" xsi:schemaLocation="http://www.omg.org/spec/BPMN/20100524/MODEL BPMN20.xsd">
   <bpmn2:process id="VnfInPlaceUpdate" name="VnfInPlaceUpdate" isExecutable="true">
     <bpmn2:scriptTask id="ScriptTask_1" name="Send Synch Response" scriptFormat="groovy">
       <bpmn2:incoming>SequenceFlow_5</bpmn2:incoming>
@@ -95,6 +95,7 @@ uvfm.falloutHandlerPrep(execution, 'FalloutHandlerRequest')
           <camunda:in source="payload" target="payload" />
           <camunda:in source="vnfName" target="vnfName" />
           <camunda:in source="rollbackQuiesceTraffic" target="rollbackQuiesceTraffic" />
+          <camunda:in source="controllerType" target="controllerType" />
         </bpmn2:extensionElements>
         <bpmn2:incoming>SequenceFlow_0hvg70o</bpmn2:incoming>
         <bpmn2:outgoing>SequenceFlow_1qnzi6i</bpmn2:outgoing>
@@ -718,6 +719,7 @@ uvfm.setClosedLoopDisabledInAAI(execution, false)
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vmIdList" target="vmIdList" />
         <camunda:in source="aicIdentity" target="identityUrl" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1c0vdki</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0if6xj4</bpmn2:incoming>
@@ -734,6 +736,7 @@ uvfm.setClosedLoopDisabledInAAI(execution, false)
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:out source="rollbackVnfLock" target="rollbackVnfLock" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1cjiv6i</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1ood2pr</bpmn2:incoming>
@@ -750,6 +753,7 @@ uvfm.setClosedLoopDisabledInAAI(execution, false)
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:out source="rollbackVnfLock" target="rollbackVnfLock" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1q3bwlt</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1hwtq9x</bpmn2:incoming>
@@ -767,6 +771,7 @@ uvfm.setClosedLoopDisabledInAAI(execution, false)
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0qy68ib</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_16t9vai</bpmn2:incoming>
@@ -784,6 +789,7 @@ uvfm.setClosedLoopDisabledInAAI(execution, false)
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_162mm0m</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_16igl7b</bpmn2:incoming>
@@ -842,6 +848,7 @@ execution.getVariable(retryVariableName) < execution.getVariable("maxRetryCount"
         <camunda:in source="rollbackQuiesceTraffic" target="rollbackQuiesceTraffic" />
         <camunda:in source="payload" target="payload" />
         <camunda:in source="vnfName" target="vnfName" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1qr8msw</bpmn2:incoming>
       <bpmn2:outgoing>SequenceFlow_0syfgbo</bpmn2:outgoing>
@@ -860,6 +867,7 @@ execution.getVariable(retryVariableName) < execution.getVariable("maxRetryCount"
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:out source="rollbackQuiesceTraffic" target="rollbackQuiesceTraffic" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0q0qan8</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1urt6le</bpmn2:incoming>
@@ -877,6 +885,7 @@ execution.getVariable(retryVariableName) < execution.getVariable("maxRetryCount"
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1fuaq5k</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1v59be9</bpmn2:incoming>
@@ -894,6 +903,7 @@ execution.getVariable(retryVariableName) < execution.getVariable("maxRetryCount"
         <camunda:out source="workStep" target="workStep" />
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_0txgesu</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_1colra4</bpmn2:incoming>
@@ -912,6 +922,7 @@ execution.getVariable(retryVariableName) < execution.getVariable("maxRetryCount"
         <camunda:out source="failedActivity" target="failedActivity" />
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:out source="rollbackQuiesceTraffic" target="rollbackQuiesceTraffic" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn2:extensionElements>
       <bpmn2:incoming>SequenceFlow_1c2xyhk</bpmn2:incoming>
       <bpmn2:incoming>SequenceFlow_0yja56j</bpmn2:incoming>
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/RollbackVnf.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/RollbackVnf.bpmn
index 2fa1fa932c..4d1ccf9c8d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/RollbackVnf.bpmn
+++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/RollbackVnf.bpmn
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.4.0">
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="1.11.3">
   <bpmn:process id="RollbackVnf" name="RollbackVnf" isExecutable="true">
     <bpmn:startEvent id="StartEvent_1">
       <bpmn:outgoing>SequenceFlow_0bie3cu</bpmn:outgoing>
@@ -63,6 +63,7 @@ uvfm.preProcessRequest(execution)
         <camunda:in source="vnfId" target="vnfId" />
         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
         <camunda:out source="errorCode" target="rollbackErrorCode" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_1lne8je</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1ney8l6</bpmn:outgoing>
@@ -74,6 +75,7 @@ uvfm.preProcessRequest(execution)
         <camunda:in source="vnfId" target="vnfId" />
         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
         <camunda:out source="errorCode" target="rollbackErrorCode" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_0gsro0z</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_11556y3</bpmn:outgoing>
@@ -128,6 +130,7 @@ uvfm.setRollbackResult(execution)
         <camunda:in source="vnfName" target="vnfName" />
         <camunda:in source="isDebugLogEnabled" target="isDebugLogEnabled" />
         <camunda:out source="errorCode" target="rollbackErrorCode" />
+        <camunda:in source="controllerType" target="controllerType" />
       </bpmn:extensionElements>
       <bpmn:incoming>SequenceFlow_05ihl7f</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_1pirwg0</bpmn:outgoing>