summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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()