Use only alternate id for passthrough read and write tests in k6 #2

- remove cm handle based passthrough read and write tests in k6
- increase passthrough read and write frequencies to match FS
  requirement for 200K

Issue-ID: CPS-2625

Change-Id: I9099163ea7e65d8cb8bc0226954bc9535ec6eb57
Signed-off-by: halil.cakal <halil.cakal@est.tech>

diff --git a/k6-tests/ncmp/common/utils.js b/k6-tests/ncmp/common/utils.js
index 57ab2ea..36ce6b4 100644 (file)
--- a/k6-tests/ncmp/common/utils.js
+++ b/k6-tests/ncmp/common/utils.js
@@ -113,9 +113,7 @@ export function makeCustomSummaryReport(testResults, scenarioConfig) {
         makeSummaryCsvLine('4c', 'CM-handle search with Property filter', 'milliseconds', 'cm_search_property_duration', 4500, testResults, scenarioConfig),
         makeSummaryCsvLine('4d', 'CM-handle search with Cps Path filter', 'milliseconds', 'cm_search_cpspath_duration', 4500, testResults, scenarioConfig),
         makeSummaryCsvLine('4e', 'CM-handle search with Trust Level filter', 'milliseconds', 'cm_search_trustlevel_duration', 7000, testResults, scenarioConfig),
-        makeSummaryCsvLine('5a', 'NCMP overhead for Synchronous single CM-handle pass-through read', 'milliseconds', 'ncmp_overhead_passthrough_read', 20, testResults, scenarioConfig),
         makeSummaryCsvLine('5b', 'NCMP overhead for Synchronous single CM-handle pass-through read with alternate id', 'milliseconds', 'ncmp_overhead_passthrough_read_alt_id', 40, testResults, scenarioConfig),
-        makeSummaryCsvLine('6a', 'NCMP overhead for Synchronous single CM-handle pass-through write', 'milliseconds', 'ncmp_overhead_passthrough_write', 20, testResults, scenarioConfig),
         makeSummaryCsvLine('6b', 'NCMP overhead for Synchronous single CM-handle pass-through write with alternate id', 'milliseconds', 'ncmp_overhead_passthrough_write_alt_id', 40, testResults, scenarioConfig),
         makeSummaryCsvLine('7', 'Legacy batch read operation', 'events/second', 'legacy_batch_read_cmhandles_per_second', 300, testResults, scenarioConfig),
     ];

