summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2015-12-22 11:51:55 +0100
committerjose.lausuch <jose.lausuch@ericsson.com>2015-12-22 11:51:55 +0100
commita473dce20c36df793aaaa0a43a2d13d42cc4815b (patch)
tree1cb10667e55185d33a7d014c59ac933a58507927
parent42bc5c13fcad3a8e6618d890d6d78129bdc48714 (diff)
Wait for floatingips to be released in clean_openstack script
Change-Id: I4d4a6866aa93d05729f625f4dffc1138cecffb16 Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
-rw-r--r--testcases/VIM/OpenStack/CI/libraries/clean_openstack.py10
1 files changed, 10 insertions, 0 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
index bdb1f7ea9..806d53c22 100644
--- a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
+++ b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
@@ -144,6 +144,16 @@ def remove_floatingips(nova_client):
logger.info(" > ERROR: There has been a problem removing the "
"floating IP %s..." % fip_id)
+ timeout = 50
+ while timeout > 0:
+ floatingips = functest_utils.get_floating_ips(nova_client)
+ if floatingips is None or len(floatingips) == 0:
+ break
+ else:
+ logger.debug("Waiting for floating ips to be released...")
+ timeout -= 1
+ time.sleep(1)
+
def remove_networks(neutron_client):
logger.info("Removing Neutron objects")