Use RFC8040 URL for JSON-RPC tests

Replace Bierman02 URLs in the JSON-RPC tests with RFC8040 URLs.

Change-Id: I72c2fc2c5964c745239c9098dd0562cd52b26658
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/csit/libraries/JsonrpcKeywords.robot b/csit/libraries/JsonrpcKeywords.robot
index 45cc03a8a1573bea09f5d2541a91267f41bf5474..d7204da745ed249963d24d69e6696334e29d84af 100644 (file)
--- a/csit/libraries/JsonrpcKeywords.robot
+++ b/csit/libraries/JsonrpcKeywords.robot
@@ -43,13 +43,13 @@ Mount Read Service Endpoint
     [Documentation]    This keyword mounts an endpoint after starting service
     ${JSON1}    OperatingSystem.Get File    ${file}
     Log    ${JSON1}
-    ${response_json}    ClusterManagement.Put_As_Json_To_Member    ${READ_SERVICE_PEER_PUT_URL}${endpoint}    ${JSON1}    ${controller_index}
+    ${response_json}    ClusterManagement.Put_As_Json_To_Member    ${READ_SERVICE_PEER_URL}=${endpoint}    ${JSON1}    ${controller_index}
     Builtin.Log    ${response_json}
 
 Verify Data On Mounted Endpoint
     [Arguments]    ${controller_index}=${FIRST_CONTROLLER_INDEX}    ${endpoint}=${DEFAULT_ENDPOINT}
     [Documentation]    This keyword verifies if the data we get on the mount point is same as what we put
-    ${resp}    ClusterManagement.Get_From_Member    ${READ_SERVICE_PEER_GET_1}${endpoint}${READ_SERVICE_PEER_GET_2}    ${controller_index}
+    ${resp}    ClusterManagement.Get_From_Member    ${READ_SERVICE_PEER_URL}=${endpoint}${READ_SERVICE_PEER_MOUNT_PATH}?content=config    ${controller_index}
     ${response_json}    Builtin.Convert To String    ${resp}
     Log    ${response_json}
     Verify Restconf Get On Mounted Endpoint    ${response_json}    ${READSERVICE_NAME}

diff --git a/csit/variables/jsonrpc/JsonrpcVariables.robot b/csit/variables/jsonrpc/JsonrpcVariables.robot
index bcd2b4a54658cb2e7306edd2508ca1a841d03037..6301683a12459facb6858cad3ecc86b9cccbd6a8 100644 (file)
--- a/csit/variables/jsonrpc/JsonrpcVariables.robot
+++ b/csit/variables/jsonrpc/JsonrpcVariables.robot
@@ -4,10 +4,9 @@ Documentation     Resource consisting purely of variable definitions useful for
 *** Variables ***
 ${JSONRPCCONFIG_MODULE_JSON}    ${CURDIR}/jsonrpcconfig_module.json
 ${JSONRPCCONFIG_DATA_JSON}    ${CURDIR}/jsonrpcconfig_data.json
-${READ_SERVICE_PEER_PUT_URL}    /restconf/config/jsonrpc:config/configured-endpoints/
+${READ_SERVICE_PEER_URL}    /rests/data/jsonrpc:config/configured-endpoints
 ${READ_SERVICE_PEER_PAYLOAD}    ${CURDIR}/readservice_peer_payload.json
-${READ_SERVICE_PEER_GET_1}    /restconf/config/jsonrpc:config/configured-endpoints/
-${READ_SERVICE_PEER_GET_2}    /yang-ext:mount/jsonrpc:config/
+${READ_SERVICE_PEER_MOUNT_PATH}    /yang-ext:mount/jsonrpc:config
 ${DEFAULT_ENDPOINT}    foo
 ${DEFAULT_PORT}    4444
 ${FIRST_CONTROLLER_INDEX}    1

diff --git a/csit/variables/jsonrpc/readservice_peer_payload.json b/csit/variables/jsonrpc/readservice_peer_payload.json
index bd3d69ebd38732165f48bbf311564e82868aa6df..b5a4a4e4078dc41843ff2125af0af731ded088cc 100644 (file)
--- a/csit/variables/jsonrpc/readservice_peer_payload.json
+++ b/csit/variables/jsonrpc/readservice_peer_payload.json
@@ -1,14 +1,22 @@
 {
- "configured-endpoints": {
-  "name": "foo",
-  "modules": ["jsonrpc"],
-  "data-config-endpoints": [{
-   "path": "{}",
-   "endpoint-uri": "zmq://127.0.0.1:4444"
-  }],
-  "data-operational-endpoints": [{
-   "path": "{}",
-   "endpoint-uri": "zmq://127.0.0.1:4444"
-  }]
- }
+    "configured-endpoints": [
+        {
+            "name": "foo",
+            "modules": [
+                "jsonrpc"
+            ],
+            "data-config-endpoints": [
+                {
+                    "path": "{}",
+                    "endpoint-uri": "zmq://127.0.0.1:4444"
+                }
+            ],
+            "data-operational-endpoints": [
+                {
+                    "path": "{}",
+                    "endpoint-uri": "zmq://127.0.0.1:4444"
+                }
+            ]
+        }
+    ]
 }