summaryrefslogtreecommitdiffstats
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-26 19:05:50 +0200
commit86ebddb4e13faa86664fe262766ee09cfe3754e4 (patch)
tree2de7d89e203712af70df37ef73f57ec8e7affc59
parent1fc41fae8d8ae691311bb274f01988e67e416e95 (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> (cherry picked from commit c391f57e6797e544d14285ca433b2499ed84cd5f)
-rw-r--r--functest/core/cloudify.py1
-rw-r--r--functest/core/singlevm.py6
2 files changed, 4 insertions, 3 deletions
diff --git a/functest/core/cloudify.py b/functest/core/cloudify.py
index 2680d5357..a388a3cd6 100644
--- a/functest/core/cloudify.py
+++ b/functest/core/cloudify.py
@@ -31,6 +31,7 @@ class Cloudify(singlevm.SingleVm2):
flavor_disk = 40
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 ad79a8e14..f79e3ed92 100644
--- a/functest/core/singlevm.py
+++ b/functest/core/singlevm.py
@@ -45,6 +45,7 @@ class VmReady1(tenantnetwork.TenantNetwork1):
flavor_alt_ram = 1024
flavor_alt_vcpus = 1
flavor_alt_disk = 1
+ create_server_timeout = 60
image_format = 'qcow2'
@@ -147,9 +148,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