summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-29 21:48:18 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-30 01:02:26 +0200
commitd072a425f48640780ca6a6d1f6332ec73d6bf5be (patch)
tree3b3c0a6bc1c76723c86ea570989a4ccad166904a
parent366adc757e3beaeb1db7811df511a0e38c3eee6d (diff)
Release floating ips used by juju_epc
It also cleans flavor_alt and image_alt. Change-Id: I62296075eca75c3c18caac4a3cddeef1fdb26e1b Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/opnfv_tests/vnf/epc/juju_epc.py6
1 files changed, 6 insertions, 0 deletions
diff --git a/functest/opnfv_tests/vnf/epc/juju_epc.py b/functest/opnfv_tests/vnf/epc/juju_epc.py
index 95898ae6c..5429fe1e4 100644
--- a/functest/opnfv_tests/vnf/epc/juju_epc.py
+++ b/functest/opnfv_tests/vnf/epc/juju_epc.py
@@ -382,7 +382,13 @@ class JujuEpc(singlevm.VmReady2):
cpe.cmd, cpe.output)
except Exception: # pylint: disable=broad-except
self.__logger.exception("General issue during the undeployment ..")
+ for fip in self.cloud.list_floating_ips():
+ self.cloud.delete_floating_ip(fip.id)
super(JujuEpc, self).clean()
+ if self.image_alt:
+ self.cloud.delete_image(self.image_alt)
+ if self.flavor_alt:
+ self.orig_cloud.delete_flavor(self.flavor_alt.id)
# ----------------------------------------------------------