Migrate Get Requests invocations(libraries)

[integration/test.git] / csit / suites / openflowplugin / Performance_Flow_Config / 010_Rest_Config_Flows.robot

diff --git a/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot b/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
index cc6a72689c54a2149182095ad4c2a52f6c413e15..d095b03110d9b31bb8163ec786dcf323b30c65f2 100644 (file)
--- a/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
+++ b/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
@@ -1,21 +1,29 @@
 *** Settings ***
-Documentation     Test suite with connection of multiple switches
-Suite Setup       Utils.Start Suite
-Suite Teardown    Utils.Stop Suite
-Library           OperatingSystem
-Library           XML
-Library           Process
-Library           RequestsLibrary
-Resource          ../../../libraries/Utils.robot
-Variables         ../../../variables/Variables.py
+Documentation       Test suite with connection of multiple switches
+
+Library             OperatingSystem
+Library             XML
+Library             Process
+Library             RequestsLibrary
+Variables           ../../../variables/Variables.py
+Resource            ../../../libraries/Utils.robot
+Resource            ../../../variables/openflowplugin/Variables.robot
+
+Suite Setup         Utils.Start Mininet
+Suite Teardown      Utils.Stop Mininet
+
 
 *** Variables ***
-${switches}       25
-${flows}          2000
-${threads}        5
-${start}          sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${switches},1 --switch ovsk,protocols=OpenFlow13
-${PERFSCRIPT}     ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_add_delete_test.py
-${PARSESCRIPT}    ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py
+${switches}         25
+${flows}            2000
+${threads}          5
+${start}
+...                 sudo mn --controller=remote,ip=${ODL_SYSTEM_IP} --topo linear,${switches},1 --switch ovsk,protocols=OpenFlow13
+${PERFSCRIPT}
+...                 ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_add_delete_test.py
+${PARSESCRIPT}
+...                 ${CURDIR}/../../../../tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py
+
 
 *** Test Cases ***
 Check Switches Connected
@@ -34,16 +42,24 @@ Configure And Deconfigure Flows
     Should Be Equal As Integers    ${result.rc}    0
     ${result}=    Process.Run Process    python    ${PARSESCRIPT}
 
+
 *** Keywords ***
 Start Http Session
     [Documentation]    Starts http session.
     Log    http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML}
-    RequestsLibrary.Create Session    tcsession    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}    auth=${AUTH}    headers=${HEADERS_XML}
+    RequestsLibrary.Create Session
+    ...    tcsession
+    ...    http://${ODL_SYSTEM_IP}:${RESTCONFPORT}
+    ...    auth=${AUTH}
+    ...    headers=${HEADERS_XML}
 
 Are Switches Connected
-    [Arguments]    ${switches}
     [Documentation]    Checks Topology Contains a fix number ${switches} of switces.
-    ${resp}=    RequestsLibrary.Get Request    tcsession    /restconf/operational/network-topology:network-topology/topology/flow:1    headers=${ACCEPT_XML}
+    [Arguments]    ${switches}
+    ${resp}=    RequestsLibrary.GET On Session
+    ...    tcsession
+    ...    url=${RFC8040_OPERATIONAL_TOPO_FLOW1_API}
+    ...    headers=${ACCEPT_XML}
     Log    ${resp.content}
     ${count}=    XML.Get Element Count    ${resp.content}    xpath=node
     Should Be Equal As Numbers    ${count}    ${switches}