Migrate request invocations (controller)

The '* Request' and 'To Json' RequestsLibrary keywords have been
deprecated. Replace '* Request' keywords with '* On Session' and replace
'To Json' in ClusterManagement.robot with the 'Json Parse from String'
keyword in Utils.robot.

Also, fix some URLs based on RESTCONF Bierman draft.

JIRA: INTTEST-141
Change-Id: I75586bd86678755541ecf9161dac31c6326f63d9
Signed-off-by: Yaroslav Lastivka <yaroslav.lastivka@pantheon.tech>
Signed-off-by: Sangwook Ha <sangwook.ha@verizon.com>

diff --git a/csit/libraries/ClusterManagement.robot b/csit/libraries/ClusterManagement.robot
index c624b10b8fd1b0067a8a467bc3e90e3c95a150c6..93ef015a108d413d20108d03c1c58d1e8052d9dd 100644 (file)
--- a/csit/libraries/ClusterManagement.robot
+++ b/csit/libraries/ClusterManagement.robot
@@ -30,7 +30,7 @@ Documentation       Resource housing Keywords common to several suites for clust
 ...
 ...                 TODO: Unify capitalization of Leaders and Followers.
 
-Library             RequestsLibrary    # for Create_Session and To_Json
+Library             RequestsLibrary    # for Create_Session
 Library             Collections
 Library             String
 Library             ClusterEntities.py
@@ -244,7 +244,7 @@ Get_Raft_Property_From_Shard_Member
     ...    uri=${uri}
     ...    session=${session}
     ...    http_timeout=${http_timeout}
-    ${data_object} =    RequestsLibrary.To_Json    ${data_text}
+    ${data_object} =    Utils.Json Parse From String    ${data_text}
     ${value} =    Collections.Get_From_Dictionary    ${data_object}    value
     ${raft_property} =    Collections.Get_From_Dictionary    ${value}    ${property}
     RETURN    ${raft_property}
@@ -1065,7 +1065,7 @@ ClusterManagement__Parse_Sync_Status
     [Documentation]    Return sync status parsed out of given text. Called twice by Get_Sync_Status_Of_Member.
     [Arguments]    ${shard_manager_text}
     BuiltIn.Log    ${shard_manager_text}
-    ${manager_object} =    RequestsLibrary.To_Json    ${shard_manager_text}
+    ${manager_object} =    Utils.Json Parse From String    ${shard_manager_text}
     ${value_object} =    Collections.Get_From_Dictionary    dictionary=${manager_object}    key=value
     ${sync_status} =    Collections.Get_From_Dictionary    dictionary=${value_object}    key=SyncStatus
     RETURN    ${sync_status}

diff --git a/csit/libraries/CrudLibrary.py b/csit/libraries/CrudLibrary.py
index 0f80253a3a5c81ac80c56b9cd082a521e4c8376a..cec6c5bc1f89c8532c3e9001caa5fada6050f6ec 100644 (file)
--- a/csit/libraries/CrudLibrary.py
+++ b/csit/libraries/CrudLibrary.py
@@ -210,7 +210,9 @@ def buyCar(hostname, port, numberOfCarBuyers, start=0):
 
 def getCars(hostname, port, ignore):
     """Uses the GET on car:cars resource to get all cars in the store using RESTCONF"""
-    resp = UtilLibrary.get(SettingsLibrary.getCarsUrl(hostname, port), "admin", "admin")
+    resp = UtilLibrary.get(
+        SettingsLibrary.getCarsUrl(hostname, port) + "?content=config", "admin", "admin"
+    )
     resp.encoding = "utf-8"
     print(resp.text)
     return resp
@@ -225,7 +227,9 @@ def getPersons(hostname, port, ignore):
     </note>
     """
     resp = UtilLibrary.get(
-        SettingsLibrary.getPersonsUrl(hostname, port), "admin", "admin"
+        SettingsLibrary.getPersonsUrl(hostname, port) + "?content=config",
+        "admin",
+        "admin",
     )
     resp.encoding = "utf-8"
     print(resp.text)
@@ -242,7 +246,9 @@ def getCarPersonMappings(hostname, port, ignore):
     </note>
     """
     resp = UtilLibrary.get(
-        SettingsLibrary.getCarPersonUrl(hostname, port), "admin", "admin"
+        SettingsLibrary.getCarPersonUrl(hostname, port) + "?content=config",
+        "admin",
+        "admin",
     )
     resp.encoding = "utf-8"
     print(resp)

