X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=integration-test%2Fsrc%2Ftest%2Fgroovy%2Forg%2Fonap%2Fcps%2Fintegration%2Fperformance%2Fcps%2FDeletePerfTest.groovy;h=91c1082a894386b5c3f56a64320ed40a75ec98ae;hb=500134c9c745eeda707e5738a5a699c69bb899c6;hp=0bab6159d439ab34c8ca9c61f3d540fdb3bcac07;hpb=b4939f3dc286b23edd6f7950e74952208f983eb4;p=cps.git

diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/DeletePerfTest.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/DeletePerfTest.groovy
index 0bab6159d..91c1082a8 100644
--- a/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/DeletePerfTest.groovy
+++ b/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/DeletePerfTest.groovy
@@ -36,13 +36,13 @@ class DeletePerfTest extends CpsPerfTestBase {
 
     def 'Create test data (please note, subsequent tests depend on this running first).'() {
         when: 'multiple anchors with a node with a large number of descendants is created'
-            stopWatch.start()
+            resourceMeter.start()
             def data = generateOpenRoadData(300)
             addAnchorsWithData(10, CPS_PERFORMANCE_TEST_DATASPACE, LARGE_SCHEMA_SET, 'delete', data)
-            stopWatch.stop()
-            def setupDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'setup duration is within expected time'
-            recordAndAssertPerformance('Delete test setup', TimeUnit.SECONDS.toMillis(200), setupDurationInMillis)
+            resourceMeter.stop()
+            def setupDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'setup duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Delete test setup', TimeUnit.SECONDS.toMillis(200), setupDurationInMillis, 200, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Delete 100 container nodes'() {
@@ -51,14 +51,14 @@ class DeletePerfTest extends CpsPerfTestBase {
                 "/openroadm-devices/openroadm-device[@device-id='C201-7-1A-" + it + "']/org-openroadm-device"
             }
         when: 'child nodes are deleted'
-            stopWatch.start()
+            resourceMeter.start()
             xpathsToDelete.each {
                 objectUnderTest.deleteDataNode(CPS_PERFORMANCE_TEST_DATASPACE, 'delete1', it, OffsetDateTime.now())
             }
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Delete 100 containers', TimeUnit.SECONDS.toMillis(2), deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Delete 100 containers', TimeUnit.SECONDS.toMillis(2), deleteDurationInMillis, 30, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Batch delete 100 container nodes'() {
@@ -67,12 +67,12 @@ class DeletePerfTest extends CpsPerfTestBase {
                 "/openroadm-devices/openroadm-device[@device-id='C201-7-1A-" + it + "']/org-openroadm-device"
             }
         when: 'child nodes are deleted'
-            stopWatch.start()
+            resourceMeter.start()
             objectUnderTest.deleteDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, 'delete2', xpathsToDelete, OffsetDateTime.now())
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Batch delete 100 containers', 500, deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Batch delete 100 containers', 500, deleteDurationInMillis, 5, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Delete 100 list elements'() {
@@ -81,14 +81,14 @@ class DeletePerfTest extends CpsPerfTestBase {
                 "/openroadm-devices/openroadm-device[@device-id='C201-7-1A-" + it + "']"
             }
         when: 'list elements are deleted'
-            stopWatch.start()
+            resourceMeter.start()
             xpathsToDelete.each {
                 objectUnderTest.deleteDataNode(CPS_PERFORMANCE_TEST_DATASPACE, 'delete3', it, OffsetDateTime.now())
             }
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Delete 100 lists elements', TimeUnit.SECONDS.toMillis(2), deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Delete 100 lists elements', TimeUnit.SECONDS.toMillis(2), deleteDurationInMillis, 20, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Batch delete 100 list elements'() {
@@ -97,12 +97,12 @@ class DeletePerfTest extends CpsPerfTestBase {
                 "/openroadm-devices/openroadm-device[@device-id='C201-7-1A-" + it + "']"
             }
         when: 'list elements are deleted'
-            stopWatch.start()
+            resourceMeter.start()
             objectUnderTest.deleteDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, 'delete4', xpathsToDelete, OffsetDateTime.now())
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Batch delete 100 lists elements', 500, deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Batch delete 100 lists elements', 500, deleteDurationInMillis, 2, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Delete 100 whole lists'() {
@@ -111,14 +111,14 @@ class DeletePerfTest extends CpsPerfTestBase {
                 "/openroadm-devices/openroadm-device[@device-id='C201-7-1A-" + it + "']/org-openroadm-device/degree"
             }
         when: 'lists are deleted'
