Update Robot Framework format - step 11

[integration/test.git] / csit / suites / openflowplugin / Flows_Additional_TCs / 010_Lithium_Rps_Calls_Ovs.robot

diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot
index 232b230391709abf5939a8b8f4a6bf653a68fee7..fee03a0ba0afb115dbf95fe8a6df4859fc853150 100644 (file)
--- a/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot
+++ b/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot
@@ -6,40 +6,34 @@ Library           XML
 Library           RequestsLibrary
 Library           SSHLibrary
 Resource          ../../../libraries/Utils.robot
+Resource          ../../../libraries/FlowLib.robot
 Variables         ../../../variables/ofplugin/RpcVariables.py
 
 *** Variables ***
-${send_barrier_url}    /restconf/operations/flow-capable-transaction:send-barrier
-${send_echo_url}    /restconf/operations/sal-echo:send-echo
+${send_barrier_url}    /rests/operations/flow-capable-transaction:send-barrier
+${send_echo_url}    /rests/operations/sal-echo:send-echo
 
 *** Test Cases ***
 Sending Barrier
     [Documentation]    Test to send barrier
-    ${resp}=    RequestsLibrary.Post    session    ${send_barrier_url}    data=${RPC_SEND_BARRIER_DATA}    headers=${HEADERS_XML}
+    ${resp}=    RequestsLibrary.Post Request    session    ${send_barrier_url}    data=${RPC_SEND_BARRIER_DATA}    headers=${HEADERS_XML}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 Sending Echo
     [Documentation]    Test to send echo
-    ${resp}=    RequestsLibrary.Post    session    ${send_echo_url}    data=${RPC_SEND_ECHO_DATA}    headers=${HEADERS_XML}
+    ${resp}=    RequestsLibrary.Post Request    session    ${send_echo_url}    data=${RPC_SEND_ECHO_DATA}    headers=${HEADERS_XML}
     Log    ${resp.content}
     Should Be Equal As Strings    ${resp.status_code}    200
 
 *** Keywords ***
 Initialization Phase
     [Documentation]    Starts mininet and verify if topology is in operational ds
-    Start Suite
+    Start Mininet
     Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
+    Wait Until Keyword Succeeds    10s    1s    FlowLib.Check Switches In Topology    1
 
 Final Phase
     [Documentation]    Stops mininet
-    Stop Suite
+    Stop Mininet
     Delete All Sessions
-
-Are Switches Connected Topo
-    [Documentation]    Checks wheather switches are connected to controller
-    ${resp}=    RequestsLibrary.Get    session    ${OPERATIONAL_TOPO_API}/topology/flow:1    headers=${ACCEPT_XML}
-    Log    ${resp.content}
-    ${count}=    Get Element Count    ${resp.content}    xpath=node
-    Should Be Equal As Numbers    ${count}    1