Migrate request invocations (controller)

[integration/test.git] / csit / suites / controller / OneNode_Datastore / 010_crud_mdsal_perf.robot

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}