X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=integration-test%2Fsrc%2Ftest%2Fgroovy%2Forg%2Fonap%2Fcps%2Fintegration%2Fperformance%2Fcps%2FGetPerfTest.groovy;h=4676c908b9ddda553be6f64fe1e2dccbbc5475d7;hb=36d6e83473846cd4e0ad5e42ad6a8d0e3e3b3425;hp=30e8bf23d41d62d11a8ff043c3722fc4eb1f647d;hpb=f0fdc500ec1bfd3b8a477e9cc862dd014828669d;p=cps.git

diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/GetPerfTest.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/GetPerfTest.groovy
index 30e8bf23d..4676c908b 100644
--- a/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/GetPerfTest.groovy
+++ b/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/GetPerfTest.groovy
@@ -21,7 +21,10 @@
 package org.onap.cps.integration.performance.cps
 
 import org.onap.cps.integration.performance.base.CpsPerfTestBase
-import org.onap.cps.spi.FetchDescendantsOption
+
+import static org.onap.cps.spi.FetchDescendantsOption.DIRECT_CHILDREN_ONLY
+import static org.onap.cps.spi.FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS
+import static org.onap.cps.spi.FetchDescendantsOption.OMIT_DESCENDANTS
 
 class GetPerfTest extends CpsPerfTestBase {
 
@@ -29,11 +32,40 @@ class GetPerfTest extends CpsPerfTestBase {
 
     def setup() { objectUnderTest = cpsDataService }
 
-    def 'Read complete data trees from multiple anchors with #scenario.'() {
+    def 'Read top-level node with #scenario.'() {
+        when: 'get data nodes from 1 anchor'
+            stopWatch.start()
+            def result = objectUnderTest.getDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, anchor, '/openroadm-devices', fetchDescendantsOption)
+            stopWatch.stop()
+            assert countDataNodesInTree(result) == expectedNumberOfDataNodes
+            def durationInMillis = stopWatch.getTotalTimeMillis()
+        then: 'all data is read within #durationLimit ms'
+            recordAndAssertPerformance("Read datatrees with ${scenario}", durationLimit, durationInMillis)
+        where: 'the following parameters are used'
+            scenario             | fetchDescendantsOption  | anchor       || durationLimit | expectedNumberOfDataNodes
+            'no descendants'     | OMIT_DESCENDANTS        | 'openroadm1' || 100           | 1
+            'direct descendants' | DIRECT_CHILDREN_ONLY    | 'openroadm2' || 100           | 1 + 50
+            'all descendants'    | INCLUDE_ALL_DESCENDANTS | 'openroadm3' || 350           | 1 + 50 * 86
+    }
+
+    def 'Read data trees for multiple xpaths'() {
+        given: 'a collection of xpaths to get'
+            def xpaths = (1..50).collect { "/openroadm-devices/openroadm-device[@device-id='C201-7-1A-" + it + "']" }
+        when: 'get data nodes from 1 anchor'
+            stopWatch.start()
+            def result = objectUnderTest.getDataNodesForMultipleXpaths(CPS_PERFORMANCE_TEST_DATASPACE, 'openroadm4', xpaths, INCLUDE_ALL_DESCENDANTS)
+            stopWatch.stop()
+            assert countDataNodesInTree(result) == 50 * 86
+            def durationInMillis = stopWatch.getTotalTimeMillis()
+        then: 'all data is read within 350 ms'
+            recordAndAssertPerformance("Read datatrees for multiple xpaths", 350, durationInMillis)
+    }
+
+    def 'Read complete data trees using #scenario.'() {
         when: 'get data nodes for 5 anchors'
             stopWatch.start()
             (1..5).each {
-                def result = objectUnderTest.getDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, anchorPrefix + it, xpath, FetchDescendantsOption.INCLUDE_ALL_DESCENDANTS)
+                def result = objectUnderTest.getDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, anchorPrefix + it, xpath, INCLUDE_ALL_DESCENDANTS)
                 assert countDataNodesInTree(result) == expectedNumberOfDataNodes
             }
             stopWatch.stop()
@@ -42,10 +74,10 @@ class GetPerfTest extends CpsPerfTestBase {
             recordAndAssertPerformance("Read datatrees using ${scenario}", durationLimit, durationInMillis)
         where: 'the following xpaths are used'
             scenario                | anchorPrefix | xpath                || durationLimit | expectedNumberOfDataNodes
-            'bookstore root'        | 'bookstore'  | '/'                  || 130           | 78
-            'bookstore top element' | 'bookstore'  | '/bookstore'         || 130           | 78
-            'openroadm root'        | 'openroadm'  | '/'                  || 750           | 2151
-            'openroadm top element' | 'openroadm'  | '/openroadm-devices' || 750           | 2151
+            'bookstore root'        | 'bookstore'  | '/'                  || 250           | 78
+            'bookstore top element' | 'bookstore'  | '/bookstore'         || 250           | 78
+            'openroadm root'        | 'openroadm'  | '/'                  || 1000          | 1 + 50 * 86
+            'openroadm top element' | 'openroadm'  | '/openroadm-devices' || 1000          | 1 + 50 * 86
     }
 
 }