From 00c7bf8b1309e1f974c1255acd99954bf5cb4530 Mon Sep 17 00:00:00 2001 From: Gurucharan Shetty Date: Thu, 18 Jul 2013 13:44:51 -0700 Subject: [PATCH] ovs-bugtool: Remove duplicate bond/show command. ovs-appctl bond/show is being run through the plugin by calling the script ovs-bugtool-bond-show. So remove the redundant code. Signed-off-by: Gurucharan Shetty --- utilities/bugtool/ovs-bugtool.in | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/utilities/bugtool/ovs-bugtool.in b/utilities/bugtool/ovs-bugtool.in index ffaf7538c..aa5b960db 100755 --- a/utilities/bugtool/ovs-bugtool.in +++ b/utilities/bugtool/ovs-bugtool.in @@ -149,7 +149,6 @@ NETSTAT = 'netstat' OVS_DPCTL = 'ovs-dpctl' OVS_OFCTL = 'ovs-ofctl' OVS_VSCTL = 'ovs-vsctl' -OVS_APPCTL = 'ovs-appctl' PS = 'ps' ROUTE = 'route' RPM = 'rpm' @@ -577,16 +576,6 @@ exclude those logs from the archive. cmd_output(CAP_NETWORK_STATUS, [OVS_DPCTL, 'show', '-s']) for d in dp_list(): cmd_output(CAP_NETWORK_STATUS, [OVS_DPCTL, 'dump-flows', d]) - try: - vspidfile = open(OPENVSWITCH_VSWITCHD_PID) - vspid = int(vspidfile.readline().strip()) - vspidfile.close() - for b in bond_list(vspid): - cmd_output(CAP_NETWORK_STATUS, - [OVS_APPCTL, '-t', '@RUNDIR@/ovs-vswitchd.%s.ctl' % vspid, '-e' 'bond/show %s' % b], - 'ovs-appctl-bond-show-%s.out' % b) - except e: - pass 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) @@ -747,17 +736,6 @@ def dp_list(): return output.getvalue().splitlines() return [] -def bond_list(pid): - output = StringIO.StringIO() - procs = [ProcOutput([OVS_APPCTL, '-t', '@RUNDIR@/ovs-vswitchd.%s.ctl' % pid, '-e' 'bond/list'], caps[CAP_NETWORK_STATUS][MAX_TIME], output)] - - run_procs([procs]) - - if not procs[0].timed_out: - bonds = output.getvalue().splitlines()[1:] - return [x.split('\t')[1] for x in bonds] - return [] - def fd_usage(cap): output = '' fd_dict = {} -- 2.43.0