Replace Bierman02 with RFC8040 for OpenFlow Plugin

[integration/test.git] / csit / suites / openflowplugin / Flows_Additional_TCs / 020_Lithium_Rps_Calls_Cpqd.robot

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 f86184250c78512c64e5a8f577fa9e4097ecb2f8..e5df8165fc62e548d1c94597bced24139e6b628f 100644 (file)
--- 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
@@ -6,10 +6,11 @@ Library           XML
 Library           RequestsLibrary
 Library           SSHLibrary
 Resource          ../../../libraries/Utils.robot
+Resource          ../../../libraries/FlowLib.robot
 Variables         ../../../variables/ofplugin/RpcVariables.py
 
 *** Variables ***
-${send_update_table_url}    /restconf/operations/sal-table:update-table
+${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 ***
@@ -22,18 +23,11 @@ Sending Update Table
 *** 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    60s    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