ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-26 06:31:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Unhardcode the port and protocol on eos EAPI (#23350)

Browse source 
We were hard-coding the protocol, port and validate_certs on
eos EAPI via the action plugin.
Put defaults on the eos_argument_spec and pull those values from it.
This commit is contained in:
Ricardo Carrillo Cruz 2017-04-06 19:18:28 +02:00 • committed by GitHub
commit 3537b24742
2 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lib/ansible/module_utils/eos.py
View file

@ -40,8 +40,7 @@ _DEVICE_CONNECTION = None
eos_argument_spec = {
'host': dict(),
'port': dict(type='int'),
'port': dict(type='int', default=443),
'username': dict(fallback=(env_fallback, ['ANSIBLE_NET_USERNAME'])),
'password': dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True),
'ssh_keyfile': dict(fallback=(env_fallback, ['ANSIBLE_NET_SSH_KEYFILE']), type='path'),
@ -50,8 +49,8 @@ eos_argument_spec = {
'authorize': dict(fallback=(env_fallback, ['ANSIBLE_NET_AUTHORIZE']), type='bool'),
'auth_pass': dict(no_log=True, fallback=(env_fallback, ['ANSIBLE_NET_AUTH_PASS'])),
'use_ssl': dict(type='bool'),
'validate_certs': dict(type='bool'),
'use_ssl': dict(type='bool', default=True),
'validate_certs': dict(type='bool', default=True),
'timeout': dict(type='int'),
'provider': dict(type='dict', no_log=True),
@ -236,20 +235,18 @@ class Eapi:
self._session_support = None
self._device_configs = {}
host = module.params['host']
port = module.params['port']
host = module.params['provider']['host']
port = module.params['provider']['port']
self._module.params['url_username'] = self._module.params['username']
self._module.params['url_password'] = self._module.params['password']
if module.params['use_ssl']:
if module.params['provider']['use_ssl']:
proto = 'https'
if not port:
port = 443
else:
proto = 'http'
if not port:
port = 80
module.params['validate_certs'] = module.params['provider']['validate_certs']
self._url = '%s://%s:%s/command-api' % (proto, host, port)