diff --git a/csit/libraries/SettingsLibrary.py b/csit/libraries/SettingsLibrary.py
index 7e22ade8d8b991638bb0fb1ef3ef9bc9068a1e05..c0325d334f40ec611abae63847b935bc46da5fd6 100644 (file)
--- a/csit/libraries/SettingsLibrary.py
+++ b/csit/libraries/SettingsLibrary.py
@@ -19,49 +19,47 @@ __email__ = "syedbahm@cisco.com"
 
 def getCarsUrl(hostname, port):
     """Cars resource URL for GET"""
-    return "http://" + hostname + ":" + port + "/restconf/config/car:cars"
+    return "http://" + hostname + ":" + port + "/rests/data/car:cars"
 
 
 def getPersonsUrl(hostname, port):
     """People resouce URL for GET"""
-    return "http://" + hostname + ":" + port + "/restconf/config/people:people"
+    return "http://" + hostname + ":" + port + "/rests/data/people:people"
 
 
 def getCarPersonUrl(hostname, port):
     """GET cars persons mapping resource URL"""
-    return "http://" + hostname + ":" + port + "/restconf/config/car-people:car-people"
+    return "http://" + hostname + ":" + port + "/rests/data/car-people:car-people"
 
 
 def getAddCarInitUrl(hostname, port):
     """POST or DELETE URL"""
-    return "http://" + hostname + ":" + port + "/restconf/config"
+    return "http://" + hostname + ":" + port + "/rests/data"
 
 
 def getAddCarUrl(hostname, port):
     """POST or DELETE URL"""
-    return "http://" + hostname + ":" + port + "/restconf/config/car:cars"
+    return "http://" + hostname + ":" + port + "/rests/data/car:cars"
 
 
 def getAddPersonUrl(hostname, port):
     """POST or DELETE URL"""
-    return "http://" + hostname + ":" + port + "/restconf/config"
+    return "http://" + hostname + ":" + port + "/rests/data"
 
 
 def getAddPersonRpcUrl(hostname, port):
     """POST URL -using rpc"""
-    return "http://" + hostname + ":" + port + "/restconf/operations/people:add-person"
+    return "http://" + hostname + ":" + port + "/rests/operations/people:add-person"
 
 
 def getAddCarPersonUrl(hostname, port):
     """POST URL for car person mapping"""
-    return "http://" + hostname + ":" + port + "/restconf/config"
+    return "http://" + hostname + ":" + port + "/rests/data"
 
 
 def getBuyCarRpcUrl(hostname, port):
     """POST URL for buy car rpc"""
-    return (
-        "http://" + hostname + ":" + port + "/restconf/operations/car-purchase:buy-car"
-    )
+    return "http://" + hostname + ":" + port + "/rests/operations/car-purchase:buy-car"
 
 
 def getJolokiaURL(hostname, port, shardIndex, shardName):

diff --git a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
index 735cfa9e9b448c3d3b320272a3e267ba4e09fa74..0be32338a8ff4464f94e9079f463c7ba0a8b9996 100644 (file)
--- a/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
+++ b/csit/suites/controller/OneNode_Datastore/010_crud_mdsal_perf.robot
@@ -40,9 +40,12 @@ ${addpeoplecmd}
 ...                         python cluster_rest_script.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} add-rpc --itemtype people --itemcount ${ITEM_COUNT} --threads 5
 ${purchasecmd}
 ...                         python cluster_rest_script.py --host ${ODL_SYSTEM_IP} --port ${RESTCONFPORT} add-rpc --itemtype car-people --itemcount ${ITEM_COUNT} --threads 5
