Reduced configure_firewall method complexity

src/lib/y2firewall/clients/installation_finish.rb

@@ -65,16 +65,22 @@ def write
       # Modifies the configuration of the firewall according to the current
       # settings
       def configure_firewall
-        if Yast::Mode.installation
-          @settings.enable_firewall ? @firewalld.enable! : @firewalld.disable!
-        end
+        configure_service
+        configure_ssh
+        configure_vnc
+      end
 
-        if @settings.open_ssh
-          @firewalld.api.add_service(@settings.default_zone, "ssh")
-        else
-          @firewalld.api.remove_service(@settings.default_zone, "ssh")
-        end
+      # Convenience method to enable / disable the firewalld service depending
+      # on the proposal settings
+      def configure_service
+        return unless Yast::Mode.installation
+
+        @settings.enable_firewall ? @firewalld.enable! : @firewalld.disable!
+      end
 
+      # Convenience method to open the vnc ports in firewalld depending on the
+      # proposal settings
+      def configure_vnc
         if @settings.open_vnc
           if @firewalld.api.service_supported?("tigervnc")
             @firewalld.api.add_service(@settings.default_zone, "tigervnc")
@@ -84,6 +90,16 @@ def configure_firewall
           end
         end
       end
+
+      # Convenience method to open the ssh ports in firewalld depending on the
+      # proposal settings
+      def configure_ssh
+        if @settings.open_ssh
+          @firewalld.api.add_service(@settings.default_zone, "ssh")
+        else
+          @firewalld.api.remove_service(@settings.default_zone, "ssh")
+        end
+      end
     end
   end
 end