diff --git a/k6-tests/ncmp/config/endurance.json b/k6-tests/ncmp/config/endurance.json
index d4893a4..8f65b81 100644 (file)
--- a/k6-tests/ncmp/config/endurance.json
+++ b/k6-tests/ncmp/config/endurance.json
@@ -6,28 +6,16 @@
     "containerUpTimeInSeconds": 420
   },
   "scenarios": {
-    "passthrough_read_scenario": {
-      "executor": "constant-vus",
-      "exec": "passthroughReadScenario",
-      "vus": 2,
-      "duration": "2h"
-    },
     "passthrough_read_alt_id_scenario": {
       "executor": "constant-vus",
       "exec": "passthroughReadAltIdScenario",
-      "vus": 2,
-      "duration": "2h"
-    },
-    "passthrough_write_scenario": {
-      "executor": "constant-vus",
-      "exec": "passthroughWriteScenario",
-      "vus": 2,
+      "vus": 4,
       "duration": "2h"
     },
     "passthrough_write_alt_id_scenario": {
       "executor": "constant-vus",
       "exec": "passthroughWriteAltIdScenario",
-      "vus": 2,
+      "vus": 4,
       "duration": "2h"
     },
     "cm_handle_id_search_nofilter_scenario": {

diff --git a/k6-tests/ncmp/config/kpi.json b/k6-tests/ncmp/config/kpi.json
index b691ed5..aa93091 100644 (file)
--- a/k6-tests/ncmp/config/kpi.json
+++ b/k6-tests/ncmp/config/kpi.json
@@ -6,44 +6,24 @@
     "containerUpTimeInSeconds": 300
   },
   "scenarios": {
-    "passthrough_read_scenario": {
-      "executor": "constant-arrival-rate",
-      "exec": "passthroughReadScenario",
-      "rate": 5,
-      "timeUnit": "1s",
-      "duration": "15m",
-      "preAllocatedVUs": 5,
-      "startTime": "0ms"
-    },
     "passthrough_read_alt_id_scenario": {
       "executor": "constant-arrival-rate",
       "exec": "passthroughReadAltIdScenario",
-      "rate": 5,
+      "rate": 25,
       "timeUnit": "1s",
       "duration": "15m",
-      "preAllocatedVUs": 5,
+      "preAllocatedVUs": 10,
       "startTime": "200ms"
     },
-
-    "passthrough_write_scenario": {
-      "executor": "constant-arrival-rate",
-      "exec": "passthroughWriteScenario",
-      "rate": 5,
-      "timeUnit": "1s",
-      "duration": "15m",
-      "preAllocatedVUs": 5,
-      "startTime": "400ms"
-    },
     "passthrough_write_alt_id_scenario": {
       "executor": "constant-arrival-rate",
       "exec": "passthroughWriteAltIdScenario",
-      "rate": 5,
+      "rate": 13,
       "timeUnit": "1s",
       "duration": "15m",
-      "preAllocatedVUs": 5,
+      "preAllocatedVUs": 10,
       "startTime": "600ms"
     },
-
     "cm_handle_id_search_nofilter_scenario": {
       "executor": "constant-arrival-rate",
       "exec": "cmHandleIdSearchNoFilterScenario",
@@ -89,7 +69,6 @@
       "preAllocatedVUs": 1,
       "startTime": "1600ms"
     },
-
     "cm_handle_search_nofilter_scenario": {
       "executor": "constant-arrival-rate",
       "exec": "cmHandleSearchNoFilterScenario",
@@ -135,7 +114,6 @@
       "preAllocatedVUs": 1,
       "startTime": "12s"
     },
-
     "legacy_batch_produce_scenario": {
       "executor": "shared-iterations",
       "exec": "legacyBatchProduceScenario",
@@ -163,8 +141,6 @@
     "http_req_failed": ["rate == 0"],
     "cmhandles_created_per_second": ["avg >= 22"],
     "cmhandles_deleted_per_second": ["avg >= 22"],
-    "ncmp_overhead_passthrough_read": ["avg <= 40"],
-    "ncmp_overhead_passthrough_write": ["avg <= 40"],
     "ncmp_overhead_passthrough_read_alt_id": ["avg <= 40"],
     "ncmp_overhead_passthrough_write_alt_id": ["avg <= 40"],
     "id_search_nofilter_duration": ["avg <= 2000"],

diff --git a/k6-tests/ncmp/ncmp-test-runner.js b/k6-tests/ncmp/ncmp-test-runner.js
index 89d1c0c..b8fccdd 100644 (file)
--- a/k6-tests/ncmp/ncmp-test-runner.js
+++ b/k6-tests/ncmp/ncmp-test-runner.js
@@ -34,9 +34,7 @@ import { sendKafkaMessages } from './common/produce-avc-event.js';
 
 let cmHandlesCreatedPerSecondTrend = new Trend('cmhandles_created_per_second', false);
 let cmHandlesDeletedPerSecondTrend = new Trend('cmhandles_deleted_per_second', false);
-let passthroughReadNcmpOverheadTrend = new Trend('ncmp_overhead_passthrough_read', true);
 let passthroughReadNcmpOverheadTrendWithAlternateId = new Trend('ncmp_overhead_passthrough_read_alt_id', true);
-let passthroughWriteNcmpOverheadTrend = new Trend('ncmp_overhead_passthrough_write', true);
 let passthroughWriteNcmpOverheadTrendWithAlternateId = new Trend('ncmp_overhead_passthrough_write_alt_id', true);
 let idSearchNoFilterDurationTrend = new Trend('id_search_nofilter_duration', true);
 let idSearchModuleDurationTrend = new Trend('id_search_module_duration', true);
@@ -102,14 +100,6 @@ export function teardown() {
     sleep(CONTAINER_UP_TIME_IN_SECONDS);
 }
 
-export function passthroughReadScenario() {
-    const response = passthroughRead(false);
-    if (check(response, { 'passthrough read status equals 200': (r) => r.status === 200 })) {
-        const overhead = response.timings.duration - READ_DATA_FOR_CM_HANDLE_DELAY_MS;
-        passthroughReadNcmpOverheadTrend.add(overhead);
-    }
-}
-
 export function passthroughReadAltIdScenario() {
     const response = passthroughRead(true);
     if (check(response, { 'passthrough read with alternate Id status equals 200': (r) => r.status === 200 })) {
@@ -118,14 +108,6 @@ export function passthroughReadAltIdScenario() {
     }
 }
 
-export function passthroughWriteScenario() {
-    const response = passthroughWrite(false);
-    if (check(response, { 'passthrough write status equals 201': (r) => r.status === 201 })) {
-        const overhead = response.timings.duration - WRITE_DATA_FOR_CM_HANDLE_DELAY_MS;
-        passthroughWriteNcmpOverheadTrend.add(overhead);
-    }
-}
-
 export function passthroughWriteAltIdScenario() {
     const response = passthroughWrite(true);
     if (check(response, { 'passthrough write with alternate Id status equals 201': (r) => r.status === 201 })) {