-${carurl}                   /restconf/config/car:cars
-${peopleurl}                /restconf/config/people:people
-${carpeopleurl}             /restconf/config/car-people:car-people
+${carurl}                   /rests/data/car:cars
+${carurl_config}            /rests/data/car:cars?content=config
+${peopleurl}                /rests/data/people:people
+${peopleurl_config}         /rests/data/people:people?content=config
+${carpeopleurl}             /rests/data/car-people:car-people
+${carpeopleurl_config}      /rests/data/car-people:car-people?content=config
 ${CONTROLLER_LOG_LEVEL}     INFO
 ${TOOL_OPTIONS}             ${EMPTY}
 
@@ -59,7 +62,7 @@ Verify Cars
     [Documentation]    Store logs and verify result
     Stop Tool
     Store File To Workspace    cluster_rest_script.log    cluster_rest_script_add_cars.log
-    ${rsp}=    RequestsLibrary.Get Request    session    ${carurl}    headers=${ACCEPT_XML}
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${carurl_config}    headers=${ACCEPT_XML}
     ${count}=    XML.Get Element Count    ${rsp.content}    xpath=car-entry
     Should Be Equal As Numbers    ${count}    ${ITEM_COUNT}
 
@@ -72,7 +75,7 @@ Verify People
     [Documentation]    Store logs and verify result
     Stop Tool
     Store File To Workspace    cluster_rest_script.log    cluster_rest_script_add_people.log
-    ${rsp}=    RequestsLibrary.Get Request    session    ${peopleurl}    headers=${ACCEPT_XML}
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${peopleurl_config}    headers=${ACCEPT_XML}
     ${count}=    XML.Get Element Count    ${rsp.content}    xpath=person
     Should Be Equal As Numbers    ${count}    ${ITEM_COUNT}
 
@@ -89,23 +92,20 @@ Verify Purchases
 
 Delete Cars
     [Documentation]    Remove cars from the datastore
-    ${rsp}=    RequestsLibrary.Delete Request    session    ${carurl}
-    Should Be Equal As Numbers    200    ${rsp.status_code}
-    ${rsp}=    RequestsLibrary.Get Request    session    ${carurl}
+    ${rsp}=    RequestsLibrary.DELETE On Session    session    url=${carurl}    expected_status=200
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${carurl_config}    expected_status=anything
     Should Contain    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 Delete People
     [Documentation]    Remove people from the datastore
-    ${rsp}=    RequestsLibrary.Delete Request    session    ${peopleurl}
-    Should Be Equal As Numbers    200    ${rsp.status_code}
-    ${rsp}=    RequestsLibrary.Get Request    session    ${peopleurl}
+    ${rsp}=    RequestsLibrary.DELETE On Session    session    url=${peopleurl}    expected_status=200
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${peopleurl_config}    expected_status=anything
     Should Contain    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 Delete CarPeople
     [Documentation]    Remove car-people entries from the datastore
-    ${rsp}=    RequestsLibrary.Delete Request    session    ${carpeopleurl}
-    Should Be Equal As Numbers    200    ${rsp.status_code}
-    ${rsp}=    RequestsLibrary.Get Request    session    ${carpeopleurl}
+    ${rsp}=    RequestsLibrary.DELETE On Session    session    url=${carpeopleurl}    expected_status=200
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${carpeopleurl_config}    expected_status=anything
     Should Contain    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 
@@ -149,7 +149,7 @@ Wait_Until_Tool_Finish
 Purchase Is Completed
     [Documentation]    Check purchase of ${item_count} is completed.
     [Arguments]    ${item_count}
-    ${rsp}=    RequestsLibrary.Get Request    session    ${carpeopleurl}    headers=${ACCEPT_XML}
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${carpeopleurl_config}    headers=${ACCEPT_XML}
     ${count}=    XML.Get Element Count    ${rsp.content}    xpath=car-person
     Should Be Equal As Numbers    ${count}    ${item_count}
 

