Browse Source

Merge "Switch to use cast method in dhcp_ready_on_ports method"

changes/67/572767/12
Zuul 3 weeks ago
parent
commit
5aec36b313
2 changed files with 2 additions and 19 deletions
  1. +2
    -5
      neutron/agent/dhcp/agent.py
  2. +0
    -14
      neutron/tests/unit/agent/dhcp/test_agent.py

+ 2
- 5
neutron/agent/dhcp/agent.py View File

@@ -256,9 +256,6 @@ class DhcpAgent(manager.Manager):
LOG.info("DHCP configuration for ports %s is completed",
ports_to_send)
continue
except oslo_messaging.MessagingTimeout:
LOG.error("Timeout notifying server of ports ready. "
"Retrying...")
except Exception:
LOG.exception("Failure notifying DHCP server of "
"ready DHCP ports. Will retry on next "
@@ -788,8 +785,8 @@ class DhcpPluginApi(object):
def dhcp_ready_on_ports(self, port_ids):
"""Notify the server that DHCP is configured for the port."""
cctxt = self.client.prepare(version='1.5')
return cctxt.call(self.context, 'dhcp_ready_on_ports',
port_ids=port_ids)
cctxt.cast(self.context, 'dhcp_ready_on_ports',
port_ids=port_ids)

def get_networks(self, filters=None, fields=None):
"""Get networks.

+ 0
- 14
neutron/tests/unit/agent/dhcp/test_agent.py View File

@@ -456,20 +456,6 @@ class TestDhcpAgent(base.BaseTestCase):
dhcp.start_ready_ports_loop()
spawn.assert_called_once_with(dhcp._dhcp_ready_ports_loop)

def test__dhcp_ready_ports_doesnt_log_exception_on_timeout(self):
dhcp = dhcp_agent.DhcpAgent(HOSTNAME)
dhcp.dhcp_ready_ports = set(range(4))

with mock.patch.object(dhcp.plugin_rpc, 'dhcp_ready_on_ports',
side_effect=oslo_messaging.MessagingTimeout):
# exit after 2 iterations
with mock.patch.object(dhcp_agent.eventlet, 'sleep',
side_effect=[0, 0, RuntimeError]):
with mock.patch.object(dhcp_agent.LOG, 'exception') as lex:
with testtools.ExpectedException(RuntimeError):
dhcp._dhcp_ready_ports_loop()
self.assertFalse(lex.called)

def test__dhcp_ready_ports_loop(self):
dhcp = dhcp_agent.DhcpAgent(HOSTNAME)
dhcp.dhcp_ready_ports = set(range(4))

Loading…
Cancel
Save