aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-18 15:05:47 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-18 15:09:34 +0200
commitc391f57e6797e544d14285ca433b2499ed84cd5f (patch)
tree1bc1efa64735e9c324c9e367d1c0da15a38157ce
parentc4c3a33b9e6ae87c15331bf95e5544f0f680e4f0 (diff)
Increase timeout when creating servers
It takes times to prepare disk on compute nodes (spawning). The default value is enough for all cirros VMs but it has to be increased for all cloudify VMs (4.1G). Change-Id: I3f1fc0142a73c586e9219a2718bfc467cc48e275 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/core/cloudify.py1
-rw-r--r--functest/core/singlevm.py6
-rw-r--r--functest/opnfv_tests/openstack/shaker/shaker.py1
3 files changed, 5 insertions, 3 deletions
diff --git a/functest/core/cloudify.py b/functest/core/cloudify.py
index b048ed1d4..655c5f5be 100644
--- a/functest/core/cloudify.py
+++ b/functest/core/cloudify.py
@@ -31,6 +31,7 @@ class Cloudify(singlevm.SingleVm2):
flavor_disk = 50
username = 'centos'
ssh_connect_loops = 12
+ create_server_timeout = 240
ports = [80, 443, 5671, 53333]
def __init__(self, **kwargs):
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py
index afc11106d..0f7ba71b4 100644
--- a/functest/core/singlevm.py
+++ b/functest/core/singlevm.py
@@ -48,6 +48,7 @@ class VmReady1(tenantnetwork.TenantNetwork1):
flavor_alt_ram = 1024
flavor_alt_vcpus = 1
flavor_alt_disk = 1
+ create_server_timeout = 60
def __init__(self, **kwargs):
if "case_name" not in kwargs:
@@ -177,9 +178,8 @@ 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,
- **kwargs)
+ auto_ip=False, wait=True, 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)
return vm1
diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index 4bf340344..86eed61da 100644
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -37,6 +37,7 @@ class Shaker(singlevm.SingleVm2):
username = 'ubuntu'
port = 9000
ssh_connect_loops = 12
+ create_server_timeout = 120
def prepare(self):
super(Shaker, self).prepare()