Merge "Fix floating ip timeout issues with uwsgi enabled"
diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py
index 152e7e8..c415c00 100644
--- a/tempest/api/compute/servers/test_server_actions.py
+++ b/tempest/api/compute/servers/test_server_actions.py
@@ -43,6 +43,17 @@
super(ServerActionsTestJSON, self).setUp()
# Check if the server is in a clean state after test
try:
+ validation_resources = self.get_class_validation_resources(
+ self.os_primary)
+ # _test_rebuild_server test compares ip address attached to the
+ # server before and after the rebuild, in order to avoid
+ # a situation when a newly created server doesn't have a floating
+ # ip attached at the beginning of the test_rebuild_server let's
+ # make sure right here the floating ip is attached
+ waiters.wait_for_server_floating_ip(
+ self.client,
+ self.client.show_server(self.server_id)['server'],
+ validation_resources['floating_ip'])
waiters.wait_for_server_status(self.client,
self.server_id, 'ACTIVE')
except lib_exc.NotFound:
diff --git a/tempest/common/compute.py b/tempest/common/compute.py
index d9ef83f..5ba0a1a 100644
--- a/tempest/common/compute.py
+++ b/tempest/common/compute.py
@@ -228,9 +228,6 @@
fip_client.associate_floating_ip_to_server(
floating_ip=validation_resources['floating_ip']['ip'],
server_id=servers[0]['id'])
- waiters.wait_for_server_floating_ip(
- clients.servers_client,
- servers[0], validation_resources['floating_ip'])
if wait_until:
for server in servers: