mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
VarDict module utils (#6511)
* vardict: easy hadling of module variables * fix copyright year * initial tests passing * small adjustments * add tests * add to BOTMETA * remove unused import pytest * Update plugins/module_utils/vardict.py Co-authored-by: Felix Fontein <felix@fontein.de> * minor refactor and documentation * minor adjustments * rename VarDict.var() to VarDict._var() - plus add more docs * fix method name in tests --------- Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
parent
8586adcd51
commit
486f6553f5
3 changed files with 302 additions and 0 deletions
3
.github/BOTMETA.yml
vendored
3
.github/BOTMETA.yml
vendored
|
@ -333,6 +333,9 @@ files:
|
||||||
$module_utils/utm_utils.py:
|
$module_utils/utm_utils.py:
|
||||||
labels: utm_utils
|
labels: utm_utils
|
||||||
maintainers: $team_e_spirit
|
maintainers: $team_e_spirit
|
||||||
|
$module_utils/vardict.py:
|
||||||
|
labels: vardict
|
||||||
|
maintainers: russoz
|
||||||
$module_utils/wdc_redfish_utils.py:
|
$module_utils/wdc_redfish_utils.py:
|
||||||
labels: wdc_redfish_utils
|
labels: wdc_redfish_utils
|
||||||
maintainers: $team_wdc
|
maintainers: $team_wdc
|
||||||
|
|
175
plugins/module_utils/vardict.py
Normal file
175
plugins/module_utils/vardict.py
Normal file
|
@ -0,0 +1,175 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# (c) 2023, Alexei Znamensky <russoz@gmail.com>
|
||||||
|
# Copyright (c) 2023, Ansible Project
|
||||||
|
# Simplified BSD License (see LICENSES/BSD-2-Clause.txt or https://opensource.org/licenses/BSD-2-Clause)
|
||||||
|
# SPDX-License-Identifier: BSD-2-Clause
|
||||||
|
|
||||||
|
from __future__ import absolute_import, division, print_function
|
||||||
|
__metaclass__ = type
|
||||||
|
|
||||||
|
import copy
|
||||||
|
|
||||||
|
|
||||||
|
class _Variable(object):
|
||||||
|
NOTHING = object()
|
||||||
|
|
||||||
|
def __init__(self, diff=False, output=True, change=None, fact=False, verbosity=0):
|
||||||
|
self.init = False
|
||||||
|
self.initial_value = None
|
||||||
|
self.value = None
|
||||||
|
|
||||||
|
self.diff = None
|
||||||
|
self._change = None
|
||||||
|
self.output = None
|
||||||
|
self.fact = None
|
||||||
|
self._verbosity = None
|
||||||
|
self.set_meta(output=output, diff=diff, change=change, fact=fact, verbosity=verbosity)
|
||||||
|
|
||||||
|
def getchange(self):
|
||||||
|
return self.diff if self._change is None else self._change
|
||||||
|
|
||||||
|
def setchange(self, value):
|
||||||
|
self._change = value
|
||||||
|
|
||||||
|
def getverbosity(self):
|
||||||
|
return self._verbosity
|
||||||
|
|
||||||
|
def setverbosity(self, v):
|
||||||
|
if not (0 <= v <= 4):
|
||||||
|
raise ValueError("verbosity must be an int in the range 0 to 4")
|
||||||
|
self._verbosity = v
|
||||||
|
|
||||||
|
change = property(getchange, setchange)
|
||||||
|
verbosity = property(getverbosity, setverbosity)
|
||||||
|
|
||||||
|
def set_meta(self, output=None, diff=None, change=None, fact=None, initial_value=NOTHING, verbosity=None):
|
||||||
|
"""Set the metadata for the variable
|
||||||
|
|
||||||
|
Args:
|
||||||
|
output (bool, optional): flag indicating whether the variable should be in the output of the module. Defaults to None.
|
||||||
|
diff (bool, optional): flag indicating whether to generate diff mode output for this variable. Defaults to None.
|
||||||
|
change (bool, optional): flag indicating whether to track if changes happened to this variable. Defaults to None.
|
||||||
|
fact (bool, optional): flag indicating whether the varaiable should be exposed as a fact of the module. Defaults to None.
|
||||||
|
initial_value (any, optional): initial value of the variable, to be used with `change`. Defaults to NOTHING.
|
||||||
|
verbosity (int, optional): level of verbosity in which this variable is reported by the module as `output`, `fact` or `diff`. Defaults to None.
|
||||||
|
"""
|
||||||
|
if output is not None:
|
||||||
|
self.output = output
|
||||||
|
if change is not None:
|
||||||
|
self.change = change
|
||||||
|
if diff is not None:
|
||||||
|
self.diff = diff
|
||||||
|
if fact is not None:
|
||||||
|
self.fact = fact
|
||||||
|
if initial_value is not _Variable.NOTHING:
|
||||||
|
self.initial_value = copy.deepcopy(initial_value)
|
||||||
|
if verbosity is not None:
|
||||||
|
self.verbosity = verbosity
|
||||||
|
|
||||||
|
def set_value(self, value):
|
||||||
|
if not self.init:
|
||||||
|
self.initial_value = copy.deepcopy(value)
|
||||||
|
self.init = True
|
||||||
|
self.value = value
|
||||||
|
return self
|
||||||
|
|
||||||
|
def is_visible(self, verbosity):
|
||||||
|
return self.verbosity <= verbosity
|
||||||
|
|
||||||
|
@property
|
||||||
|
def has_changed(self):
|
||||||
|
return self.change and (self.initial_value != self.value)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def diff_result(self):
|
||||||
|
if self.diff and self.has_changed:
|
||||||
|
return {'before': self.initial_value, 'after': self.value}
|
||||||
|
return
|
||||||
|
|
||||||
|
def __str__(self):
|
||||||
|
return "<_Variable: value={0!r}, initial={1!r}, diff={2}, output={3}, change={4}, verbosity={5}>".format(
|
||||||
|
self.value, self.initial_value, self.diff, self.output, self.change, self.verbosity
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
class VarDict(object):
|
||||||
|
reserved_names = ('__vars__', 'var', 'set_meta', 'set', 'output', 'diff', 'facts', 'has_changed')
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
self.__vars__ = dict()
|
||||||
|
|
||||||
|
def __getitem__(self, item):
|
||||||
|
return self.__vars__[item].value
|
||||||
|
|
||||||
|
def __setitem__(self, key, value):
|
||||||
|
self.set(key, value)
|
||||||
|
|
||||||
|
def __getattr__(self, item):
|
||||||
|
try:
|
||||||
|
return self.__vars__[item].value
|
||||||
|
except KeyError:
|
||||||
|
return getattr(super(VarDict, self), item)
|
||||||
|
|
||||||
|
def __setattr__(self, key, value):
|
||||||
|
if key == '__vars__':
|
||||||
|
super(VarDict, self).__setattr__(key, value)
|
||||||
|
else:
|
||||||
|
self.set(key, value)
|
||||||
|
|
||||||
|
def _var(self, name):
|
||||||
|
return self.__vars__[name]
|
||||||
|
|
||||||
|
def set_meta(self, name, **kwargs):
|
||||||
|
"""Set the metadata for the variable
|
||||||
|
|
||||||
|
Args:
|
||||||
|
name (str): name of the variable having its metadata changed
|
||||||
|
output (bool, optional): flag indicating whether the variable should be in the output of the module. Defaults to None.
|
||||||
|
diff (bool, optional): flag indicating whether to generate diff mode output for this variable. Defaults to None.
|
||||||
|
change (bool, optional): flag indicating whether to track if changes happened to this variable. Defaults to None.
|
||||||
|
fact (bool, optional): flag indicating whether the varaiable should be exposed as a fact of the module. Defaults to None.
|
||||||
|
initial_value (any, optional): initial value of the variable, to be used with `change`. Defaults to NOTHING.
|
||||||
|
verbosity (int, optional): level of verbosity in which this variable is reported by the module as `output`, `fact` or `diff`. Defaults to None.
|
||||||
|
"""
|
||||||
|
self._var(name).set_meta(**kwargs)
|
||||||
|
|
||||||
|
def set(self, name, value, **kwargs):
|
||||||
|
"""Set the value and optionally metadata for a variable. The variable is not required to exist prior to calling `set`.
|
||||||
|
|
||||||
|
For details on the accepted metada see the documentation for method `set_meta`.
|
||||||
|
|
||||||
|
Args:
|
||||||
|
name (str): name of the variable being changed
|
||||||
|
value (any): the value of the variable, it can be of any type
|
||||||
|
|
||||||
|
Raises:
|
||||||
|
ValueError: Raised if trying to set a variable with a reserved name.
|
||||||
|
"""
|
||||||
|
if name in self.reserved_names:
|
||||||
|
raise ValueError("Name {0} is reserved".format(name))
|
||||||
|
if name in self.__vars__:
|
||||||
|
var = self._var(name)
|
||||||
|
var.set_meta(**kwargs)
|
||||||
|
else:
|
||||||
|
var = _Variable(**kwargs)
|
||||||
|
var.set_value(value)
|
||||||
|
self.__vars__[name] = var
|
||||||
|
|
||||||
|
def output(self, verbosity=0):
|
||||||
|
return dict((n, v.value) for n, v in self.__vars__.items() if v.output and v.is_visible(verbosity))
|
||||||
|
|
||||||
|
def diff(self, verbosity=0):
|
||||||
|
diff_results = [(n, v.diff_result) for n, v in self.__vars__.items() if v.diff_result and v.is_visible(verbosity)]
|
||||||
|
if diff_results:
|
||||||
|
before = dict((n, dr['before']) for n, dr in diff_results)
|
||||||
|
after = dict((n, dr['after']) for n, dr in diff_results)
|
||||||
|
return {'before': before, 'after': after}
|
||||||
|
return None
|
||||||
|
|
||||||
|
def facts(self, verbosity=0):
|
||||||
|
facts_result = dict((n, v.value) for n, v in self.__vars__.items() if v.fact and v.is_visible(verbosity))
|
||||||
|
return facts_result if facts_result else None
|
||||||
|
|
||||||
|
@property
|
||||||
|
def has_changed(self):
|
||||||
|
return any(True for var in self.__vars__.values() if var.has_changed)
|
124
tests/unit/plugins/module_utils/test_vardict.py
Normal file
124
tests/unit/plugins/module_utils/test_vardict.py
Normal file
|
@ -0,0 +1,124 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
# (c) 2023, Alexei Znamensky <russoz@gmail.com>
|
||||||
|
# Copyright (c) 2023 Ansible Project
|
||||||
|
# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt)
|
||||||
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
from __future__ import (absolute_import, division, print_function)
|
||||||
|
__metaclass__ = type
|
||||||
|
|
||||||
|
|
||||||
|
from ansible_collections.community.general.plugins.module_utils.vardict import VarDict
|
||||||
|
|
||||||
|
|
||||||
|
def test_var_simple():
|
||||||
|
vd = VarDict()
|
||||||
|
vd["a"] = 123
|
||||||
|
|
||||||
|
var = vd._var("a")
|
||||||
|
assert var.output is True
|
||||||
|
assert var.diff is False
|
||||||
|
assert var.change is False
|
||||||
|
assert var.fact is False
|
||||||
|
assert var.initial_value == 123
|
||||||
|
assert var.value == 123
|
||||||
|
|
||||||
|
vd.a = 456
|
||||||
|
assert var.output is True
|
||||||
|
assert var.diff is False
|
||||||
|
assert var.change is False
|
||||||
|
assert var.fact is False
|
||||||
|
assert var.initial_value == 123
|
||||||
|
assert var.value == 456
|
||||||
|
|
||||||
|
|
||||||
|
def test_var_diff_scalar():
|
||||||
|
vd = VarDict()
|
||||||
|
vd.set("aa", 123, diff=True)
|
||||||
|
|
||||||
|
var = vd._var("aa")
|
||||||
|
assert var.output is True
|
||||||
|
assert var.diff is True
|
||||||
|
assert var.change is True
|
||||||
|
assert var.fact is False
|
||||||
|
assert var.initial_value == 123
|
||||||
|
assert var.value == 123
|
||||||
|
assert vd.diff() is None
|
||||||
|
|
||||||
|
vd.aa = 456
|
||||||
|
assert var.output is True
|
||||||
|
assert var.diff is True
|
||||||
|
assert var.change is True
|
||||||
|
assert var.fact is False
|
||||||
|
assert var.initial_value == 123
|
||||||
|
assert var.value == 456
|
||||||
|
assert vd.diff() == {"before": {"aa": 123}, "after": {"aa": 456}}, "actual={0}".format(vd.diff())
|
||||||
|
|
||||||
|
|
||||||
|
def test_var_diff_dict():
|
||||||
|
val_before = dict(x=0, y=10, z=10)
|
||||||
|
val_after = dict(x=0, y=30, z=10)
|
||||||
|
|
||||||
|
vd = VarDict()
|
||||||
|
vd.set("dd", val_before, diff=True)
|
||||||
|
|
||||||
|
var = vd._var("dd")
|
||||||
|
assert var.output is True
|
||||||
|
assert var.diff is True
|
||||||
|
assert var.change is True
|
||||||
|
assert var.fact is False
|
||||||
|
assert var.initial_value == val_before
|
||||||
|
assert var.value == val_before
|
||||||
|
assert vd.diff() is None
|
||||||
|
|
||||||
|
vd.dd = val_after
|
||||||
|
assert var.output is True
|
||||||
|
assert var.diff is True
|
||||||
|
assert var.change is True
|
||||||
|
assert var.fact is False
|
||||||
|
assert var.initial_value == val_before
|
||||||
|
assert var.value == val_after
|
||||||
|
assert vd.diff() == {"before": {"dd": val_before}, "after": {"dd": val_after}}, "actual={0}".format(vd.diff())
|
||||||
|
|
||||||
|
vd.set("aa", 123, diff=True)
|
||||||
|
vd.aa = 456
|
||||||
|
assert vd.diff() == {"before": {"aa": 123, "dd": val_before}, "after": {"aa": 456, "dd": val_after}}, "actual={0}".format(vd.diff())
|
||||||
|
|
||||||
|
|
||||||
|
def test_vardict_set_meta():
|
||||||
|
vd = VarDict()
|
||||||
|
vd["jj"] = 123
|
||||||
|
|
||||||
|
var = vd._var("jj")
|
||||||
|
assert var.output is True
|
||||||
|
assert var.diff is False
|
||||||
|
assert var.change is False
|
||||||
|
assert var.fact is False
|
||||||
|
assert var.initial_value == 123
|
||||||
|
assert var.value == 123
|
||||||
|
|
||||||
|
vd.set_meta("jj", diff=True)
|
||||||
|
assert var.diff is True
|
||||||
|
assert var.change is True
|
||||||
|
|
||||||
|
vd.set_meta("jj", diff=False)
|
||||||
|
assert var.diff is False
|
||||||
|
assert var.change is False
|
||||||
|
|
||||||
|
vd.set_meta("jj", change=False)
|
||||||
|
vd.set_meta("jj", diff=True)
|
||||||
|
assert var.diff is True
|
||||||
|
assert var.change is False
|
||||||
|
|
||||||
|
|
||||||
|
def test_vardict_change():
|
||||||
|
vd = VarDict()
|
||||||
|
vd.set("xx", 123, change=True)
|
||||||
|
vd.set("yy", 456, change=True)
|
||||||
|
vd.set("zz", 789, change=True)
|
||||||
|
|
||||||
|
vd.xx = 123
|
||||||
|
vd.yy = 456
|
||||||
|
assert vd.has_changed is False
|
||||||
|
vd.xx = 12345
|
||||||
|
assert vd.has_changed is True
|
Loading…
Reference in a new issue