Fix junos_netconf idempotency issues (#27804)
* Fix junos_netconf idempotency issues * Fix pep8 issue * Fix pep8 issue
This commit is contained in:
parent
2ad56c0700
commit
b51a1e9045
1 changed files with 6 additions and 11 deletions
|
@ -82,16 +82,11 @@ def map_obj_to_commands(updates, module):
|
|||
want, have = updates
|
||||
commands = list()
|
||||
|
||||
if want['state'] == 'present' and have['state'] == 'absent':
|
||||
commands.append(
|
||||
'set system services netconf ssh port %s' % want['netconf_port']
|
||||
)
|
||||
|
||||
elif want['state'] == 'absent' and have['state'] == 'present':
|
||||
commands.append('delete system services netconf')
|
||||
|
||||
elif want['state'] == 'present':
|
||||
if want['netconf_port'] != have.get('netconf_port'):
|
||||
if want['state'] == 'absent':
|
||||
if have['state'] == 'present':
|
||||
commands.append('delete system services netconf')
|
||||
else:
|
||||
if have['state'] == 'absent' or want['netconf_port'] != have.get('netconf_port'):
|
||||
commands.append(
|
||||
'set system services netconf ssh port %s' % want['netconf_port']
|
||||
)
|
||||
|
@ -113,7 +108,7 @@ def map_config_to_obj(module):
|
|||
config = str(out).strip()
|
||||
|
||||
obj = {'state': 'absent'}
|
||||
if config:
|
||||
if 'ssh' in config:
|
||||
obj.update({
|
||||
'state': 'present',
|
||||
'netconf_port': parse_port(config)
|
||||
|
|
Loading…
Reference in a new issue