summaryrefslogtreecommitdiffstats
path: root/sdnvpn/lib/utils.py
diff options
context:
space:
mode:
authortomsou <soth@intracom-telecom.com>2017-06-27 13:51:13 +0000
committertomsou <soth@intracom-telecom.com>2017-06-27 13:53:11 +0000
commit18443e7872ddb154e2c91433ed03b09deab90321 (patch)
treee544385296996c9b8979d9d4db77f336193d50de /sdnvpn/lib/utils.py
parent3ce7e4e7d64007f4c242885b13766f4440bc533c (diff)
Adapt the floating ip handling in functest
Comply with the new floating ip management in functest (https://gerrit.opnfv.org/gerrit/#/c/36415) JIRA: SDNVPN-165 Change-Id: I39e380caf07568e2370246afcf483eb8adb3def6 Signed-off-by: tomsou <soth@intracom-telecom.com>
Diffstat (limited to 'sdnvpn/lib/utils.py')
-rw-r--r--sdnvpn/lib/utils.py23
1 files changed, 11 insertions, 12 deletions
diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py
index 7e41d41..220f61e 100644
--- a/sdnvpn/lib/utils.py
+++ b/sdnvpn/lib/utils.py
@@ -538,8 +538,16 @@ def detach_instance_from_ext_br(instance, compute_node):
compute_node.run_cmd(cmd.format(bridge=bridge))
-def cleanup_neutron(neutron_client, bgpvpn_ids, interfaces, subnet_ids,
- router_ids, network_ids):
+def cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces,
+ subnet_ids, router_ids, network_ids):
+
+ if len(floatingip_ids) != 0:
+ for floatingip_id in floatingip_ids:
+ if not os_utils.delete_floating_ip(neutron_client, floatingip_id):
+ logging.error('Fail to delete all floating ips. '
+ 'Floating ip with id {} was not deleted.'.
+ format(floatingip_id))
+ return False
if len(bgpvpn_ids) != 0:
for bgpvpn_id in bgpvpn_ids:
@@ -586,16 +594,7 @@ def cleanup_neutron(neutron_client, bgpvpn_ids, interfaces, subnet_ids,
return True
-def cleanup_nova(nova_client, floatingip_ids, instance_ids, image_ids):
-
- if len(floatingip_ids) != 0:
- for floatingip_id in floatingip_ids:
- if not os_utils.delete_floating_ip(nova_client, floatingip_id):
- logging.error('Fail to delete all floating ips. '
- 'Floating ip with id {} was not deleted.'.
- format(floatingip_id))
- return False
-
+def cleanup_nova(nova_client, instance_ids, image_ids):
if len(instance_ids) != 0:
for instance_id in instance_ids:
if not os_utils.delete_instance(nova_client, instance_id):