1 files changed, 25 insertions, 23 deletions

diff --git a/k6-tests/ncmp/common/search-base.js b/k6-tests/ncmp/common/search-base.js
index bc964856af..a6424fe5d0 100644
--- a/k6-tests/ncmp/common/search-base.js
+++ b/k6-tests/ncmp/common/search-base.js
@@ -18,27 +18,7 @@
  *  ============LICENSE_END=========================================================
  */
 
-import http from 'k6/http';
-import { NCMP_BASE_URL, CONTENT_TYPE_JSON_PARAM } from './utils.js';
-
-const SEARCH_PARAMETERS_PER_SCENARIO = {
-    'module': {
-        'cmHandleQueryParameters': [
-            {
-                'conditionName': 'hasAllModules',
-                'conditionParameters': [{'moduleName': 'ietf-yang-types-1'}]
-            }
-        ]
-    },
-    'readyCmHandles': {
-        'cmHandleQueryParameters': [
-            {
-                'conditionName': 'cmHandleWithCpsPath',
-                'conditionParameters': [{'cpsPath': '//state[@cm-handle-state="READY"]'}]
-            }
-        ]
-    }
-};
+import {performPostRequest, NCMP_BASE_URL} from './utils.js';
 
 export function executeCmHandleSearch(scenario) {
     return executeSearchRequest('searches', scenario);
@@ -52,6 +32,28 @@ function executeSearchRequest(searchType, scenario) {
     const searchParameters = SEARCH_PARAMETERS_PER_SCENARIO[scenario];
     const payload = JSON.stringify(searchParameters);
     const url = `${NCMP_BASE_URL}/ncmp/v1/ch/${searchType}`;
-    const response = http.post(url, payload, CONTENT_TYPE_JSON_PARAM);
-    return response;
+    return performPostRequest(url, payload, searchType);
 }
+
+const SEARCH_PARAMETERS_PER_SCENARIO = {
+    "module-and-properties": {
+        "cmHandleQueryParameters": [
+            {
+                "conditionName": "hasAllModules",
+                "conditionParameters": [{"moduleName": "ietf-yang-types"}]
+            },
+            {
+                "conditionName": "hasAllProperties",
+                "conditionParameters": [{"Color": "yellow"}]
+            }
+        ]
+    },
+    "readyCmHandles": {
+        "cmHandleQueryParameters": [
+            {
+                "conditionName": "cmHandleWithCpsPath",
+                "conditionParameters": [{"cpsPath": "//state[@cm-handle-state='READY']"}]
+            }
+        ]
+    }
+};