ovs-bugtool: Add "ovs-vsctl show" output to bugtool.

The information output by "ovs-vsctl show" is a subset of that available
elsewhere in bugtool output, but it is human-readable instead of needing
to be processed through ovsdb-server or ovsdb-tool, so it is much more
convenient for basic diagnosis.

Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk
index e688b3f65a3a6da26761dea7ef81fa7074120eb3..676a5a26808e30b6aa8339cc6f1daa8186b61984 100644 (file)
--- a/utilities/bugtool/automake.mk
+++ b/utilities/bugtool/automake.mk
@@ -16,6 +16,7 @@ bugtool_scripts = \
        utilities/bugtool/ovs-bugtool-coverage-show \
        utilities/bugtool/ovs-bugtool-lacp-show \
        utilities/bugtool/ovs-bugtool-tc-class-show \
+       utilities/bugtool/ovs-bugtool-vsctl-show \
        utilities/bugtool/ovs-bugtool-ovsdb-dump \
        utilities/bugtool/ovs-bugtool-daemons-ver
 scripts_SCRIPTS += $(bugtool_scripts)

diff --git a/utilities/bugtool/ovs-bugtool-vsctl-show b/utilities/bugtool/ovs-bugtool-vsctl-show
new file mode 100755 (executable)
index 0000000..46ac7fb
--- /dev/null
+++ b/utilities/bugtool/ovs-bugtool-vsctl-show
@@ -0,0 +1,19 @@
+#! /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) 2012 Nicira Networks.
+
+ovs-vsctl --timeout=5 show

diff --git a/utilities/bugtool/plugins/network-status/openvswitch.xml b/utilities/bugtool/plugins/network-status/openvswitch.xml
index d34b13453cd010778fd0c1535ca61283768c3c8d..dab05ef2f48f7901ae56f50af6ef1555c6593f27 100644 (file)
--- a/utilities/bugtool/plugins/network-status/openvswitch.xml
+++ b/utilities/bugtool/plugins/network-status/openvswitch.xml
@@ -18,6 +18,7 @@
 
 <collect>
   <command label="tc-class-show">/usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show</command>
+  <command label="ovs-vsctl-show">/usr/share/openvswitch/scripts/ovs-bugtool-vsctl-show</command>
   <command label="dump-ovsdb">/usr/share/openvswitch/scripts/ovs-bugtool-ovsdb-dump</command>
   <command label="ovs-lacp-show">/usr/share/openvswitch/scripts/ovs-bugtool-lacp-show</command>
   <command label="ovs-cfm-show">/usr/share/openvswitch/scripts/ovs-bugtool-cfm-show</command>