From c3b2d036bd0c0bf8d338123375a7bcc7de809f34 Mon Sep 17 00:00:00 2001 From: Nathaniel Case Date: Thu, 25 Mar 2021 11:42:06 -0400 Subject: Replace module._check_required_* calls (#140) Replace removed module._check_required_* calls Reviewed-by: https://github.com/apps/ansible-zuul --- plugins/modules/vyos_logging.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'plugins/modules/vyos_logging.py') diff --git a/plugins/modules/vyos_logging.py b/plugins/modules/vyos_logging.py index c7780d8e..d4f0cfc4 100644 --- a/plugins/modules/vyos_logging.py +++ b/plugins/modules/vyos_logging.py @@ -152,7 +152,9 @@ import re from copy import deepcopy +from ansible.module_utils._text import to_text from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.common.validation import check_required_if from ansible_collections.ansible.netcommon.plugins.module_utils.network.common.utils import ( remove_default_spec, ) @@ -256,7 +258,10 @@ def map_params_to_obj(module, required_if=None): if item.get(key) is None: item[key] = module.params[key] - module._check_required_if(required_if, item) + try: + check_required_if(required_if, item) + except TypeError as exc: + module.fail_json(to_text(exc)) obj.append(item.copy()) else: @@ -294,7 +299,7 @@ def main(): remove_default_spec(aggregate_spec) argument_spec = dict( - aggregate=dict(type="list", elements="dict", options=aggregate_spec), + aggregate=dict(type="list", elements="dict", options=aggregate_spec) ) argument_spec.update(element_spec) -- cgit v1.2.3