Fix timeout (switch to synchronous calls)

It completes "Switch create_server timeout to default value" [1]
which forbids waiting more that 180s (create_server was asynchronous).

[1] https://gerrit.opnfv.org/gerrit/#/c/60423/2

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

diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py
index 46aa419..7393fdb 100644 (file)
--- a/functest/core/singlevm.py
+++ b/functest/core/singlevm.py
@@ -180,8 +180,7 @@ class VmReady1(tenantnetwork.TenantNetwork1):
             name if name else '{}-vm_{}'.format(self.case_name, self.guid),
             image=self.image.id, flavor=self.flavor.id,
             auto_ip=False, network=self.network.id,
-            timeout=self.create_server_timeout, **kwargs)
-        vm1 = self.cloud.wait_for_server(vm1, auto_ip=False)
+            timeout=self.create_server_timeout, wait=True, **kwargs)
         self.__logger.debug("vm: %s", vm1)
         return vm1
 

diff --git a/functest/opnfv_tests/openstack/vping/vping_userdata.py b/functest/opnfv_tests/openstack/vping/vping_userdata.py
index f9d0bdb..a58184c 100644 (file)
--- a/functest/opnfv_tests/openstack/vping/vping_userdata.py
+++ b/functest/opnfv_tests/openstack/vping/vping_userdata.py
@@ -46,7 +46,6 @@ class VPingUserdata(singlevm.VmReady2):
             self.vm2 = self.boot_vm(
                 '{}-vm2_{}'.format(self.case_name, self.guid),
                 userdata=self._get_userdata())
-            self.vm2 = self.cloud.wait_for_server(self.vm2, auto_ip=False)
 
             result = self._do_vping()
             self.stop_time = time.time()