From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Tue, 22 Dec 2015 10:51:55 +0000 (+0100)
Subject: Wait for floatingips to be released in clean_openstack script
X-Git-Tag: brahmaputra.1.0~230
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F63%2F5063%2F1;p=functest.git

Wait for floatingips to be released in clean_openstack script

Change-Id: I4d4a6866aa93d05729f625f4dffc1138cecffb16
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---

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")