[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 <daniel.hanrahan@est.tech>
Change-Id: I88d2fe431f74821e8e0e976441efcf82aa320849

1 files changed, 12 insertions, 8 deletions

diff --git a/k6-tests/ncmp/common/search-base.js b/k6-tests/ncmp/common/search-base.js
index a7d0c925c4..beb3aad07c 100644
--- a/k6-tests/ncmp/common/search-base.js
+++ b/k6-tests/ncmp/common/search-base.js
@@ -22,19 +22,23 @@ import http from 'k6/http';
 import { NCMP_BASE_URL, CONTENT_TYPE_JSON_PARAM } from './utils.js';
 
 const SEARCH_PARAMETERS_PER_SCENARIO = {
-    'module': {
-        'cmHandleQueryParameters': [
+    "module-and-properties": {
+        "cmHandleQueryParameters": [
             {
-                'conditionName': 'hasAllModules',
-                'conditionParameters': [{'moduleName': 'ietf-yang-types'}]
+                "conditionName": "hasAllModules",
+                "conditionParameters": [{"moduleName": "ietf-yang-types"}]
+            },
+            {
+                "conditionName": "hasAllProperties",
+                "conditionParameters": [{"Color": "yellow"}]
             }
         ]
     },
-    'readyCmHandles': {
-        'cmHandleQueryParameters': [
+    "readyCmHandles": {
+        "cmHandleQueryParameters": [
             {
-                'conditionName': 'cmHandleWithCpsPath',
-                'conditionParameters': [{'cpsPath': '//state[@cm-handle-state="READY"]'}]
+                "conditionName": "cmHandleWithCpsPath",
+                "conditionParameters": [{"cpsPath": "//state[@cm-handle-state='READY']"}]
             }
         ]
     }