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

Fixed issue "CRM module throws error". #543

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed issue "CRM module throws error". #543

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 32 additions & 2 deletions crm/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ def show_thresholds(self, resource):
"""
CRM Handler to display thresholds information.
"""
default_threshold_type = 'percentage'
default_threshold_low = 70
default_threshold_high = 85

configdb = swsssdk.ConfigDBConnector()
configdb.connect()

Expand All @@ -52,9 +56,35 @@ def show_thresholds(self, resource):
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"]])
if(crm_info.has_key(res + "_threshold_type")):
threshold_type = crm_info[res + "_threshold_type"]
else:
threshold_type = default_threshold_type
if(crm_info.has_key(res + "_low_threshold")):
threshold_low = crm_info[res + "_low_threshold"]
else:
threshold_low = default_threshold_low
if(crm_info.has_key(res + "_high_threshold")):
threshold_high = crm_info[res + "_high_threshold"]
else:
threshold_high = default_threshold_high

data.append([res, threshold_type, threshold_low, threshold_high])
else:
data.append([resource, crm_info[resource + "_threshold_type"], crm_info[resource + "_low_threshold"], crm_info[resource + "_high_threshold"]])
if(crm_info.has_key(resource + "_threshold_type")):
threshold_type = crm_info[resource + "_threshold_type"]
else:
threshold_type = default_threshold_type
if(crm_info.has_key(resource + "_low_threshold")):
threshold_low = crm_info[resource + "_low_threshold"]
else:
threshold_low = default_threshold_low
if(crm_info.has_key(resource + "_high_threshold")):
threshold_high = crm_info[resource + "_high_threshold"]
else:
threshold_high = default_threshold_high

data.append([resource, threshold_type, threshold_low, threshold_high])
else:
print '\nError! Could not get CRM configuration.'

Expand Down