diff --git a/neutron/agent/dhcp/agent.py b/neutron/agent/dhcp/agent.py index ca3cb26cd76..b2f14df2d7a 100644 --- a/neutron/agent/dhcp/agent.py +++ b/neutron/agent/dhcp/agent.py @@ -132,7 +132,7 @@ class DhcpAgent(manager.Manager): if (isinstance(e, oslo_messaging.RemoteError) and e.exc_type == 'NetworkNotFound' or isinstance(e, exceptions.NetworkNotFound)): - LOG.warning(_LW("Network %s has been deleted."), network.id) + LOG.debug("Network %s has been deleted.", network.id) else: LOG.exception(_LE('Unable to %(action)s dhcp for %(net_id)s.'), {'net_id': network.id, 'action': action}) @@ -205,7 +205,7 @@ class DhcpAgent(manager.Manager): try: network = self.plugin_rpc.get_network_info(network_id) if not network: - LOG.warn(_LW('Network %s has been deleted.'), network_id) + LOG.debug('Network %s has been deleted.', network_id) return network except Exception as e: self.schedule_resync(e, network_id) diff --git a/neutron/tests/unit/agent/dhcp/test_agent.py b/neutron/tests/unit/agent/dhcp/test_agent.py index 220f6d2dbe6..92a790dff87 100644 --- a/neutron/tests/unit/agent/dhcp/test_agent.py +++ b/neutron/tests/unit/agent/dhcp/test_agent.py @@ -312,18 +312,16 @@ class TestDhcpAgent(base.BaseTestCase): network = mock.Mock() network.id = '1' self.driver.return_value.foo.side_effect = exc or Exception - with mock.patch.object(dhcp_agent.LOG, trace_level) as log: - dhcp = dhcp_agent.DhcpAgent(HOSTNAME) - with mock.patch.object(dhcp, - 'schedule_resync') as schedule_resync: - self.assertIsNone(dhcp.call_driver('foo', network)) - self.driver.assert_called_once_with(cfg.CONF, - mock.ANY, - mock.ANY, - mock.ANY, - mock.ANY) - self.assertEqual(log.call_count, 1) - self.assertEqual(expected_sync, schedule_resync.called) + dhcp = dhcp_agent.DhcpAgent(HOSTNAME) + with mock.patch.object(dhcp, + 'schedule_resync') as schedule_resync: + self.assertIsNone(dhcp.call_driver('foo', network)) + self.driver.assert_called_once_with(cfg.CONF, + mock.ANY, + mock.ANY, + mock.ANY, + mock.ANY) + self.assertEqual(expected_sync, schedule_resync.called) def test_call_driver_ip_address_generation_failure(self): error = oslo_messaging.RemoteError( @@ -704,13 +702,11 @@ class TestDhcpAgentEventHandler(base.BaseTestCase): def test_enable_dhcp_helper_network_none(self): self.plugin.get_network_info.return_value = None - with mock.patch.object(dhcp_agent.LOG, 'warn') as log: - self.dhcp.enable_dhcp_helper('fake_id') - self.plugin.assert_has_calls( - [mock.call.get_network_info('fake_id')]) - self.assertFalse(self.call_driver.called) - self.assertTrue(log.called) - self.assertFalse(self.dhcp.schedule_resync.called) + self.dhcp.enable_dhcp_helper('fake_id') + self.plugin.assert_has_calls( + [mock.call.get_network_info('fake_id')]) + self.assertFalse(self.call_driver.called) + self.assertFalse(self.dhcp.schedule_resync.called) def test_enable_dhcp_helper_exception_during_rpc(self): self.plugin.get_network_info.side_effect = Exception