eos_user: sends user secret first on user creation fixes #31680 (#32162)

* fix command order

* add integration test

* test cleanup

* remove redudant commands
This commit is contained in:
Dave Thelen 2017-10-26 03:10:58 -04:00 committed by Trishna Guha
parent 87989b5c63
commit 602a618e60
2 changed files with 27 additions and 7 deletions

View file

@ -181,16 +181,16 @@ def map_obj_to_commands(updates, module):
commands.append('no username %s' % want['name']) commands.append('no username %s' % want['name'])
continue continue
if needs_update('configured_password'):
if update_password == 'always' or not have:
add('secret %s' % want['configured_password'])
if needs_update('role'): if needs_update('role'):
add('role %s' % want['role']) add('role %s' % want['role'])
if needs_update('privilege'): if needs_update('privilege'):
add('privilege %s' % want['privilege']) add('privilege %s' % want['privilege'])
if needs_update('configured_password'):
if update_password == 'always' or not have:
add('secret %s' % want['configured_password'])
if needs_update('sshkey'): if needs_update('sshkey'):
add('sshkey %s' % want['sshkey']) add('sshkey %s' % want['sshkey'])

View file

@ -5,9 +5,10 @@
- no username ansibletest1 - no username ansibletest1
- no username ansibletest2 - no username ansibletest2
- no username ansibletest3 - no username ansibletest3
- no username ansibletest4
provider: "{{ cli }}" provider: "{{ cli }}"
- name: Create user - name: Create user with role
eos_user: eos_user:
name: ansibletest1 name: ansibletest1
privilege: 15 privilege: 15
@ -22,9 +23,27 @@
that: that:
- 'result.changed == true' - 'result.changed == true'
- '"username" in result.commands[0]' - '"username" in result.commands[0]'
- '"role network-operator" in result.commands[0]' - '"secret" in result.commands[0]'
- '"role network-operator" in result.commands[1]'
- '"privilege 15" in result.commands[2]'
- name: Create user with priv level and update_password
eos_user:
name: ansibletest4
privilege: 15
state: present
configured_password: test1
authorize: yes
update_password: on_create
provider: "{{ cli }}"
register: result
- assert:
that:
- 'result.changed == true'
- '"username" in result.commands[0]'
- '"secret" in result.commands[0]'
- '"privilege 15" in result.commands[1]' - '"privilege 15" in result.commands[1]'
- '"secret" in result.commands[2]'
- name: Collection of users - name: Collection of users
eos_user: eos_user:
@ -69,4 +88,5 @@
- no username ansibletest1 - no username ansibletest1
- no username ansibletest2 - no username ansibletest2
- no username ansibletest3 - no username ansibletest3
- no username ansibletest4
provider: "{{ cli }}" provider: "{{ cli }}"