openstack
/
neutron
Code Issues Proposed changes

Merge "Update arp entry of snat port on qrouter ns" into stable/train

This commit is contained in:
Zuul 2021-09-23 19:54:02 +00:00 committed by Gerrit Code Review
parent 9c255bc1a3 c689ac5a66
commit 16bc89f1e4
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
neutron/agent/l3/dvr_local_router.py
View File

@ -322,6 +322,17 @@ class DvrLocalRouter(dvr_router_base.DvrRouterBase):
allowed_address_pair['mac_address'],
subnet_id,
'add')
# subnet_ports does not have snat port if the port is still unbound
# by the time this function is called. So ensure to add arp entry
# for snat port if port details are updated in router info.
for p in self.get_snat_interfaces():
for fixed_ip in p['fixed_ips']:
if fixed_ip['subnet_id'] == subnet_id:
self._update_arp_entry(fixed_ip['ip_address'],
p['mac_address'],
subnet_id,
'add')
self._process_arp_cache_for_internal_port(subnet_id)
@staticmethod

1
neutron/tests/unit/agent/l3/test_agent.py
View File

@ -1270,6 +1270,7 @@ class TestBasicRouterOperations(BasicRouterOperationsFramework):
router[lib_constants.INTERFACE_KEY][0])
ri.router['distributed'] = True
ri.router['_snat_router_interfaces'] = [{
'mac_address': 'fa:16:3e:80:8d:80',
'fixed_ips': [{'subnet_id': subnet_id,
'ip_address': '1.2.3.4'}]}]
ri.router['gw_port_host'] = None

8
neutron/tests/unit/agent/l3/test_dvr_local_router.py
View File

@ -527,6 +527,11 @@ class TestDvrRouterOperations(base.BaseTestCase):
ri = dvr_router.DvrLocalRouter(HOSTNAME, **self.ri_kwargs)
ports = ri.router.get(lib_constants.INTERFACE_KEY, [])
subnet_id = l3_test_common.get_subnet_id(ports[0])
ri.router['_snat_router_interfaces'] = [{
'mac_address': 'fa:16:3e:80:8d:80',
'fixed_ips': [{'subnet_id': subnet_id,
'ip_address': '1.2.3.10'}]}]
test_ports = [{'mac_address': '00:11:22:33:44:55',
'device_owner': lib_constants.DEVICE_OWNER_DHCP,
'fixed_ips': [{'ip_address': '1.2.3.4',
@ -558,7 +563,8 @@ class TestDvrRouterOperations(base.BaseTestCase):
self.assertEqual(1, parp.call_count)
self.mock_ip_dev.neigh.add.assert_has_calls([
mock.call('1.2.3.4', '00:11:22:33:44:55'),
mock.call('10.20.30.40', '00:11:22:33:44:55')])
mock.call('10.20.30.40', '00:11:22:33:44:55'),
mock.call('1.2.3.10', 'fa:16:3e:80:8d:80')])
# Test negative case
router['distributed'] = False