From e09616c6c9d6d5f01e3400917b59764d263fea4a Mon Sep 17 00:00:00 2001 From: Ben Pfaff Date: Mon, 30 Apr 2012 10:47:51 -0700 Subject: [PATCH] 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 --- utilities/bugtool/automake.mk | 1 + utilities/bugtool/ovs-bugtool-vsctl-show | 19 +++++++++++++++++++ .../plugins/network-status/openvswitch.xml | 1 + 3 files changed, 21 insertions(+) create mode 100755 utilities/bugtool/ovs-bugtool-vsctl-show diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk index e688b3f6..676a5a26 100644 --- 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 index 00000000..46ac7fbd --- /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 d34b1345..dab05ef2 100644 --- a/utilities/bugtool/plugins/network-status/openvswitch.xml +++ b/utilities/bugtool/plugins/network-status/openvswitch.xml @@ -18,6 +18,7 @@ /usr/share/openvswitch/scripts/ovs-bugtool-tc-class-show + /usr/share/openvswitch/scripts/ovs-bugtool-vsctl-show /usr/share/openvswitch/scripts/ovs-bugtool-ovsdb-dump /usr/share/openvswitch/scripts/ovs-bugtool-lacp-show /usr/share/openvswitch/scripts/ovs-bugtool-cfm-show -- 2.30.2