From: Thomas Graf <tgraf@redhat.com>
Date: Wed, 9 Apr 2014 15:19:17 +0000 (+0200)
Subject: bridge: improve vlan mode related error messages when adding port
X-Git-Tag: sliver-openvswitch-2.2.90-1~5^2~12
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=65a0903b26bdff3e42dc0fa78ef5b73a48448e80;p=sliver-openvswitch.git

bridge: improve vlan mode related error messages when adding port

Inform about fallback to trunk mode and convert errors to warnings
when we are not failing.

Signed-off-by: Thomas Graf <tgraf@redhat.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
---

diff --git a/vswitchd/bridge.c b/vswitchd/bridge.c
index 24b3602c7..f46d002eb 100644
--- a/vswitchd/bridge.c
+++ b/vswitchd/bridge.c
@@ -839,15 +839,16 @@ port_configure(struct port *port)
             s.vlan_mode = PORT_VLAN_NATIVE_UNTAGGED;
         } else {
             /* This "can't happen" because ovsdb-server should prevent it. */
-            VLOG_ERR("unknown VLAN mode %s", cfg->vlan_mode);
+            VLOG_WARN("port %s: unknown VLAN mode %s, falling "
+                      "back to trunk mode", port->name, cfg->vlan_mode);
             s.vlan_mode = PORT_VLAN_TRUNK;
         }
     } else {
         if (s.vlan >= 0) {
             s.vlan_mode = PORT_VLAN_ACCESS;
             if (cfg->n_trunks) {
-                VLOG_ERR("port %s: ignoring trunks in favor of implicit vlan",
-                         port->name);
+                VLOG_WARN("port %s: ignoring trunks in favor of implicit vlan",
+                          port->name);
             }
         } else {
             s.vlan_mode = PORT_VLAN_TRUNK;