Open firewall port for nfs-server configuration

os-autoinst · May 6, 2024 · 12c0bb1 · 12c0bb1
1 parent 94bb59f
commit 12c0bb1
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/data/yam/autoyast/support_images/sles12sp5_install_all_patterns_s390x.xml b/data/yam/autoyast/support_images/sles12sp5_install_all_patterns_s390x.xml
@@ -35,14 +35,20 @@
     </mode>
     <final_reboot config:type="boolean">true</final_reboot>
   </general>
-  <networking>
   <firewall>
+    <FW_CONFIGURATIONS_DMZ>sshd vnc-httpd vnc-server</FW_CONFIGURATIONS_DMZ>
+    <FW_CONFIGURATIONS_EXT>sshd vnc-httpd vnc-server</FW_CONFIGURATIONS_EXT>
+    <FW_CONFIGURATIONS_INT>sshd vnc-httpd vnc-server</FW_CONFIGURATIONS_INT>
+    <FW_IGNORE_FW_BROADCAST_EXT>yes</FW_IGNORE_FW_BROADCAST_EXT>
+    <FW_LOAD_MODULES>nf_conntrack_netbios_ns</FW_LOAD_MODULES>
+    <FW_LOG_ACCEPT_CRIT>yes</FW_LOG_ACCEPT_CRIT>
+    <FW_LOG_DROP_CRIT>yes</FW_LOG_DROP_CRIT>
+    <FW_SERVICES_ACCEPT_EXT>0.0.0.0/0,tcp,22</FW_SERVICES_ACCEPT_EXT>
+    <FW_STOP_KEEP_ROUTING_STATE>no</FW_STOP_KEEP_ROUTING_STATE>
     <enable_firewall config:type="boolean">true</enable_firewall>
     <start_firewall config:type="boolean">true</start_firewall>
-    <FW_ALLOW_PING_FW>yes</FW_ALLOW_PING_FW>
-    <FW_DEV_EXT>eth0</FW_DEV_EXT>
-    <FW_SERVICES_ACCEPT_EXT>0/0,tcp,22</FW_SERVICES_ACCEPT_EXT>
   </firewall>
+  <networking>
     <dhcp_options>
       <dhclient_client_id/>
       <dhclient_hostname_option>AUTO</dhclient_hostname_option>
@@ -234,6 +240,8 @@
       <disable config:type="list"/>
       <enable config:type="list">
         <service>sshd</service>
+	<service>SuSEfirewall2</service>
+        <service>SuSEfirewall2_init</service>
       </enable>
     </services>
   </services-manager>

diff --git a/lib/main_common.pm b/lib/main_common.pm
@@ -2343,6 +2343,7 @@ sub load_security_tests {
 
 sub load_system_prepare_tests {
     loadtest 'console/system_prepare' unless is_opensuse;
+    loadtest 'autoyast/clone';
     loadtest 'ses/install_ses' if check_var_array('ADDONS', 'ses') || check_var_array('SCC_ADDONS', 'ses');
     if (is_updates_tests and !get_var("USER_SPACE_TESTSUITES")) {
         if (is_transactional) {

diff --git a/lib/nfs_common.pm b/lib/nfs_common.pm
@@ -78,7 +78,7 @@ sub prepare_exports {
 sub yast_handle_firewall {
     if (is_sle('<15')) {
         send_key 'alt-f';    # Open port in firewall
-        assert_screen 'nfs-firewall-open';
+	assert_screen 'nfs-firewall-open';
     }
     else {
         save_screenshot;