diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-08-03 10:38:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-08-03 10:38:54 +0000 |
| commit | 51b476da479b32ece3cee36dccd75191e0832940 (patch) | |
| tree | 805f2db268c9e009bc77b649c831827e78818508 | |
| parent | 1e6b7a08862b4a8ebe372fc5f3a46356181618f3 (diff) | |
| parent | f31841906a7cddcecc4c8fba9b641265811e9b7f (diff) | |
Merge "Fix timeout (switch to synchronous calls)"
| -rw-r--r-- | functest/core/singlevm.py | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/vping/vping_userdata.py | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/functest/core/singlevm.py b/functest/core/singlevm.py index 46aa41902..7393fdbe3 100644 --- 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 f9d0bdbf0..a58184c59 100644 --- 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() |