Reduced timeout for SSH connection attempt in tempest.conf

Some tempest test cases try to establish SSH connection to
Cirros VMs using default 300s timeout. Since Cirros VMs send
only three DHCP requests with 1 minute interval, future SSH
connection attempts will most probably fail if DHCP response
will not be received right after third request. For that reason
the optimal timeout is slightly above 2 minutes.

JIRA: FUNCTEST-378

Change-Id: I57415ad37a85cd84887d3cac4f7a44f7e145d820
Signed-off-by: vitikkan <viktor.tikkanen@nokia.com>

diff --git a/ci/config_functest.yaml b/ci/config_functest.yaml
index e446820..fb4103d 100644 (file)
--- a/ci/config_functest.yaml
+++ b/ci/config_functest.yaml
@@ -74,6 +74,8 @@ tempest:
         tenant_description: Tenant for Tempest test suite
         user_name: tempest
         user_password: tempest
+    validation:
+        ssh_timeout: 130
     private_net_name: tempest-net
     private_subnet_name: tempest-subnet
     private_subnet_cidr: 192.168.150.0/24

diff --git a/testcases/OpenStack/tempest/run_tempest.py b/testcases/OpenStack/tempest/run_tempest.py
index 4a8a3d0..d29b3f3 100755 (executable)
--- a/testcases/OpenStack/tempest/run_tempest.py
+++ b/testcases/OpenStack/tempest/run_tempest.py
@@ -81,6 +81,8 @@ TENANT_DESCRIPTION = functest_yaml.get("tempest").get("identity").get(
 USER_NAME = functest_yaml.get("tempest").get("identity").get("user_name")
 USER_PASSWORD = functest_yaml.get("tempest").get("identity").get(
     "user_password")
+SSH_TIMEOUT = functest_yaml.get("tempest").get("validation").get(
+    "ssh_timeout")
 DEPLOYMENT_MAME = functest_yaml.get("rally").get("deployment_name")
 RALLY_INSTALLATION_DIR = functest_yaml.get("general").get("directories").get(
     "dir_rally_inst")
@@ -198,6 +200,7 @@ def configure_tempest(deployment_dir):
     config.set('identity', 'tenant_name', TENANT_NAME)
     config.set('identity', 'username', USER_NAME)
     config.set('identity', 'password', USER_PASSWORD)
+    config.set('validation', 'ssh_timeout', SSH_TIMEOUT)
 
     if os.getenv('OS_ENDPOINT_TYPE') is not None:
         services_list = ['compute', 'volume', 'image', 'network',