diff options
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp')
2 files changed, 16 insertions, 6 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy index 167c9c8b54..38ac23e5a1 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRG.groovy @@ -46,6 +46,9 @@ import static org.apache.commons.lang3.StringUtils.* * @param - disableRollback - O ignored * @param - failNotfound - O * @param - serviceInstanceId + * @param - globalCustomerId - O + * @param - subscriptionServiceType - O + * @param - parentServiceInstanceId * @param - allottedResourceId * * Outputs: @@ -155,6 +158,8 @@ public class DoDeleteAllottedResourceBRG extends AbstractServiceTaskProcessor{ String allottedResourceId = execution.getVariable("allottedResourceId") String serviceInstanceId = execution.getVariable("serviceInstanceId") String parentServiceInstanceId = execution.getVariable("parentServiceInstanceId") + String globalCustomerId = execution.getVariable("globalCustomerId") + String subscriptionServiceType = execution.getVariable("subscriptionServiceType") String callbackUrl = execution.getVariable("sdncCallbackUrl") String requestId = execution.getVariable("msoRequestId") @@ -194,11 +199,11 @@ public class DoDeleteAllottedResourceBRG extends AbstractServiceTaskProcessor{ </request-information> <service-information> <service-id></service-id> - <subscription-service-type></subscription-service-type> + <subscription-service-type>${subscriptionServiceType}</subscription-service-type> <onap-model-information></onap-model-information> - <service-instance-id>${parentServiceInstanceId}</service-instance-id> + <service-instance-id>${serviceInstanceId}</service-instance-id> <subscriber-name/> - <global-customer-id></global-customer-id> + <global-customer-id>${globalCustomerId}</global-customer-id> </service-information> <allotted-resource-information> <allotted-resource-id>${allottedResourceId}</allotted-resource-id> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy index eb045eb54b..a5b7c1350d 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXC.groovy @@ -46,6 +46,9 @@ import static org.apache.commons.lang3.StringUtils.* * @param - disableRollback - O ignored * @param - failNotfound - O * @param - serviceInstanceId + * @param - globalCustomerId - O + * @param - subscriptionServiceType - O + * @param - parentServiceInstanceId * @param - allottedResourceId * * Outputs: @@ -155,6 +158,8 @@ public class DoDeleteAllottedResourceTXC extends AbstractServiceTaskProcessor{ String allottedResourceId = execution.getVariable("allottedResourceId") String serviceInstanceId = execution.getVariable("serviceInstanceId") String parentServiceInstanceId = execution.getVariable("parentServiceInstanceId") + String globalCustomerId = execution.getVariable("globalCustomerId") + String subscriptionServiceType = execution.getVariable("subscriptionServiceType") String callbackUrl = execution.getVariable("sdncCallbackUrl") String requestId = execution.getVariable("msoRequestId") @@ -194,11 +199,11 @@ public class DoDeleteAllottedResourceTXC extends AbstractServiceTaskProcessor{ </request-information> <service-information> <service-id></service-id> - <subscription-service-type></subscription-service-type> + <subscription-service-type>${subscriptionServiceType}</subscription-service-type> <onap-model-information></onap-model-information> - <service-instance-id>${parentServiceInstanceId}</service-instance-id> + <service-instance-id>${serviceInstanceId}</service-instance-id> <subscriber-name/> - <global-customer-id></global-customer-id> + <global-customer-id>${globalCustomerId}</global-customer-id> </service-information> <allotted-resource-information> <allotted-resource-id>${allottedResourceId}</allotted-resource-id> |