Remove check_args for vyos modules (#30739)
* With addition of provider sub option validation check_args() is no longer required.
This commit is contained in:
parent
06aad40ccb
commit
c86b945a7c
14 changed files with 13 additions and 37 deletions
|
@ -62,16 +62,6 @@ def get_provider_argspec():
|
||||||
return vyos_provider_spec
|
return vyos_provider_spec
|
||||||
|
|
||||||
|
|
||||||
def check_args(module, warnings):
|
|
||||||
for key in vyos_argument_spec:
|
|
||||||
if module._name == 'vyos_user':
|
|
||||||
if key not in ['password', 'provider'] and module.params[key]:
|
|
||||||
warnings.append('argument %s has been deprecated and will be removed in a future version' % key)
|
|
||||||
else:
|
|
||||||
if key != 'provider' and module.params[key]:
|
|
||||||
warnings.append('argument %s has been deprecated and will be removed in a future version' % key)
|
|
||||||
|
|
||||||
|
|
||||||
def get_config(module, target='commands'):
|
def get_config(module, target='commands'):
|
||||||
cmd = ' '.join(['show configuration', target])
|
cmd = ' '.join(['show configuration', target])
|
||||||
|
|
||||||
|
|
|
@ -88,7 +88,7 @@ import re
|
||||||
|
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.vyos import get_config, load_config
|
from ansible.module_utils.vyos import get_config, load_config
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
def spec_to_commands(updates, module):
|
def spec_to_commands(updates, module):
|
||||||
|
@ -156,7 +156,6 @@ def main():
|
||||||
supports_check_mode=True)
|
supports_check_mode=True)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = {'changed': False}
|
result = {'changed': False}
|
||||||
if warnings:
|
if warnings:
|
||||||
|
|
|
@ -140,7 +140,7 @@ from ansible.module_utils.netcli import Conditional
|
||||||
from ansible.module_utils.network_common import ComplexList
|
from ansible.module_utils.network_common import ComplexList
|
||||||
from ansible.module_utils.six import string_types
|
from ansible.module_utils.six import string_types
|
||||||
from ansible.module_utils.vyos import run_commands
|
from ansible.module_utils.vyos import run_commands
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
def to_lines(stdout):
|
def to_lines(stdout):
|
||||||
for item in stdout:
|
for item in stdout:
|
||||||
|
@ -184,7 +184,6 @@ def main():
|
||||||
module = AnsibleModule(argument_spec=spec, supports_check_mode=True)
|
module = AnsibleModule(argument_spec=spec, supports_check_mode=True)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
commands = parse_commands(module, warnings)
|
commands = parse_commands(module, warnings)
|
||||||
|
|
||||||
|
|
|
@ -129,7 +129,7 @@ import re
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.netcfg import NetworkConfig
|
from ansible.module_utils.netcfg import NetworkConfig
|
||||||
from ansible.module_utils.vyos import load_config, get_config, run_commands
|
from ansible.module_utils.vyos import load_config, get_config, run_commands
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
DEFAULT_COMMENT = 'configured by vyos_config'
|
DEFAULT_COMMENT = 'configured by vyos_config'
|
||||||
|
@ -260,7 +260,6 @@ def main():
|
||||||
)
|
)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = dict(changed=False, warnings=warnings)
|
result = dict(changed=False, warnings=warnings)
|
||||||
|
|
||||||
|
|
|
@ -101,7 +101,7 @@ import re
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.six import iteritems
|
from ansible.module_utils.six import iteritems
|
||||||
from ansible.module_utils.vyos import run_commands
|
from ansible.module_utils.vyos import run_commands
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
class FactsBase(object):
|
class FactsBase(object):
|
||||||
|
@ -262,7 +262,6 @@ def main():
|
||||||
supports_check_mode=True)
|
supports_check_mode=True)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
gather_subset = module.params['gather_subset']
|
gather_subset = module.params['gather_subset']
|
||||||
|
|
||||||
|
|
|
@ -169,7 +169,7 @@ from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.connection import exec_command
|
from ansible.module_utils.connection import exec_command
|
||||||
from ansible.module_utils.network_common import conditional, remove_default_spec
|
from ansible.module_utils.network_common import conditional, remove_default_spec
|
||||||
from ansible.module_utils.vyos import load_config, get_config
|
from ansible.module_utils.vyos import load_config, get_config
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
def search_obj_in_list(name, lst):
|
def search_obj_in_list(name, lst):
|
||||||
|
@ -402,7 +402,6 @@ def main():
|
||||||
supports_check_mode=True)
|
supports_check_mode=True)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = {'changed': False}
|
result = {'changed': False}
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,7 @@ from copy import deepcopy
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.network_common import remove_default_spec
|
from ansible.module_utils.network_common import remove_default_spec
|
||||||
from ansible.module_utils.vyos import load_config, run_commands
|
from ansible.module_utils.vyos import load_config, run_commands
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
def search_obj_in_list(name, lst):
|
def search_obj_in_list(name, lst):
|
||||||
|
@ -218,7 +218,6 @@ def main():
|
||||||
supports_check_mode=True)
|
supports_check_mode=True)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = {'changed': False}
|
result = {'changed': False}
|
||||||
|
|
||||||
|
|
|
@ -100,7 +100,7 @@ from copy import deepcopy
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.network_common import remove_default_spec
|
from ansible.module_utils.network_common import remove_default_spec
|
||||||
from ansible.module_utils.vyos import load_config, run_commands
|
from ansible.module_utils.vyos import load_config, run_commands
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
def search_obj_in_list(name, lst):
|
def search_obj_in_list(name, lst):
|
||||||
|
@ -240,7 +240,6 @@ def main():
|
||||||
supports_check_mode=True)
|
supports_check_mode=True)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = {'changed': False}
|
result = {'changed': False}
|
||||||
|
|
||||||
|
|
|
@ -63,7 +63,7 @@ commands:
|
||||||
"""
|
"""
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.vyos import get_config, load_config
|
from ansible.module_utils.vyos import get_config, load_config
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
def has_lldp(module):
|
def has_lldp(module):
|
||||||
|
@ -91,7 +91,6 @@ def main():
|
||||||
supports_check_mode=True)
|
supports_check_mode=True)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = {'changed': False}
|
result = {'changed': False}
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ from copy import deepcopy
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.network_common import remove_default_spec
|
from ansible.module_utils.network_common import remove_default_spec
|
||||||
from ansible.module_utils.vyos import get_config, load_config
|
from ansible.module_utils.vyos import get_config, load_config
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
def search_obj_in_list(name, lst):
|
def search_obj_in_list(name, lst):
|
||||||
|
@ -203,7 +203,6 @@ def main():
|
||||||
supports_check_mode=True)
|
supports_check_mode=True)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = {'changed': False}
|
result = {'changed': False}
|
||||||
|
|
||||||
|
|
|
@ -110,7 +110,7 @@ from copy import deepcopy
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.network_common import remove_default_spec
|
from ansible.module_utils.network_common import remove_default_spec
|
||||||
from ansible.module_utils.vyos import get_config, load_config
|
from ansible.module_utils.vyos import get_config, load_config
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
def spec_to_commands(updates, module):
|
def spec_to_commands(updates, module):
|
||||||
|
@ -240,7 +240,6 @@ def main():
|
||||||
supports_check_mode=True)
|
supports_check_mode=True)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = {'changed': False}
|
result = {'changed': False}
|
||||||
if warnings:
|
if warnings:
|
||||||
|
|
|
@ -108,7 +108,7 @@ from copy import deepcopy
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.network_common import remove_default_spec
|
from ansible.module_utils.network_common import remove_default_spec
|
||||||
from ansible.module_utils.vyos import get_config, load_config
|
from ansible.module_utils.vyos import get_config, load_config
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
def spec_to_commands(updates, module):
|
def spec_to_commands(updates, module):
|
||||||
|
@ -242,7 +242,6 @@ def main():
|
||||||
supports_check_mode=True)
|
supports_check_mode=True)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = {'changed': False}
|
result = {'changed': False}
|
||||||
if warnings:
|
if warnings:
|
||||||
|
|
|
@ -94,7 +94,7 @@ EXAMPLES = """
|
||||||
|
|
||||||
from ansible.module_utils.basic import AnsibleModule
|
from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.vyos import get_config, load_config
|
from ansible.module_utils.vyos import get_config, load_config
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
def spec_key_to_device_key(key):
|
def spec_key_to_device_key(key):
|
||||||
|
@ -190,7 +190,6 @@ def main():
|
||||||
)
|
)
|
||||||
|
|
||||||
warnings = list()
|
warnings = list()
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = {'changed': False, 'warnings': warnings}
|
result = {'changed': False, 'warnings': warnings}
|
||||||
|
|
||||||
|
|
|
@ -136,7 +136,7 @@ from ansible.module_utils.basic import AnsibleModule
|
||||||
from ansible.module_utils.network_common import remove_default_spec
|
from ansible.module_utils.network_common import remove_default_spec
|
||||||
from ansible.module_utils.vyos import get_config, load_config
|
from ansible.module_utils.vyos import get_config, load_config
|
||||||
from ansible.module_utils.six import iteritems
|
from ansible.module_utils.six import iteritems
|
||||||
from ansible.module_utils.vyos import vyos_argument_spec, check_args
|
from ansible.module_utils.vyos import vyos_argument_spec
|
||||||
|
|
||||||
|
|
||||||
def validate_level(value, module):
|
def validate_level(value, module):
|
||||||
|
@ -309,8 +309,6 @@ def main():
|
||||||
'To set a user password use "configured_password" instead.'
|
'To set a user password use "configured_password" instead.'
|
||||||
)
|
)
|
||||||
|
|
||||||
check_args(module, warnings)
|
|
||||||
|
|
||||||
result = {'changed': False}
|
result = {'changed': False}
|
||||||
if warnings:
|
if warnings:
|
||||||
result['warnings'] = warnings
|
result['warnings'] = warnings
|
||||||
|
|
Loading…
Reference in a new issue