From: Cédric Ollivier Date: Sun, 29 Jul 2018 19:48:18 +0000 (+0200) Subject: Release floating ips used by juju_epc X-Git-Tag: opnfv-7.0.0~159 X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d072a425f48640780ca6a6d1f6332ec73d6bf5be;p=functest.git Release floating ips used by juju_epc It also cleans flavor_alt and image_alt. Change-Id: I62296075eca75c3c18caac4a3cddeef1fdb26e1b Signed-off-by: Cédric Ollivier --- 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) # ----------------------------------------------------------