Merge "fix query param to options"

3 files changed, 46 insertions, 22 deletions

diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy b/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
index 256db4e9..3bc1f3be 100644
--- a/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
+++ b/src/test/groovy/org/onap/cps/ncmp/dmi/rest/controller/DmiRestControllerSpec.groovy
@@ -198,7 +198,7 @@ class DmiRestControllerSpec extends Specification {
     def 'Get resource data for pass-through operational from cm handle.'() {
         given: 'Get resource data url'
             def getResourceDataForCmHandleUrl = "${basePathV1}/ch/some-cmHandle/data/ds/ncmp-datastore:passthrough-operational" +
-                    "?resourceIdentifier=abc/xyz&fields=myfields&depth=5"
+                    "?resourceIdentifier=parent/child&options=(fields=myfields,depth=5)"
             def json = '{"cmHandleProperties" : { "prop1" : "value1", "prop2" : "value2"}}'
         when: 'get resource data PUT api is invoked'
             def response = mvc.perform(
@@ -209,10 +209,9 @@ class DmiRestControllerSpec extends Specification {
             response.status == HttpStatus.OK.value()
         and: 'dmi service called with get resource data for cm handle'
             1 * mockDmiService.getResourceDataOperationalForCmHandle('some-cmHandle',
-                    'abc/xyz',
+                    'parent/child',
                     'application/json',
-                    'myfields',
-                    5,
+                    '(fields=myfields,depth=5)',
                     ['prop1': 'value1', 'prop2': 'value2'])
     }
 
@@ -243,7 +242,7 @@ class DmiRestControllerSpec extends Specification {
     def 'Get resource data for pass-through running from cm handle with #scenario value in resource identifier param.'() {
         given: 'Get resource data url'
             def getResourceDataForCmHandleUrl = "${basePathV1}/ch/some-cmHandle/data/ds/ncmp-datastore:passthrough-running" +
-                    "?resourceIdentifier="+resourceIdentifier+"&fields=testFields&depth=5"
+                    "?resourceIdentifier="+resourceIdentifier+"&options=(fields=myfields,depth=5)"
             def json = '{"cmHandleProperties" : { "prop1" : "value1", "prop2" : "value2"}}'
         when: 'get resource data PUT api is invoked'
             def response = mvc.perform(
@@ -256,8 +255,7 @@ class DmiRestControllerSpec extends Specification {
             1 * mockDmiService.getResourceDataPassThroughRunningForCmHandle('some-cmHandle',
                     resourceIdentifier,
                     'application/json',
-                    'testFields',
-                    5,
+                    '(fields=myfields,depth=5)',
                     ['prop1':'value1', 'prop2':'value2'])
         where: 'tokens are used in the resource identifier parameter'
             scenario                       | resourceIdentifier
diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy b/src/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy
index 4c6bc750..9325d59b 100644
--- a/src/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy
+++ b/src/test/groovy/org/onap/cps/ncmp/dmi/service/DmiServiceImplSpec.groovy
@@ -210,15 +210,14 @@ class DmiServiceImplSpec extends Specification {
             def cmHandle = 'testCmHandle'
             def resourceId = 'testResourceId'
             def acceptHeaderParam = 'testAcceptParam'
-            def fieldsParam = 'testFields'
-            def depthParam = 10
+            def optionsParam = '(fields=x/y/z,depth=10,test=abc)'
             def contentQuery = 'content=all'
         and: 'sdnc operation returns OK response'
-            mockSdncOperations.getResouceDataForOperationalAndRunning(cmHandle, resourceId, fieldsParam, depthParam, acceptHeaderParam, contentQuery) >> new ResponseEntity<>('response json', HttpStatus.OK)
+            mockSdncOperations.getResouceDataForOperationalAndRunning(cmHandle, resourceId, optionsParam, acceptHeaderParam, contentQuery) >> new ResponseEntity<>('response json', HttpStatus.OK)
         when: 'get resource data from cm handles service method invoked'
             def response = objectUnderTest.getResourceDataOperationalForCmHandle(cmHandle,
                     resourceId, acceptHeaderParam,
-                    fieldsParam, depthParam, null)
+                    optionsParam, null)
         then: 'response have expected json'
             response == 'response json'
     }
@@ -228,14 +227,13 @@ class DmiServiceImplSpec extends Specification {
             def cmHandle = 'testCmHandle'
             def resourceId = 'testResourceId'
             def acceptHeaderParam = 'testAcceptParam'
-            def fieldsParam = 'testFields'
-            def depthParam = 10
+            def optionsParam = '(fields=x/y/z,depth=10,test=abc)'
         and: 'sdnc operation returns "NOT_FOUND" response'
-            mockSdncOperations.getResouceDataForOperationalAndRunning(cmHandle, resourceId, fieldsParam, depthParam, acceptHeaderParam, _ as String) >> new ResponseEntity<>(HttpStatus.NOT_FOUND)
+            mockSdncOperations.getResouceDataForOperationalAndRunning(cmHandle, resourceId, optionsParam, acceptHeaderParam, _ as String) >> new ResponseEntity<>(HttpStatus.NOT_FOUND)
         when: 'get resource data from cm handles service method invoked'
             objectUnderTest.getResourceDataOperationalForCmHandle(cmHandle,
                     resourceId, acceptHeaderParam,
-                    fieldsParam, depthParam, null)
+                    optionsParam, null)
         then: 'resource data not found'
             thrown(ResourceDataNotFound.class)
     }
@@ -245,16 +243,15 @@ class DmiServiceImplSpec extends Specification {
             def cmHandle = 'testCmHandle'
             def resourceId = 'testResourceId'
             def acceptHeaderParam = 'testAcceptParam'
-            def fieldsParam = 'testFields'
-            def depthParam = 10
+            def optionsParam = '(fields=x/y/z,depth=10,test=abc)'
             def contentQuery = 'content=config'
         and: 'sdnc operation returns OK response'
-            mockSdncOperations.getResouceDataForOperationalAndRunning(cmHandle, resourceId, fieldsParam,
-                    depthParam, acceptHeaderParam, contentQuery) >> new ResponseEntity<>('response json', HttpStatus.OK)
+            mockSdncOperations.getResouceDataForOperationalAndRunning(cmHandle, resourceId, optionsParam,
+                    acceptHeaderParam, contentQuery) >> new ResponseEntity<>('response json', HttpStatus.OK)
         when: 'get resource data from cm handles service method invoked'
             def response = objectUnderTest.getResourceDataPassThroughRunningForCmHandle(cmHandle,
                     resourceId, acceptHeaderParam,
-                    fieldsParam, depthParam, null)
+                    optionsParam, null)
         then: 'response have expected json'
             response == 'response json'
     }
diff --git a/src/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy b/src/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy
index 95a9c0a7..4411971a 100644
--- a/src/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy
+++ b/src/test/groovy/org/onap/cps/ncmp/dmi/service/operation/SdncOperationsSpec.groovy
@@ -61,10 +61,10 @@ class SdncOperationsSpec extends Specification {
 
     def 'Get resource data from node to SDNC.'() {
         given: 'expected url, topology-id, sdncOperation object'
-            def expectedUrl = '/rests/data/network-topology:network-topology/topology=test-topology/node=node1/yang-ext:mount/testResourceId?fields=testFields&depth=10&content=testContent'
+            def expectedUrl = '/rests/data/network-topology:network-topology/topology=test-topology/node=node1/yang-ext:mount/testResourceId?a=1&b=2&content=testContent'
         when: 'called get modules from node'
             objectUnderTest.getResouceDataForOperationalAndRunning('node1', 'testResourceId',
-                    'testFields', 10, 'testAcceptParam', 'content=testContent')
+                    '(a=1,b=2)', 'testAcceptParam', 'content=testContent')
         then: 'the get operation is executed with the correct URL'
             1 * mockSdncRestClient.getOperation(expectedUrl, _ as HttpHeaders)
     }
@@ -77,4 +77,33 @@ class SdncOperationsSpec extends Specification {
         then: 'the post operation is executed with the correct URL and data'
             1 * mockSdncRestClient.postOperationWithJsonData(expectedUrl, 'requestData', _ as HttpHeaders)
     }
+
+    def 'build query param list for SDNC where options contains a #scenario'() {
+        when: 'build query param list is called with #scenario'
+            def result = objectUnderTest.buildQueryParamList(optionsParamInQuery,'d=4')
+        then: 'result equals to expected result'
+            result == expectedResult
+        where: 'following parameters are used'
+            scenario                  | optionsParamInQuery || expectedResult
+            'single key-value pair'   | '(a=x)'             || ['a=x','d=4']
+            'multiple key-value pairs'| '(a=x,b=y,c=z)'     || ['a=x','b=y','c=z','d=4']
+            '/ as special char'       | '(a=x,b=y,c=t/z)'   || ['a=x','b=y','c=t/z','d=4']
+            '" as special char'       | '(a=x,b=y,c="z")'   || ['a=x','b=y','c="z"','d=4']
+            '[] as special char'      | '(a=x,b=y,c=[z])'   || ['a=x','b=y','c=[z]','d=4']
+            '= in value'              | '(a=(x=y),b=x=y)'   || ['a=(x=y)','b=x=y','d=4']
+    }
+
+    def 'options parameters contains a comma #scenario'() {
+        // https://jira.onap.org/browse/CPS-719
+        when: 'build query param list is called with #scenario'
+            def result = objectUnderTest.buildQueryParamList(optionsParamInQuery,'d=4')
+        then: 'expect 2 elements from options +1 from content query param (2+1) = 3 elements'
+            def expectedNoOfElements = 3
+        and: 'results contains more elements than expected'
+            result.size() > expectedNoOfElements
+        where: 'following parameters are used'
+            scenario              | optionsParamInQuery
+            '"," in value'        | '(a=(x,y),b=y)'
+            '"," in string value' | '(a="x,y",b=y)'
+    }
 }