From: shikha0203 Date: Wed, 28 Jan 2026 11:46:09 +0000 (+0000) Subject: Fix: broken testware X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=4f10010fe988a6660c6bca69a8e518dd90b089bc;p=cps.git Fix: broken testware Issue-ID: CPS-3056 Change-Id: Ie24d759d65697182336bf71d9641d30a0485ba24 Signed-off-by: shikha0203 --- diff --git a/k6-tests/ncmp/common/utils.js b/k6-tests/ncmp/common/utils.js index 8691a3710c..0c334d6755 100644 --- a/k6-tests/ncmp/common/utils.js +++ b/k6-tests/ncmp/common/utils.js @@ -27,9 +27,10 @@ export const TEST_PROFILE = __ENV.TEST_PROFILE ? __ENV.TEST_PROFILE : 'kpi' export const HOST_TYPE = __ENV.DEPLOYMENT_TYPE ? __ENV.DEPLOYMENT_TYPE : 'dockerHosts' export const testConfig = JSON.parse(open(`../config/${TEST_PROFILE}.json`)); export const scenarioMetaData = JSON.parse(open(`../config/scenario-metadata.json`)); -export const KAFKA_BOOTSTRAP_SERVERS = testConfig[`${HOST_TYPE}`].kafkaBootstrapServer; -export const NCMP_BASE_URL = testConfig[`${HOST_TYPE}`].ncmpBaseUrl; -export const DMI_PLUGIN_URL = testConfig[`${HOST_TYPE}`].dmiStubUrl; +export const KAFKA_BOOTSTRAP_SERVERS = __ENV.KAFKA_BOOTSTRAP_SERVERS || testConfig[`${HOST_TYPE}`].kafkaBootstrapServer; +export const NCMP_BASE_URL = __ENV.NCMP_BASE_URL || testConfig[`${HOST_TYPE}`].ncmpBaseUrl; +export const DMI_PLUGIN_URL = __ENV.DMI_PLUGIN_URL || (HOST_TYPE === 'k8sHosts' ? 'http://cps-ncmp-dmi-stub-1-service:8092' + : testConfig[`${HOST_TYPE}`].dmiStubUrl); export const CONTAINER_COOL_DOWW_TIME_IN_SECONDS = testConfig[`${HOST_TYPE}`].containerCoolDownTimeInSeconds || 10; export const LEGACY_BATCH_TOPIC_NAME = 'legacy_batch_topic'; export const TOTAL_CM_HANDLES = __ENV.TOTAL_CM_HANDLES ? parseInt(__ENV.TOTAL_CM_HANDLES) : 50000; @@ -48,7 +49,7 @@ export const MODULE_SET_TAGS = ['tagA', 'tagB', 'tagC', 'tagD', 'tagE']; */ export function makeBatchOfCmHandleIds(batchSize, batchNumber) { const startIndex = 1 + batchNumber * batchSize; - return Array.from({ length: batchSize }, (_, i) => `ch-${startIndex + i}`); + return Array.from({length: batchSize}, (_, i) => `ch-${startIndex + i}`); } /** @@ -124,17 +125,17 @@ export function performGetRequest(url, metricTag) { export function makeCustomSummaryReport(testResults, scenarioConfig) { const summaryCsvLines = [ '#,Test Name,Unit,Fs Requirement,Current Expectation,Actual', - ...scenarioMetaData.map(kpiTest => { - return makeSummaryCsvLine( - kpiTest.testNumber, - kpiTest.testName, - kpiTest.unit, - kpiTest.measurementName, - kpiTest.currentExpectation, - testResults, - scenarioConfig - ); - }) + ...scenarioMetaData.map(kpiTest => { + return makeSummaryCsvLine( + kpiTest.testNumber, + kpiTest.testName, + kpiTest.unit, + kpiTest.measurementName, + kpiTest.currentExpectation, + testResults, + scenarioConfig + ); + }) ]; return summaryCsvLines.join('\n') + '\n'; } diff --git a/k6-tests/ncmp/config/kpi.json b/k6-tests/ncmp/config/kpi.json index 609de30993..18b85b3fb7 100644 --- a/k6-tests/ncmp/config/kpi.json +++ b/k6-tests/ncmp/config/kpi.json @@ -7,7 +7,7 @@ }, "k8sHosts": { "ncmpBaseUrl": "http://localhost:30080", - "dmiStubUrl": "http://cps-and-ncmp-dmi-stub-1-service:8092", + "dmiStubUrl": "http://localhost:30092", "kafkaBootstrapServer": "localhost:30093" }, "scenarios": {