diff --git a/library/mt_user.py b/library/mt_user.py index 417c59b..cf4a5b8 100644 --- a/library/mt_user.py +++ b/library/mt_user.py @@ -56,65 +56,66 @@ from ansible.module_utils.basic import AnsibleModule def main(): - module = AnsibleModule( - argument_spec = dict( - hostname = dict(required=True), - username = dict(required=True), - password = dict(required=True), - settings = dict(required=False, type='dict'), - parameter = dict( - required = True, - choices = ['user', 'active', 'aaa'], - type = 'str' - ), - state = dict( - required = False, - choices = ['present', 'absent'], - type = 'str' - ), - ) + module = AnsibleModule( + argument_spec = dict( + hostname = dict(required=True), + username = dict(required=True), + password = dict(required=True), + settings = dict(required=False, type='dict'), + parameter = dict( + required = True, + choices = ['user', 'active', 'aaa'], + type = 'str' + ), + state = dict( + required = False, + choices = ['present', 'absent'], + 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 ) - - 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']), - + 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'], ) - - 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__': main() diff --git a/tests/integration/tests.yml b/tests/integration/tests.yml index 5778e9a..dc31706 100644 --- a/tests/integration/tests.yml +++ b/tests/integration/tests.yml @@ -1975,7 +1975,11 @@ name: user_test1 group: read register: user_add - failed_when: ( user_add | changed ) + failed_when: ( + not ansible_check_mode + ) and ( + ( user_add | changed ) + ) - name: ALWAYS_CHANGES modify user mt_user: @@ -1988,7 +1992,11 @@ name: user_test1 group: group_test1 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 mt_user: @@ -2000,7 +2008,11 @@ settings: name: user_test1 register: user_rem - failed_when: not ( user_rem | changed ) + failed_when: ( + not ansible_check_mode + ) and ( + not ( user_rem | changed ) + ) tags: user