diff --git a/tests/k6/src/lib/api/dav.ts b/tests/k6/src/lib/api/dav.ts index 77d03e8c98..1d0b58b520 100644 --- a/tests/k6/src/lib/api/dav.ts +++ b/tests/k6/src/lib/api/dav.ts @@ -7,7 +7,7 @@ export const fileUpload = ( {credential, userName, asset}: { credential: types.Account | types.Token; userName: string; asset: types.Asset } ): RefinedResponse => { return http.put( - `${defaults.OC_OCIS_HOST}/remote.php/dav/files/${userName}/${asset.fileName}`, + `${defaults.OC_HOST}/remote.php/dav/files/${userName}/${asset.fileName}`, asset.bytes as any, { headers: { @@ -21,7 +21,7 @@ export const fileDownload = ( {credential, userName, fileName}: { credential: types.Account | types.Token; userName: string; fileName: string } ): RefinedResponse => { return http.get( - `${defaults.OC_OCIS_HOST}/remote.php/dav/files/${userName}/${fileName}`, + `${defaults.OC_HOST}/remote.php/dav/files/${userName}/${fileName}`, { headers: { ...api.headersDefault({credential}) @@ -34,7 +34,7 @@ export const fileDelete = ( {credential, userName, fileName}: { credential: types.Account | types.Token; userName: string; fileName: string } ): RefinedResponse => { return http.del( - `${defaults.OC_OCIS_HOST}/remote.php/dav/files/${userName}/${fileName}`, + `${defaults.OC_HOST}/remote.php/dav/files/${userName}/${fileName}`, {}, { headers: { diff --git a/tests/k6/src/lib/api/users.ts b/tests/k6/src/lib/api/users.ts index c15e36a51c..b6dd38df08 100644 --- a/tests/k6/src/lib/api/users.ts +++ b/tests/k6/src/lib/api/users.ts @@ -7,7 +7,7 @@ export const userInfo = ( {credential, userName}: { credential: types.Account | types.Token; userName: string; } ): RefinedResponse => { return http.get( - `${defaults.OC_OCIS_HOST}/ocs/v1.php/cloud/users/${userName}`, + `${defaults.OC_HOST}/ocs/v1.php/cloud/users/${userName}`, { headers: { ...api.headersDefault({credential}) diff --git a/tests/k6/src/lib/defaults.ts b/tests/k6/src/lib/defaults.ts index 04746a834a..094456a431 100644 --- a/tests/k6/src/lib/defaults.ts +++ b/tests/k6/src/lib/defaults.ts @@ -2,8 +2,10 @@ import * as types from './types'; import {Options} from "k6/options"; const ocTestFile = '../_files/' + (__ENV.OC_TEST_FILE || 'kb_50.jpg').split('/').pop() -export const OC_OCIS_HOST = __ENV.OC_OCIS_HOST || 'https://localhost:9200' -export const OC_OIDC_HOST = __ENV.OC_OIDC_HOST || OC_OCIS_HOST +export const OC_HOST = __ENV.OC_HOST || 'https://localhost:9200' +export const OC_LOGIN = __ENV.OC_LOGIN +export const OC_PASSWORD = __ENV.OC_PASSWORD +export const OC_OIDC_HOST = __ENV.OC_OIDC_HOST || OC_HOST export const OC_OIDC = __ENV.OC_OIDC === 'true' || false export const OC_TEST_FILE = { fileName: ocTestFile, diff --git a/tests/k6/src/lib/utils.ts b/tests/k6/src/lib/utils.ts index 54f9dcb354..36da0281db 100644 --- a/tests/k6/src/lib/utils.ts +++ b/tests/k6/src/lib/utils.ts @@ -1,3 +1,6 @@ +import * as types from "./types"; +import * as defaults from "./defaults"; + export const randomString = (): string => { return Math.random().toString(36).slice(2) } @@ -6,3 +9,14 @@ export const extension = (p: string): string | undefined => { return (p.split('/').pop())!.split('.').pop() } +export const getAccount = (key: string): types.Account => { + if (defaults.OC_LOGIN && defaults.OC_PASSWORD) { + return { + login: defaults.OC_LOGIN, + password: defaults.OC_PASSWORD, + } + } + + return defaults.knownAccounts[key]; +} + diff --git a/tests/k6/src/test/benchmark/file-download.ts b/tests/k6/src/test/benchmark/file-download.ts index 1506516dd6..21ef37de76 100644 --- a/tests/k6/src/test/benchmark/file-download.ts +++ b/tests/k6/src/test/benchmark/file-download.ts @@ -3,6 +3,7 @@ import {Options} from 'k6/options'; import {sleep} from "k6"; import * as auth from "../../lib/auth"; import * as types from "../../lib/types"; +import * as utils from "../../lib/utils"; interface dataI { credential: types.Account | types.Token; @@ -13,7 +14,7 @@ export const options: Options = { iterations: 1, vus: 1, }; -const account = defaults.knownAccounts.einstein; +const account = utils.getAccount('einstein'); const playbooks = { fileUpload: playbook.dav.fileUpload(), fileDownload: playbook.dav.fileDownload(), diff --git a/tests/k6/src/test/benchmark/file-upload.ts b/tests/k6/src/test/benchmark/file-upload.ts index 23fa5f9d3e..062c14c95b 100644 --- a/tests/k6/src/test/benchmark/file-upload.ts +++ b/tests/k6/src/test/benchmark/file-upload.ts @@ -3,6 +3,7 @@ import {Options} from 'k6/options'; import {sleep} from "k6"; import * as auth from "../../lib/auth"; import * as types from "../../lib/types"; +import * as utils from "../../lib/utils"; interface dataI { credential: types.Account | types.Token; @@ -13,7 +14,7 @@ export const options: Options = { iterations: 1, vus: 1, }; -const account = defaults.knownAccounts.einstein; +const account = utils.getAccount('einstein'); const playbooks = { fileUpload: playbook.dav.fileUpload(), fileDelete: playbook.dav.fileDelete(),