javelin: don't destroy floating IP resource
The code to destroy floating IP resources is broken today and needs more
work.
To bring back the CI again, let's drop this code and add a TODO so we
can work on it later once CI is back and we also have a new job testing
Grenade on Neutron.
Change-Id: I8cf7fb3aa7e361d603716afbd3cf98827151f094
diff --git a/tempest/cmd/javelin.py b/tempest/cmd/javelin.py
index ab23dea..e970249 100755
--- a/tempest/cmd/javelin.py
+++ b/tempest/cmd/javelin.py
@@ -870,32 +870,14 @@
for server in servers:
client = client_for_user(server['owner'])
- res = _get_server_by_name(client, server['name'])
- if not res:
+ response = _get_server_by_name(client, server['name'])
+ if not response:
LOG.info("Server '%s' does not exist" % server['name'])
continue
- res = client.servers.get_server(res['id'])
- # we iterate all interfaces until we find a floating IP
- # and stop looping after dropping it.
- def _find_first_floating():
- if (CONF.service_available.neutron and
- not CONF.baremetal.driver_enabled and
- CONF.compute.use_floatingip_for_ssh):
- for network_name, body in res['addresses'].items():
- for addr in body:
- ip = addr['addr']
- if addr.get('OS-EXT-IPS:type',
- 'floating') == 'floating':
- (client.floating_ips.
- disassociate_floating_ip_from_server(
- ip, res['id']))
- client.floating_ips.delete_floating_ip(ip)
- return
-
- _find_first_floating()
- client.servers.delete_server(res['id'])
- client.servers.wait_for_server_termination(res['id'],
+ # TODO(EmilienM): disassociate floating IP from server and release it.
+ client.servers.delete_server(response['id'])
+ client.servers.wait_for_server_termination(response['id'],
ignore_error=True)