ovs-bugtool: Log more detail for dumped flows.

The standard mode for printing flows doesn't always provide the full
range of information that is available, particularly with the UFID
changes. Turn on more detail.

Suggested-by: Justin Pettit <jpettit@nicira.com>
Signed-off-by: Joe Stringer <joestringer@nicira.com>
Acked-by: Gurucharan Shetty <gshetty@nicira.com>

diff --git a/utilities/bugtool/ovs-bugtool-ovs-appctl-dpif b/utilities/bugtool/ovs-bugtool-ovs-appctl-dpif
index 3560ef0..648ba68 100755 (executable)
--- a/utilities/bugtool/ovs-bugtool-ovs-appctl-dpif
+++ b/utilities/bugtool/ovs-bugtool-ovs-appctl-dpif
@@ -20,7 +20,7 @@ for bridge in `ovs-vsctl -- --real list-br`
 do
     echo "ovs-appctl dpif/show ${bridge}"
     ovs-appctl dpif/show "${bridge}"
-    echo "ovs-appctl dpif/dump-flows ${bridge}"
-    ovs-appctl dpif/dump-flows "$bridge"
+    echo "ovs-appctl dpif/dump-flows -m ${bridge}"
+    ovs-appctl dpif/dump-flows -m "$bridge"
     echo ""
 done

diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in
index 15f8271..75fcd0e 100755 (executable)
--- a/utilities/bugtool/ovs-bugtool.in
+++ b/utilities/bugtool/ovs-bugtool.in
@@ -586,7 +586,7 @@ exclude those logs from the archive.
     if os.path.exists(OPENVSWITCH_VSWITCHD_PID):
         cmd_output(CAP_NETWORK_STATUS, [OVS_DPCTL, 'show', '-s'])
         for d in dp_list():
-            cmd_output(CAP_NETWORK_STATUS, [OVS_DPCTL, 'dump-flows', d])
+            cmd_output(CAP_NETWORK_STATUS, [OVS_DPCTL, 'dump-flows', '-m', d])
 
     cmd_output(CAP_PROCESS_LIST, [PS, 'wwwaxf', '-eo', 'pid,tty,stat,time,nice,psr,pcpu,pmem,nwchan,wchan:25,args'], label='process-tree')
     func_output(CAP_PROCESS_LIST, 'fd_usage', fd_usage)