Added global customer id to sdnc delete request

Modified delete-BRG & delete-TXC to add global customer id and
several other fields to the SDNC request.

Change-Id: I4b85ba634b56a218037f95e1772fe0fcdde1cd91
Issue-Id: SO-336
Signed-off-by: Jim Hahn <jrh3@att.com>

2 files changed, 10 insertions, 2 deletions

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")
 	}