Migrate Get Requests invocations(libraries)

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

diff --git a/csit/suites/openflowplugin/Bug_Validation/8723.robot b/csit/suites/openflowplugin/Bug_Validation/8723.robot
index 8dd96ef2f844445b5796d558c391cf0e4d61d824..f916e6f4dabf91fe63ddadf05ae6436023d64a1e 100644 (file)
--- a/csit/suites/openflowplugin/Bug_Validation/8723.robot
+++ b/csit/suites/openflowplugin/Bug_Validation/8723.robot
@@ -1,27 +1,33 @@
 *** Settings ***
-Documentation     Test suite for Split connection bug.
-Suite Setup       Initialization Phase
-Suite Teardown    Final Phase
-Library           XML
-Library           SSHLibrary
-Library           RequestsLibrary
-Library           Collections
-Resource          ../../../libraries/MininetKeywords.robot
-Resource          ../../../libraries/FlowLib.robot
-Resource          ../../../libraries/OVSDB.robot
-Resource          ../../../variables/Variables.robot
-Resource          ../../../variables/openflowplugin/Variables.robot
+Documentation       Test suite for Split connection bug.
+
+Library             XML
+Library             SSHLibrary
+Library             RequestsLibrary
+Library             Collections
+Resource            ../../../libraries/MininetKeywords.robot
+Resource            ../../../libraries/FlowLib.robot
+Resource            ../../../libraries/OVSDB.robot
+Resource            ../../../variables/Variables.robot
+Resource            ../../../variables/openflowplugin/Variables.robot
+
+Suite Setup         Initialization Phase
+Suite Teardown      Final Phase
+
 
 *** Variables ***
-${ODL_OF_PORT1}    6653
-${SH_CNTL_CMD}    ovs-vsctl list Controller
-${lprompt}        mininet>
+${ODL_OF_PORT1}     6653
+${SH_CNTL_CMD}      ovs-vsctl list Controller
+${lprompt}          mininet>
+
 
 *** Test Cases ***
 Create Two Active Switch Connections To Controller And Check OVS Connections
     [Documentation]    Make a second connection from switch s1 to a controller
     ${controller_opt} =    BuiltIn.Set Variable
-    ${controller_opt} =    BuiltIn.Catenate    ${controller_opt}    ${SPACE}tcp:${ODL_SYSTEM_IP}:${ODL_OF_PORT}${SPACE}tcp:${ODL_SYSTEM_IP}:${ODL_OF_PORT1}
+    ${controller_opt} =    BuiltIn.Catenate
+    ...    ${controller_opt}
+    ...    ${SPACE}tcp:${ODL_SYSTEM_IP}:${ODL_OF_PORT}${SPACE}tcp:${ODL_SYSTEM_IP}:${ODL_OF_PORT1}
     OVSDB.Set Controller In OVS Bridge    ${TOOLS_SYSTEM_IP}    s1    ${controller_opt}
     BuiltIn.Wait Until Keyword Succeeds    20s    1s    OVSDB.Check OVS OpenFlow Connections    ${TOOLS_SYSTEM_IP}    1
     Check Master Connection    30
@@ -37,25 +43,32 @@ Restore original Connection To Controller And Check OVS Connection
     FlowLib.Check Number Of Flows    1
     [Teardown]    Report_Failure_Due_To_Bug    8723
 
+
 *** Keywords ***
 Initialization Phase
     [Documentation]    Starts mininet and verify if topology is in operational datastore.
-    ${mininet_conn_id}=    MininetKeywords.Start Mininet Single Controller
+    ${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}
+    RequestsLibrary.Create Session
+    ...    session
+    ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
+    ...    auth=${AUTH}
+    ...    headers=${HEADERS_XML}
     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    ${RFC8040_NODES_API}
+    BuiltIn.Run Keyword And Ignore Error    RequestsLibrary.DELETE On Session    session    url=${RFC8040_NODES_API}
     MininetKeywords.Stop Mininet And Exit    ${mininet_conn_id}
     RequestsLibrary.Delete All Sessions
 
 Check Master Connection
-    [Arguments]    ${timeout}=20
     [Documentation]    Execute OvsVsctl List Controllers Command and check for master connection.
-    ${output} =    Utils.Run Command On Mininet    ${TOOLS_SYSTEM_IP}    sudo timeout --signal=KILL ${timeout} ovsdb-client monitor Controller target,role
+    [Arguments]    ${timeout}=20
+    ${output} =    Utils.Run Command On Mininet
+    ...    ${TOOLS_SYSTEM_IP}
+    ...    sudo timeout --signal=KILL ${timeout} ovsdb-client monitor Controller target,role
     BuiltIn.Set Suite Variable    ${output}
     Should Contain    ${output}    master
     Log    ${output}
-    BuiltIn.Return From Keyword    ${output}
+    RETURN    ${output}