firewalld: Correct usage of queryForwardPort

* Correct queryForwardPort API usage * Enable port_foward_test_cases tests Fixes: ansible-collections#247 Signed-off-by: Abhijeet Kasurde <[email protected]>
Akasurde · Aug 16, 2021 · 12941f6 · 12941f6
1 parent ab9eaf2
commit 12941f6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/changelogs/fragments/247_firewalld.yml b/changelogs/fragments/247_firewalld.yml
@@ -0,0 +1,3 @@
+---
+bugfixes:
+- firewalld - Correct usage of queryForwardPort (https://github.com/ansible-collections/ansible.posix/issues/247).
diff --git a/plugins/modules/firewalld.py b/plugins/modules/firewalld.py
@@ -706,7 +706,7 @@ def get_enabled_immediate(self, port, proto, toport, toaddr, timeout):
         if self.fw_offline:
             dummy, fw_settings = self.get_fw_zone_settings()
             return fw_settings.queryForwardPort(port=port, protocol=proto, to_port=toport, to_addr=toaddr)
-        return self.fw.queryForwardPort(port=port, protocol=proto, to_port=toport, to_addr=toaddr)
+        return self.fw.queryForwardPort(zone=self.zone, port=port, protocol=proto, toport=toport, toaddr=toaddr)
 
     def get_enabled_permanent(self, port, proto, toport, toaddr, timeout):
         dummy, fw_settings = self.get_fw_zone_settings()

diff --git a/tests/integration/targets/firewalld/tasks/run_all_tests.yml b/tests/integration/targets/firewalld/tasks/run_all_tests.yml
@@ -14,7 +14,10 @@
 - include_tasks: port_test_cases.yml
 
 # firewalld source operation test cases
-- import_tasks: source_test_cases.yml
+- include_tasks: source_test_cases.yml
 
 # firewalld zone target operation test cases
-- import_tasks: zone_target_test_cases.yml
+- include_tasks: zone_target_test_cases.yml
+
+# firewalld port forwarding operation test cases
+- include_tasks: port_forward_test_cases.yml