ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-05-21 00:19:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix nxos_bgp_neighbor issues (#36318)

Browse source
This commit is contained in:
saichint 2018-02-19 20:38:17 -08:00 • committed by Trishna Guha
parent cac6c19a63
commit 80d19e6af3
3 changed files with 189 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

25
lib/ansible/modules/network/nxos/nxos_bgp_neighbor.py
View file

@ -107,7 +107,8 @@ options:
description:
- Specify Maximum number of peers for this neighbor prefix
Valid values are between 1 and 1000, or 'default', which does
not impose the limit.
not impose the limit. Note that this parameter is accepted
only on neighbors with address/prefix.
required: false
default: null
pwd:
@ -118,9 +119,9 @@ options:
pwd_type:
description:
- Specify the encryption type the password will use. Valid values
are '3des' or 'cisco_type_7' encryption.
are '3des' or 'cisco_type_7' encryption or keyword 'default'.
required: false
choices: ['3des', 'cisco_type_7']
choices: ['3des', 'cisco_type_7', 'default']
default: null
remote_as:
description:
@ -170,8 +171,6 @@ options:
Valid values are 'true', 'false', and 'default', which defaults
to 'false'. This property can only be configured when the
neighbor is in 'ip' address format without prefix length.
This property and the transport_passive_mode property are
mutually exclusive.
required: false
choices: ['true','false']
default: null
@ -388,11 +387,13 @@ def state_present(module, existing, proposed, candidate):
command = '{0} {1}'.format(key, value)
commands.append(command)
elif key == 'timers':
command = 'timers {0} {1}'.format(
proposed['timers_keepalive'],
proposed['timers_holdtime'])
if command not in commands:
commands.append(command)
if (proposed['timers_keepalive'] != PARAM_TO_DEFAULT_KEYMAP.get('timers_keepalive') or
proposed['timers_holdtime'] != PARAM_TO_DEFAULT_KEYMAP.get('timers_holdtime')):
command = 'timers {0} {1}'.format(
proposed['timers_keepalive'],
proposed['timers_holdtime'])
if command not in commands:
commands.append(command)
else:
command = '{0} {1}'.format(key, value)
commands.append(command)
@ -437,7 +438,7 @@ def main():
low_memory_exempt=dict(required=False, type='bool'),
maximum_peers=dict(required=False, type='str'),
pwd=dict(required=False, type='str'),
pwd_type=dict(required=False, type='str', choices=['cleartext', '3des', 'cisco_type_7', 'default']),
pwd_type=dict(required=False, type='str', choices=['3des', 'cisco_type_7', 'default']),
remote_as=dict(required=False, type='str'),
remove_private_as=dict(required=False, type='str', choices=['enable', 'disable', 'all', 'replace-as']),
shutdown=dict(required=False, type='bool'),
@ -452,7 +453,7 @@ def main():
module = AnsibleModule(
argument_spec=argument_spec,
required_together=[['timers_holdtime', 'timers_keepalive']],
required_together=[['timers_holdtime', 'timers_keepalive'], ['pwd', 'pwd_type']],
supports_check_mode=True,
)