x/quark
Code Issues Proposed changes

Merge "Deleting a port without sg does not hit redis"

Browse Source
This commit is contained in:
Zuul 2018-02-06 17:46:53 +00:00 committed by Gerrit Code Review
commit c4eeb27c3a
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
quark/drivers/security_groups.py
View File

@ -42,11 +42,12 @@ class SecurityGroupDriver(object):
def delete_port(self, **kwargs):
client = sg_client.SecurityGroupsClient()
try:
device_id = kwargs.get('device_id')
mac_address = kwargs.get('mac_address')
if not device_id or not mac_address:
LOG.warning('device_id or mac_address not given, ignored.')
return
client.delete_vif(device_id, mac_address)
if kwargs.get('security_groups'):
device_id = kwargs.get('device_id')
mac_address = kwargs.get('mac_address')
if not device_id or not mac_address:
LOG.warning('device_id or mac_address not given, ignored.')
return
client.delete_vif(device_id, mac_address)
except Exception:
LOG.exception("Failed to reach the security groups backend")

31
quark/tests/test_unmanaged_driver.py
View File

@ -113,14 +113,38 @@ class TestUnmanagedDriver(test_base.TestBase):
@mock.patch("quark.cache.security_groups_client.SecurityGroupsClient")
def test_delete_port(self, sg_cli):
device_id = str(uuid.uuid4())
mac_address = netaddr.EUI("AA:BB:CC:DD:EE:FF").value
security_groups = [str(uuid.uuid4())]
mock_client = mock.MagicMock()
sg_cli.return_value = mock_client
self.driver.delete_port(context=self.context, port_id=2,
mac_address=mac_address, device_id=device_id,
security_groups=security_groups)
mock_client.delete_vif.assert_called_once_with(
device_id, mac_address)
@mock.patch("quark.cache.security_groups_client.SecurityGroupsClient")
def test_delete_port_empty_security_group(self, sg_cli):
device_id = str(uuid.uuid4())
mac_address = netaddr.EUI("AA:BB:CC:DD:EE:FF").value
security_groups = []
mock_client = mock.MagicMock()
sg_cli.return_value = mock_client
self.driver.delete_port(context=self.context, port_id=2,
mac_address=mac_address, device_id=device_id,
security_groups=security_groups)
mock_client.delete_vif.assert_not_called()
@mock.patch("quark.cache.security_groups_client.SecurityGroupsClient")
def test_delete_port_no_security_group(self, sg_cli):
device_id = str(uuid.uuid4())
mac_address = netaddr.EUI("AA:BB:CC:DD:EE:FF").value
mock_client = mock.MagicMock()
sg_cli.return_value = mock_client
self.driver.delete_port(context=self.context, port_id=2,
mac_address=mac_address, device_id=device_id)
mock_client.delete_vif.assert_called_once_with(
device_id, mac_address)
mock_client.delete_vif.assert_not_called()
@mock.patch("quark.cache.security_groups_client.SecurityGroupsClient")
def test_delete_port_redis_is_dead(self, sg_cli):
@ -134,8 +158,7 @@ class TestUnmanagedDriver(test_base.TestBase):
self.driver.delete_port(context=self.context, port_id=2,
mac_address=mac_address,
device_id=device_id)
mock_client.delete_vif.assert_called_once_with(
device_id, mac_address)
mock_client.delete_vif.assert_not_called()
except Exception:
# This test fails without the exception handling in
# _delete_port_security_groups