X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Fsuites%2Fopenflowplugin%2FFlows_Additional_TCs%2F020_Lithium_Rps_Calls_Cpqd.robot;h=a22d47a2cd26a2450e187813dabf8d0ae2610c0f;hb=HEAD;hp=91f00bb142cd0513cf8636e0128deb5a87f9dc6a;hpb=67e35984cc1c25bb8635f97e41239c92405206c6;p=integration%2Ftest.git

diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot
index 91f00bb142..a22d47a2cd 100644
--- a/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot
+++ b/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot
@@ -1,39 +1,42 @@
 *** Settings ***
-Documentation     Test suite to test various rcp calls
-Suite Setup       Initialization Phase
-Suite Teardown    Final Phase
-Library           XML
-Library           RequestsLibrary
-Library           SSHLibrary
-Resource          ../../../libraries/Utils.robot
-Variables         ../../../variables/ofplugin/RpcVariables.py
+Documentation       Test suite to test various rcp calls
+
+Library             XML
+Library             RequestsLibrary
+Library             SSHLibrary
+Resource            ../../../libraries/Utils.robot
+Resource            ../../../libraries/FlowLib.robot
+Variables           ../../../variables/ofplugin/RpcVariables.py
+
+Suite Setup         Initialization Phase
+Suite Teardown      Final Phase
+
 
 *** Variables ***
-${send_update_table_url}    /restconf/operations/sal-table:update-table
-${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,1 --switch user
+${send_update_table_url}    /rests/operations/sal-table:update-table
+${start}                    sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo tree,1 --switch user
+
 
 *** Test Cases ***
 Sending Update Table
     [Documentation]    Test to send table update request
-    ${resp}=    RequestsLibrary.Post Request    session    ${send_update_table_url}    data=${RPC_SEND_UPDATE_TABLE_DATA}    headers=${HEADERS_XML}
+    ${resp}=    RequestsLibrary.POST On Session
+    ...    session
+    ...    url=${send_update_table_url}
+    ...    data=${RPC_SEND_UPDATE_TABLE_DATA}
+    ...    headers=${HEADERS_XML}
+    ...    expected_status=200
     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    40s    1s    Are Switches Connected Topo
+    Wait Until Keyword Succeeds    90s    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 Request    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