mirror.MikroTik/zahodi.ansible-mikrotik
1
0
Fork 0
mirror of https://github.com/zahodi/ansible-mikrotik.git synced 2025-07-21 19:34:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add check mode to user module

Browse source
This commit is contained in:
Valentin Gurmeza 2017-06-02 15:21:09 -07:00
parent caa99b3e5d
commit 8ddf2e67d9
2 changed files with 73 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

115
library/mt_user.py
View file

@ -56,65 +56,66 @@ from ansible.module_utils.basic import AnsibleModule
def main(): def main():
module = AnsibleModule( module = AnsibleModule(
argument_spec = dict( argument_spec = dict(
hostname = dict(required=True), hostname = dict(required=True),
username = dict(required=True), username = dict(required=True),
password = dict(required=True), password = dict(required=True),
settings = dict(required=False, type='dict'), settings = dict(required=False, type='dict'),
parameter = dict( parameter = dict(
required = True, required = True,
choices = ['user', 'active', 'aaa'], choices = ['user', 'active', 'aaa'],
type = 'str' type = 'str'
), ),
state = dict( state = dict(
required = False, required = False,
choices = ['present', 'absent'], choices = ['present', 'absent'],
type = 'str' type = 'str'
), ),
) ),
supports_check_mode=True
)
idempotent_parameter = None
params = module.params
idempotent_parameter = 'name'
if params['parameter'] == 'group':
params['parameter'] = 'user/group'
mt_obj = MikrotikIdempotent(
hostname = params['hostname'],
username = params['username'],
password = params['password'],
state = params['state'],
desired_params = params['settings'],
idempotent_param = idempotent_parameter,
api_path = '/' + str(params['parameter']),
check_mode = module.check_mode
)
mt_obj.sync_state()
if mt_obj.failed:
module.fail_json(
msg = mt_obj.failed_msg
) )
elif mt_obj.changed:
idempotent_parameter = None module.exit_json(
params = module.params failed=False,
idempotent_parameter = 'name' changed=True,
msg=mt_obj.changed_msg,
if params['parameter'] == 'group': diff={ "prepared": {
params['parameter'] = 'user/group' "old": mt_obj.old_params,
mt_obj = MikrotikIdempotent( "new": mt_obj.new_params,
hostname = params['hostname'], }},
username = params['username'], )
password = params['password'], else:
state = params['state'], module.exit_json(
desired_params = params['settings'], failed=False,
idempotent_param = idempotent_parameter, changed=False,
api_path = '/' + str(params['parameter']), #msg='',
msg=params['settings'],
) )
mt_obj.sync_state()
if mt_obj.failed:
module.fail_json(
msg = mt_obj.failed_msg
)
elif mt_obj.changed:
module.exit_json(
failed=False,
changed=True,
msg=mt_obj.changed_msg,
diff={ "prepared": {
"old": mt_obj.old_params,
"new": mt_obj.new_params,
}},
)
else:
module.exit_json(
failed=False,
changed=False,
#msg='',
msg=params['settings'],
)
if __name__ == '__main__': if __name__ == '__main__':
main() main()

18
tests/integration/tests.yml
View file

@ -1975,7 +1975,11 @@
name: user_test1 name: user_test1
group: read group: read
register: user_add register: user_add
failed_when: ( user_add | changed ) failed_when: (
not ansible_check_mode
) and (
( user_add | changed )
)
- name: ALWAYS_CHANGES modify user - name: ALWAYS_CHANGES modify user
mt_user: mt_user:
@ -1988,7 +1992,11 @@
name: user_test1 name: user_test1
group: group_test1 group: group_test1
register: user_edit register: user_edit
failed_when: not ( user_edit | changed ) failed_when: (
not ansible_check_mode
) and (
not ( user_edit | changed )
)
- name: ALWAYS_CHANGES remove user - name: ALWAYS_CHANGES remove user
mt_user: mt_user:
@ -2000,7 +2008,11 @@
settings: settings:
name: user_test1 name: user_test1
register: user_rem register: user_rem
failed_when: not ( user_rem | changed ) failed_when: (
not ansible_check_mode
) and (
not ( user_rem | changed )
)
tags: user tags: user