openstack
/
charms.openstack
Code Issues Proposed changes

Replace deprecated call from charmhelpers policyd 

The use of function maybe_do_policyd_overrides_on_config_changed
is deprecated in favor of maybe_do_policyd_overrides.
This would trigger deprecation warning messages not only in logs
but also in actions such as seen in Octavia Charm

The unittest covering the call has also been updated accordingly

Closes-Bug: #1939840
Change-Id: Iec91d60727533e6291c3ec20442197ac44f4607c
This commit is contained in:
Olivier Dufour-Cuvillier 2021-11-23 11:59:36 +01:00
parent 10627ee5f9
commit 6b0c1c7cad
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
charms_openstack/plugins/classes.py
View File

@ -536,5 +536,6 @@ class PolicydOverridePlugin(object):
except Exception:
pass
args, kwargs = self._policyd_function_args()
ch_policyd.maybe_do_policyd_overrides_on_config_changed(
*args, **kwargs)
if 'config_changed' not in kwargs.keys():
kwargs['config_changed'] = True
ch_policyd.maybe_do_policyd_overrides(*args, **kwargs)

4
unit_tests/charms_openstack/plugins/test_classes.py
View File

@ -369,10 +369,10 @@ class TestPolicydOverridePlugin(BaseOpenStackCharmTest):
self.patch_target('_policyd_function_args',
return_value=(["args"], {"kwargs": 1}))
self.patch_object(cpl.ch_policyd,
'maybe_do_policyd_overrides_on_config_changed',
'maybe_do_policyd_overrides',
name='mock_policyd_call')
self.target.config_changed()
self.assertTrue(self.target._config_changed)
self._policyd_function_args.assert_called_once_with()
self.mock_policyd_call.assert_called_once_with(
"args", kwargs=1)
"args", kwargs=1, config_changed=True)