Merge "Fix include_rules option to work properly"

This commit is contained in:
Zuul 2017-12-04 20:20:42 +00:00 committed by Gerrit Code Review
commit 5bf2b12126
2 changed files with 8 additions and 4 deletions

View File

@ -43,7 +43,9 @@ class LibraryPolicyModel(base.APIModel):
a list of items in the model. Additional keys set in the
dict will also be rendered for the user.
"""
include_rules = params.get('include_rules', True)
include_rules = True
if params.get('include_rules', 'true').lower() == 'false':
include_rules = False
try:
# Note: name is included as a filtering parameter in get_items
# rather than a key in get_item because the API does not commit to
@ -79,7 +81,9 @@ class LibraryPolicyModel(base.APIModel):
"""
try:
# Note(thread-safety): blocking call
include_rules = params.get('include_rules', True)
include_rules = True
if params.get('include_rules', 'true').lower() == 'false':
include_rules = False
return self.invoke_rpc(base.LIBRARY_SERVICE_ID,
'get_policy',
{'id_': id_,

View File

@ -79,7 +79,7 @@ class TestLibraryPolicyModel(base.SqlTestCase):
for p in [self.policy,
self.policy2]))
ret = self.library_policy_model.get_items({'include_rules': False})
ret = self.library_policy_model.get_items({'include_rules': 'False'})
self.assertTrue(all(p in ret['results']
for p in [self.policy_metadata,
self.policy2_metadata]))
@ -99,7 +99,7 @@ class TestLibraryPolicyModel(base.SqlTestCase):
self.assertEqual(expected_ret, ret)
ret = self.library_policy_model.get_item(self.policy["id"],
{'include_rules': False})
{'include_rules': 'False'})
del expected_ret['rules']
self.assertEqual(expected_ret, ret)