x
/
deb-oslo.policy
Code Issues Proposed changes

Merge "Adds debug logging for policy file validation"

This commit is contained in:
Jenkins 2016-07-20 20:07:15 +00:00 committed by Gerrit Code Review
parent ab8cbd187f 5273d2c3a1
commit e12ae8bd0c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
oslo_policy/policy.py
View File

@ -338,11 +338,7 @@ class Rules(dict):
"""
parsed_file = parse_file_contents(data)
# Parse the rules
rules = {k: _parser.parse_rule(v) for k, v in parsed_file.items()}
return cls(rules, default_rule)
return cls.from_dict(parsed_file, default_rule)
@classmethod
def load_json(cls, data, default_rule=None):
@ -364,7 +360,10 @@ class Rules(dict):
"""Allow loading of rule data from a dictionary."""
# Parse the rules stored in the dictionary
rules = {k: _parser.parse_rule(v) for k, v in rules_dict.items()}
rules = dict()
for k, v in rules_dict.items():
LOG.debug('Processing policy: "%s": "%s"', k, v)
rules[k] = _parser.parse_rule(v)
return cls(rules, default_rule)