From d3107d99157e7b619ae6842085dc46d27f5d9c68 Mon Sep 17 00:00:00 2001 From: traittinen <34029206+traittinen@users.noreply.github.com> Date: Fri, 11 Jan 2019 11:26:40 +0200 Subject: [PATCH] Improve panos_commit module (#50451) * Added description, admin commit and VSYS commit features. * pep8 fixing * Ansible pylint fixing + module.fail on commit fail * Ported from lxml.etree to xml.etree. Changed username to fall back to admin if nothing else defined. * Fixed documentation for username defaults. --- .../modules/network/panos/panos_commit.py | 143 ++++++++++++++++-- 1 file changed, 128 insertions(+), 15 deletions(-) diff --git a/lib/ansible/modules/network/panos/panos_commit.py b/lib/ansible/modules/network/panos/panos_commit.py index b16fe6d804e..b35da19ba8b 100644 --- a/lib/ansible/modules/network/panos/panos_commit.py +++ b/lib/ansible/modules/network/panos/panos_commit.py @@ -2,6 +2,7 @@ # -*- coding: utf-8 -*- # # Ansible module to manage PaloAltoNetworks Firewall +# (c) 2019, Tomi Raittinen # (c) 2016, techbizdev # # This file is part of Ansible @@ -26,11 +27,31 @@ short_description: commit firewall's candidate configuration description: - PanOS module that will commit firewall's candidate configuration on - the device. The new configuration will become active immediately. -author: "Luigi Mori (@jtschichold), Ivan Bojer (@ivanbojer)" +author: + - Luigi Mori (@jtschichold) + - Ivan Bojer (@ivanbojer) + - Tomi Raittinen (@traittinen) version_added: "2.3" requirements: - pan-python options: + ip_address: + description: + - IP address (or hostname) of PAN-OS device. + required: true + password: + description: + - Password for authentication. If the value is not specified in the + task, the value of environment variable C(ANSIBLE_NET_PASSWORD) + will be used instead. + required: true + username: + description: + - Username for authentication. If the value is not specified in the + task, the value of environment variable C(ANSIBLE_NET_USERNAME) + will be used instead if defined. C(admin) will be used if nothing + above is defined. + default: admin interval: description: - interval for checking commit job @@ -43,7 +64,21 @@ options: - if commit should be synchronous type: bool default: 'yes' -extends_documentation_fragment: panos + description: + description: + - Commit description/comment + type: str + version_added: "2.8" + commit_changes_by: + description: + - Commit changes made by specified admin + type: list + version_added: "2.8" + commit_vsys: + description: + - Commit changes for specified VSYS + type: list + version_added: "2.8" ''' EXAMPLES = ''' @@ -55,11 +90,32 @@ EXAMPLES = ''' ''' RETURN = ''' -status: - description: success status - returned: success - type: str - sample: "okey dokey" +panos_commit: + description: Information about commit job. + returned: always + type: complex + version_added: 2.8 + contains: + job_id: + description: Palo Alto job ID for the commit operation. Only returned if commit job is launched on device. + returned: always + type: str + sample: "139" + status_code: + description: Palo Alto API status code. Null if commit is successful. + returned: always + type: str + sample: 19 + status_detail: + description: Palo Alto API detailed status message. + returned: always + type: str + sample: Configuration committed successfully + status_text: + description: Palo Alto API status text. + returned: always + type: str + sample: success ''' ANSIBLE_METADATA = {'metadata_version': '1.1', @@ -67,7 +123,8 @@ ANSIBLE_METADATA = {'metadata_version': '1.1', 'supported_by': 'community'} -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, env_fallback +import xml.etree.ElementTree as etree try: import pan.xapi @@ -78,25 +135,32 @@ except ImportError: def main(): argument_spec = dict( - ip_address=dict(), - password=dict(no_log=True), - username=dict(default='admin'), + ip_address=dict(required=True, type='str'), + password=dict(fallback=(env_fallback, ['ANSIBLE_NET_PASSWORD']), no_log=True), + username=dict(fallback=(env_fallback, ['ANSIBLE_NET_USERNAME']), default="admin"), interval=dict(default=0.5), timeout=dict(), - sync=dict(type='bool', default=True) + sync=dict(type='bool', default=True), + description=dict(type='str'), + commit_changes_by=dict(type='list'), + commit_vsys=dict(type='list') ) module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=False) if not HAS_LIB: - module.fail_json(msg='pan-python required for this module') + module.fail_json(msg='pan-python is required for this module') ip_address = module.params["ip_address"] if not ip_address: module.fail_json(msg="ip_address should be specified") + password = module.params["password"] if not password: module.fail_json(msg="password is required") + username = module.params['username'] + if not username: + module.fail_json(msg="username is required") interval = module.params['interval'] timeout = module.params['timeout'] @@ -108,14 +172,63 @@ def main(): api_password=password ) + cmd = "" + + description = module.params["description"] + if description: + cmd += "" + description + "" + + commit_changes_by = module.params["commit_changes_by"] + commit_vsys = module.params["commit_vsys"] + + if commit_changes_by or commit_vsys: + + cmd += "" + + if commit_changes_by: + cmd += "" + for admin in commit_changes_by: + cmd += "" + admin + "" + cmd += "" + + if commit_vsys: + cmd += "" + for vsys in commit_vsys: + cmd += "" + vsys + "" + cmd += "" + + cmd += "" + + cmd += "" + xapi.commit( - cmd="", + cmd=cmd, sync=sync, interval=interval, timeout=timeout ) - module.exit_json(changed=True, msg="okey dokey") + try: + result = xapi.xml_root().encode('utf-8') + root = etree.fromstring(result) + job_id = root.find('./result/job/id').text + except AttributeError: + job_id = None + + panos_commit_details = dict( + status_text=xapi.status, + status_code=xapi.status_code, + status_detail=xapi.status_detail, + job_id=job_id + ) + + if "Commit failed" in xapi.status_detail: + module.fail_json(msg=xapi.status_detail, panos_commit=panos_commit_details) + + if job_id: + module.exit_json(changed=True, msg="Commit successful.", panos_commit=panos_commit_details) + else: + module.exit_json(changed=False, msg="No changes to commit.", panos_commit=panos_commit_details) if __name__ == '__main__':