From f2e1e2571fec6fd701df3033641a3e11a8aae62f Mon Sep 17 00:00:00 2001 From: danielhanrahan Date: Sun, 25 Aug 2024 21:35:19 +0100 Subject: [k6] Align tests with updated requirements - Test load increased to 5 CM handle searches and 5 Id searches to reflect current requirements. - CM handles searches now use a combined search filter including 1 module and 1 public property, so we are testing with a heavier load than required, for early warning of trouble. - Test load reduced for passthrough operations to 4 VUs per operation to reflect addition of batch operation. - Added test of passthrough write operation with alternate ID. - Additional refactoring. Issue-ID: CPS-2349 Signed-off-by: danielhanrahan Change-Id: I88d2fe431f74821e8e0e976441efcf82aa320849 --- k6-tests/ncmp/common/utils.js | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'k6-tests/ncmp/common/utils.js') diff --git a/k6-tests/ncmp/common/utils.js b/k6-tests/ncmp/common/utils.js index 98c9eb86f1..d216f7fe19 100644 --- a/k6-tests/ncmp/common/utils.js +++ b/k6-tests/ncmp/common/utils.js @@ -38,17 +38,8 @@ export const MODULE_SET_TAGS = ['tagA','tagB','tagC',' tagD'] * @returns {string[]} Array of CM-handle IDs, for example ['ch-201', 'ch-202' ... 'ch-300'] */ export function makeBatchOfCmHandleIds(batchSize, batchNumber) { - const batchOfIds = []; const startIndex = 1 + batchNumber * batchSize; - for (let i = 0; i < batchSize; i++) { - let cmHandleId = `ch-${startIndex + i}`; - batchOfIds.push(cmHandleId); - } - return batchOfIds; -} - -export function getRandomCmHandleId() { - return `ch-${Math.floor(Math.random() * TOTAL_CM_HANDLES) + 1}`; + return Array.from({ length: batchSize }, (_, i) => `ch-${startIndex + i}`); } export function makeCustomSummaryReport(data, options) { @@ -61,7 +52,8 @@ export function makeCustomSummaryReport(data, options) { makeSummaryCsvLine('4', 'CM-handle search with Module filter', 'milliseconds', 'cm_search_duration', data, options), makeSummaryCsvLine('5a', 'NCMP overhead for Synchronous single CM-handle pass-through read', 'milliseconds', 'ncmp_overhead_passthrough_read', data, options), makeSummaryCsvLine('5b', 'NCMP overhead for Synchronous single CM-handle pass-through read with alternate id', 'milliseconds', 'ncmp_overhead_passthrough_read_alt_id', data, options), - makeSummaryCsvLine('6', 'NCMP overhead for Synchronous single CM-handle pass-through write', 'milliseconds', 'ncmp_overhead_passthrough_write', data, options), + makeSummaryCsvLine('6a', 'NCMP overhead for Synchronous single CM-handle pass-through write', 'milliseconds', 'ncmp_overhead_passthrough_write', data, options), + makeSummaryCsvLine('6b', 'NCMP overhead for Synchronous single CM-handle pass-through write with alternate id', 'milliseconds', 'ncmp_overhead_passthrough_write_alt_id', data, options), makeSummaryCsvLine('7', 'Data operations batch read', 'events/second', 'data_operations_batch_read_cmhandles_per_second', data, options), ]; return summaryCsvLines.join('\n') + '\n'; -- cgit 1.2.3-korg