ovs-bugtool: Bugfix for bugtool plugin queries.

Introducing 'ovs-bugtool-ovs-ofctl-loop-over-bridges' bash script. It calls ovs-ofctl commands given as first parameter for each bridge with the corresponding open flow protocol option. Usage: ovs-bugtool-ovs-ofctl-loop-over-bridges "param1" "param2" - param1: ovs-ofctl command to call (show, dump-flows, etc...) - param2: optional, add further parts for the shell command (like "| grep something") Calling ovs-ofctl commands 'show' and 'dump-flows' with the 'ovs-bugtool-ovs-ofctl-loop-over-bridges' bash script. Signed-off-by: David Patrik Pinter <[email protected]> Signed-off-by: Ben Pfaff <[email protected]>
orimanabu · Jan 10, 2018 · 97cb2cf · 97cb2cf
1 parent 092bc0f
commit 97cb2cf
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 33 deletions.
diff --git a/utilities/bugtool/automake.mk b/utilities/bugtool/automake.mk
@@ -25,8 +25,7 @@ bugtool_scripts = \
 	utilities/bugtool/ovs-bugtool-vsctl-show \
 	utilities/bugtool/ovs-bugtool-ovsdb-dump \
 	utilities/bugtool/ovs-bugtool-daemons-ver \
-	utilities/bugtool/ovs-bugtool-ovs-ofctl-show \
-	utilities/bugtool/ovs-bugtool-ovs-ofctl-dump-flows \
+	utilities/bugtool/ovs-bugtool-ovs-ofctl-loop-over-bridges \
 	utilities/bugtool/ovs-bugtool-ovs-appctl-dpif \
 	utilities/bugtool/ovs-bugtool-bond-show \
 	utilities/bugtool/ovs-bugtool-conntrack-dump

diff --git a/.../bugtool/ovs-bugtool-ovs-ofctl-dump-flows → ...l/ovs-bugtool-ovs-ofctl-loop-over-bridges b/.../bugtool/ovs-bugtool-ovs-ofctl-dump-flows → ...l/ovs-bugtool-ovs-ofctl-loop-over-bridges
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/bash
 
 # 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
@@ -14,11 +14,20 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 #
-# Copyright (C) 2013 Nicira, Inc.
+# Copyright (C) 2017 Ericsson AB
 
-for bridge in `ovs-vsctl list-br`
+for bridge in `ovs-vsctl -- --real list-br`
 do
-    echo "ovs-ofctl dump-flows ${bridge}"
-    ovs-ofctl dump-flows "$bridge"
+    PROTOCOLS="$(ovs-vsctl get Bridge "$bridge" protocols)"
+    if [ "$PROTOCOLS" = "[]" ]
+    then
+        echo "ovs-ofctl $1 ${bridge} $2"
+        eval ovs-ofctl $1 "${bridge}" $2
+    else
+        LENGTHPRO="$(expr length "$PROTOCOLS")"
+        COMMAIND="$(expr index "$PROTOCOLS" ,)"
+        echo "ovs-ofctl $1 -O${PROTOCOLS:${COMMAIND}+2:${LENGTHPRO}-${COMMAIND}-4} ${bridge} $2"
+        eval ovs-ofctl $1 -O"${PROTOCOLS:${COMMAIND}+2:${LENGTHPRO}-${COMMAIND}-4}" "${bridge}" $2
+    fi
     echo ""
 done
diff --git a/utilities/bugtool/ovs-bugtool-ovs-ofctl-show b/utilities/bugtool/ovs-bugtool-ovs-ofctl-show
diff --git a/utilities/bugtool/plugins/network-status/openvswitch.xml b/utilities/bugtool/plugins/network-status/openvswitch.xml
@@ -28,8 +28,8 @@
   <command label="ovs-appctl-coverage-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-coverage-show</command>
   <command label="ovs-appctl-bond-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-bond-show</command>
   <command label="ovs-appctl-memory-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-memory-show</command>
-  <command label="ovs-ofctl-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-ofctl-show</command>
-  <command label="ovs-ofctl-dump-flows" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-ofctl-dump-flows</command>
+  <command label="ovs-ofctl-show" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-ofctl-loop-over-bridges "show"</command>
+  <command label="ovs-ofctl-dump-flows" filters="ovs">/usr/share/openvswitch/scripts/ovs-bugtool-ovs-ofctl-loop-over-bridges "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>
 </collect>