openstack
/
neutron
Code Issues Proposed changes

Log the exception in linuxbridge_neutron_agent as exception 

The log here should be logged as exception. 1) It is more readable.
2) It keeps consistent with the action of its sibling module,
ovs_neutron_agent.

Change-Id: Idf11a617369cbee0dc23c8e56ae9475bb41dcc02
Closes-bug: #1508270
This commit is contained in:
Hong Hui Xiao 2015-10-21 10:35:53 -04:00
parent 4ccf21561c
commit e61e15de99
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py
View File

@ -963,10 +963,8 @@ class LinuxBridgeNeutronAgentRPC(service.Service):
try: try:
devices_details_list = self.plugin_rpc.get_devices_details_list( devices_details_list = self.plugin_rpc.get_devices_details_list(
self.context, devices, self.agent_id) self.context, devices, self.agent_id)
except Exception as e: except Exception:
LOG.debug("Unable to get port details for " LOG.exception(_LE("Unable to get port details for %s"), devices)
"%(devices)s: %(e)s",
{'devices': devices, 'e': e})
# resync is needed # resync is needed
return True return True
@ -1023,9 +1021,9 @@ class LinuxBridgeNeutronAgentRPC(service.Service):
device, device,
self.agent_id, self.agent_id,
cfg.CONF.host) cfg.CONF.host)
except Exception as e: except Exception:
LOG.debug("port_removed failed for %(device)s: %(e)s", LOG.exception(_LE("Error occurred while removing port %s"),
{'device': device, 'e': e}) device)
resync = True resync = True
if details and details['exists']: if details and details['exists']:
LOG.info(_LI("Port %s updated."), device) LOG.info(_LI("Port %s updated."), device)

11
neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py
View File

@ -166,13 +166,10 @@ class TestLinuxBridgeAgent(base.BaseTestCase):
mock.patch.object(agent.sg_agent, mock.patch.object(agent.sg_agent,
"remove_devices_filter") as fn_rdf: "remove_devices_filter") as fn_rdf:
fn_udd.side_effect = Exception() fn_udd.side_effect = Exception()
with mock.patch.object(linuxbridge_neutron_agent.LOG, resync = agent.treat_devices_removed(devices)
'debug') as log: self.assertTrue(resync)
resync = agent.treat_devices_removed(devices) self.assertTrue(fn_udd.called)
self.assertEqual(2, log.call_count) self.assertTrue(fn_rdf.called)
self.assertTrue(resync)
self.assertTrue(fn_udd.called)
self.assertTrue(fn_rdf.called)
def _test_scan_devices(self, previous, updated, def _test_scan_devices(self, previous, updated,
fake_current, expected, sync): fake_current, expected, sync):