cleaning up system variables

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

diff --git a/csit/suites/openflowplugin/Bug_Validation/2429.robot b/csit/suites/openflowplugin/Bug_Validation/2429.robot
index 670dc37576257570c1f16cc1db94b952ccec1976..390f9550a1a264fba8ac9c21b6b69c1d0d334752 100644 (file)
--- a/csit/suites/openflowplugin/Bug_Validation/2429.robot
+++ b/csit/suites/openflowplugin/Bug_Validation/2429.robot
@@ -1,9 +1,9 @@
 *** Settings ***
 Documentation     OF Handshake threads should be closed if the connection has a
-...               failure.  This bug was fixed in the Helium SR3 release but
-...               persisted in to the Lithium release.  Once fixed, this will
+...               failure. This bug was fixed in the Helium SR3 release but
+...               persisted in to the Lithium release. Once fixed, this will
 ...               catch any future regressions
-Metadata:         https://bugs.opendaylight.org/show_bug.cgi?id=2429
+Metadata          https://bugs.opendaylight.org/show_bug.cgi?id=2429    ${EMPTY}
 Library           OperatingSystem
 Library           SSHLibrary
 Library           Process
@@ -11,35 +11,38 @@ Resource          ../../../libraries/Utils.robot
 Variables         ../../../variables/Variables.py
 
 *** Variables ***
-${openflow_port}                   6633
+${openflow_port}    6633
 ${number_ofconnections_to_fail}    600
-${margin_of_error}                 0.05   # percentage
+${margin_of_error}    0.05    # percentage
 
 *** Test Cases ***
 Bug_2429
     [Documentation]    Using the "nc" tool, a number of connections to the ${openflow_port}
-    ...    will be opened and closed to simulate a failed OF handshake.  The java threadcount
-    ...    will be compared before and after to ensure that there are no thread leaks.  Since
+    ...    will be opened and closed to simulate a failed OF handshake. The java threadcount
+    ...    will be compared before and after to ensure that there are no thread leaks. Since
     ...    it's reasonable for other valid threads to be started (or stopped) during the test
     ...    a larger number of failed connections will be used and a small margin of error will
     ...    determine if the test is a PASS or FAIL
     Log Environment Details
-    ${controller_pid}=    Get Process ID Based On Regex On Remote System    ${CONTROLLER}    java.*distribution.*karaf    ${CONTROLLER_USER}
+    ${controller_pid}=    Get Process ID Based On Regex On Remote System    ${ODL_SYSTEM_IP}    java.*distribution.*karaf    ${ODL_SYSTEM_USER}
     Should Match Regexp    ${controller_pid}    [0-9]+    PID was not discovered
-    ${starting_thread_count}=    Get Process Thread Count On Remote System    ${CONTROLLER}    ${controller_pid}    ${CONTROLLER_USER}
-    Repeat Keyword    ${number_ofconnections_to_fail}    Start Process    nc    -w    1    ${CONTROLLER}    ${openflow_port}
+    ${starting_thread_count}=    Get Process Thread Count On Remote System    ${ODL_SYSTEM_IP}    ${controller_pid}    ${ODL_SYSTEM_USER}
+    Repeat Keyword    ${number_ofconnections_to_fail}    Start Process    nc    -w    1    ${ODL_SYSTEM_IP}
+    ...    ${openflow_port}
+    Run    pkill -f 'nc -w'
     Log Environment Details
-    ${ending_thread_count}=    Get Process Thread Count On Remote System    ${CONTROLLER}    ${controller_pid}    ${CONTROLLER_USER}
+    ${ending_thread_count}=    Get Process Thread Count On Remote System    ${ODL_SYSTEM_IP}    ${controller_pid}    ${ODL_SYSTEM_USER}
     Log Environment Details
     Log    starting count: ${starting_thread_count}\nending count: ${ending_thread_count}
     ${acceptable_thread_count}=    Evaluate    ${starting_thread_count} + (${number_of_connections_to_fail} * ${margin_of_error})
     Should Be True    ${ending_thread_count} <= ${acceptable_thread_count}    Final thread count of ${ending_thread_count} exceeds acceptable count: ${acceptable_thread_count}
+    [Teardown]    Report_Failure_Due_To_Bug    2429
 
-*** Keywords ****
+*** Keywords ***
 Log Environment Details
     [Documentation]    Will display relevant details of the test environement to help aid debugging efforts if
     ...    needed in the future.
-    ${output}=    Get Process ID Based On Regex On Remote System    ${CONTROLLER}    java.*distribution.*karaf    ${CONTROLLER_USER}
+    ${output}=    Get Process ID Based On Regex On Remote System    ${ODL_SYSTEM_IP}    java.*distribution.*karaf    ${ODL_SYSTEM_USER}
+    Log    ${output}
+    ${output}=    Run Command On Remote System    ${ODL_SYSTEM_IP}    netstat -na | grep 6633    ${ODL_SYSTEM_USER}
     Log    ${output}
-    ${output}=    Run Command On Remote System    ${CONTROLLER}    netstat -na | grep 6633    ${CONTROLLER_USER}
-    Log    ${output}
\ No newline at end of file