1 files changed, 6 insertions, 24 deletions

diff --git a/k6-tests/ncmp/ncmp-test-runner.js b/k6-tests/ncmp/ncmp-test-runner.js
index 89d1c0cfe7..1104b14e4a 100644
--- a/k6-tests/ncmp/ncmp-test-runner.js
+++ b/k6-tests/ncmp/ncmp-test-runner.js
@@ -1,6 +1,6 @@
 /*
  *  ============LICENSE_START=======================================================
- *  Copyright (C) 2024-2025 Nordix Foundation
+ *  Copyright (C) 2024-2025 OpenInfra Foundation Europe. All rights reserved.
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -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 })) {
@@ -137,7 +119,7 @@ export function passthroughWriteAltIdScenario() {
 export function cmHandleIdSearchNoFilterScenario() {
     const response = executeCmHandleIdSearch('no-filter');
     if (check(response, { 'CM handle ID no-filter search status equals 200': (r) => r.status === 200 })
-     && check(response, { 'CM handle ID no-filter search returned expected CM-handles': (r) => r.json('#') === TOTAL_CM_HANDLES })) {
+     && check(response, { 'CM handle ID no-filter search returned the correct number of ids': (r) => r.json('#') === TOTAL_CM_HANDLES })) {
         idSearchNoFilterDurationTrend.add(response.timings.duration);
     }
 }
@@ -153,7 +135,7 @@ export function cmHandleSearchNoFilterScenario() {
 export function cmHandleIdSearchModuleScenario() {
     const response = executeCmHandleIdSearch('module');
     if (check(response, { 'CM handle ID module search status equals 200': (r) => r.status === 200 })
-     && check(response, { 'CM handle ID module search returned expected CM-handles': (r) => r.json('#') === TOTAL_CM_HANDLES })) {
+     && check(response, { 'CM handle ID module search returned the correct number of ids': (r) => r.json('#') === TOTAL_CM_HANDLES })) {
         idSearchModuleDurationTrend.add(response.timings.duration);
     }
 }
@@ -169,7 +151,7 @@ export function cmHandleSearchModuleScenario() {
 export function cmHandleIdSearchPropertyScenario() {
     const response = executeCmHandleIdSearch('property');
     if (check(response, { 'CM handle ID property search status equals 200': (r) => r.status === 200 })
-     && check(response, { 'CM handle ID property search returned expected CM-handles': (r) => r.json('#') === TOTAL_CM_HANDLES })) {
+     && check(response, { 'CM handle ID property search returned the correct number of ids': (r) => r.json('#') === TOTAL_CM_HANDLES })) {
         idSearchPropertyDurationTrend.add(response.timings.duration);
     }
 }
@@ -185,7 +167,7 @@ export function cmHandleSearchPropertyScenario() {
 export function cmHandleIdSearchCpsPathScenario() {
     const response = executeCmHandleIdSearch('cps-path-for-ready-cm-handles');
     if (check(response, { 'CM handle ID cps path search status equals 200': (r) => r.status === 200 })
-     && check(response, { 'CM handle ID cps path search returned expected CM-handles': (r) => r.json('#') === TOTAL_CM_HANDLES })) {
+     && check(response, { 'CM handle ID cps path search returned the correct number of ids': (r) => r.json('#') === TOTAL_CM_HANDLES })) {
         idSearchCpsPathDurationTrend.add(response.timings.duration);
     }
 }
@@ -201,7 +183,7 @@ export function cmHandleSearchCpsPathScenario() {
 export function cmHandleIdSearchTrustLevelScenario() {
     const response = executeCmHandleIdSearch('trust-level');
     if (check(response, { 'CM handle ID trust level search status equals 200': (r) => r.status === 200 })
-     && check(response, { 'CM handle ID trust level search returned expected CM-handles': (r) => r.json('#') === TOTAL_CM_HANDLES })) {
+     && check(response, { 'CM handle ID trust level search returned the correct number of ids': (r) => r.json('#') === TOTAL_CM_HANDLES })) {
         idSearchTrustLevelDurationTrend.add(response.timings.duration);
     }
 }