diff --git a/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot b/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot
index 7fb96081317f34c8cef2b36d22715c03602f1785..a4fd17741f0959d64a0a84e439645ad0bbac6490 100644 (file)
--- a/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot
+++ b/csit/suites/controller/ThreeNodes_Datastore/010_crud_mdsal_perf.robot
@@ -43,9 +43,12 @@ ${addpeoplecmd}
 ...                         python cluster_rest_script.py --port ${RESTCONFPORT} add-rpc --itemtype people --itemcount ${ITEM_COUNT} --threads 6
 ${purchasecmd}
 ...                         python cluster_rest_script.py --port ${RESTCONFPORT} add-rpc --itemtype car-people --itemcount ${ITEM_COUNT} --threads 6
-${carurl}                   /restconf/config/car:cars
-${peopleurl}                /restconf/config/people:people
-${carpeopleurl}             /restconf/config/car-people:car-people
+${carurl}                   /rests/data/car:cars
+${carurl_config}            /rests/data/car:cars?content=config
+${peopleurl}                /rests/data/people:people
+${peopleurl_config}         /rests/data/people:people?content=config
+${carpeopleurl}             /rests/data/car-people:car-people
+${carpeopleurl_config}      /rests/data/car-people:car-people?content=config
 ${CONTROLLER_LOG_LEVEL}     INFO
 ${TOOL_OPTIONS}             ${EMPTY}
 
@@ -61,7 +64,7 @@ Verify Cars
     [Documentation]    Store logs and verify result
     Stop Tool
     Store File To Workspace    cluster_rest_script.log    cluster_rest_script_add_cars.log
-    ${rsp}=    RequestsLibrary.Get Request    ${car_leader_session}    ${carurl}    headers=${ACCEPT_XML}
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${carurl_config}    headers=${ACCEPT_XML}
     ${count}=    XML.Get Element Count    ${rsp.content}    xpath=car-entry
     Should Be Equal As Numbers    ${count}    ${ITEM_COUNT}
 
@@ -74,7 +77,7 @@ Verify People
     [Documentation]    Store logs and verify result
     Stop Tool
     Store File To Workspace    cluster_rest_script.log    cluster_rest_script_add_people.log
-    ${rsp}=    RequestsLibrary.Get Request    ${car_leader_session}    ${peopleurl}    headers=${ACCEPT_XML}
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${peopleurl_config}    headers=${ACCEPT_XML}
     ${count}=    XML.Get Element Count    ${rsp.content}    xpath=person
     Should Be Equal As Numbers    ${count}    ${ITEM_COUNT}
 
@@ -92,23 +95,20 @@ Verify Purchases
 
 Delete Cars
     [Documentation]    Remove cars from the datastore
-    ${rsp}=    RequestsLibrary.Delete Request    ${car_leader_session}    ${carurl}
-    Should Be Equal As Numbers    200    ${rsp.status_code}
-    ${rsp}=    RequestsLibrary.Get Request    ${car_leader_session}    ${carurl}
+    ${rsp}=    RequestsLibrary.DELETE On Session    session    url=${carurl}    expected_status=200
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${carurl_config}    expected_status=anything
     Should Contain    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 Delete People
     [Documentation]    Remove people from the datastore
-    ${rsp}=    RequestsLibrary.Delete Request    ${car_leader_session}    ${peopleurl}
-    Should Be Equal As Numbers    200    ${rsp.status_code}
-    ${rsp}=    RequestsLibrary.Get Request    ${car_leader_session}    ${peopleurl}
+    ${rsp}=    RequestsLibrary.DELETE On Session    session    url=${peopleurl}    expected_status=200
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${peopleurl_config}    expected_status=anything
     Should Contain    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 Delete CarPeople
     [Documentation]    Remove car-people entries from the datastore
-    ${rsp}=    RequestsLibrary.Delete Request    ${car_leader_session}    ${carpeopleurl}
-    Should Be Equal As Numbers    200    ${rsp.status_code}
-    ${rsp}=    RequestsLibrary.Get Request    ${car_leader_session}    ${carpeopleurl}
+    ${rsp}=    RequestsLibrary.DELETE On Session    session    url=${carpeopleurl}    expected_status=200
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${carpeopleurl_config}    expected_status=anything
     Should Contain    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 
