OVS-DVR: Improve an error log about csnat port

Use a single LOG.error per message rather than per lines.
Also, print both of old and new subnets.

Change-Id: I162d3d178fec8b84b66fdfd5a037c2d858c47e30
This commit is contained in:
YAMAMOTO Takashi 2015-04-24 13:49:02 +09:00
parent 6da51bdaa6
commit dca3cdfae9
1 changed files with 7 additions and 3 deletions

View File

@ -600,9 +600,13 @@ class OVSDVRNeutronAgent(object):
# dvr routed subnet
ovsport = self.local_ports[port.vif_id]
subs = list(ovsport.get_subnets())
LOG.error(_LE("Centralized-SNAT port %s already seen on "),
port.vif_id)
LOG.error(_LE("a different subnet %s"), subs[0])
LOG.error(_LE("Centralized-SNAT port %(port)s on subnet "
"%(port_subnet)s already seen on a different "
"subnet %(orig_subnet)s"), {
"port": port.vif_id,
"port_subnet": fixed_ips[0]['subnet_id'],
"orig_subnet": subs[0],
})
return
# since centralized-SNAT (CSNAT) port must have only one fixed
# IP, directly use fixed_ips[0]