openstack
/
neutron
Code Issues Proposed changes

Merge "Broadcast service port's arp in DVR"

This commit is contained in:
Jenkins 2015-08-10 17:04:26 +00:00 committed by Gerrit Code Review
parent 6163e0a486 85ebf88afa
commit 39b9dad9bd
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/db/l3_dvr_db.py
View File

@ -661,9 +661,9 @@ class L3_NAT_with_dvr_db_mixin(l3_db.L3_NAT_db_mixin,
router.
"""
# Check this is a valid VM port
if ("compute:" not in port_dict['device_owner'] or
not port_dict['fixed_ips']):
# Check this is a valid VM or service port
if not (n_utils.is_dvr_serviced(port_dict['device_owner']) and
port_dict['fixed_ips']):
return
ip_address = port_dict['fixed_ips'][0]['ip_address']
subnet = port_dict['fixed_ips'][0]['subnet_id']

41
neutron/tests/unit/db/test_l3_dvr_db.py
View File

@ -551,3 +551,44 @@ class L3DvrTestCase(testlib_api.SqlTestCase):
kwargs = {'context': self.ctx, 'router': router_db}
mock_notify.assert_called_once_with(
'router', 'before_update', self.mixin, **kwargs)
def _test_dvr_vmarp_table_update(self, device_owner, action):
with mock.patch.object(manager.NeutronManager, 'get_plugin') as gp,\
mock.patch.object(self.mixin, '_get_router') as grtr:
plugin = mock.Mock()
dvr_router = mock.Mock()
l3_notify = self.mixin.l3_rpc_notifier = mock.Mock()
gp.return_value = plugin
port = {
'id': 'my_port_id',
'fixed_ips': [{
'ip_address': 'my_ip',
'subnet_id': 'my_subnet_id',
}],
'mac_address': 'my_mac',
'device_owner': device_owner
}
dvr_port = {
'id': 'dvr_port_id',
'fixed_ips': mock.ANY,
'device_owner': l3_const.DEVICE_OWNER_DVR_INTERFACE,
'device_id': 'dvr_router_id'
}
plugin.get_ports.return_value = [port, dvr_port]
grtr.return_value = dvr_router
dvr_router.extra_attributes.distributed = True
self.mixin.dvr_vmarp_table_update(self.ctx, port, action)
if action == 'add':
self.assertTrue(l3_notify.add_arp_entry.called)
elif action == 'del':
self.assertTrue(l3_notify.del_arp_entry.called)
def test_dvr_vmarp_table_update_with_service_port_added(self):
action = 'add'
device_owner = l3_const.DEVICE_OWNER_LOADBALANCER
self._test_dvr_vmarp_table_update(device_owner, action)
def test_dvr_vmarp_table_update_with_service_port_deleted(self):
action = 'del'
device_owner = l3_const.DEVICE_OWNER_LOADBALANCER
self._test_dvr_vmarp_table_update(device_owner, action)