openstack
/
neutron
Code Issues Proposed changes

Merge "Remove todo's in Y release"

This commit is contained in:
Zuul 2021-11-09 16:11:35 +00:00 committed by Gerrit Code Review
parent 218a1e9f61 53000704f2
commit 2268b92cb9
2 changed files with 7 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
neutron/agent/dhcp/agent.py
View File

@ -85,15 +85,6 @@ class DHCPResourceUpdate(queue.ResourceUpdate):
def __lt__(self, other):
if other.obj_type == self.obj_type == 'port':
# NOTE(ralonsoh): both resources should have "fixed_ips"
# information. That key was added to the deleted ports in this
# patch but this code runs in the Neutron API (server). Both the
# server and the DHCP agent should be updated.
# This check could be removed in Y release.
if ('fixed_ips' not in self.resource or
'fixed_ips' not in other.resource):
return super().__lt__(other)
self_ips = set(str(fixed_ip['ip_address']) for
fixed_ip in self.resource['fixed_ips'])
other_ips = set(str(fixed_ip['ip_address']) for
@ -409,18 +400,13 @@ class DhcpAgent(manager.Manager):
if not network.admin_state_up:
return
for subnet in network.subnets:
# TODO(isabek): in Y release below 'if' can be removed
# because only dhcp enbaled subnets are returned from server
if subnet.enable_dhcp:
if self.call_driver('enable', network):
self.update_isolated_metadata_proxy(network)
self.cache.put(network)
# After enabling dhcp for network, mark all existing
# ports as ready. So that the status of ports which are
# created before enabling dhcp can be updated.
self.dhcp_ready_ports |= {p.id for p in network.ports}
break
if len(network.subnets) and self.call_driver('enable', network):
self.update_isolated_metadata_proxy(network)
self.cache.put(network)
# After enabling dhcp for network, mark all existing
# ports as ready. So that the status of ports which are
# created before enabling dhcp can be updated.
self.dhcp_ready_ports |= {p.id for p in network.ports}
self._resize_process_pool()

7
neutron/tests/unit/agent/dhcp/test_agent.py
View File

@ -2410,13 +2410,6 @@ class TestDHCPResourceUpdate(base.BaseTestCase):
'id2', 6, timestamp=self.date2, obj_type='network')
self.assertLess(update1, update2)
def test__lt__port_no_fixed_ips(self):
update1 = dhcp_agent.DHCPResourceUpdate(
'id1', 5, timestamp=self.date1, resource={}, obj_type='port')
update2 = dhcp_agent.DHCPResourceUpdate(
'id2', 6, timestamp=self.date2, resource={}, obj_type='port')
self.assertLess(update1, update2)
def test__lt__port_fixed_ips_not_matching(self):
resource1 = {'fixed_ips': [
{'subnet_id': 'subnet1', 'ip_address': '10.0.0.1'}]}