bugtool: Collect "lacp/show" and "cfm/show" information.

Feature #7496

7 files changed, 60 insertions, 1 deletions

diff --git a/debian/copyright.in b/debian/copyright.in
index 3b003a4f..3792dd16 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -53,6 +53,8 @@ License:
   GNU Lesser General Public Licence version 2.1.
 
 	utilities/bugtool/ovs-bugtool
+	utilities/bugtool/ovs-bugtool-cfm-show
+	utilities/bugtool/ovs-bugtool-lacp-show
 	utilities/bugtool/ovs-bugtool-tc-class-show
 	utilities/bugtool/plugins/kernel-info/openvswitch.xml
 	utilities/bugtool/plugins/network-status/openvswitch.xml
diff --git a/debian/openvswitch-common.install b/debian/openvswitch-common.install
index df261d07..282519a1 100644
--- a/debian/openvswitch-common.install
+++ b/debian/openvswitch-common.install
@@ -6,4 +6,6 @@ usr/bin/ovs-parse-leaks
 usr/bin/ovs-pki
 usr/bin/ovsdb-client
 usr/sbin/ovs-bugtool
+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
diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk
index 98b6db44..5b4a12fe 100644
--- a/utilities/bugtool/automake.mk
+++ b/utilities/bugtool/automake.mk
@@ -11,6 +11,8 @@ bugtool_plugins = \
 	utilities/bugtool/plugins/system-configuration/openvswitch.xml
 
 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
 scripts_SCRIPTS += $(bugtool_scripts)
diff --git a/utilities/bugtool/ovs-bugtool-cfm-show b/utilities/bugtool/ovs-bugtool-cfm-show
new file mode 100755
index 00000000..b137a2d8
--- /dev/null
+++ b/utilities/bugtool/ovs-bugtool-cfm-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) 2011 Nicira Networks.
+
+ovs-appctl cfm/show
diff --git a/utilities/bugtool/ovs-bugtool-lacp-show b/utilities/bugtool/ovs-bugtool-lacp-show
new file mode 100755
index 00000000..2a2d72bf
--- /dev/null
+++ b/utilities/bugtool/ovs-bugtool-lacp-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) 2011 Nicira Networks.
+
+ovs-appctl lacp/show
diff --git a/utilities/bugtool/plugins/network-status/openvswitch.xml b/utilities/bugtool/plugins/network-status/openvswitch.xml
index 1ae5d9d8..980ba481 100644
--- a/utilities/bugtool/plugins/network-status/openvswitch.xml
+++ b/utilities/bugtool/plugins/network-status/openvswitch.xml
@@ -19,4 +19,6 @@
 <collect>
   <command label="tc-class-show">/usr/share/openvswitch/scripts/ovs-bugtool-tc-class-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>
 </collect>
diff --git a/xenserver/README b/xenserver/README
index 0e2affa3..3039da3f 100644
--- a/xenserver/README
+++ b/xenserver/README
@@ -37,7 +37,8 @@ files are:
     etc_xensource_bugtool_network-status_openvswitch.xml
 
         xen-bugtool extension to collect networking information relevant to
-        Open vSwitch. Runs
+        Open vSwitch. Runs usr_share_openvswitch_scripts_xen-bugtool-cfm-show,
+        usr_share_openvswitch_scripts_xen-bugtool-lcap-show, and
         usr_share_openvswitch_scripts_xen-bugtool-tc-class-show.
 
     etc_xensource_bugtool_kernel-info_openvswitch.xml
@@ -80,6 +81,18 @@ files are:
         Template for Open vSwitch's /etc/sysconfig/openvswitch
         configuration file.
 
+    usr_share_openvswitch_scripts_ovs-bugtool-cfm-show
+
+        Script to dump detailed CFM information for all enabled
+        interfaces. Intended to be run by xen-bugtool via
+        etc_xensource_bugtool_network-status_openvswitch.xml.
+
+    usr_share_openvswitch_scripts_ovs-bugtool-lacp-show
+
+        Script to dump detailed LACP information for all enabled
+        ports. Intended to be run by xen-bugtool via
+        etc_xensource_bugtool_network-status_openvswitch.xml.
+
     usr_share_openvswitch_scripts_xen-bugtool-tc-class-show
 
         Script to dump tc class configuration for all network