diff mbox

[ovs-dev,1/2] ovs-bugtool: Add OVN commands to bugtool plugin scripts.

Message ID 1452902727-80120-1-git-send-email-u9012063@gmail.com
State Changes Requested
Headers show

Commit Message

William Tu Jan. 16, 2016, 12:05 a.m. UTC 
Add ovn-nbctl show, ovn-sbctl show, and ovn-sbctl lflow-list.

Signed-off-by: William Tu <u9012063@gmail.com>
---
 utilities/bugtool/automake.mk                         |  5 ++++-
 utilities/bugtool/ovs-bugtool-ovn-nbctl-show          | 19 +++++++++++++++++++
 utilities/bugtool/ovs-bugtool-ovn-sbctl-lflow-list    | 19 +++++++++++++++++++
 utilities/bugtool/ovs-bugtool-ovn-sbctl-show          | 19 +++++++++++++++++++
 .../bugtool/plugins/network-status/openvswitch.xml    |  3 +++
 xenserver/README                                      | 15 +++++++++++++++
 6 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 utilities/bugtool/ovs-bugtool-ovn-nbctl-show
 create mode 100644 utilities/bugtool/ovs-bugtool-ovn-sbctl-lflow-list
 create mode 100644 utilities/bugtool/ovs-bugtool-ovn-sbctl-show

Comments

Ben Pfaff Jan. 19, 2016, 5:07 p.m. UTC | #1 
On Fri, Jan 15, 2016 at 04:05:26PM -0800, William Tu wrote:
> Add ovn-nbctl show, ovn-sbctl show, and ovn-sbctl lflow-list.
> 
> Signed-off-by: William Tu <u9012063@gmail.com>

I think that we should probably start a new ovn/utilities/bugtool
directory for these, so that they can easily be installed with OVN
packaging rather than with general OVS packaging.
diff mbox

Patch

diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk
index b11cf1a..5353135 100644
--- a/utilities/bugtool/automake.mk
+++ b/utilities/bugtool/automake.mk
@@ -29,7 +29,10 @@  bugtool_scripts = \
 	utilities/bugtool/ovs-bugtool-ovs-ofctl-dump-flows \
 	utilities/bugtool/ovs-bugtool-ovs-appctl-dpif \
 	utilities/bugtool/ovs-bugtool-bond-show \
-	utilities/bugtool/ovs-bugtool-conntrack-dump
+	utilities/bugtool/ovs-bugtool-conntrack-dump \
+	utilities/bugtool/ovs-bugtool-ovn-nbctl-show \
+	utilities/bugtool/ovs-bugtool-ovn-sbctl-show \
+	utilities/bugtool/ovs-bugtool-ovn-sbctl-lflow-list
 
 scripts_SCRIPTS += $(bugtool_scripts)
 
diff --git a/utilities/bugtool/ovs-bugtool-ovn-nbctl-show b/utilities/bugtool/ovs-bugtool-ovn-nbctl-show
new file mode 100644
index 0000000..9272527
--- /dev/null
+++ b/utilities/bugtool/ovs-bugtool-ovn-nbctl-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) 2016 Nicira, Inc.
+
+ovn-nbctl --timeout=3 show
diff --git a/utilities/bugtool/ovs-bugtool-ovn-sbctl-lflow-list b/utilities/bugtool/ovs-bugtool-ovn-sbctl-lflow-list
new file mode 100644
index 0000000..33a15d7
--- /dev/null
+++ b/utilities/bugtool/ovs-bugtool-ovn-sbctl-lflow-list
@@ -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) 2016 Nicira, Inc.
+
+ovn-sbctl --timeout=3 lflow-list
diff --git a/utilities/bugtool/ovs-bugtool-ovn-sbctl-show b/utilities/bugtool/ovs-bugtool-ovn-sbctl-show
new file mode 100644
index 0000000..b6741bc
--- /dev/null
+++ b/utilities/bugtool/ovs-bugtool-ovn-sbctl-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) 2016 Nicira, Inc.
+
+ovn-sbctl --timeout=3 show
diff --git a/utilities/bugtool/plugins/network-status/openvswitch.xml b/utilities/bugtool/plugins/network-status/openvswitch.xml
index bb6792a..25f6b73 100644
--- a/utilities/bugtool/plugins/network-status/openvswitch.xml
+++ b/utilities/bugtool/plugins/network-status/openvswitch.xml
@@ -32,4 +32,7 @@ 
   <command label="ovs-ofctl-dump-flows" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-ofctl-dump-flows</command>
   <command label="ovs-appctl-dpif" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-appctl-dpif</command>
   <command label="ovs-appctl-list-dbs" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-list-dbs</command>
+  <command label="ovs-ovn-nbctl-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovn-nbctl-show</command>
+  <command label="ovs-ovn-sbctl-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovn-sbctl-show</command>
+  <command label="ovs-ovn-sbctl-lflow-list" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovn-sbctl-lflow-list</command>
 </collect>
diff --git a/xenserver/README b/xenserver/README
index 87378d0..d13ab58 100644
--- a/xenserver/README
+++ b/xenserver/README
@@ -96,6 +96,9 @@  debugging.  The sources for the extensions are in
             * ovs-bugtool-memory-show
             * ovs-bugtool-vsctl-show
             * ovs-bugtool-conntrack-dump
+            * ovs-bugtool-ovn-nbctl-show
+            * ovs-bugtool-ovn-sbctl-show
+            * ovs-bugtool-ovn-sbctl-lflow-list
 
     system-configuration/openvswitch.xml
 
@@ -173,6 +176,18 @@  scripts are located in ../utilities/bugtool:
 
         Script to show all the connection entries in the tracker.
 
+    ovs-bugtool-ovn-nbctl-show
+
+        Script to show northbound database contents.
+
+    ovs-bugtool-ovn-sbctl-show
+
+        Script to show southbound database contents.
+
+    ovs-bugtool-ovn-sbctl-lflow-list
+
+        Script to list logical flows at southbound database.
+
     ovs-bugtool-daemons-ver
 
         Script to dump version information for all Open vSwitch daemons.