bugtool: Collect bond state information from ovs.

This is an enhancement in bugtool archive output to determine the bond
state information. It is implemented as a plugin which internally calls
"ovs-appctl bond/show" command to get bond state.

Feature #11283.
Signed-off-by: Arun Sharma <arun.sharma@calsoftinc.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk
index 676a5a26808e30b6aa8339cc6f1daa8186b61984..c09380d9978ddf99ec75e98c417dc7177767de33 100644 (file)
--- a/utilities/bugtool/automake.mk
+++ b/utilities/bugtool/automake.mk
@@ -18,7 +18,8 @@ bugtool_scripts = \
        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
+       utilities/bugtool/ovs-bugtool-daemons-ver \
+       utilities/bugtool/ovs-bugtool-bond-show
 scripts_SCRIPTS += $(bugtool_scripts)
 
 bugtoolpluginsdir = $(pkgdatadir)/bugtool-plugins

diff --git a/utilities/bugtool/ovs-bugtool-bond-show b/utilities/bugtool/ovs-bugtool-bond-show
new file mode 100755 (executable)
index 0000000..86ec97f
--- /dev/null
+++ b/utilities/bugtool/ovs-bugtool-bond-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, Inc.
+
+ovs-appctl bond/show

diff --git a/utilities/bugtool/plugins/network-status/openvswitch.xml b/utilities/bugtool/plugins/network-status/openvswitch.xml
index 8ae498faf6029f216b3dc6c9aa8d5a829c192975..952c6569c5905e9ef086c45c870fd5588d3bac4a 100644 (file)
--- a/utilities/bugtool/plugins/network-status/openvswitch.xml
+++ b/utilities/bugtool/plugins/network-status/openvswitch.xml
@@ -23,4 +23,5 @@
   <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>
   <command label="ovs-coverage-show">/usr/share/openvswitch/scripts/ovs-bugtool-coverage-show</command>
+  <command label="ovs-appctl-bond-show">/usr/share/openvswitch/scripts/ovs-bugtool-bond-show</command>
 </collect>

diff --git a/xenserver/README b/xenserver/README
index 5413c67acc8ebd1a5a6bdc1f2dbb61ca5006219d..e72655f777b47229be46177ca61a7c38f489ca8f 100644 (file)
--- a/xenserver/README
+++ b/xenserver/README
@@ -85,6 +85,7 @@ debugging.  The sources for the extensions are in
             * ovs-bugtool-lcap-show
             * ovs-bugtool-ovsdb-dump
             * ovs-bugtool-tc-class-show
+            * ovs-bugtool-bond-show
 
     system-configuration/openvswitch.xml