Merge "[k6] Add JVM warmup phase (#2)"

[cps.git] / integration-test / src / test / groovy / org / onap / cps / integration / performance / cps / WritePerfTest.groovy

diff --git a/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/WritePerfTest.groovy b/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/WritePerfTest.groovy
index 1898f43..0195611 100644 (file)
--- a/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/WritePerfTest.groovy
+++ b/integration-test/src/test/groovy/org/onap/cps/integration/performance/cps/WritePerfTest.groovy
@@ -41,14 +41,13 @@ class WritePerfTest extends CpsPerfTestBase {
                     expectedDuration, resourceMeter.getTotalTimeInSeconds(),
                     memoryLimit, resourceMeter.getTotalMemoryUsageInMB())
         cleanup:
-            cpsDataService.deleteDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, WRITE_TEST_ANCHOR, OffsetDateTime.now())
             cpsAnchorService.deleteAnchor(CPS_PERFORMANCE_TEST_DATASPACE, WRITE_TEST_ANCHOR)
         where:
             totalNodes || expectedDuration | memoryLimit
-            50         || 4                | 100
-            100        || 7                | 200
-            200        || 14               | 400
-            400        || 28               | 500
+            50         || 1.98             | 100
+            100        || 3.84             | 200
+            200        || 8.6              | 400
+            400        || 16.37            | 500
     }
 
     def 'Writing bookstore data has exponential time.'() {
@@ -64,17 +63,16 @@ class WritePerfTest extends CpsPerfTestBase {
             resourceMeter.stop()
         then: 'the operation takes less than #expectedDuration and memory used is within limit'
             recordAndAssertResourceUsage("Writing ${totalBooks} books",
-                    expectedDuration, resourceMeter.getTotalTimeInSeconds(),
-                    memoryLimit, resourceMeter.getTotalMemoryUsageInMB())
+                    expectedDuration, resourceMeter.totalTimeInSeconds,
+                    memoryLimit, resourceMeter.totalMemoryUsageInMB)
         cleanup:
-            cpsDataService.deleteDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, WRITE_TEST_ANCHOR, OffsetDateTime.now())
             cpsAnchorService.deleteAnchor(CPS_PERFORMANCE_TEST_DATASPACE, WRITE_TEST_ANCHOR)
         where:
             totalBooks || expectedDuration | memoryLimit
-            800        || 1                | 50
-            1600       || 2                | 100
-            3200       || 6                | 150
-            6400       || 18               | 200
+            800        || 0.38             | 50
+            1600       || 0.95             | 100
+            3200       || 2.71             | 150
+            6400       || 8.08             | 200
     }
 
     def 'Writing openroadm list data using saveListElements.'() {
@@ -93,17 +91,16 @@ class WritePerfTest extends CpsPerfTestBase {
             resourceMeter.stop()
         then: 'the operation takes less than #expectedDuration and memory used is within limit'
             recordAndAssertResourceUsage("Saving list of ${totalNodes} devices",
-                    expectedDuration, resourceMeter.getTotalTimeInSeconds(),
-                    memoryLimit, resourceMeter.getTotalMemoryUsageInMB())
+                    expectedDuration, resourceMeter.totalTimeInSeconds,
+                    memoryLimit, resourceMeter.totalMemoryUsageInMB)
         cleanup:
-            cpsDataService.deleteDataNodes(CPS_PERFORMANCE_TEST_DATASPACE, WRITE_TEST_ANCHOR, OffsetDateTime.now())
             cpsAnchorService.deleteAnchor(CPS_PERFORMANCE_TEST_DATASPACE, WRITE_TEST_ANCHOR)
         where:
             totalNodes || expectedDuration | memoryLimit
-            50         || 4                | 200
-            100        || 7                | 200
-            200        || 14               | 250
-            400        || 28               | 250
+            50         || 1.8              | 100
+            100        || 3.93             | 200
+            200        || 7.77             | 400
+            400        || 16.59            | 500
     }
 
 }