ovs-bugtool: Add fdb output for all bridges

Fdb entries can provide useful information. Collect them in bugtool.

Signed-off-by: Andy Zhou <azhou@nicira.com>

4 files changed, 31 insertions, 0 deletions

diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk
index 528b72095..36d80cec4 100644
--- a/utilities/bugtool/automake.mk
+++ b/utilities/bugtool/automake.mk
@@ -17,6 +17,7 @@ bugtool_scripts = \
 	utilities/bugtool/ovs-bugtool-bfd-show \
 	utilities/bugtool/ovs-bugtool-cfm-show \
 	utilities/bugtool/ovs-bugtool-coverage-show \
+	utilities/bugtool/ovs-bugtool-fdb-show \
 	utilities/bugtool/ovs-bugtool-lacp-show \
 	utilities/bugtool/ovs-bugtool-list-dbs \
 	utilities/bugtool/ovs-bugtool-memory-show \
diff --git a/utilities/bugtool/ovs-bugtool-fdb-show b/utilities/bugtool/ovs-bugtool-fdb-show
new file mode 100755
index 000000000..79baba0e0
--- /dev/null
+++ b/utilities/bugtool/ovs-bugtool-fdb-show
@@ -0,0 +1,24 @@
+#! /bin/sh
+
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of version 2.1 of the GNU Lesser General
+# Public License as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+# USA
+#
+# Copyright (C) 2014 Nicira, Inc.
+
+for bridge in `ovs-vsctl -- --real list-br`
+do
+    echo "ovs-appctl fdb/show ${bridge}"
+    ovs-appctl fdb/show "${bridge}"
+    echo ""
+done
diff --git a/utilities/bugtool/plugins/network-status/openvswitch.xml b/utilities/bugtool/plugins/network-status/openvswitch.xml
index 00247f964..836cd6e69 100644
--- a/utilities/bugtool/plugins/network-status/openvswitch.xml
+++ b/utilities/bugtool/plugins/network-status/openvswitch.xml
@@ -20,6 +20,7 @@
   <command label="tc-class-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show</command>
   <command label="ovs-vsctl-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-vsctl-show</command>
   <command label="dump-ovsdb" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovsdb-dump</command>
+  <command label="ovs-appctl-fdb-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-fdb-show</command>
   <command label="ovs-appctl-lacp-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-lacp-show</command>
   <command label="ovs-appctl-cfm-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-cfm-show</command>
   <command label="ovs-appctl-bfd-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-bfd-show</command>
diff --git a/xenserver/README b/xenserver/README
index 9aedaf630..36ea567f6 100644
--- a/xenserver/README
+++ b/xenserver/README
@@ -83,6 +83,7 @@ debugging.  The sources for the extensions are in
 
             * ovs-bugtool-bfd-show
             * ovs-bugtool-cfm-show
+            * ovs-bugtool-fdb-show
             * ovs-bugtool-lacp-show
             * ovs-bugtool-list-dbs
             * ovs-bugtool-ovsdb-dump
@@ -121,6 +122,10 @@ scripts are located in ../utilities/bugtool:
 
         Script to dump detailed CFM information for all enabled interfaces.
 
+    ovs-bugtool-fdb-show
+
+        Script to collect a summary of learned MACs for each bridge.
+
     ovs-bugtool-lacp-show
 
         Script to dump detailed LACP information for all enabled ports.