From 9fc412714c038f69f959105e1f5dc8e8a670d0b9 Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Wed, 18 Apr 2018 10:37:40 +0200 Subject: Track the indirectly created security groups networking-odl creates a security group when creating a router. This security group is not tracked by SNAPs and thus it never gets removed when running the clean up. We need this workaround until the following bug is fixed: https://bugs.launchpad.net/networking-odl/+bug/1763705 Change-Id: I15b939609e815f24ef0c1dcc0aeb9f4471f351f0 Signed-off-by: Manuel Buil --- sfc/lib/cleanup.py | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'sfc/lib/cleanup.py') diff --git a/sfc/lib/cleanup.py b/sfc/lib/cleanup.py index 32835fa8..7a2f4053 100644 --- a/sfc/lib/cleanup.py +++ b/sfc/lib/cleanup.py @@ -82,6 +82,13 @@ def delete_openstack_objects(creators): logger.error('Unexpected error cleaning - %s', e) +# Networking-odl generates a new security group when creating a router +# which is not tracked by SNAPs +def delete_untracked_security_groups(): + openstack_sfc = os_sfc_utils.OpenStackSFC() + openstack_sfc.delete_all_security_groups() + + def cleanup_odl(odl_ip, odl_port): delete_odl_resources(odl_ip, odl_port, 'service-function-forwarder') delete_odl_resources(odl_ip, odl_port, 'service-function-chain') @@ -98,6 +105,7 @@ def cleanup(creators, odl_ip=None, odl_port=None): delete_vnfds() delete_vims() delete_openstack_objects(creators) + delete_untracked_security_groups() if odl_ip is not None and odl_port is not None: cleanup_odl(odl_ip, odl_port) -- cgit 1.2.3-korg