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

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

Merged
merged 2 commits into from
Jan 24, 2019
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6812779
[caclmgrd] Don't crash if we find empty/null rule_props
jleveque Jan 22, 2019
739939a
Address review comments
jleveque Jan 23, 2019
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
10 changes: 9 additions & 1 deletion files/image_config/caclmgrd/caclmgrd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,15 @@ class ControlPlaneAclManager(object):

for ((rule_table_name, rule_id), rule_props) in self._rules_db_info.iteritems():
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,
# try to do it now. We determine heuristically based on whether the
Expand Down