diff --git a/lib/ansible/module_utils/ce.py b/lib/ansible/module_utils/ce.py index bc12996787e..e4ee9edabf4 100644 --- a/lib/ansible/module_utils/ce.py +++ b/lib/ansible/module_utils/ce.py @@ -61,7 +61,7 @@ ce_provider_spec = { 'use_ssl': dict(type='bool'), 'validate_certs': dict(type='bool'), 'timeout': dict(type='int'), - 'transport': dict(choices=['cli']), + 'transport': dict(default='cli', choices=['cli']), } ce_argument_spec = { 'provider': dict(type='dict', options=ce_provider_spec), diff --git a/lib/ansible/module_utils/eos.py b/lib/ansible/module_utils/eos.py index dc80f3e4b1b..2cfb1fa2e92 100644 --- a/lib/ansible/module_utils/eos.py +++ b/lib/ansible/module_utils/eos.py @@ -53,7 +53,7 @@ eos_provider_spec = { 'validate_certs': dict(type='bool'), 'timeout': dict(type='int'), - 'transport': dict(choices=['cli', 'eapi']) + 'transport': dict(default='cli', choices=['cli', 'eapi']) } eos_argument_spec = { 'provider': dict(type='dict', options=eos_provider_spec), @@ -79,7 +79,7 @@ def check_args(module, warnings): module.params[key]): warnings.append('argument %s has been deprecated and will be removed in a future version' % key) else: - if key not in ['provider', 'authorize'] and module.params[key]: + if key not in ['provider', 'transport', 'authorize'] and module.params[key]: warnings.append('argument %s has been deprecated and will be removed in a future version' % key) # set argument's default value if not provided in input diff --git a/lib/ansible/module_utils/nxos.py b/lib/ansible/module_utils/nxos.py index aecd9811523..4811f993b7e 100644 --- a/lib/ansible/module_utils/nxos.py +++ b/lib/ansible/module_utils/nxos.py @@ -51,7 +51,7 @@ nxos_provider_spec = { 'validate_certs': dict(type='bool'), 'timeout': dict(type='int'), - 'transport': dict(choices=['cli', 'nxapi']) + 'transport': dict(default='cli', choices=['cli', 'nxapi']) } nxos_argument_spec = { 'provider': dict(type='dict', options=nxos_provider_spec), diff --git a/lib/ansible/plugins/action/ce.py b/lib/ansible/plugins/action/ce.py index f5a2e8bc32e..85ae6585898 100644 --- a/lib/ansible/plugins/action/ce.py +++ b/lib/ansible/plugins/action/ce.py @@ -100,6 +100,8 @@ class ActionModule(_ActionModule): provider[key] = self._task.args[key] elif 'fallback' in value: provider[key] = self._fallback(value['fallback']) + elif 'default' in value: + provider[key] = value['default'] elif key not in provider: provider[key] = None return provider diff --git a/lib/ansible/plugins/action/eos.py b/lib/ansible/plugins/action/eos.py index 873051f99aa..b6b9e940d86 100644 --- a/lib/ansible/plugins/action/eos.py +++ b/lib/ansible/plugins/action/eos.py @@ -124,6 +124,8 @@ class ActionModule(_ActionModule): provider[key] = self._task.args[key] elif 'fallback' in value: provider[key] = self._fallback(value['fallback']) + elif 'default' in value: + provider[key] = value['default'] elif key not in provider: provider[key] = None return provider diff --git a/lib/ansible/plugins/action/nxos.py b/lib/ansible/plugins/action/nxos.py index 9702e855603..ceb49d0e5e0 100644 --- a/lib/ansible/plugins/action/nxos.py +++ b/lib/ansible/plugins/action/nxos.py @@ -122,6 +122,8 @@ class ActionModule(_ActionModule): provider[key] = self._task.args[key] elif 'fallback' in value: provider[key] = self._fallback(value['fallback']) + elif 'default' in value: + provider[key] = value['default'] elif key not in provider: provider[key] = None return provider