diff options
| author |   Chuanyu Chen <chenchuanyu@huawei.com> | 2018-04-26 03:08:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-26 03:08:45 +0000 |
| commit | efdfc40f759c70b9ab2ac7e23de42c7d211fde79 (patch) | |
| tree | d2bed21a2b5ced7d8eb84d5499d60f2486241413 /bpmn | |
| parent | 72ac7f21e79eb69782df1e58cc9f8bddbff82640 (diff) | |
| parent | 4168307276ccf6c7eb0c06c46e6033a693c29bf4 (diff) | |
Merge "Fix VFCNS termination invocation"
Diffstat (limited to 'bpmn')
2 files changed, 20 insertions, 0 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVFCNSResource.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVFCNSResource.groovy index e9d51b2965..9ebd1fa0ba 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVFCNSResource.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DeleteVFCNSResource.groovy @@ -20,6 +20,8 @@ */ package org.openecomp.mso.bpmn.infrastructure.scripts +import com.fasterxml.jackson.databind.ObjectMapper +import org.openecomp.mso.bpmn.common.recipe.ResourceInput import org.openecomp.mso.bpmn.common.scripts.AbstractServiceTaskProcessor import org.camunda.bpm.engine.delegate.DelegateExecution import org.openecomp.mso.bpmn.core.json.JsonUtils @@ -36,6 +38,22 @@ public class DeleteVFCNSResource extends AbstractServiceTaskProcessor { def isDebugEnabled = execution.getVariable("isDebugLogEnabled") utils.log("INFO"," ***** start preProcessRequest *****", isDebugEnabled) + String resourceInputStr = execution.getVariable("resourceInput") + ResourceInput resourceInput = new ObjectMapper().readValue(resourceInputStr, ResourceInput.class) + + String globalSubscriberId = resourceInput.getGlobalSubscriberId() + String serviceType = execution.getVariable("serviceType") + String operationId = resourceInput.getOperationId() + String resourceModeluuid = resourceInput.getResourceModelInfo().getModelCustomizationUuid() + String resourceInstanceId = resourceInput.getResourceInstancenUuid() + + + execution.setVariable("globalSubscriberId",globalSubscriberId) + execution.setVariable("serviceType", serviceType) + execution.setVariable("operationId", operationId) + execution.setVariable("resourceTemplateId", resourceModeluuid) + execution.setVariable("resourceInstanceId", resourceInstanceId) + utils.log("INFO"," ***** end preProcessRequest *****", isDebugEnabled) } diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy index b2a7bb6fdf..8508f07765 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoDeleteResourcesV1.groovy @@ -242,6 +242,8 @@ public class DoDeleteResourcesV1 extends AbstractServiceTaskProcessor { ResourceInput resourceInput = new ResourceInput(); resourceInput.setServiceInstanceId(serviceInstanceId) resourceInput.setResourceInstanceName(currentResource.getResourceInstanceName()) + resourceInput.setResourceInstancenUuid(currentResource.getResourceId()) + resourceInput.setOperationId(execution.getVariable("operationId")) String globalSubscriberId = execution.getVariable("globalSubscriberId") resourceInput.setGlobalSubscriberId(globalSubscriberId) resourceInput.setResourceModelInfo(currentResource.getModelInfo()); |