diff options
| author | Zuul <zuul@review.opendev.org> | 2021-09-15 09:59:24 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-09-15 09:59:24 +0000 |
| commit | 6db261962894b1667dd213b116e89246a3e54386 (patch) | |
| tree | a046ba447f022940f90b438be80d224f91312c06 | |
| parent | ed3374746db291ebc85261c517cf7881c2cd454a (diff) | |
| parent | 19375b3e78ad6b635793b716e5ecabd53dc73a76 (diff) | |
| download | neutron-6db261962894b1667dd213b116e89246a3e54386.tar.gz | |
Merge "[DVR] Set arp entries only for single IPs given as allowed addr pair"19.0.0.0rc1
| -rw-r--r-- | neutron/agent/l3/dvr_local_router.py | 18 | ||||
| -rw-r--r-- | neutron/tests/functional/agent/l3/test_dvr_router.py | 20 |
2 files changed, 28 insertions, 10 deletions
diff --git a/neutron/agent/l3/dvr_local_router.py b/neutron/agent/l3/dvr_local_router.py index 7f72a142ab..4adfe9769c 100644 --- a/neutron/agent/l3/dvr_local_router.py +++ b/neutron/agent/l3/dvr_local_router.py @@ -366,12 +366,18 @@ class DvrLocalRouter(dvr_router_base.DvrRouterBase): device=device, device_exists=device_exists) for allowed_address_pair in p.get('allowed_address_pairs', []): - self._update_arp_entry(allowed_address_pair['ip_address'], - allowed_address_pair['mac_address'], - subnet_id, - 'add', - device=device, - device_exists=device_exists) + if ('/' not in str(allowed_address_pair['ip_address']) or + common_utils.is_cidr_host( + allowed_address_pair['ip_address'])): + ip_address = common_utils.cidr_to_ip( + allowed_address_pair['ip_address']) + self._update_arp_entry( + ip_address, + allowed_address_pair['mac_address'], + subnet_id, + 'add', + device=device, + device_exists=device_exists) # 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 diff --git a/neutron/tests/functional/agent/l3/test_dvr_router.py b/neutron/tests/functional/agent/l3/test_dvr_router.py index 70ebd2675b..7c121e8d9d 100644 --- a/neutron/tests/functional/agent/l3/test_dvr_router.py +++ b/neutron/tests/functional/agent/l3/test_dvr_router.py @@ -1005,13 +1005,18 @@ class TestDvrRouter(DvrRouterTestFramework, framework.L3AgentTestFramework): # cache is properly populated. self.agent.conf.agent_mode = 'dvr_snat' router_info = self.generate_dvr_router_info(enable_snat=True) - expected_neighbors = ['35.4.1.10', '10.0.0.10'] + expected_neighbors = ['35.4.1.10', '10.0.0.10', '10.200.0.3'] + allowed_address_net = netaddr.IPNetwork('10.100.0.0/30') port_data = { 'fixed_ips': [{'ip_address': expected_neighbors[0]}], 'mac_address': 'fa:3e:aa:bb:cc:dd', 'device_owner': DEVICE_OWNER_COMPUTE, 'allowed_address_pairs': [ {'ip_address': expected_neighbors[1], + 'mac_address': 'fa:3e:aa:bb:cc:dd'}, + {'ip_address': '10.200.0.3/32', + 'mac_address': 'fa:3e:aa:bb:cc:dd'}, + {'ip_address': str(allowed_address_net), 'mac_address': 'fa:3e:aa:bb:cc:dd'}] } self.agent.plugin_rpc.get_ports_by_subnet.return_value = [port_data] @@ -1019,11 +1024,18 @@ class TestDvrRouter(DvrRouterTestFramework, framework.L3AgentTestFramework): internal_device = router1.get_internal_device_name( router_info['_interfaces'][0]['id']) for expected_neighbor in expected_neighbors: - neighbor = ip_lib.dump_neigh_entries(4, internal_device, - router1.ns_name, - dst=expected_neighbor) + neighbor = ip_lib.dump_neigh_entries( + lib_constants.IP_VERSION_4, internal_device, + router1.ns_name, + dst=expected_neighbor) self.assertNotEqual([], neighbor) self.assertEqual(expected_neighbor, neighbor[0]['dst']) + for not_expected_neighbor in allowed_address_net: + neighbor = ip_lib.dump_neigh_entries( + lib_constants.IP_VERSION_4, internal_device, + router1.ns_name, + dst=str(not_expected_neighbor)) + self.assertEqual([], neighbor) def _assert_rfp_fpr_mtu(self, router, expected_mtu=1500): dev_mtu = self.get_device_mtu( |