From: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date: Fri, 15 May 2015 02:33:51 +0000 (+0900)
Subject: OVS-DVR: Suppress a confusing error log about csnat port
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8dbacebf6752e7654afbf9451388b42d4d6355a9;p=openstack-build%2Fneutron-build.git

OVS-DVR: Suppress a confusing error log about csnat port

Complain only when the port was seen on a different subnet.

Change-Id: If4a310da06f9b0076a9f62926a16b574a8c109ce
---

diff --git a/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py b/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py
index 43f4ac5e7..db7a41cd4 100644
--- a/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py
+++ b/neutron/plugins/openvswitch/agent/ovs_dvr_neutron_agent.py
@@ -600,6 +600,8 @@ class OVSDVRNeutronAgent(object):
             # dvr routed subnet
             ovsport = self.local_ports[port.vif_id]
             subs = list(ovsport.get_subnets())
+            if subs[0] == fixed_ips[0]['subnet_id']:
+                return
             LOG.error(_LE("Centralized-SNAT port %(port)s on subnet "
                           "%(port_subnet)s already seen on a different "
                           "subnet %(orig_subnet)s"), {