Set default value for provider transport

Fixes #30331
Set defualt value of provider to avoid
behaviour change before and after sub spec
validation was added as part of PR #28894
pull/30386/head
Ganesh B. Nalawade 8 years ago committed by Toshio Kuratomi
parent 8a10472a3d
commit a886b2b11e

@ -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),

@ -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

@ -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),

@ -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

@ -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

@ -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

Loading…
Cancel
Save