@@ -128,6 +128,7 @@ Start Suite
     SSHLibrary.Put File    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/scripts/cluster_rest_script.py    .
     ${stdout}    ${stderr}    ${rc}=    SSHLibrary.Execute Command    ls    return_stdout=True    return_stderr=True
     ...    return_rc=True
+    RequestsLibrary.Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}
 
 Stop Suite
     [Documentation]    Suite teardown keyword
@@ -149,7 +150,7 @@ Wait_Until_Tool_Finish
 Purchase Is Completed
     [Documentation]    Check purchase of ${item_count} is completed.
     [Arguments]    ${item_count}
-    ${rsp}=    RequestsLibrary.Get Request    ${car_leader_session}    ${carpeopleurl}    headers=${ACCEPT_XML}
+    ${rsp}=    RequestsLibrary.GET On Session    session    url=${carpeopleurl_config}    headers=${ACCEPT_XML}
     ${count}=    XML.Get Element Count    ${rsp.content}    xpath=car-person
     Should Be Equal As Numbers    ${count}    ${item_count}
 

diff --git a/csit/suites/controller/ThreeNodes_Datastore/puts_during_isolation.robot b/csit/suites/controller/ThreeNodes_Datastore/puts_during_isolation.robot
index 7b02de6007a22f6ae893610e268051a69fbfd276..2be077c6f1cce170de5fac4df5925e4ad1068611 100644 (file)
--- a/csit/suites/controller/ThreeNodes_Datastore/puts_during_isolation.robot
+++ b/csit/suites/controller/ThreeNodes_Datastore/puts_during_isolation.robot
@@ -33,7 +33,8 @@ ${ITEM_COUNT}               ${10000}
 ${THREADS}                  10
 ${ADDCMD}
 ...                         python ${TOOL_NAME} --port ${RESTCONFPORT} add-with-retries --itemtype car --itemcount ${ITEM_COUNT} --threads ${THREADS}
-${CARURL}                   /restconf/config/car:cars
+${CARURL}                   /rests/data/car:cars
+${CARURL_CONFIG}            /rests/data/car:cars?content=config
 ${SHARD_NAME}               car
 ${SHARD_TYPE}               config
 ${TEST_LOG_LEVEL}           info
@@ -86,9 +87,8 @@ Rejoin_Isolated_Member
 Delete Cars
     [Documentation]    Remove cars from the datastore
     ${session} =    Resolve_Http_Session_For_Member    member_index=${new_leader_index}
-    ${rsp} =    RequestsLibrary.Delete Request    ${session}    ${CARURL}
-    Should Be Equal As Numbers    200    ${rsp.status_code}
-    ${rsp} =    RequestsLibrary.Get Request    ${session}    ${CARURL}
+    ${rsp} =    RequestsLibrary.DELETE On Session    ${session}    url=${CARURL}    expected_status=200
+    ${rsp} =    RequestsLibrary.GET On Session    ${session}    url=${CARURL_CONFIG}    expected_status=anything
     Should Contain    ${DELETED_STATUS_CODES}    ${rsp.status_code}
 
 
@@ -113,7 +113,7 @@ Stop Suite
     Stop_Tool
     ${session} =    Resolve_Http_Session_For_Member    member_index=${new_leader_index}
     # best effort to make sure cars are deleted in case more suites will run after this and the delete test case had trouble
-    ${rsp} =    RequestsLibrary.Delete Request    ${session}    ${CARURL}
+    ${rsp} =    RequestsLibrary.DELETE On Session    ${session}    url=${CARURL}    expected_status=anything
     BuiltIn.Log    ${rsp.status_code} : ${rsp.text}
     SSHKeywords.Virtual_Env_Delete
     Store_File_To_Workspace    ${out_file}    ${out_file}
@@ -147,7 +147,7 @@ Verify_Cars_Count
 Get_Cars_Count
     [Documentation]    Count car items in config ds.
     [Arguments]    ${session}
