openstack
/
placement
Code Issues Proposed changes

Merge "Make sure the policy upgrade check get a valid config"

This commit is contained in:
Zuul 2021-04-21 19:33:42 +00:00 committed by Gerrit Code Review
parent 5bf92eaef1 992dd6a706
commit 9dc90f2efb
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
placement/cmd/status.py
View File

@ -30,6 +30,7 @@ class Checks(upgradecheck.UpgradeCommands):
and added to _upgrade_checks tuple.
"""
def __init__(self, config):
self.config = config
self.ctxt = context.RequestContext(config=config)
@db_api.placement_context_manager.reader
@ -96,6 +97,12 @@ class Checks(upgradecheck.UpgradeCommands):
# No missing consumers (or no allocations [fresh install?]) so it's OK.
return upgradecheck.Result(upgradecheck.Code.SUCCESS)
def _check_policy_json(self):
"""A wrapper passing a proper config object when calling the generic
policy json check.
"""
return common_checks.check_policy_json(self, self.config)
# The format of the check functions is to return an
# oslo_upgradecheck.upgradecheck.Result
# object with the appropriate
@ -106,8 +113,7 @@ class Checks(upgradecheck.UpgradeCommands):
_upgrade_checks = (
('Missing Root Provider IDs', _check_root_provider_ids),
('Incomplete Consumers', _check_incomplete_consumers),
("Policy File JSON to YAML Migration",
(common_checks.check_policy_json, {'conf': cfg.CONF})),
("Policy File JSON to YAML Migration", _check_policy_json),
)

5
placement/tests/functional/cmd/test_status.py
View File

@ -81,7 +81,4 @@ class UpgradeCheckIncompleteConsumersTestCase(
self.assertEqual(upgradecheck.Code.SUCCESS, result.code)
def test_all_registered_check_is_runnable(self):
# this is bug story/2008831
self.assertRaises(cfg.NotInitializedError, self.checks.check)
# after it is fixed we expect that all the checks succeeds
# self.assertEquals(upgradecheck.Code.SUCCESS, self.checks.check())
self.assertEqual(upgradecheck.Code.SUCCESS, self.checks.check())