bugtool - Collect version information for all running Open vSwitch daemons.

This is an improvement in {ovs|xen}-bugtool archive output to determine the
version which was running for all the OVS daemons. It is implemented as a
plugin which internally calls "ovs-appctl -t <daemon> version" command for
daemons whose pid file is present in /var/run/openvswitch directory.

Feature #10383
Signed-off-by: Arun Sharma <arun.sharma@calsoftinc.com>
[blp@nicira.com updated debian/copyright.in]
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/AUTHORS b/AUTHORS
index 324c4ba74bf92a69375024f0947a6cc1d8a02cc0..7b00dde194c33c88f774f7c93e22b3ac5af97f7e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -6,6 +6,7 @@ Alexey I. Froloff       raorn@altlinux.org
 Andrew Evans            aevans@nicira.com
 Andrew Lambeth          wal@nicira.com
 Andy Southgate          andy.southgate@citrix.com
+Arun Sharma             arun.sharma@calsoftinc.com
 Ben Pfaff               blp@nicira.com
 Bryan Phillippe         bp@toroki.com
 Casey Barker            crbarker@google.com

diff --git a/debian/copyright.in b/debian/copyright.in
index 40b794fee4f7133d732fa598cf55aac09c712099..c81db07e95b670243fd10bf26ba84584960498af 100644 (file)
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -56,6 +56,7 @@ License:
        utilities/bugtool/ovs-bugtool-cfm-show
        utilities/bugtool/ovs-bugtool-lacp-show
        utilities/bugtool/ovs-bugtool-tc-class-show
+       utilities/bugtool/ovs-bugtool-daemons-ver
        utilities/bugtool/plugins/kernel-info/openvswitch.xml
        utilities/bugtool/plugins/network-status/openvswitch.xml
        utilities/bugtool/plugins/system-configuration.xml

diff --git a/debian/openvswitch-common.install b/debian/openvswitch-common.install
index 597fb8d66140d28113f33de0a1fe0c2f7db29d0b..1805582c8a072b99978a6045706760026b5405ee 100644 (file)
--- a/debian/openvswitch-common.install
+++ b/debian/openvswitch-common.install
@@ -9,3 +9,4 @@ usr/share/openvswitch/bugtool-plugins
 usr/share/openvswitch/scripts/ovs-bugtool-cfm-show
 usr/share/openvswitch/scripts/ovs-bugtool-lacp-show
 usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show
+usr/share/openvswitch/scripts/ovs-bugtool-daemons-ver

diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk
index 9e625ceeed12e0f385e0958e9d051d90ce4d1a4d..e3ba0ad9ed4cf7545cc6787e6c71c63585149aae 100644 (file)
--- a/utilities/bugtool/automake.mk
+++ b/utilities/bugtool/automake.mk
@@ -15,7 +15,8 @@ bugtool_scripts = \
        utilities/bugtool/ovs-bugtool-cfm-show \
        utilities/bugtool/ovs-bugtool-lacp-show \
        utilities/bugtool/ovs-bugtool-tc-class-show \
-       utilities/bugtool/ovs-bugtool-ovsdb-dump
+       utilities/bugtool/ovs-bugtool-ovsdb-dump \
+       utilities/bugtool/ovs-bugtool-daemons-ver
 scripts_SCRIPTS += $(bugtool_scripts)
 
 bugtoolpluginsdir = $(pkgdatadir)/bugtool-plugins

diff --git a/utilities/bugtool/ovs-bugtool-daemons-ver b/utilities/bugtool/ovs-bugtool-daemons-ver
new file mode 100755 (executable)
index 0000000..672e7e1
--- /dev/null
+++ b/utilities/bugtool/ovs-bugtool-daemons-ver
@@ -0,0 +1,25 @@
+#! /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.
+
+for f in `cd /var/run/openvswitch/; ls *.pid 2>/dev/null`
+do
+    if [ -n "${f%.pid}" ]; then
+        ovs-appctl -t "${f%.pid}" version 2>&1
+    fi
+    echo
+done

diff --git a/utilities/bugtool/plugins/system-configuration/openvswitch.xml b/utilities/bugtool/plugins/system-configuration/openvswitch.xml
index 84373d5f9eee8a179631242b538766aa20d93346..260e6dc812c9189697d0849a9c2135421f84332f 100644 (file)
--- a/utilities/bugtool/plugins/system-configuration/openvswitch.xml
+++ b/utilities/bugtool/plugins/system-configuration/openvswitch.xml
@@ -18,4 +18,5 @@
 
 <collect>
     <command label="timezone">date --rfc-3339=seconds</command>
+    <command label="ovs-daemons-ver">/usr/share/openvswitch/scripts/ovs-bugtool-daemons-ver</command>
 </collect>

diff --git a/xenserver/README b/xenserver/README
index c626a928a34f65c2fe598de0a6a1245f7b16ce0e..4efdc3799e1074dd99994b9673216dd57e057cf6 100644 (file)
--- a/xenserver/README
+++ b/xenserver/README
@@ -89,7 +89,10 @@ debugging.  The sources for the extensions are in
     system-configuration/openvswitch.xml
 
         Collect system configuration information relevant to Open vSwitch,
-        including timezone.
+        including timezone. Runs the following script which is described
+        below:
+
+            * ovs-bugtool-daemons-ver
 
     system-configuration.xml
 
@@ -118,6 +121,10 @@ scripts are located in ../utilities/bugtool:
 
         Script to dump tc class configuration for all network interfaces.
 
+    ovs-bugtool-daemons-ver
+
+        Script to dump version information for all Open vSwitch daemons.
+
 ----------------------------------------------------------------------
 Copyright (C) 2009, 2010, 2011 Nicira Networks, Inc.