Increase timeout in shaker and vmtp

Running them in parallel of rally full and jobs asks for a increase.

Change-Id: Ib2369d384ac839fb46031411e1985ac402da0c1e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit 6a4195b2dbdfeecb6b75450d28039097fd71d8eb)

diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index 57e033e..917c659 100644 (file)
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -40,6 +40,7 @@ class Shaker(singlevm.SingleVm2):
     port = 9000
     ssh_connect_loops = 12
     create_server_timeout = 300
+    check_console_loop = 12
     shaker_timeout = '3600'
     quota_instances = -1
     quota_cores = -1

diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py
index dc480c4..822c1b6 100644 (file)
--- a/functest/opnfv_tests/openstack/vmtp/vmtp.py
+++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py
@@ -50,6 +50,7 @@ class Vmtp(singlevm.VmReady2):
     flavor_vcpus = 1
     flavor_disk = 0
     create_server_timeout = 300
+    ssh_retry_timeout = 240
 
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
@@ -122,6 +123,7 @@ class Vmtp(singlevm.VmReady2):
                 self.guid)
             vmtp_conf["dns_nameservers"] = [env.get('NAMESERVER')]
             vmtp_conf["generic_retry_count"] = self.create_server_timeout // 2
+            vmtp_conf["ssh_retry_count"] = self.ssh_retry_timeout // 2
             conf.write(yaml.dump(vmtp_conf))
 
     def run_vmtp(self):