ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-25 14:20:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

roll up of fixes for eos modules (#21406)

Browse source 
* fixes issue with load_provider() not checking for an existing key
* adds updates to eos_config results key
* lots of minor syntax fixes in eos shared module
* adds eos_argument_spec to eos_eapi

fixes #21402
This commit is contained in:
Peter Sprygada 2017-02-14 13:47:29 -05:00 • committed by John R Barker
commit e1a2c6e1d3
7 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/ansible/modules/network/eos/eos_eapi.py
View file

@ -184,6 +184,7 @@ import re
from ansible.module_utils.basic import AnsibleModule
from ansible.module_utils.eos import run_commands, load_config
from ansible.module_utils.six import iteritems
from ansible.module_utils.eos import eos_argument_spec, check_args
def validate_http_port(value, module):
if not 1 <= value <= 65535:
@ -198,8 +199,8 @@ def validate_local_http_port(value, module):
module.fail_json(msg='http_port must be between 1 and 65535')
def validate_vrf(value, module):
rc, out, err = run_commands(module, ['show vrf'])
configured_vrfs = re.findall('^\s+(\w+)(?=\s)', out[0],re.M)
out = run_commands(module, ['show vrf'])
configured_vrfs = re.findall('^\s+(\w+)(?=\s)', out[0], re.M)
configured_vrfs.append('default')
if value not in configured_vrfs:
module.fail_json(msg='vrf `%s` is not configured on the system' % value)
@ -255,7 +256,7 @@ def parse_state(data):
def map_config_to_obj(module):
rc, out, err = run_commands(module, ['show management api http-commands | json'])
out = run_commands(module, ['show management api http-commands | json'])
return {
'http': out[0]['httpServer']['configured'],
'http_port': out[0]['httpServer']['port'],
@ -290,7 +291,7 @@ def map_params_to_obj(module):
return obj
def collect_facts(module, result):
rc, out, err = run_commands(module, ['show management api http-commands | json'])
out = run_commands(module, ['show management api http-commands | json'])
facts = dict(eos_eapi_urls=dict())
for each in out[0]['urls']:
intf, url = each.split(' : ')
@ -320,6 +321,8 @@ def main():
state=dict(default='started', choices=['stopped', 'started']),
)
argument_spec.update(eos_argument_spec)
module = AnsibleModule(argument_spec=argument_spec,
supports_check_mode=True)