-    ${resp} =    RequestsLibrary.Get_Request    ${session}    ${CARURL}
+    ${resp} =    RequestsLibrary.GET On Session    ${session}    url=${CARURL_CONFIG}
     ${count} =    BuiltIn.Evaluate    len(${resp.json()}[cars][car-entry])
     RETURN    ${count}
 

diff --git a/csit/suites/controller/singleton_service/global_rpc_freeze.robot b/csit/suites/controller/singleton_service/global_rpc_freeze.robot
index 073c5916675adc98f1b600fbd784d890722565eb..8dfbfcff2bc720cebef6410d0310fc78434f6768 100644 (file)
--- a/csit/suites/controller/singleton_service/global_rpc_freeze.robot
+++ b/csit/suites/controller/singleton_service/global_rpc_freeze.robot
@@ -23,12 +23,12 @@ Default Tags        critical
 
 
 *** Variables ***
-${RPC_URL}                  /restconf/operations/basic-rpc-test:basic-global
+${RPC_URL}                  /rests/operations/basic-rpc-test:basic-global
 &{EMPTY_DICT}
 ${SERVICE}                  Basic-rpc-test']
 ${TEST_LOG_LEVEL}           info
 @{TEST_LOG_COMPONENTS}      org.opendaylight.controller.remote.rpc
-${EOS_URL}                  /restconf/operational/entity-owners:entity-owners
+${EOS_URL}                  /rests/data/entity-owners:entity-owners?content=nonconfig
 ${active_nodes}             ${EMPTY}
 
 

diff --git a/csit/suites/controller/singleton_service/global_rpc_isolate.robot b/csit/suites/controller/singleton_service/global_rpc_isolate.robot
index 96029838fb78a2ac6fabef645f2aab3bfe077cdf..42761acad6447a7dc54bc1ab2677287c3b6c9a48 100644 (file)
--- a/csit/suites/controller/singleton_service/global_rpc_isolate.robot
+++ b/csit/suites/controller/singleton_service/global_rpc_isolate.robot
@@ -24,12 +24,12 @@ Default Tags        critical
 
 
 *** Variables ***
-${RPC_URL}                  /restconf/operations/basic-rpc-test:basic-global
+${RPC_URL}                  /rests/operations/basic-rpc-test:basic-global
 &{EMPTY_DICT}
 ${SERVICE}                  Basic-rpc-test']
 ${TEST_LOG_LEVEL}           info
 @{TEST_LOG_COMPONENTS}      org.opendaylight.controller.remote.rpc
-${EOS_URL}                  /restconf/operational/entity-owners:entity-owners
+${EOS_URL}                  /rests/data/entity-owners:entity-owners?content=nonconfig
 ${RPC_STATUS_ISOLATED}      501
 
 
@@ -71,8 +71,8 @@ Rpc_On_Isolated_Node
     ${session} =    Resolve_Http_Session_For_Member    member_index=${old_brt_owner}
     BuiltIn.Run_Keyword_And_Ignore_Error    Get_And_Log_EOS_Output_To_Karaf_Log    ${session}
     BuiltIn.Pass_Execution    Rpc on isolated node may work for some time(bug 8207), then will fail (bug 8214)
-    ${resp} =    RequestsLibrary.Post Request    ${session}    ${RPC_URL}    data=${EMPTY}
-    BuiltIn.Should_Be_Equal_As_Numbers    ${resp.status_code}    ${RPC_STATUS_ISOLATED}
+    ${resp} =    RequestsLibrary.POST On Session    ${session}    url=${RPC_URL}    data=${EMPTY}
+    ...    expected_status=${RPC_STATUS_ISOLATED}
 
 Rpc_On_Non_Isolated_Cluster_Nodes
     [Documentation]    Run rpc on remained cluster nodes.

diff --git a/csit/suites/controller/singleton_service/global_rpc_kill.robot b/csit/suites/controller/singleton_service/global_rpc_kill.robot
index 59c0767e5ffaa467d3855a4bca7ffc2fe5ba598a..08ce9945b556d39a577faa5cc8ce195b19cec245 100644 (file)
--- a/csit/suites/controller/singleton_service/global_rpc_kill.robot
+++ b/csit/suites/controller/singleton_service/global_rpc_kill.robot
@@ -24,12 +24,12 @@ Default Tags        critical
 
 
 *** Variables ***
