diff options
| -rw-r--r-- | k6-tests/ncmp/common/cmhandle-crud.js | 6 | ||||
| -rw-r--r-- | k6-tests/ncmp/common/passthrough-crud.js | 17 |
2 files changed, 14 insertions, 9 deletions
diff --git a/k6-tests/ncmp/common/cmhandle-crud.js b/k6-tests/ncmp/common/cmhandle-crud.js index 0fea1a44f2..285028f13c 100644 --- a/k6-tests/ncmp/common/cmhandle-crud.js +++ b/k6-tests/ncmp/common/cmhandle-crud.js @@ -53,9 +53,11 @@ function createCmHandlePayload(cmHandleIds) { "dmiPlugin": DMI_PLUGIN_URL, "createdCmHandles": cmHandleIds.map((cmHandleId, index) => ({ "cmHandle": cmHandleId, - "alternateId": cmHandleId.replace('ch-', 'alt-'), + "alternateId": cmHandleId.replace('ch-', 'Subnetwork=Europe,ManagedElement='), "moduleSetTag": MODULE_SET_TAGS[index % MODULE_SET_TAGS.length], - "cmHandleProperties": {"neType": "RadioNode"}, + "cmHandleProperties": { + "id": "123" + }, "publicCmHandleProperties": { "Color": "yellow", "Size": "small", diff --git a/k6-tests/ncmp/common/passthrough-crud.js b/k6-tests/ncmp/common/passthrough-crud.js index 86fcef6242..251ddf8890 100644 --- a/k6-tests/ncmp/common/passthrough-crud.js +++ b/k6-tests/ncmp/common/passthrough-crud.js @@ -29,7 +29,7 @@ import { export function passthroughRead(useAlternateId) { const cmHandleReference = getRandomCmHandleReference(useAlternateId); - const resourceIdentifier = 'my-resource-identifier'; + const resourceIdentifier = 'NRCellDU/attributes/cellLocalId'; const datastoreName = 'ncmp-datastore:passthrough-operational'; const includeDescendants = true; const url = generatePassthroughUrl(cmHandleReference, datastoreName, resourceIdentifier, includeDescendants); @@ -38,11 +38,14 @@ export function passthroughRead(useAlternateId) { export function passthroughWrite(useAlternateId) { const cmHandleReference = getRandomCmHandleReference(useAlternateId); - const resourceIdentifier = 'my-resource-identifier'; + const resourceIdentifier = 'NRCellDU/attributes/cellLocalId'; const datastoreName = 'ncmp-datastore:passthrough-running'; const includeDescendants = false; const url = generatePassthroughUrl(cmHandleReference, datastoreName, resourceIdentifier, includeDescendants); - const payload = JSON.stringify({"neType": "BaseStation"}); + const payload = JSON.stringify({ + "id": "123", + "attributes": {"userLabel": "test"} + }); return performPostRequest(url, payload, 'passthroughWrite'); } @@ -51,10 +54,10 @@ export function legacyBatchRead(cmHandleIds) { const payload = JSON.stringify({ "operations": [ { - "resourceIdentifier": "parent/child", + "resourceIdentifier": "NRCellDU/attributes/cellLocalId", "targetIds": cmHandleIds, "datastore": "ncmp-datastore:passthrough-operational", - "options": "(fields=schemas/schema)", + "options": "(fields=NRCellDU/attributes/cellLocalId)", "operationId": "12", "operation": "read" } @@ -64,8 +67,8 @@ export function legacyBatchRead(cmHandleIds) { } function getRandomCmHandleReference(useAlternateId) { - const prefix = useAlternateId ? 'alt' : 'ch'; - return `${prefix}-${randomIntBetween(1, TOTAL_CM_HANDLES)}`; + const prefix = useAlternateId ? 'Subnetwork=Europe,ManagedElement=' : 'ch-'; + return `${prefix}${randomIntBetween(1, TOTAL_CM_HANDLES)}`; } function generatePassthroughUrl(cmHandleReference, datastoreName, resourceIdentifier, includeDescendants) { |