Firewalld Change from restart firewalld service to reload firewalld c…

…onfig hard
inverse-inc · Jul 8, 2024 · 620b0dc · 620b0dc
1 parent d4ab9d4
commit 620b0dc
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 49 deletions.
diff --git a/t/venom/lib/reload_firewalld_config_hard.yml b/t/venom/lib/reload_firewalld_config_hard.yml
@@ -0,0 +1,6 @@
+name: Reload firewalld config hard
+testcases:
+- name: reload_firewalld_config_hard
+  steps:
+  - type: pfcmd_run_command
+    command: generatefirewalldconfig hard
diff --git a/t/venom/lib/reload_firewalld_config_soft.yml b/t/venom/lib/reload_firewalld_config_soft.yml
@@ -0,0 +1,6 @@
+name: Reload firewalld config soft
+testcases:
+- name: reload_firewalld_config_soft
+  steps:
+  - type: pfcmd_run_command
+    command: generatefirewalldconfig
diff --git a/t/venom/test_suites/common/restart_iptables_service.yml b/t/venom/test_suites/common/restart_iptables_service.yml
diff --git a/t/venom/test_suites/configurator/50_run_configurator_step4.yml b/t/venom/test_suites/configurator/50_run_configurator_step4.yml
@@ -27,10 +27,9 @@ testcases:
       - result.statuscode ShouldEqual 200
       - result.bodyjson.message ShouldEqual "Updated systemd for pf"
 
-- name: restart_firewalld_service
+- name: reload_firewalld_config_hard
   steps:
-  - type: systemctl_service_restart
-    service: 'packetfence-firewalld.service'
+  - type: reload_firewalld_config_hard
 
 - name: restart_haproxy_admin_service
   steps:

diff --git a/t/venom/test_suites/fingerbank_proxy/setup_proxy/teardown/teardown.yml b/t/venom/test_suites/fingerbank_proxy/setup_proxy/teardown/teardown.yml
@@ -23,11 +23,9 @@ testcases:
     assertions:
     - result.statuscode ShouldEqual 200
 
-- name: restart_firewalld                         
+- name: reload_firewalld_config_hard
   steps:                                          
-  - type: systemctl_service_restart               
-    service: packetfence-firewalld                
-    time_to_sleep: 10                             
+  - type: reload_firewalld_config_hard
 
 - name: ping_to_wan_should_work
   steps:
@@ -37,7 +35,7 @@ testcases:
     - result.code ShouldEqual 0
 
 - name: restart_collector_and_clear_cache
-  steps:                                          
+  steps:
   - type: systemctl_service_restart
     service: packetfence-fingerbank-collector
     time_to_sleep: 5

diff --git a/t/venom/test_suites/global_config/25_reload_firewalld_config_hard.yml b/t/venom/test_suites/global_config/25_reload_firewalld_config_hard.yml
@@ -0,0 +1,5 @@
+name: Reload firewalld config hard
+testcases:
+- name: reload_firewalld_config_hard
+  steps:
+  - type: reload_firewalld_config_hard
diff --git a/t/venom/test_suites/global_config/25_restart_iptables_service.yml b/t/venom/test_suites/global_config/25_restart_iptables_service.yml
diff --git a/t/venom/test_suites/inline/l2/05_setup_packetfence.yml b/t/venom/test_suites/inline/l2/05_setup_packetfence.yml
@@ -239,11 +239,9 @@ testcases:
     assertions:
       - result.statuscode ShouldEqual 200
 
-- name: restart_firewalld
+- name: Reload firewalld config hard
   steps:
-  - type: systemctl_service_restart
-    service: packetfence-firewalld
-    time_to_sleep: 10
+  - type: reload_firewalld_config_hard
 
 - name: restart_pfdns_service
   steps:

diff --git a/t/venom/test_suites/inline/l2/teardown/05_deconfigure_packetfence.yml b/t/venom/test_suites/inline/l2/teardown/05_deconfigure_packetfence.yml
@@ -69,11 +69,9 @@ testcases:
     assertions:
       - result.statuscode ShouldEqual 200
 
