Log OpenFlow max switch scale result

[integration/test.git] / csit / suites / openflowplugin / Maximum_Switches / 020__find_max_switches.robot

diff --git a/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot b/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
index 3e988cb601e585e59e2a4229471ccf98c7ad2d88..b2adbc7759cb46108ee84ea15a399667c2d2401a 100644 (file)
--- a/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
+++ b/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
@@ -1,7 +1,7 @@
 *** Settings ***
 Documentation     Test suite to find maximum switches which can be connected to the controller
 Suite Setup       Start Suite
-Suite Teardown    Utils.Stop Suite
+Suite Teardown    Utils.Stop Mininet
 Library           SSHLibrary
 Resource          ../../../libraries/Utils.robot
 Variables         ../../../variables/Variables.py
@@ -23,7 +23,7 @@ Find Max Switches
     ${max_sw}    Convert to Integer    ${max_sw}
     ${step_sw}    Convert to Integer    ${step_sw}
     : FOR    ${exp_sw}    IN RANGE    ${init_sw}    ${max_sw+1}    ${step_sw}
-    \    BuiltIn.Wait Until Keyword Succeeds    35s    1s    Verify Switches Connected    ${exp_sw}
+    \    BuiltIn.Wait Until Keyword Succeeds    120s    1s    Verify Switches Connected    ${exp_sw}
     \    ${max_found}=    Set Variable    ${exp_sw}
     \    Set Suite variable    ${max_found}
     \    Add Switches    10
@@ -33,15 +33,15 @@ Find Max Switches
 Start Suite
     [Documentation]    Starts mininet with requested number of switches
     Log    Start the test on the base edition
-    ${mininet_conn_id}=    Open Connection    ${MININET}    prompt=>    timeout=1800
+    ${mininet_conn_id}=    Open Connection    ${TOOLS_SYSTEM_IP}    prompt=${DEFAULT_LINUX_PROMPT}    timeout=1800
     Set Suite Variable    ${mininet_conn_id}
-    Login With Public Key    ${MININET_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
+    Login With Public Key    ${TOOLS_SYSTEM_USER}    ${USER_HOME}/.ssh/${SSH_KEY}    any
     Put File    ${CURDIR}/../../../libraries/DynamicMininet.py    DynamicMininet.py
     Execute Command    sudo ovs-vsctl set-manager ptcp:6644
     Execute Command    sudo mn -c
     Write    ${start}
     Read Until    mininet>
-    Write    start ${CONTROLLER} ${init_sw}
+    Write    start ${ODL_SYSTEM_IP} ${init_sw}
     Read Until    mininet>
     Wait Until Keyword Succeeds    10s    1s    Verify Switches Connected    ${init_sw}
 
@@ -54,10 +54,11 @@ Add Switches
 Verify Switches Connected
     [Arguments]    ${exp_switches}
     [Documentation]    Verifies if switches are connected/present in operational inventory
-    ${sw}    ${rep}    ${found}=    Flow Stats Collected    controller=${CONTROLLER}
+    ${sw}    ${rep}    ${found}=    Flow Stats Collected    controller=${ODL_SYSTEM_IP}
     Should Be Equal As Numbers    ${sw}    ${exp_switches}
 
 Log Store Max Found
     [Documentation]    Logs the found number
     Log To Console    ${max_found}
+    Log    ${max_found}
     Append To File    ${out_file}    Max\n${max_found}