From 757b544cf33332ef4baa7102401964c113246025 Mon Sep 17 00:00:00 2001 From: Erkki Hurme Date: Tue, 29 Jun 2021 10:38:47 +0300 Subject: [PATCH 1/5] fix REJECT target name --- plugins/modules/firewalld.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/modules/firewalld.py b/plugins/modules/firewalld.py index 30acedf..5307e0d 100644 --- a/plugins/modules/firewalld.py +++ b/plugins/modules/firewalld.py @@ -114,7 +114,7 @@ options: description: - firewalld Zone target - If state is set to C(absent), this will reset the target to default - choices: [ default, ACCEPT, DROP, REJECT ] + choices: [ default, ACCEPT, DROP, %%REJECT%% ] type: str version_added: 1.2.0 notes: @@ -748,7 +748,7 @@ def main(): interface=dict(type='str'), masquerade=dict(type='str'), offline=dict(type='bool'), - target=dict(type='str', choices=['default', 'ACCEPT', 'DROP', 'REJECT']), + target=dict(type='str', choices=['default', 'ACCEPT', 'DROP', '%%REJECT%%']), ), supports_check_mode=True, required_by=dict( From fcb2a466e07ed0116494bbca52a0161fc950fbcd Mon Sep 17 00:00:00 2001 From: quasd <> Date: Tue, 29 Jun 2021 11:31:04 +0300 Subject: [PATCH 2/5] add fragment --- changelogs/fragments/215_fix_REJECT_target_name.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 changelogs/fragments/215_fix_REJECT_target_name.yml diff --git a/changelogs/fragments/215_fix_REJECT_target_name.yml b/changelogs/fragments/215_fix_REJECT_target_name.yml new file mode 100644 index 0000000..8a1e5c8 --- /dev/null +++ b/changelogs/fragments/215_fix_REJECT_target_name.yml @@ -0,0 +1,2 @@ +bugfixes: + - firewalld - fix setting target to REJECT ( https://github.com/ansible-collections/ansible.posix/pull/215 ) From 310c68e6dd9220b4493b5269e4d467cf93815e27 Mon Sep 17 00:00:00 2001 From: quasd <> Date: Tue, 29 Jun 2021 11:37:20 +0300 Subject: [PATCH 3/5] add tests for REJECT target --- .../tasks/zone_target_test_cases.yml | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/tests/integration/targets/firewalld/tasks/zone_target_test_cases.yml b/tests/integration/targets/firewalld/tasks/zone_target_test_cases.yml index cbcafed..085762a 100644 --- a/tests/integration/targets/firewalld/tasks/zone_target_test_cases.yml +++ b/tests/integration/targets/firewalld/tasks/zone_target_test_cases.yml @@ -67,3 +67,55 @@ assert: that: - result is not changed + +- name: firewalld dmz zone target %%REJECT%% + firewalld: + zone: dmz + permanent: True + state: present + target: '%%REJECT%%' + register: result + +- name: assert firewalld dmz zone target %%REJECT%% present worked + assert: + that: + - result is changed + +- name: firewalld dmz zone target %%REJECT%% rerun (verify not changed) + firewalld: + zone: dmz + permanent: True + state: present + target: '%%REJECT%%' + register: result + +- name: assert firewalld dmz zone target %%REJECT%% present worked (verify not changed) + assert: + that: + - result is not changed + +- name: firewalld dmz zone target %%REJECT%% absent + firewalld: + zone: dmz + permanent: True + state: absent + target: '%%REJECT%%' + register: result + +- name: assert firewalld dmz zone target %%REJECT%% absent worked + assert: + that: + - result is changed + +- name: firewalld dmz zone target %%REJECT%% rerun (verify not changed) + firewalld: + zone: dmz + permanent: True + state: absent + target: '%%REJECT%%' + register: result + +- name: assert firewalld dmz zone target %%REJECT%% present worked (verify not changed) + assert: + that: + - result is not changed \ No newline at end of file From 049292669be67af7ed15f306cf442b80d3d66308 Mon Sep 17 00:00:00 2001 From: quasd <> Date: Tue, 29 Jun 2021 13:33:35 +0300 Subject: [PATCH 4/5] fix yaml syntax for reject choices --- plugins/modules/firewalld.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/firewalld.py b/plugins/modules/firewalld.py index 5307e0d..ae5c2a2 100644 --- a/plugins/modules/firewalld.py +++ b/plugins/modules/firewalld.py @@ -114,7 +114,7 @@ options: description: - firewalld Zone target - If state is set to C(absent), this will reset the target to default - choices: [ default, ACCEPT, DROP, %%REJECT%% ] + choices: [ default, ACCEPT, DROP, "%%REJECT%%" ] type: str version_added: 1.2.0 notes: From c596feab78a6fd835ddd0f9e7b5b58e57bf77561 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Thu, 1 Jul 2021 10:36:33 +0530 Subject: [PATCH 5/5] Review comments Co-authored-by: quidame --- changelogs/fragments/215_fix_REJECT_target_name.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/215_fix_REJECT_target_name.yml b/changelogs/fragments/215_fix_REJECT_target_name.yml index 8a1e5c8..206589f 100644 --- a/changelogs/fragments/215_fix_REJECT_target_name.yml +++ b/changelogs/fragments/215_fix_REJECT_target_name.yml @@ -1,2 +1,2 @@ bugfixes: - - firewalld - fix setting target to REJECT ( https://github.com/ansible-collections/ansible.posix/pull/215 ) + - firewalld - fix setting zone target to ``%%REJECT%%`` (https://github.com/ansible-collections/ansible.posix/pull/215).