Fix oslo policy DeprecatedRule warnings

Since 3.7.0, oslo policy started the DeprecationWarning[1] if
deprecated_reason and deprecated_since param are not passed
in DeprecatedRule or they are passed in RuleDefault object.

These warnings are logged for every test which increase the
log size and sometime can full the log buffer and fail the
job.

[1] https://github.com/openstack/oslo.policy/blob/3.7.0/oslo_policy/policy.py#L1538

Change-Id: I5f7b2027e9d015cef6e8e7b459ebf2005c432209
This commit is contained in:
Ghanshyam Mann 2021-07-03 18:55:57 -05:00
parent 30041a9d09
commit 5469b497eb
2 changed files with 21 additions and 21 deletions

View File

@ -32,16 +32,28 @@ from cyborg.policies import base
# we can totally remove these deprecated device_profile policies from code.
deprecated_get_all = policy.DeprecatedRule(
name='cyborg:device_profile:get_all',
check_str=base.deprecated_default)
check_str=base.deprecated_default,
deprecated_reason=('request admin_or_owmer rule is too strict for '
'listing device_profile'),
deprecated_since=versionutils.deprecated.WALLABY)
deprecated_get_one = policy.DeprecatedRule(
name='cyborg:device_profile:get_one',
check_str=base.deprecated_default)
check_str=base.deprecated_default,
deprecated_reason=('request admin_or_owmer rule is too strict for '
'retrieving a device_profile'),
deprecated_since=versionutils.deprecated.WALLABY)
deprecated_create = policy.DeprecatedRule(
name='cyborg:device_profile:create',
check_str=base.deprecated_is_admin)
check_str=base.deprecated_is_admin,
deprecated_reason=('project_admin_or_owner is too permissive, '
'introduce system_scoped admin for creation'),
deprecated_since=versionutils.deprecated.WALLABY)
deprecated_delete = policy.DeprecatedRule(
name='cyborg:device_profile:delete',
check_str=base.deprecated_default)
check_str=base.deprecated_default,
deprecated_reason=('project_admin_or_owner is too permissive, '
'introduce system_scoped admin for deletion'),
deprecated_since=versionutils.deprecated.WALLABY)
# new device_profile policies
device_profile_policies = [
@ -55,10 +67,7 @@ device_profile_policies = [
'method': 'GET'
}],
scope_types=['system', 'project'],
deprecated_rule=deprecated_get_all,
deprecated_reason=('request admin_or_owmer rule is too strict for '
'listing device_profile'),
deprecated_since=versionutils.deprecated.WALLABY),
deprecated_rule=deprecated_get_all),
policy.DocumentedRuleDefault(
name='cyborg:device_profile:get_one',
check_str=base.PROJECT_READER_OR_SYSTEM_READER,
@ -69,10 +78,7 @@ device_profile_policies = [
'method': 'GET'
}],
scope_types=['system', 'project'],
deprecated_rule=deprecated_get_one,
deprecated_reason=('request admin_or_owmer rule is too strict for '
'retrieving a device_profile'),
deprecated_since=versionutils.deprecated.WALLABY),
deprecated_rule=deprecated_get_one),
policy.DocumentedRuleDefault(
name='cyborg:device_profile:create',
check_str=base.SYSTEM_ADMIN,
@ -83,10 +89,7 @@ device_profile_policies = [
'method': 'POST'
}],
scope_types=['system'],
deprecated_rule=deprecated_create,
deprecated_reason=('project_admin_or_owner is too permissive, '
'introduce system_scoped admin for creation'),
deprecated_since=versionutils.deprecated.WALLABY),
deprecated_rule=deprecated_create),
policy.DocumentedRuleDefault(
name='cyborg:device_profile:delete',
check_str=base.SYSTEM_ADMIN,
@ -100,10 +103,7 @@ device_profile_policies = [
'method': 'DELETE'},
],
scope_types=['system'],
deprecated_rule=deprecated_delete,
deprecated_reason=('project_admin_or_owner is too permissive, '
'introduce system_scoped admin for deletion'),
deprecated_since=versionutils.deprecated.WALLABY),
deprecated_rule=deprecated_delete),
]

View File

@ -18,7 +18,7 @@ os-resource-classes>=0.5.0 # Apache-2.0
oslo.upgradecheck>=0.1.0 # Apache-2.0
oslo.utils>=4.5.0 # Apache-2.0
oslo.versionedobjects>=1.31.2 # Apache-2.0
oslo.policy>=3.4.0 # Apache-2.0
oslo.policy>=3.7.0 # Apache-2.0
SQLAlchemy>=0.9.0,!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8 # MIT
alembic>=0.8.10 # MIT
stevedore>=1.5.0 # Apache-2.0