openstack
/
neutron
Code Issues Proposed changes

Merge "Use 'segment' instead of 'network' in log"

This commit is contained in:
Jenkins 2017-04-16 03:09:07 +00:00 committed by Gerrit Code Review
parent 1cf5577603 e3616cec7a
commit 45255dadd4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
neutron/plugins/ml2/drivers/mech_agent.py
View File

@ -233,10 +233,10 @@ class SimpleAgentMechanismDriverBase(AgentMechanismDriverBase):
network_type = segment[api.NETWORK_TYPE]
if network_type not in allowed_network_types:
LOG.debug(
'Network %(network_id)s is of type %(network_type)s '
'Segment %(id)s is of type %(network_type)s '
'but agent %(agent)s or mechanism driver only '
'support %(allowed_network_types)s.',
{'network_id': segment['id'],
{'id': segment['id'],
'network_type': network_type,
'agent': agent['host'],
'allowed_network_types': allowed_network_types})
@ -246,12 +246,12 @@ class SimpleAgentMechanismDriverBase(AgentMechanismDriverBase):
physnet = segment[api.PHYSICAL_NETWORK]
if not self.physnet_in_mappings(physnet, mappings):
LOG.debug(
'Network %(network_id)s is connected to physical '
'Segment %(id)s is connected to physical '
'network %(physnet)s, but agent %(agent)s reported '
'physical networks %(mappings)s. '
'The physical network must be configured on the '
'agent if binding is to succeed.',
{'network_id': segment['id'],
{'id': segment['id'],
'physnet': physnet,
'agent': agent['host'],
'mappings': mappings})