Add variable for timeout of controller stop

This change will expose the max timeout used to stop a controller.
The value is not being changed, it just allows robot to override
the default via the "-v" parameter. Example:

pybot -v CONTROLLER_STOP_TIMEOUT:240

Change-Id: Ica23742006d4eaef5319b4faed29d9ed20866387
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

diff --git a/csit/libraries/ClusterKeywords.robot b/csit/libraries/ClusterKeywords.robot
index e3846aeaa19563a558844bcc9d957739172317d4..1a951c2337cf8a962a22be0b3c22d9f317a3426e 100644 (file)
--- a/csit/libraries/ClusterKeywords.robot
+++ b/csit/libraries/ClusterKeywords.robot
@@ -170,7 +170,7 @@ Stop One Or More Controllers
     : FOR    ${ip}    IN    @{controllers}
     \    Run Command On Remote System    ${ip}    ${cmd}
     : FOR    ${ip}    IN    @{controllers}
-    \    Wait Until Keyword Succeeds    120 s    3 s    Controller Down Check    ${ip}
+    \    Wait Until Keyword Succeeds    ${CONTROLLER_STOP_TIMEOUT} s    3 s    Controller Down Check    ${ip}
 
 Start One Or More Controllers
     [Arguments]    @{controllers}

diff --git a/csit/variables/Variables.py b/csit/variables/Variables.py
index ef89eecbd1bd477b630c515f29784647dc75681c..17e6f3adf3bcfcdf5eb4681db6dde4b81d1be868 100644 (file)
--- a/csit/variables/Variables.py
+++ b/csit/variables/Variables.py
@@ -29,6 +29,7 @@ CONTROLLER_PASSWORD = ''  # empty means use keys
 MININET_PASSWORD = ''  # empty means use keys
 KEYFILE_PASS = 'any'
 SSH_KEY = 'id_rsa'
+CONTROLLER_STOP_TIMEOUT = 120  # Max number of seconds test will wait for a controller to stop
 
 # KARAF Variaable
 KARAF_SHELL_PORT = '8101'