-${RPC_URL}                  /restconf/operations/basic-rpc-test:basic-global
+${RPC_URL}                  /rests/operations/basic-rpc-test:basic-global
 &{EMPTY_DICT}
 ${SERVICE}                  Basic-rpc-test']
 ${TEST_LOG_LEVEL}           info
 @{TEST_LOG_COMPONENTS}      org.opendaylight.controller.remote.rpc
-${EOS_URL}                  /restconf/operational/entity-owners:entity-owners
+${EOS_URL}                  /rests/data/entity-owners:entity-owners?content=nonconfig
 
 
 *** Test Cases ***

diff --git a/csit/variables/carpeople/crud/car-people/location.uri b/csit/variables/carpeople/crud/car-people/location.uri
index 81ac4440fca2c6b799456f54c044bd4f5c75d411..b78be0b238dced3c985fc55278fe70568b62ffc8 100644 (file)
--- a/csit/variables/carpeople/crud/car-people/location.uri
+++ b/csit/variables/carpeople/crud/car-people/location.uri
@@ -1 +1 @@
-/restconf/config/car-people:car-people
+/rests/data/car-people:car-people

diff --git a/csit/variables/carpeople/crud/cars/location.uri b/csit/variables/carpeople/crud/cars/location.uri
index 22a7f80ea181f29972b8a13197ae63941fd52d59..8a0a81dbdf605d1a4bd36789e25c079c2db2027f 100644 (file)
--- a/csit/variables/carpeople/crud/cars/location.uri
+++ b/csit/variables/carpeople/crud/cars/location.uri
@@ -1 +1 @@
-/restconf/config/car:cars
+/rests/data/car:cars

diff --git a/csit/variables/carpeople/libtest/car/location.uri b/csit/variables/carpeople/libtest/car/location.uri
index e07c8f83290421a930c19b6d5297846877b54fe9..2abba97b584a8bd5877236a619100ce9d02caad9 100644 (file)
--- a/csit/variables/carpeople/libtest/car/location.uri
+++ b/csit/variables/carpeople/libtest/car/location.uri
@@ -1 +1 @@
-/restconf/config/car:cars/car-entry/boogie
+/rests/data/car:cars/car-entry/boogie

diff --git a/csit/variables/carpeople/libtest/car_person/location.uri b/csit/variables/carpeople/libtest/car_person/location.uri
index 49d3e33b6cf6cf4226777afa40aa9283b825e8f7..6e7f29ead886c37563ad8f429a1d8ae1512ebebd 100644 (file)
--- a/csit/variables/carpeople/libtest/car_person/location.uri
+++ b/csit/variables/carpeople/libtest/car_person/location.uri
@@ -1 +1 @@
-/restconf/config/car-people:car-people/car-person/boogie/joe
+/rests/data/car-people:car-people/car-person/boogie/joe

diff --git a/csit/variables/carpeople/libtest/cars/location.uri b/csit/variables/carpeople/libtest/cars/location.uri
index 22a7f80ea181f29972b8a13197ae63941fd52d59..8a0a81dbdf605d1a4bd36789e25c079c2db2027f 100644 (file)
--- a/csit/variables/carpeople/libtest/cars/location.uri
+++ b/csit/variables/carpeople/libtest/cars/location.uri
@@ -1 +1 @@
-/restconf/config/car:cars
+/rests/data/car:cars

diff --git a/csit/variables/carpeople/libtest/cars_people/location.uri b/csit/variables/carpeople/libtest/cars_people/location.uri
index 81ac4440fca2c6b799456f54c044bd4f5c75d411..b78be0b238dced3c985fc55278fe70568b62ffc8 100644 (file)
--- a/csit/variables/carpeople/libtest/cars_people/location.uri
+++ b/csit/variables/carpeople/libtest/cars_people/location.uri
@@ -1 +1 @@
-/restconf/config/car-people:car-people
+/rests/data/car-people:car-people