matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[caclmgrd] Don't crash if we find empty/null rule_props (#2475)

Browse Source 
* [caclmgrd] Don't crash if we find empty/null rule_props
This commit is contained in:
Joe LeVeque 2019-01-23 18:47:05 -08:00 committed by lguohan
parent 12735abc51
commit 116ddb996a
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
files/image_config/caclmgrd/caclmgrd
View File

@ -183,7 +183,15 @@ class ControlPlaneAclManager(object):
for ((rule_table_name, rule_id), rule_props) in self._rules_db_info.iteritems(): for ((rule_table_name, rule_id), rule_props) in self._rules_db_info.iteritems():
if rule_table_name == table_name: if rule_table_name == table_name:
acl_rules[rule_props["PRIORITY"]] = rule_props if not rule_props:
log_warning("rule_props for rule_id {} empty or null!".format(rule_id))
continue
try:
acl_rules[rule_props["PRIORITY"]] = rule_props
except KeyError:
log_error("rule_props for rule_id {} does not have key 'PRIORITY'!".format(rule_id))
continue
# If we haven't determined the IP version for this ACL table yet, # If we haven't determined the IP version for this ACL table yet,
# try to do it now. We determine heuristically based on whether the # try to do it now. We determine heuristically based on whether the