-- name: restart_firewalld
+- name: Reload firewalld config hard
   steps:
-  - type: systemctl_service_restart
-    service: packetfence-firewalld
-    time_to_sleep: 10
+  - type: reload_firewalld_config_hard
 
 - name: restart_pfdns_service
   steps:

diff --git a/t/venom/test_suites/inline/l3/teardown/05_deconfigure_packetfence.yml b/t/venom/test_suites/inline/l3/teardown/05_deconfigure_packetfence.yml
@@ -81,11 +81,9 @@ testcases:
     assertions:
       - result.statuscode ShouldEqual 200
 
-- name: restart_firewalld
+- name: Reload firewalld config hard
   steps:
-  - type: systemctl_service_restart
-    service: packetfence-firewalld
-    time_to_sleep: 10
+  - type: reload_firewalld_config_hard
 
 - name: restart_pfdns_service
   steps:

diff --git a/t/venom/test_suites/inline_l2_and_radius/15_restart_services.yml b/t/venom/test_suites/inline_l2_and_radius/15_restart_services.yml
@@ -1,9 +1,8 @@
 name: Restart services
 testcases:
-- name: restart_firewalld
+- name: reload_firewalld_config_hard
   steps:
-  - type: systemctl_service_restart
-    service: packetfence-firewalld
+  - type: reload_firewalld_config_hard
 
 - name: restart_pfdns
   steps:

diff --git a/t/venom/test_suites/security_event_random_mac/teardown/05_deconfigure_packetfence.yml b/t/venom/test_suites/security_event_random_mac/teardown/05_deconfigure_packetfence.yml
@@ -76,11 +76,9 @@ testcases:
     url: 'config/security_event/{{.security_event_random_mac.event.id}}'
     body: '{"id":"{{.security_event_random_mac.event.id}}","enabled":"N","quiet":true}'
 
-- name: restart_firewalld
+- name: reload_config_firewalld_hard
   steps:
-  - type: systemctl_service_restart
-    service: packetfence-firewalld
-    time_to_sleep: 10
+  - type: reload_firewalld_config_hard
 
 - name: restart_pfdns_service
   steps:

diff --git a/t/venom/test_suites/security_event_suricata/05_setup_packetfence.yml b/t/venom/test_suites/security_event_suricata/05_setup_packetfence.yml
@@ -239,11 +239,9 @@ testcases:
     assertions:
       - result.statuscode ShouldEqual 200
 
-- name: restart_firewalld
+- name: Reload firewalld config hard
   steps:
-  - type: systemctl_service_restart
-    service: packetfence-firewalld
-    time_to_sleep: 10
+  - type: reload_firewalld_config_hard
 
 - name: restart_pfdns_service
   steps:

diff --git a/t/venom/test_suites/security_event_suricata/teardown/05_deconfigure_packetfence.yml b/t/venom/test_suites/security_event_suricata/teardown/05_deconfigure_packetfence.yml
@@ -69,11 +69,9 @@ testcases:
     assertions:
       - result.statuscode ShouldEqual 200
 
-- name: restart_firewalld
+- name: reload_firewalld_config_hard
   steps:
-  - type: systemctl_service_restart
-    service: packetfence-firewalld
-    time_to_sleep: 10
+  - type: reload_firewalld_config_hard
 
 - name: restart_pfdns_service
   steps:

diff --git a/...om/test_suites/wired_dot1x_eap_peap_firewall_sso_radius/teardown/96_restart_firewalld.yml b/...om/test_suites/wired_dot1x_eap_peap_firewall_sso_radius/teardown/96_restart_firewalld.yml
@@ -1,8 +1,6 @@
-name: Restart firewalld
+name: Reload firewalld config hard
 testcases:
 # temp, as a workaround
-- name: restart_firewalld
+- name: reload_firewalld_config_hard
   steps:
-  - type: systemctl_service_restart
-    service: packetfence-firewalld
-    time_to_sleep: 10
+  - type: reload_firewalld_config_hard