Switch create_server timeout to default value

60s was successfully reached when running all containers (3
containers * 3 branches) in parallel.

It also removes the wait attribute (the current impl will meet
a possible next asynchronous design) which is useless here.

For the time being, only cloudify needs an extra timeout.

Change-Id: Ic7741b4c1a3223be076fb69ef70a3cb6c05456c2
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py
index 768e67d..2a8ae87 100644 (file)
--- a/functest/core/singlevm.py
+++ b/functest/core/singlevm.py
@@ -49,7 +49,7 @@ class VmReady1(tenantnetwork.TenantNetwork1):
     flavor_alt_ram = 1024
     flavor_alt_vcpus = 1
     flavor_alt_disk = 1
-    create_server_timeout = 60
+    create_server_timeout = 180
 
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
@@ -179,7 +179,7 @@ class VmReady1(tenantnetwork.TenantNetwork1):
         vm1 = self.cloud.create_server(
             name if name else '{}-vm_{}'.format(self.case_name, self.guid),
             image=self.image.id, flavor=self.flavor.id,
-            auto_ip=False, wait=True, network=self.network.id,
+            auto_ip=False, network=self.network.id,
             timeout=self.create_server_timeout, **kwargs)
         vm1 = self.cloud.wait_for_server(vm1, auto_ip=False)
         self.__logger.debug("vm: %s", vm1)

diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index 097d9b2..efe3a15 100644 (file)
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -37,7 +37,6 @@ class Shaker(singlevm.SingleVm2):
     username = 'ubuntu'
     port = 9000
     ssh_connect_loops = 12
-    create_server_timeout = 360
 
     def __init__(self, **kwargs):
         super(Shaker, self).__init__(**kwargs)