diff --git a/scripts/intfstat b/scripts/intfstat index d99dbaab00ae..0bf9a4712e70 100755 --- a/scripts/intfstat +++ b/scripts/intfstat @@ -34,6 +34,7 @@ from collections import namedtuple, OrderedDict from natsort import natsorted from tabulate import tabulate from utilities_common.netstat import ns_diff, ns_brate, ns_prate, table_as_json, STATUS_NA +from utilities_common import get_uptime NStats = namedtuple("NStats", "rx_b_ok, rx_p_ok, tx_b_ok, tx_p_ok,\ rx_b_err, rx_p_err, tx_b_err, tx_p_err,") @@ -130,25 +131,6 @@ class Intfstat(object): else: return STATUS_NA - def cnstat_print(self, cnstat_dict, use_json): - """ - Print the cnstat. - """ - table = [] - - for key, data in cnstat_dict.iteritems(): - if key == 'time': - continue - - table.append((key, data.rx_p_ok, STATUS_NA, STATUS_NA, data.rx_p_err, - data.tx_p_ok, STATUS_NA, STATUS_NA, data.tx_p_err)) - - if use_json: - print table_as_json(table, header) - - else: - print tabulate(table, header, tablefmt='simple', stralign='right') - def cnstat_diff_print(self, cnstat_new_dict, cnstat_old_dict, use_json): """ Print the difference between two cnstat results. @@ -158,33 +140,27 @@ class Intfstat(object): for key, cntr in cnstat_new_dict.iteritems(): if key == 'time': - time_gap = cnstat_new_dict.get('time') - cnstat_old_dict.get('time') - time_gap = time_gap.total_seconds() + if 'time' in cnstat_old_dict: + time_gap = cnstat_new_dict.get('time') - cnstat_old_dict.get('time') + time_gap = time_gap.total_seconds() + else: + time_gap = get_uptime() continue - old_cntr = None + if key in cnstat_old_dict: old_cntr = cnstat_old_dict.get(key) - - if old_cntr is not None: - table.append((key, - ns_diff(cntr.rx_p_ok, old_cntr.rx_p_ok), - ns_brate(cntr.rx_b_ok, old_cntr.rx_b_ok, time_gap), - ns_prate(cntr.rx_p_ok, old_cntr.rx_p_ok, time_gap), - ns_diff(cntr.rx_p_err, old_cntr.rx_p_err), - ns_diff(cntr.tx_p_ok, old_cntr.tx_p_ok), - ns_brate(cntr.tx_b_ok, old_cntr.tx_b_ok, time_gap), - ns_prate(cntr.tx_p_ok, old_cntr.tx_p_ok, time_gap), - ns_diff(cntr.tx_p_err, old_cntr.tx_p_err))) else: - table.append((key, - cntr.rx_p_ok, - STATUS_NA, - STATUS_NA, - cntr.rx_p_err, - cntr.tx_p_ok, - STATUS_NA, - STATUS_NA, - cntr.tx_p_err)) + old_cntr = NStats._make([0] * (len(header) - 1)) + + table.append((key, + ns_diff(cntr.rx_p_ok, old_cntr.rx_p_ok), + ns_brate(cntr.rx_b_ok, old_cntr.rx_b_ok, time_gap), + ns_prate(cntr.rx_p_ok, old_cntr.rx_p_ok, time_gap), + ns_diff(cntr.rx_p_err, old_cntr.rx_p_err), + ns_diff(cntr.tx_p_ok, old_cntr.tx_p_ok), + ns_brate(cntr.tx_b_ok, old_cntr.tx_b_ok, time_gap), + ns_prate(cntr.tx_p_ok, old_cntr.tx_p_ok, time_gap), + ns_diff(cntr.tx_p_err, old_cntr.tx_p_err))) if use_json: print self.table_as_json(table, header) else: @@ -331,7 +307,7 @@ def main(): if interface_name: intfstat.cnstat_single_interface(interface_name, cnstat_dict, None) else: - intfstat.cnstat_print(cnstat_dict, use_json) + intfstat.cnstat_diff_print(cnstat_dict, {}, use_json) else: #wait for the specified time and then gather the new stats and output the difference. time.sleep(wait_time_in_seconds) diff --git a/scripts/portstat b/scripts/portstat index 80968b177ed2..f7bd9b233c87 100755 --- a/scripts/portstat +++ b/scripts/portstat @@ -21,6 +21,7 @@ from collections import namedtuple, OrderedDict from natsort import natsorted from tabulate import tabulate from utilities_common.netstat import ns_diff, ns_brate, ns_prate, ns_util, table_as_json +from utilities_common import get_uptime PORT_RATE = 40 @@ -32,6 +33,7 @@ header_all = ['IFACE', 'STATE', 'RX_OK', 'RX_BPS', 'RX_PPS', 'RX_UTIL', 'RX_ERR' header = ['IFACE', 'STATE', 'RX_OK', 'RX_BPS', 'RX_UTIL', 'RX_ERR', 'RX_DRP', 'RX_OVR', 'TX_OK', 'TX_BPS', 'TX_UTIL', 'TX_ERR', 'TX_DRP', 'TX_OVR'] +BUCKET_NUM = 10 counter_bucket_dict = { 'SAI_PORT_STAT_IF_IN_UCAST_PKTS': 0, 'SAI_PORT_STAT_IF_IN_NON_UCAST_PKTS': 0, @@ -116,36 +118,7 @@ class Portstat(object): else: return STATUS_NA - def cnstat_print(self, cnstat_dict, use_json, print_all): - """ - Print the cnstat. - """ - table = [] - - for key, data in cnstat_dict.iteritems(): - if key == 'time': - continue - - if print_all: - table.append((key, self.get_port_state(key), - data.rx_ok, STATUS_NA, STATUS_NA, STATUS_NA, data.rx_err, - data.rx_drop, data.rx_ovr, - data.tx_ok, STATUS_NA, STATUS_NA, STATUS_NA, data.tx_err, - data.tx_drop, data.tx_ovr)) - else: - table.append((key, self.get_port_state(key), - data.rx_ok, STATUS_NA, STATUS_NA, data.rx_err, - data.rx_drop, data.rx_ovr, - data.tx_ok, STATUS_NA, STATUS_NA, data.tx_err, - data.tx_drop, data.tx_ovr)) - - - if use_json: - table_as_json(table, header_all if print_all else header) - else: - print tabulate(table, header_all, tablefmt='simple', stralign='right') # if print_all else header - - def cnstat_diff_print(self, cnstat_new_dict, cnstat_old_dict, use_json, print_all): + def cnstat_diff_print(self, cnstat_new_dict, cnstat_old_dict, use_json=False, print_all=False): """ Print the difference between two cnstat results. """ @@ -154,75 +127,47 @@ class Portstat(object): for key, cntr in cnstat_new_dict.iteritems(): if key == 'time': - time_gap = cnstat_new_dict.get('time') - cnstat_old_dict.get('time') - time_gap = time_gap.total_seconds() + if 'time' in cnstat_old_dict: + time_gap = cnstat_new_dict.get('time') - cnstat_old_dict.get('time') + time_gap = time_gap.total_seconds() + else: + time_gap = get_uptime() continue - old_cntr = None if key in cnstat_old_dict: old_cntr = cnstat_old_dict.get(key) + else: + old_cntr = NStats._make([0] * BUCKET_NUM) if print_all: - if old_cntr is not None: - table.append((key, self.get_port_state(key), - ns_diff(cntr.rx_ok, old_cntr.rx_ok), - ns_brate(cntr.rx_byt, old_cntr.rx_byt, time_gap), - ns_prate(cntr.rx_ok, old_cntr.rx_ok, time_gap), - ns_util(cntr.rx_byt, old_cntr.rx_byt, time_gap), - ns_diff(cntr.rx_err, old_cntr.rx_err), - ns_diff(cntr.rx_drop, old_cntr.rx_drop), - ns_diff(cntr.rx_ovr, old_cntr.rx_ovr), - ns_diff(cntr.tx_ok, old_cntr.tx_ok), - ns_brate(cntr.tx_byt, old_cntr.tx_byt, time_gap), - ns_prate(cntr.tx_ok, old_cntr.tx_ok, time_gap), - ns_util(cntr.tx_byt, old_cntr.tx_byt, time_gap), - ns_diff(cntr.tx_err, old_cntr.tx_err), - ns_diff(cntr.tx_drop, old_cntr.tx_drop), - ns_diff(cntr.tx_ovr, old_cntr.tx_ovr))) - else: - table.append((key, self.get_port_state(key), - cntr.rx_ok, - STATUS_NA, - STATUS_NA, - STATUS_NA, - cntr.rx_err, - cntr.rx_drop, - cntr.rx_ovr, - cntr.tx_ok, - STATUS_NA, - STATUS_NA, - STATUS_NA, - cntr.tx_err, - cntr.tx_drop, - cntr.tx_err)) + table.append((key, self.get_port_state(key), + ns_diff(cntr.rx_ok, old_cntr.rx_ok), + ns_brate(cntr.rx_byt, old_cntr.rx_byt, time_gap), + ns_prate(cntr.rx_ok, old_cntr.rx_ok, time_gap), + ns_util(cntr.rx_byt, old_cntr.rx_byt, time_gap), + ns_diff(cntr.rx_err, old_cntr.rx_err), + ns_diff(cntr.rx_drop, old_cntr.rx_drop), + ns_diff(cntr.rx_ovr, old_cntr.rx_ovr), + ns_diff(cntr.tx_ok, old_cntr.tx_ok), + ns_brate(cntr.tx_byt, old_cntr.tx_byt, time_gap), + ns_prate(cntr.tx_ok, old_cntr.tx_ok, time_gap), + ns_util(cntr.tx_byt, old_cntr.tx_byt, time_gap), + ns_diff(cntr.tx_err, old_cntr.tx_err), + ns_diff(cntr.tx_drop, old_cntr.tx_drop), + ns_diff(cntr.tx_ovr, old_cntr.tx_ovr))) else: - if old_cntr is not None: - table.append((key, self.get_port_state(key), - ns_diff(cntr.rx_ok, old_cntr.rx_ok), - ns_brate(cntr.rx_byt, old_cntr.rx_byt, time_gap), - ns_util(cntr.rx_byt, old_cntr.rx_byt, time_gap), - ns_diff(cntr.rx_err, old_cntr.rx_err), - ns_diff(cntr.rx_drop, old_cntr.rx_drop), - ns_diff(cntr.rx_ovr, old_cntr.rx_ovr), - ns_diff(cntr.tx_ok, old_cntr.tx_ok), - ns_brate(cntr.tx_byt, old_cntr.tx_byt, time_gap), - ns_util(cntr.tx_byt, old_cntr.tx_byt, time_gap), - ns_diff(cntr.tx_err, old_cntr.tx_err), - ns_diff(cntr.tx_drop, old_cntr.tx_drop), - ns_diff(cntr.tx_ovr, old_cntr.tx_ovr))) - else: - table.append((key, self.get_port_state(key), - cntr.rx_ok, - STATUS_NA, - STATUS_NA, - cntr.rx_err, - cntr.rx_drop, - cntr.rx_ovr, - cntr.tx_ok, - STATUS_NA, - STATUS_NA, - cntr.tx_err, - cntr.tx_drop, - cntr.tx_err)) + table.append((key, self.get_port_state(key), + ns_diff(cntr.rx_ok, old_cntr.rx_ok), + ns_brate(cntr.rx_byt, old_cntr.rx_byt, time_gap), + ns_util(cntr.rx_byt, old_cntr.rx_byt, time_gap), + ns_diff(cntr.rx_err, old_cntr.rx_err), + ns_diff(cntr.rx_drop, old_cntr.rx_drop), + ns_diff(cntr.rx_ovr, old_cntr.rx_ovr), + ns_diff(cntr.tx_ok, old_cntr.tx_ok), + ns_brate(cntr.tx_byt, old_cntr.tx_byt, time_gap), + ns_util(cntr.tx_byt, old_cntr.tx_byt, time_gap), + ns_diff(cntr.tx_err, old_cntr.tx_err), + ns_diff(cntr.tx_drop, old_cntr.tx_drop), + ns_diff(cntr.tx_ovr, old_cntr.tx_ovr))) if use_json: print self.table_as_json(table, print_all) @@ -340,7 +285,7 @@ Examples: print "\nFile '%s' does not exist" % cnstat_fqn_file print "Did you run 'portstat -c -t %s' to record the counters via tag %s?\n" % (tag_name, tag_name) else: - portstat.cnstat_print(cnstat_dict, use_json, print_all) + portstat.cnstat_diff_print(cnstat_dict, {}, use_json, print_all) else: #wait for the specified time and then gather the new stats and output the difference. time.sleep(wait_time_in_seconds) diff --git a/utilities_common/__init__.py b/utilities_common/__init__.py index e69de29bb2d1..2240b46886a0 100755 --- a/utilities_common/__init__.py +++ b/utilities_common/__init__.py @@ -0,0 +1,3 @@ +def get_uptime(): + with open('/proc/uptime') as fp: + return float(fp.read().split(' ')[0]) \ No newline at end of file