Skip to content
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

[crm]: Fix failures in CLI show commands #221

Merged
merged 2 commits into from
Mar 29, 2018
Merged

[crm]: Fix failures in CLI show commands #221

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be1e08f
[crm]: Fix failures in CLI show commands
Mar 21, 2018
589b508
[crm]: Fix failures in CLI show commands
Mar 28, 2018
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
49 changes: 27 additions & 22 deletions crm/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ def show_summary(self):

crm_info = configdb.get_entry('CRM', 'Config')

print '\nPolling Interval: ' + crm_info['polling_interval'] + ' second(s)\n'
if crm_info:
print '\nPolling Interval: ' + crm_info['polling_interval'] + ' second(s)\n'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We would need to print some failure message if crm_info is null for some reason!


def show_thresholds(self, resource):
"""
Expand All @@ -44,13 +45,14 @@ def show_thresholds(self, resource):
header = ("Resource Name", "Threshold Type", "Low Threshold", "High Threshold")
data = []

if resource == 'all':
for res in ["ipv4_route", "ipv6_route", "ipv4_nexthop", "ipv6_nexthop", "ipv4_neighbor", "ipv6_neighbor",
"nexthop_group_member", "nexthop_group", "acl_table", "acl_group", "acl_entry",
"acl_counter", "fdb_entry"]:
data.append([res, crm_info[res + "_threshold_type"], crm_info[res + "_low_threshold"], crm_info[res + "_high_threshold"]])
else:
data.append([resource, crm_info[resource + "_threshold_type"], crm_info[resource + "_low_threshold"], crm_info[resource + "_high_threshold"]])
if crm_info:
if resource == 'all':
for res in ["ipv4_route", "ipv6_route", "ipv4_nexthop", "ipv6_nexthop", "ipv4_neighbor", "ipv6_neighbor",
"nexthop_group_member", "nexthop_group", "acl_table", "acl_group", "acl_entry",
"acl_counter", "fdb_entry"]:
data.append([res, crm_info[res + "_threshold_type"], crm_info[res + "_low_threshold"], crm_info[res + "_high_threshold"]])
else:
data.append([resource, crm_info[resource + "_threshold_type"], crm_info[resource + "_low_threshold"], crm_info[resource + "_high_threshold"]])

print '\n'
print tabulate(data, headers=header, tablefmt="simple", missingval="")
Expand All @@ -68,12 +70,13 @@ def show_resources(self, resource):
header = ("Resource Name", "Used Count", "Available Count")
data = []

if resource == 'all':
for res in ["ipv4_route", "ipv6_route", "ipv4_nexthop", "ipv6_nexthop", "ipv4_neighbor", "ipv6_neighbor",
"nexthop_group_member", "nexthop_group", "fdb_entry"]:
data.append([res, crm_stats['crm_stats_' + res + "_used"], crm_stats['crm_stats_' + res + "_available"]])
else:
data.append([resource, crm_stats['crm_stats_' + resource + "_used"], crm_stats['crm_stats_' + resource + "_available"]])
if crm_stats:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The else part has to display some message stating crm_stats is not_ready since it would be populated only after the polling interval

if resource == 'all':
for res in ["ipv4_route", "ipv6_route", "ipv4_nexthop", "ipv6_nexthop", "ipv4_neighbor", "ipv6_neighbor",
"nexthop_group_member", "nexthop_group", "fdb_entry"]:
data.append([res, crm_stats['crm_stats_' + res + "_used"], crm_stats['crm_stats_' + res + "_available"]])
else:
data.append([resource, crm_stats['crm_stats_' + resource + "_used"], crm_stats['crm_stats_' + resource + "_available"]])

print '\n'
print tabulate(data, headers=header, tablefmt="simple", missingval="")
Expand Down Expand Up @@ -118,15 +121,17 @@ def show_acl_table_resources(self):
proc = Popen("docker exec -i database redis-cli --raw -n 2 KEYS *CRM:ACL_TABLE_STATS*", stdout=PIPE, stderr=PIPE, shell=True)
out, err = proc.communicate()

for key in out.splitlines():
for key in out.splitlines() or [None]:
data = []
id = key.replace('CRM:ACL_TABLE_STATS:', '')

crm_stats = countersdb.get_all(countersdb.COUNTERS_DB, key)
if key:
id = key.replace('CRM:ACL_TABLE_STATS:', '')

for res in ['acl_entry', 'acl_counter']:
if ('crm_stats_' + res + '_used' in crm_stats) and ('crm_stats_' + res + '_available' in crm_stats):
data.append([id, res, crm_stats['crm_stats_' + res + '_used'], crm_stats['crm_stats_' + res + '_available']])
crm_stats = countersdb.get_all(countersdb.COUNTERS_DB, key)

for res in ['acl_entry', 'acl_counter']:
if ('crm_stats_' + res + '_used' in crm_stats) and ('crm_stats_' + res + '_available' in crm_stats):
data.append([id, res, crm_stats['crm_stats_' + res + '_used'], crm_stats['crm_stats_' + res + '_available']])

print '\n'
print tabulate(data, headers=header, tablefmt="simple", missingval="")
Expand Down Expand Up @@ -459,14 +464,14 @@ def table(ctx):
elif ctx.obj["crm"].cli_mode == 'resources':
ctx.obj["crm"].show_acl_table_resources()

@acl.group()
@acl.command()
@click.pass_context
def group(ctx):
"""Show CRM information for acl group resource"""
if ctx.obj["crm"].cli_mode == 'thresholds':
ctx.obj["crm"].show_thresholds('acl_group')
elif ctx.obj["crm"].cli_mode == 'resources':
ctx.obj["crm"].show_resources('acl_group')
ctx.obj["crm"].show_acl_resources()

@resources.command()
@click.pass_context
Expand Down