openstack
/
kuryr-kubernetes
Code Issues Proposed changes

Merge "Ensure sg rules associated to listeners are deleted" into stable/rocky

This commit is contained in:
Zuul 2019-01-21 15:17:55 +00:00 committed by Gerrit Code Review
parent a8951134ed 9dd7c1a5fc
commit 324c186612
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kuryr_kubernetes/controller/drivers/lbaasv2.py
View File

@ -245,7 +245,10 @@ class LBaaSv2Driver(base.LBaaSDriver):
lbaas.delete_listener,
listener.id)
sg_id = self._find_listeners_sg(loadbalancer)
if loadbalancer.provider == const.NEUTRON_LBAAS_HAPROXY_PROVIDER:
sg_id = self._find_listeners_sg(loadbalancer)
else:
sg_id = self._get_vip_port(loadbalancer).get('security_groups')[0]
if sg_id:
rules = neutron.list_security_group_rules(
security_group_id=sg_id, description=listener.name)

2
kuryr_kubernetes/tests/unit/controller/drivers/test_lbaasv2.py
View File

@ -137,6 +137,8 @@ class TestLBaaSv2Driver(test_base.TestCase):
'security_group_rules': []}
cls = d_lbaasv2.LBaaSv2Driver
m_driver = mock.Mock(spec=d_lbaasv2.LBaaSv2Driver)
m_driver._get_vip_port.return_value = {
'security_groups': [mock.sentinel.sg_id]}
loadbalancer = mock.Mock()
listener = mock.Mock()