From 402785f85637e6540e8dce31906e41f460ad7c21 Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Fri, 23 Feb 2018 15:39:22 -0800 Subject: Store NB Create req. userParam - Customer_Location 1. Additional user param Customer_Location needs to be passed and stored for use later in communication to OOF for homing/placement. 2. Added request.json fields to unit test Customer_Location and enabled testing of Customer_Location in CreateVcpeResCustServiceTest.groovy 3. Cleanup of CreateVcpeRestCustService.groovy to match code conventions Issue-ID: SO-402 Change-Id: Id23161c1d63e2f0e7871bf9310468c1b64cbd04e Signed-off-by: Marcus G K Williams --- .../mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy | 3 +++ 1 file changed, 3 insertions(+) (limited to 'bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso') diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy index 3b97cad585..7a494db998 100644 --- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy +++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/vcpe/scripts/CreateVcpeResCustServiceTest.groovy @@ -109,6 +109,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { assertTrue(map.containsKey("subscriberInfo")) verify(mex).setVariable("brgWanMacAddress", "brgmac") + verify(mex).setVariable("customerLocation", ["customerLatitude":"32.897480", "customerLongitude":"-97.040443", "customerName":"some_company"]) assertTrue(map.containsKey("serviceInputParams")) assertTrue(map.containsKey(Prefix+"requestInfo")) @@ -141,6 +142,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { def req = request .replace('"source"', '"sourceXXX"') .replace('"BRG_WAN_MAC_Address"', '"BRG_WAN_MAC_AddressXXX"') + .replace('"Customer_Location"', '"Customer_LocationXXX"') when(mex.getVariable("bpmnRequest")).thenReturn(req) when(mex.getVariable("serviceInstanceId")).thenReturn(null) @@ -164,6 +166,7 @@ class CreateVcpeResCustServiceTest extends GroovyTestBase { assertTrue(map.containsKey("subscriberInfo")) assertEquals("", map.get("brgWanMacAddress")) + assertEquals("", map.get("customerLocation")) assertTrue(map.containsKey("serviceInputParams")) assertTrue(map.containsKey(Prefix+"requestInfo")) -- cgit 1.2.3-korg