New OF reconciliation suite + other fixes

[integration/test.git] / csit / suites / openflowplugin / Flows_Additional_TCs / 030_Flow_Update_Test.robot

diff --git a/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot
index 2dd8900fa209f53fbd0844a3a42c40664dc346b4..090f699c68daff673c73fb6fc8b22e2a90d7f8d8 100644 (file)
--- a/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot
+++ b/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot
@@ -8,8 +8,8 @@ Library           XML
 Library           RequestsLibrary
 Library           SSHLibrary
 Resource          ../../../libraries/Utils.robot
-Variables         ../../../variables/Variables.py
 Resource          ../../../libraries/FlowLib.robot
+Variables         ../../../variables/Variables.py
 Library           ../../../libraries/XmlComparator.py
 
 *** Variables ***
@@ -44,20 +44,13 @@ Initialization Phase
     [Documentation]    Starts mininet and verify if topology is in operational ds
     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 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
-
 Delete Flow
     [Documentation]    Removes used flow
     ${resp}=    RequestsLibrary.Delete Request    session    ${CONFIG_NODES_API}/node/openflow:${switch_idx}/table/${table_id}/flow/${flow_id}