-            stopWatch.start()
+            resourceMeter.start()
             xpathsToDelete.each {
                 objectUnderTest.deleteDataNode(CPS_PERFORMANCE_TEST_DATASPACE, 'delete5', it, OffsetDateTime.now())
             }
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Delete 100 whole lists', TimeUnit.SECONDS.toMillis(5), deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Delete 100 whole lists', TimeUnit.SECONDS.toMillis(5), deleteDurationInMillis, 30, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Batch delete 100 whole lists'() {
@@ -127,68 +127,68 @@ class DeletePerfTest extends CpsPerfTestBase {
                 "/openroadm-devices/openroadm-device[@device-id='C201-7-1A-" + it + "']/org-openroadm-device/degree"
             }
         when: 'lists are deleted'
-            stopWatch.start()
+            resourceMeter.start()
             objectUnderTest.deleteDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, 'delete6', xpathsToDelete, OffsetDateTime.now())
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Batch delete 100 whole lists', TimeUnit.SECONDS.toMillis(4), deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Batch delete 100 whole lists', TimeUnit.SECONDS.toMillis(4), deleteDurationInMillis, 5, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Delete 1 large data node'() {
         when: 'parent node is deleted'
-            stopWatch.start()
+            resourceMeter.start()
             objectUnderTest.deleteDataNode(CPS_PERFORMANCE_TEST_DATASPACE, 'delete7', '/openroadm-devices', OffsetDateTime.now())
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Delete one large node', TimeUnit.SECONDS.toMillis(2), deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Delete one large node', TimeUnit.SECONDS.toMillis(2), deleteDurationInMillis, 2, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Delete root node with many descendants'() {
         when: 'root node is deleted'
-            stopWatch.start()
+            resourceMeter.start()
             objectUnderTest.deleteDataNode(CPS_PERFORMANCE_TEST_DATASPACE, 'delete8', '/', OffsetDateTime.now())
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Delete root node', TimeUnit.SECONDS.toMillis(2), deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Delete root node', TimeUnit.SECONDS.toMillis(2), deleteDurationInMillis, 2, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Delete data nodes for an anchor'() {
         when: 'data nodes are deleted'
-            stopWatch.start()
+            resourceMeter.start()
             objectUnderTest.deleteDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, 'delete9', OffsetDateTime.now())
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Delete data nodes for anchor', TimeUnit.SECONDS.toMillis(2), deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Delete data nodes for anchor', TimeUnit.SECONDS.toMillis(2), deleteDurationInMillis, 2, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Batch delete 100 non-existing nodes'() {
         given: 'a list of xpaths to delete'
             def xpathsToDelete = (1..100).collect { "/path/to/non-existing/node[@id='" + it + "']" }
         when: 'child nodes are deleted'
-            stopWatch.start()
+            resourceMeter.start()
             try {
                 objectUnderTest.deleteDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, 'delete10', xpathsToDelete, OffsetDateTime.now())
             } catch (DataNodeNotFoundException ignored) {}
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Batch delete 100 non-existing', TimeUnit.SECONDS.toMillis(7), deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Batch delete 100 non-existing', TimeUnit.SECONDS.toMillis(7), deleteDurationInMillis, 5, resourceMeter.getTotalMemoryUsageInMB())
     }
 
     def 'Clean up test data'() {
         given: 'a list of anchors to delete'
             def anchorNames = (1..10).collect {'delete' + it}
         when: 'data nodes are deleted'
-            stopWatch.start()
+            resourceMeter.start()
             cpsAdminService.deleteAnchors(CPS_PERFORMANCE_TEST_DATASPACE, anchorNames)
-            stopWatch.stop()
-            def deleteDurationInMillis = stopWatch.getTotalTimeMillis()
-        then: 'delete duration is within expected time'
-            recordAndAssertPerformance('Delete test cleanup', TimeUnit.SECONDS.toMillis(10), deleteDurationInMillis)
+            resourceMeter.stop()
+            def deleteDurationInMillis = resourceMeter.getTotalTimeMillis()
+        then: 'delete duration is within expected time and memory used is within limit'
+            recordAndAssertResourceUsage('Delete test cleanup', TimeUnit.SECONDS.toMillis(10), deleteDurationInMillis, 2, resourceMeter.getTotalMemoryUsageInMB())
     }
 
 }