Skip to content

[aclshow]: Skip rules with 0 count and sort the output #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stcheng merged 1 commit into from
Jun 23, 2017
Merged

[aclshow]: Skip rules with 0 count and sort the output #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 16 additions & 9 deletions scripts/aclshow
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,16 @@ optional arguments:
"""

from __future__ import print_function
import subprocess
import re
import sys
import os
from tabulate import tabulate

import argparse
import json
import os
import re
import subprocess
import swsssdk
import sys

from tabulate import tabulate

### temp file to save counter positions when doing clear counter action.
### if we could have a SAI command to clear counters will be better, so no need to maintain
Expand Down Expand Up @@ -198,21 +200,21 @@ class AclStat(object):

def get_counter_value(self, key, type):
"""
return the counter value or the difference comparing with the saved value
return the counter value or the difference comparing with the saved value in string format
"""
if not self.acl_counters[key]:
return 'N/A'

if key in self.saved_acl_counters:
new_value = int(self.acl_counters[key][type]) - int(self.saved_acl_counters[key][type])
if new_value > 0:
return new_value
return str(new_value)

return self.acl_counters[key][type]
return str(self.acl_counters[key][type])

def display_acl_stat(self):
"""
print out acl rules and counters
print out ACL rules and counters
"""
def get_action(rule):
for action in ['packet_action', 'mirror_action']:
Expand All @@ -223,6 +225,9 @@ class AclStat(object):
header = ACL_HEADER
aclstat = []
for rule_key in self.acl_rules.keys():
if self.get_counter_value(rule_key, 'packets') == '0' or \
self.get_counter_value(rule_key, 'packets') == 'N/A':
continue
rule = self.acl_rules[rule_key]
ports = self.acl_tables[rule_key[0]]['ports']
line = [rule_key[1], rule['table'],
Expand All @@ -233,6 +238,8 @@ class AclStat(object):
self.get_counter_value(rule_key, 'bytes')]
aclstat.append(line)

# sort the list with table name first and then descending priority
aclstat.sort(key=lambda x: (x[1], -int(x[3])))
print(tabulate(aclstat, header))

def display_acl_details(self):
Expand Down