diff options
Diffstat (limited to 'bpmn')
5 files changed, 30 insertions, 8 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> diff --git a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn index 88c45afda2..e8b18e6dca 100644 --- a/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn +++ b/bpmn/MSOInfrastructureBPMN/src/main/resources/process/DeleteVcpeResCustService.bpmn @@ -181,6 +181,8 @@ DeleteVcpeResCustService.prepareServiceDelete(execution)]]></bpmn2:script> <camunda:in source="BRG_allottedResourceId" target="allottedResourceId" /> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:out source="rolledBack" target="rolledBack" /> + <camunda:in source="globalCustomerId" target="globalCustomerId" /> + <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_05cjs89</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0snq0kw</bpmn2:outgoing> @@ -235,6 +237,8 @@ DeleteVcpeResCustService.prepareServiceDelete(execution)]]></bpmn2:script> <camunda:in source="TXC_allottedResourceId" target="allottedResourceId" /> <camunda:out source="WorkflowException" target="WorkflowException" /> <camunda:out source="rolledBack" target="rolledBack" /> + <camunda:in source="globalCustomerId" target="globalCustomerId" /> + <camunda:in source="subscriptionServiceType" target="subscriptionServiceType" /> </bpmn2:extensionElements> <bpmn2:incoming>SequenceFlow_0npvfo3</bpmn2:incoming> <bpmn2:outgoing>SequenceFlow_0et9p0i</bpmn2:outgoing> diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRGTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRGTest.groovy index f91a39c856..ec65347f5e 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRGTest.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceBRGTest.groovy @@ -197,8 +197,10 @@ class DoDeleteAllottedResourceBRGTest extends GroovyTestBase { assertTrue(result.indexOf("<sdncadapter:SvcAction>myact</") >= 0) assertTrue(result.indexOf("<allotted-resource-id>ari</") >= 0) assertTrue(result.indexOf("<sdncadapter:SvcInstanceId>sii</") >= 0) - assertTrue(result.indexOf("<service-instance-id>psii</") >= 0) + assertTrue(result.indexOf("<service-instance-id>sii</") >= 0) assertTrue(result.indexOf("<parent-service-instance-id>psii</") >= 0) + assertTrue(result.indexOf("<subscription-service-type>sst</") >= 0) + assertTrue(result.indexOf("<global-customer-id>gci</") >= 0) assertTrue(result.indexOf("<sdncadapter:CallbackUrl>scu</") >= 0) assertTrue(result.indexOf("<request-id>mri</") >= 0) assertTrue(result.indexOf("<model-invariant-uuid/>") >= 0) @@ -572,6 +574,8 @@ class DoDeleteAllottedResourceBRGTest extends GroovyTestBase { when(mex.getVariable("allottedResourceId")).thenReturn("ari") when(mex.getVariable("serviceInstanceId")).thenReturn("sii") when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii") + when(mex.getVariable("subscriptionServiceType")).thenReturn("sst") + when(mex.getVariable("globalCustomerId")).thenReturn("gci") when(mex.getVariable("sdncCallbackUrl")).thenReturn("scu") when(mex.getVariable("msoRequestId")).thenReturn("mri") } diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXCTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXCTest.groovy index 97f714d98d..adf6313a2a 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXCTest.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/DoDeleteAllottedResourceTXCTest.groovy @@ -197,8 +197,10 @@ class DoDeleteAllottedResourceTXCTest extends GroovyTestBase { assertTrue(result.indexOf("<sdncadapter:SvcAction>myact</") >= 0) assertTrue(result.indexOf("<allotted-resource-id>ari</") >= 0) assertTrue(result.indexOf("<sdncadapter:SvcInstanceId>sii</") >= 0) - assertTrue(result.indexOf("<service-instance-id>psii</") >= 0) + assertTrue(result.indexOf("<service-instance-id>sii</") >= 0) assertTrue(result.indexOf("<parent-service-instance-id>psii</") >= 0) + assertTrue(result.indexOf("<subscription-service-type>sst</") >= 0) + assertTrue(result.indexOf("<global-customer-id>gci</") >= 0) assertTrue(result.indexOf("<sdncadapter:CallbackUrl>scu</") >= 0) assertTrue(result.indexOf("<request-id>mri</") >= 0) assertTrue(result.indexOf("<model-invariant-uuid/>") >= 0) @@ -572,6 +574,8 @@ class DoDeleteAllottedResourceTXCTest extends GroovyTestBase { when(mex.getVariable("allottedResourceId")).thenReturn("ari") when(mex.getVariable("serviceInstanceId")).thenReturn("sii") when(mex.getVariable("parentServiceInstanceId")).thenReturn("psii") + when(mex.getVariable("subscriptionServiceType")).thenReturn("sst") + when(mex.getVariable("globalCustomerId")).thenReturn("gci") when(mex.getVariable("sdncCallbackUrl")).thenReturn("scu") when(mex.getVariable("msoRequestId")).thenReturn("mri") } |