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

Jump to bottom

[crm]: Add utility for CRM configuration #187

Merged
merged 3 commits into from
Feb 21, 2018
Merged

[crm]: Add utility for CRM configuration #187

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23af16e
[crm]: Add utility for CRM configuration
Jan 15, 2018
a2f2eb7
[crm]: Add utility for CRM configuration
Feb 14, 2018
4908cba
[crm]: Add utility for CRM configuration
Feb 19, 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: 29 additions & 20 deletions crm/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/usr/bin/env python

import os
import click
import swsssdk
from tabulate import tabulate
Expand Down Expand Up @@ -28,7 +29,7 @@ def show_summary(self):

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

print '\nPolling Interval: ' + crm_info['polling_interval'] + ' minute(s)\n'
print '\nPolling Interval: ' + crm_info['polling_interval'] + ' second(s)\n'

def show_thresholds(self, resource):
"""
Expand All @@ -44,7 +45,7 @@ def show_thresholds(self, resource):

if resource == 'all':
for res in ["ipv4_route", "ipv6_route", "ipv4_nexthop", "ipv6_nexthop", "ipv4_neighbor", "ipv6_neighbor",
"nexthop_group_member", "nexthop_group_object", "acl_table", "acl_group", "acl_entry",
"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"]])
Copy link
Contributor

Choose a reason for hiding this comment

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

is crm_info[] from config_db prefixed with "crm" as mentioned in the design spec (CRM_IPV4_ROUTE_THRESHOLD_TYPE)?. Can you place the config_db output for understanding?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Currently "CONFIG_DB" output looks as following:

127.0.0.1:6379[4]> HGETALL CRM|Config
 1) "ipv4_route_threshold_type"
 2) "percentage"
 3) "ipv4_route_low_threshold"
 4) "70"
 5) "ipv4_route_high_threshold"
 6) "85"
...

else:
Expand All @@ -68,7 +69,7 @@ def show_resources(self, resource):

if resource == 'all':
for res in ["ipv4_route", "ipv6_route", "ipv4_nexthop", "ipv6_nexthop", "ipv4_neighbor", "ipv6_neighbor",
"nexthop_group_member", "nexthop_group_object", "fdb_entry"]:
"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"]])
Expand Down Expand Up @@ -103,25 +104,33 @@ def show_acl_resources(self):
print tabulate(data, headers=header, tablefmt="simple", missingval="")
print '\n'

def show_acl_table_resources(self, table_id):
def show_acl_table_resources(self):
"""
CRM Handler to display ACL table information.
"""
countersdb = swsssdk.SonicV2Connector(host='127.0.0.1')
countersdb.connect(countersdb.COUNTERS_DB)

header = ("Resource Name", "Used Count", "Available Count")
header = ("Table ID", "Resource Name", "Used Count", "Available Count")
Copy link
Contributor

Choose a reason for hiding this comment

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

Just checking, is it possible to display Table name as well, if it's available in the DB?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Looks like no, currently we cannot display ACL table name here.

data = []

crm_stats = countersdb.get_all(countersdb.COUNTERS_DB, 'CRM:ACL_TABLE_STATS:{0}'.format(table_id))
# Retrieve all ACL table keys from CRM:ACL_TABLE_STATS
output = os.popen("docker exec -i database redis-cli --raw -n 2 KEYS *CRM:ACL_TABLE_STATS*").readlines()
Copy link
Contributor

Choose a reason for hiding this comment

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

In general, subprocess is being used instead of os.popen

keys = [item.strip() for item in output]

for res in ['crm_stats_' + 'acl_entry' + '_used', 'crm_stats_' + 'acl_counter' + '_available']:
if res in crm_stats:
data.append([res, crm_stats[res], crm_stats[res]])
for key in keys:
id = key.replace('CRM:ACL_TABLE_STATS:', '')

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="")
print '\n'

print '\n'
print tabulate(data, headers=header, tablefmt="simple", missingval="")
print '\n'

@click.group()
@click.pass_context
Expand Down Expand Up @@ -260,8 +269,8 @@ def member(ctx):
@group.group()
@click.pass_context
def object(ctx):
"""CRM configuration for nexthop group object resource"""
ctx.obj["crm"].res_type = 'nexthop_group_object'
"""CRM configuration for nexthop group resource"""
ctx.obj["crm"].res_type = 'nexthop_group'

member.add_command(type)
member.add_command(low)
Expand Down Expand Up @@ -359,6 +368,7 @@ def all(ctx):
elif ctx.obj["crm"].cli_mode == 'resources':
ctx.obj["crm"].show_resources('all')
ctx.obj["crm"].show_acl_resources()
ctx.obj["crm"].show_acl_table_resources()

@resources.group()
@click.pass_context
Expand Down Expand Up @@ -427,11 +437,11 @@ def member(ctx):
@group.command()
@click.pass_context
def object(ctx):
"""Show CRM information for nexthop group object resource"""
"""Show CRM information for nexthop group resource"""
if ctx.obj["crm"].cli_mode == 'thresholds':
ctx.obj["crm"].show_thresholds('nexthop_group_object')
ctx.obj["crm"].show_thresholds('nexthop_group')
elif ctx.obj["crm"].cli_mode == 'resources':
ctx.obj["crm"].show_resources('nexthop_group_object')
ctx.obj["crm"].show_resources('nexthop_group')

@resources.group()
@click.pass_context
Expand All @@ -441,13 +451,12 @@ def acl(ctx):

@acl.command()
@click.pass_context
@click.argument('table_id', type=click.STRING)
def table(ctx, table_id):
def table(ctx):
"""Show CRM information for acl table resource"""
if ctx.obj["crm"].cli_mode == 'thresholds':
ctx.obj["crm"].show_thresholds('acl_table')
elif ctx.obj["crm"].cli_mode == 'resources':
ctx.obj["crm"].show_acl_table_resources(table_id)
ctx.obj["crm"].show_acl_table_resources()

@acl.group()
@click.pass_context
Expand Down