Replace Bierman02 with RFC8040 for OpenFlow Plugin

[integration/test.git] / csit / suites / openflowplugin / Bug_Validation / 7349.robot

diff --git a/csit/suites/openflowplugin/Bug_Validation/7349.robot b/csit/suites/openflowplugin/Bug_Validation/7349.robot
index 64c90733ec45f564ff725fba1c7e46d2c059a348..8a9d6dd1022bf1e239da717131ea0218700b8e9f 100644 (file)
--- a/csit/suites/openflowplugin/Bug_Validation/7349.robot
+++ b/csit/suites/openflowplugin/Bug_Validation/7349.robot
@@ -7,6 +7,7 @@ Library           RequestsLibrary
 Resource          ../../../libraries/MininetKeywords.robot
 Resource          ../../../libraries/FlowLib.robot
 Resource          ../../../variables/Variables.robot
+Resource          ../../../variables/openflowplugin/Variables.robot
 
 *** Variables ***
 ${XmlsDir}        ${CURDIR}/../../../variables/xmls
@@ -38,17 +39,10 @@ Initialization Phase
     ${mininet_conn_id}=    MininetKeywords.Start Mininet Single Controller
     BuiltIn.Set Suite Variable    ${mininet_conn_id}
     RequestsLibrary.Create Session    session    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
-    BuiltIn.Wait Until Keyword Succeeds    10s    1s    Are Switches Connected Topo
+    BuiltIn.Wait Until Keyword Succeeds    10s    1s    FlowLib.Check Switches In Topology    1
 
 Final Phase
     [Documentation]    Stops mininet.
-    BuiltIn.Run Keyword And Ignore Error    RequestsLibrary.Delete Request    session    ${CONFIG_NODES_API}
+    BuiltIn.Run Keyword And Ignore Error    RequestsLibrary.Delete Request    session    ${RFC8040_NODES_API}
     MininetKeywords.Stop Mininet And Exit    ${mininet_conn_id}
     RequestsLibrary.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}=    XML.Get Element Count    ${resp.content}    xpath=node
-    BuiltIn.Should Be Equal As Numbers    ${count}    1