summaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorElena Kuleshov <ek1439@att.com>2018-03-28 11:25:31 -0400
committerRob Daugherty <rd472p@att.com>2018-03-28 13:56:23 -0400
commit19efd68c8f8babdaf8a2eb7f78b4522940339da2 (patch)
tree3dccdd401467d51e2c1eb182b9bec07b18fdc84c /bpmn
parent35a1423d200962910d508a8f9a0daba9d6c668d2 (diff)
ControllerType update for CM flows
Change-Id: I42c60ba45baaf29fa5fe54a8bb7ffc0aab5622c7 Signed-off-by: Elena Kuleshov <ek1439@att.com> Issue-ID: SO-526
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy7
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerAction.java47
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java18
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestrator.java4
-rw-r--r--bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java11
-rw-r--r--bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java4
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/ReplaceVnfInfra.groovy8
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy8
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/VnfConfigUpdate.groovy10
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/VnfInPlaceUpdate.groovy8
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/resources/process/ReplaceVnfInfra.bpmn11
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/resources/process/UpdateVnfInfra.bpmn9
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/resources/process/VnfConfigUpdate.bpmn7
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/resources/process/VnfInPlaceUpdate.bpmn13
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/resources/subprocess/RollbackVnf.bpmn5
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json1
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json1
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json1
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json1
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties4
20 files changed, 124 insertions, 54 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy
index 8df6af7adb..ca7eef8aa1 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/openecomp/mso/bpmn/common/scripts/AppCClient.groovy
@@ -27,6 +27,8 @@ import java.util.UUID;
* @param - vnfId
* @param - action
* @param - payload
+ * @param - vnfName
+ * @param - controllerType
*
* Outputs:
* @param - errorcode
@@ -72,7 +74,8 @@ public class AppCClient extends AbstractServiceTaskProcessor{
String vnfHostIpAddress = execution.getVariable('vnfHostIpAddress')
String vmIdList = execution.getVariable("vmIdList")
String identityUrl = execution.getVariable("identityUrl")
- HashMap<String, String> payloadInfo = new HashMap<String, String>();
+ String controllerType = execution.getVariable("controllerType")
+ HashMap<String, String> payloadInfo = new HashMap<String, String>();
payloadInfo.put("vnfName", vnfName)
payloadInfo.put("aicIdentity", aicIdentity)
payloadInfo.put("vnfHostIpAddress", vnfHostIpAddress)
@@ -96,7 +99,7 @@ public class AppCClient extends AbstractServiceTaskProcessor{
ApplicationControllerAction client = new ApplicationControllerAction()
utils.log("DEBUG", "Created Application Controller Action Object", isDebugLogEnabled)
//PayloadInfo contains extra information that adds on to payload before making request to appc
- client.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo)
+ client.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType)
utils.log("DEBUG", "ran through the main method for Application Contoller", isDebugLogEnabled)
appcCode = client.getErrorCode()
appcMessage = client.getErrorMessage()
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerAction.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerAction.java
index 8b870889ac..44da566ec7 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerAction.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerAction.java
@@ -46,8 +46,7 @@ public class ApplicationControllerAction {
private String errorMessage = "Unable to reach App C Servers";
protected final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
- public void runAppCCommand(Action action, String msoRequestId, String vnfId, Optional<String> payload, HashMap<String, String> payloadInfo){
- Status appCStatus = null;
+ public void runAppCCommand(Action action, String msoRequestId, String vnfId, Optional<String> payload, HashMap<String, String> payloadInfo, String controllerType){ Status appCStatus = null;
try{
String vnfName = payloadInfo.getOrDefault("vnfName", "");
String aicIdentity = payloadInfo.getOrDefault("vnfName","");
@@ -56,21 +55,21 @@ public class ApplicationControllerAction {
String identityUrl = payloadInfo.getOrDefault("identityUrl", "");
switch(action){
case ResumeTraffic:
- appCStatus = resumeTrafficAction(msoRequestId, vnfId, vnfName);
+ appCStatus = resumeTrafficAction(msoRequestId, vnfId, vnfName, controllerType);
break;
case Start:
case Stop:
- appCStatus = startStopAction(action, msoRequestId, vnfId, aicIdentity);
+ appCStatus = startStopAction(action, msoRequestId, vnfId, aicIdentity, controllerType);
break;
case Unlock:
case Lock:
- appCStatus = client.vnfCommand(action, msoRequestId, vnfId, Optional.empty());
+ appCStatus = client.vnfCommand(action, msoRequestId, vnfId, Optional.empty(), controllerType);
break;
case QuiesceTraffic:
- appCStatus = quiesceTrafficAction(msoRequestId, vnfId, payload, vnfName);
+ appCStatus = quiesceTrafficAction(msoRequestId, vnfId, payload, vnfName, controllerType);
break;
case HealthCheck:
- appCStatus = healthCheckAction(msoRequestId, vnfId, vnfName, vnfHostIpAddress);
+ appCStatus = healthCheckAction(msoRequestId, vnfId, vnfName, vnfHostIpAddress, controllerType);
break;
case Snapshot:
String vmIds = JsonUtils.getJsonValue(vmIdList, "vmIds");
@@ -80,18 +79,18 @@ public class ApplicationControllerAction {
int i = 0;
while(i < vmIdJsonList.size()){
vmId = vmIdJsonList.get(i);
- appCStatus = snapshotAction(msoRequestId, vnfId, vmId, identityUrl);
+ appCStatus = snapshotAction(msoRequestId, vnfId, vmId, identityUrl, controllerType);
i++;
}
break;
case ConfigModify:
- appCStatus = payloadAction(action, msoRequestId, vnfId, payload);
+ appCStatus = payloadAction(action, msoRequestId, vnfId, payload, controllerType);
break;
case UpgradePreCheck:
case UpgradePostCheck:
case UpgradeSoftware:
case UpgradeBackup:
- appCStatus = upgradeAction(action,msoRequestId, vnfId, payload, vnfName);
+ appCStatus = upgradeAction(action,msoRequestId, vnfId, payload, vnfName, controllerType);
break;
default:
errorMessage = "Unable to idenify Action request for AppCClient";
@@ -125,47 +124,47 @@ public class ApplicationControllerAction {
}
}
- private Status payloadAction(Action action, String msoRequestId, String vnfId, Optional<String> payload) throws JsonProcessingException, Exception{
+ private Status payloadAction(Action action, String msoRequestId, String vnfId, Optional<String> payload, String controllerType) throws JsonProcessingException, Exception{
if(!(payload.isPresent())){
throw new IllegalArgumentException("Payload is not present for " + action.toString());
}
- return client.vnfCommand(action, msoRequestId, vnfId, payload);
+ return client.vnfCommand(action, msoRequestId, vnfId, payload, controllerType);
}
- private Status quiesceTrafficAction(String msoRequestId, String vnfId, Optional<String> payload, String vnfName) throws JsonProcessingException, Exception{
+ private Status quiesceTrafficAction(String msoRequestId, String vnfId, Optional<String> payload, String vnfName, String controllerType) throws JsonProcessingException, Exception{
if(!(payload.isPresent())){
throw new IllegalArgumentException("Payload is not present for " + Action.QuiesceTraffic.toString());
}
payload = PayloadClient.quiesceTrafficFormat(payload, vnfName);
- return client.vnfCommand(Action.QuiesceTraffic, msoRequestId, vnfId, payload);
+ return client.vnfCommand(Action.QuiesceTraffic, msoRequestId, vnfId, payload, controllerType);
}
- private Status upgradeAction(Action action, String msoRequestId, String vnfId, Optional<String> payload, String vnfName) throws JsonProcessingException, Exception{
+ private Status upgradeAction(Action action, String msoRequestId, String vnfId, Optional<String> payload, String vnfName, String controllerType) throws JsonProcessingException, Exception{
if(!(payload.isPresent())){
throw new IllegalArgumentException("Payload is not present for " + action.toString());
}
payload = PayloadClient.upgradeFormat(payload, vnfName);
- return client.vnfCommand(action, msoRequestId, vnfId, payload);
+ return client.vnfCommand(action, msoRequestId, vnfId, payload, controllerType);
}
- private Status resumeTrafficAction(String msoRequestId, String vnfId, String vnfName)throws JsonProcessingException, Exception{
+ private Status resumeTrafficAction(String msoRequestId, String vnfId, String vnfName, String controllerType)throws JsonProcessingException, Exception{
Optional<String> payload = PayloadClient.resumeTrafficFormat(vnfName);
- return client.vnfCommand(Action.ResumeTraffic, msoRequestId, vnfId, payload);
+ return client.vnfCommand(Action.ResumeTraffic, msoRequestId, vnfId, payload, controllerType);
}
- private Status startStopAction(Action action, String msoRequestId, String vnfId, String aicIdentity)throws JsonProcessingException, Exception{
+ private Status startStopAction(Action action, String msoRequestId, String vnfId, String aicIdentity, String controllerType)throws JsonProcessingException, Exception{
Optional<String> payload = PayloadClient.startStopFormat(aicIdentity);
- return client.vnfCommand(action, msoRequestId, vnfId, payload);
+ return client.vnfCommand(action, msoRequestId, vnfId, payload, controllerType);
}
- private Status healthCheckAction(String msoRequestId, String vnfId, String vnfName, String vnfHostIpAddress)throws JsonProcessingException, Exception{
+ private Status healthCheckAction(String msoRequestId, String vnfId, String vnfName, String vnfHostIpAddress, String controllerType)throws JsonProcessingException, Exception{
Optional<String> payload = PayloadClient.healthCheckFormat(vnfName, vnfHostIpAddress);
- return client.vnfCommand(Action.HealthCheck, msoRequestId, vnfId, payload);
+ return client.vnfCommand(Action.HealthCheck, msoRequestId, vnfId, payload, controllerType);
}
- private Status snapshotAction(String msoRequestId, String vnfId, String vmId, String identityUrl) throws JsonProcessingException, Exception{
+ private Status snapshotAction(String msoRequestId, String vnfId, String vmId, String identityUrl, String controllerType) throws JsonProcessingException, Exception{
Optional<String> payload = PayloadClient.snapshotFormat(vmId, identityUrl);
- return client.vnfCommand(Action.Snapshot, msoRequestId, vnfId, payload);
+ return client.vnfCommand(Action.Snapshot, msoRequestId, vnfId, payload, controllerType);
}
public String getErrorMessage(){
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
index c383408488..8c57b9255c 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerClient.java
@@ -60,11 +60,11 @@ public class ApplicationControllerClient {
@Autowired
public ApplicationControllerSupport appCSupport;
- private static LifeCycleManagerStateful client;
+ private static LifeCycleManagerStateful client;
- public ApplicationControllerClient() {
+ public ApplicationControllerClient(String controllerType) {
appCSupport = new ApplicationControllerSupport();
- client = this.getAppCClient();
+ client = this.getAppCClient(controllerType);
}
public Status runCommand(Action action, org.onap.appc.client.lcm.model.ActionIdentifiers actionIdentifiers, org.onap.appc.client.lcm.model.Payload payload, String requestID)
@@ -81,27 +81,31 @@ public class ApplicationControllerClient {
}
}
- public LifeCycleManagerStateful getAppCClient() {
+ public LifeCycleManagerStateful getAppCClient(String controllerType) {
if (client == null)
try {
client = AppcClientServiceFactoryProvider.getFactory(AppcLifeCycleManagerServiceFactory.class)
- .createLifeCycleManagerStateful(new ApplicationContext(), getLCMProperties());
+ .createLifeCycleManagerStateful(new ApplicationContext(), getLCMProperties(controllerType));
} catch (AppcClientException e) {
auditLogger.log(Level.ERROR, "Error in getting LifeCycleManagerStateful: ", e, e.getMessage());
}
return client;
}
- protected Properties getLCMProperties() {
+ protected Properties getLCMProperties(String controllerType) {
Properties properties = new Properties();
Map<String, String> globalProperties = PropertyConfiguration.getInstance()
.getProperties("mso.bpmn.urn.properties");
-
+ String controllerTypeValue = controllerType;
+ if (controllerType == null) {
+ controllerTypeValue = "";
+ }
properties.put("topic.read", globalProperties.get("appc.topic.read"));
properties.put("topic.read.timeout", globalProperties.get("appc.topic.read.timeout"));
properties.put("client.response.timeout", globalProperties.get("appc.client.response.timeout"));
properties.put("topic.write", globalProperties.get("appc.topic.write"));
properties.put("poolMembers", globalProperties.get("appc.poolMembers"));
+ properties.put("client.controllerType", controllerTypeValue);
properties.put("client.key", globalProperties.get("appc.client.key"));
properties.put("client.secret", globalProperties.get("appc.client.secret"));
properties.put("client.name", CLIENT_NAME);
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestrator.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestrator.java
index 217525e56a..744be5f28f 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestrator.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestrator.java
@@ -31,8 +31,8 @@ import org.onap.appc.client.lcm.model.Status;
public class ApplicationControllerOrchestrator {
- public Status vnfCommand(Action action, String requestId, String vnfId, Optional<String> request) throws ApplicationControllerOrchestratorException {
- ApplicationControllerClient client = new ApplicationControllerClient();
+ public Status vnfCommand(Action action, String requestId, String vnfId, Optional<String> request, String controllerType) throws ApplicationControllerOrchestratorException {
+ ApplicationControllerClient client = new ApplicationControllerClient(controllerType);
Status status;
ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
actionIdentifiers.setVnfId(vnfId);
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
index 7fe32880c6..e737f5da16 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
@@ -43,7 +43,7 @@ public class ApplicationControllerClientTest {
@Test
public void createRequest_CheckLock_RequestBuilt() {
- ApplicationControllerClient client = new ApplicationControllerClient();
+ ApplicationControllerClient client = new ApplicationControllerClient("appc");
ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
actionIdentifiers.setVnfId("vnfId");
CheckLockInput checkLockInput = (CheckLockInput) client.createRequest(Action.CheckLock, actionIdentifiers, null,
@@ -54,7 +54,7 @@ public class ApplicationControllerClientTest {
@Test
@Ignore // 1802 merge
public void runCommand_liveAppc() {
- ApplicationControllerClient client = new ApplicationControllerClient();
+ ApplicationControllerClient client = new ApplicationControllerClient("appc");
ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
//actionIdentifiers.setVnfId("ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f");
actionIdentifiers.setVnfId("2d2bf10e-81a5-");
@@ -72,7 +72,7 @@ public class ApplicationControllerClientTest {
@Test
@Ignore // 1802 merge
public void runCommand_CheckLock_RequestBuilt() {
- ApplicationControllerClient client = new ApplicationControllerClient();
+ ApplicationControllerClient client = new ApplicationControllerClient("appc");
ActionIdentifiers actionIdentifiers = new ActionIdentifiers();
actionIdentifiers.setVnfId("fusion-vpp-vnf-001");
Status status;
@@ -88,14 +88,15 @@ public class ApplicationControllerClientTest {
@Test
public void test_getLCMPropertiesHelper() {
- ApplicationControllerClient client = new ApplicationControllerClient();
- Properties properties = client.getLCMProperties();
+ ApplicationControllerClient client = new ApplicationControllerClient("appc");
+ Properties properties = client.getLCMProperties("appc");
assertEquals(properties.get("topic.write"), "APPC-TEST-AMDOCS1-DEV3");
assertEquals(properties.get("topic.read.timeout"), "120000");
assertEquals(properties.get("client.response.timeout"), "120000");
assertEquals(properties.get("topic.read"), "APPC-TEST-AMDOCS2");
assertEquals(properties.get("poolMembers"),
"uebsb93kcdc.it.att.com:3904,uebsb92kcdc.it.att.com:3904,uebsb91kcdc.it.att.com:3904");
+ assertEquals(properties.get("client.controllerType"), "appc");
assertEquals(properties.get("client.key"), "iaEMAfjsVsZnraBP");
assertEquals(properties.get("client.secret"), "wcivUjsjXzmGFBfxMmyJu9dz");
}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java
index bd026d0b6d..d9c5654989 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerOrchestratorTest.java
@@ -46,7 +46,7 @@ public class ApplicationControllerOrchestratorTest {
Status status;
try {
status = client.vnfCommand(Action.Lock, UUID.randomUUID().toString(),
- "3ffdee3c-94d2-45fe-904d-fc1efa0f8b59", Optional.of(""));
+ "3ffdee3c-94d2-45fe-904d-fc1efa0f8b59", Optional.of(""), "appc");
} catch (ApplicationControllerOrchestratorException e) {
status = new Status();
status.setCode(e.getAppcCode());
@@ -62,7 +62,7 @@ public class ApplicationControllerOrchestratorTest {
Status status;
try {
status = client.vnfCommand(Action.Unlock, UUID.randomUUID().toString(),
- "ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f", Optional.of(""));
+ "ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f", Optional.of(""), "appc");
} catch (ApplicationControllerOrchestratorException e) {
status = new Status();
status.setCode(e.getAppcCode());
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/ReplaceVnfInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/ReplaceVnfInfra.groovy
index c84c73cb96..a9cc776ab6 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/ReplaceVnfInfra.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/ReplaceVnfInfra.groovy
@@ -76,6 +76,7 @@ public class ReplaceVnfInfra extends VnfCmBase {
execution.setVariable('vnfInputs', null)
execution.setVariable('tenantId', null)
execution.setVariable('vnfParams', null)
+ execution.setVariable('controllerType', null)
execution.setVariable('cloudConfiguration', null)
execution.setVariable('ReplaceVnfSuccessIndicator', false)
execution.setVariable('serviceType', null)
@@ -164,7 +165,12 @@ public class ReplaceVnfInfra extends VnfCmBase {
logDebug("vnfModelInvariantUuid: " + vnfModelInvariantUuid, isDebugLogEnabled)
def vnfType = execution.getVariable('vnfType')
- execution.setVariable('vnfType', vnfType)
+ execution.setVariable('vnfType', vnfType)
+
+ def controllerType = reqMap.requestDetails?.requestParameters?.controllerType
+ execution.setVariable('controllerType', controllerType)
+
+ utils.log("DEBUG", 'Controller Type: ' + controllerType, isDebugLogEnabled)
def userParams = reqMap.requestDetails?.requestParameters?.userParams
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy
index b6af0a5a6b..0b6ddb8ad2 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/UpdateVnfInfra.groovy
@@ -74,7 +74,8 @@ public class UpdateVnfInfra extends VnfCmBase {
execution.setVariable('source', null)
execution.setVariable('vnfInputs', null)
execution.setVariable('tenantId', null)
- execution.setVariable('vnfParams', null)
+ execution.setVariable('vnfParams', null)
+ execution.setVariable('controllerType', null)
execution.setVariable('UpdateVnfSuccessIndicator', false)
execution.setVariable('serviceType', null)
execution.setVariable('nfRole', null)
@@ -154,6 +155,11 @@ public class UpdateVnfInfra extends VnfCmBase {
def vnfType = execution.getVariable('vnfType')
execution.setVariable('vnfType', vnfType)
+ def controllerType = reqMap.requestDetails?.requestParameters?.controllerType
+ execution.setVariable('controllerType', controllerType)
+
+ utils.log("DEBUG", 'Controller Type: ' + controllerType, isDebugLogEnabled)
+
def userParams = reqMap.requestDetails?.requestParameters?.userParams
Map<String, String> userParamsMap = [:]
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/VnfConfigUpdate.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/VnfConfigUpdate.groovy
index 13016a5ae4..aa3320044d 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/VnfConfigUpdate.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/VnfConfigUpdate.groovy
@@ -75,7 +75,8 @@ public class VnfConfigUpdate extends VnfCmBase {
public void initProcessVariables(DelegateExecution execution) {
execution.setVariable('prefix', 'VnfCU_')
execution.setVariable('Request', null)
- execution.setVariable('source', null)
+ execution.setVariable('source', null)
+ execution.setVariable('controllerType', null)
execution.setVariable('UpdateVnfSuccessIndicator', false)
execution.setVariable('serviceType', null)
execution.setVariable('nfRole', null)
@@ -128,7 +129,12 @@ public class VnfConfigUpdate extends VnfCmBase {
execution.setVariable('serviceType', 'Mobility')
execution.setVariable('payload', "")
execution.setVariable('actionHealthCheck', Action.HealthCheck)
- execution.setVariable('actionConfigModify', Action.ConfigModify)
+ execution.setVariable('actionConfigModify', Action.ConfigModify)
+
+ def controllerType = reqMap.requestDetails?.requestParameters?.controllerType
+ execution.setVariable('controllerType', controllerType)
+
+ utils.log("DEBUG", 'Controller Type: ' + controllerType, isDebugLogEnabled)
def payload = reqMap.requestDetails?.requestParameters?.payload
execution.setVariable('payload', payload)
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/VnfInPlaceUpdate.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/VnfInPlaceUpdate.groovy
index 4a64ab058b..64894563bf 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/VnfInPlaceUpdate.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/VnfInPlaceUpdate.groovy
@@ -80,7 +80,8 @@ public class VnfInPlaceUpdate extends VnfCmBase {
execution.setVariable('source', null)
execution.setVariable('vnfInputs', null)
execution.setVariable('tenantId', null)
- execution.setVariable('vnfParams', null)
+ execution.setVariable('vnfParams', null)
+ execution.setVariable('controllerType', null)
execution.setVariable('UpdateVnfSuccessIndicator', false)
execution.setVariable('serviceType', null)
execution.setVariable('nfRole', null)
@@ -140,6 +141,11 @@ public class VnfInPlaceUpdate extends VnfCmBase {
execution.setVariable('actionUpgradeBackup', Action.UpgradeBackup)
execution.setVariable('actionUpgradeSoftware', Action.UpgradeSoftware)
execution.setVariable('actionResumeTraffic', Action.ResumeTraffic)
+
+ def controllerType = reqMap.requestDetails?.requestParameters?.controllerType
+ execution.setVariable('controllerType', controllerType)
+
+ utils.log("DEBUG", 'Controller Type: ' + controllerType, isDebugLogEnabled)
def payload = reqMap.requestDetails?.requestParameters?.payload
execution.setVariable('payload', payload)
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>
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json
index 04040028c3..3fc25944f2 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ConfigVnf_VID_request.json
@@ -33,6 +33,7 @@
}
],
"requestParameters": {
+"controllerType" : "appc",
"payload": "{\"request-parameters\":{\"host-ip-address\":\"10.10.10.10\"},\"configuration- parameters\":{\"name1\":\"value1\",\"name2\":\"value2\"}}"
}
}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json
index 7c9717244b..a018f50355 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/ReplaceVnf_VID_request.json
@@ -34,6 +34,7 @@
],
"requestParameters": {
"usePreload": false,
+"controllerType" : "appc",
"userParams" : [
{
"name" : "someUserParam",
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json
index 40e7b598c0..e6d3e97a5c 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/UpdateVnf_VID_request.json
@@ -34,6 +34,7 @@
],
"requestParameters": {
"usePreload": false,
+"controllerType" : "appc",
"userParams" : [
{
"name" : "someUserParam",
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json
index 009db93d68..588ef1cbec 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/InfrastructureFlows/VnfInPlaceUpdate_VID_request.json
@@ -9,6 +9,7 @@
"requestorId": "ab1234"
},
"requestParameters": {
+"controllerType": "",
"payload":
"{\"existing-software-version\": \"3.1\",\"new-software-version\": \"3.2\", \"operations-timeout\": \"3600\"}"
}
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
index 2e5a199cdb..245d753f3e 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/mso.bpmn.urn.properties
@@ -106,6 +106,7 @@ log.debug.CreateGenericALaCarteServiceInstance=true
log.debug.DecomposeService=true
log.debug.DoCreateServiceInstance=true
log.debug.DoDeleteServiceInstance=true
+log.debug.VnfInPlaceUpdate=true
policy.client.auth=Basic bTAzNzQzOnBvbGljeVIwY2sk
policy.auth=Basic dGVzdHBkcDphbHBoYTEyMw==
@@ -117,9 +118,10 @@ appc.topic.read=APPC-CL-FUSION-LCM-RESPONSE
appc.topic.read.timeout=100
appc.client.response.timeout=300
appc.topic.write=APPC-CL-FUSION-LCM
-appc.pool.members=localhost:28090
+appc.poolMembers=localhost:28090
appc.client.key=iaEMAfjsVsZnraBP
appc.client.secret=wcivUjsjXzmGFBfxMmyJu9dz
+appc.service=ueb
sdnc.si.sv.types=PORT-MIRROR,PPROBES
mso.bpmn.optimisticlockingexception.retrycount=3