wip

joseivanlopez · Nov 29, 2024 · 57e69a1 · 57e69a1
1 parent 812ce5f
commit 57e69a1
Show file tree

Hide file tree

Showing 7 changed files with 822 additions and 7 deletions.
diff --git a/service/lib/agama/storage/config_conversions/from_model_conversions/filesystem.rb b/service/lib/agama/storage/config_conversions/from_model_conversions/filesystem.rb
@@ -49,7 +49,7 @@ def conversions
           # @return [Configs::FilesystemType, nil]
           def convert_type
             filesystem_model = model_json[:filesystem]
-            return if !filesystem_model || filesystem_model[:default]
+            return if filesystem_model.nil?
 
             FromModelConversions::FilesystemType.new(filesystem_model).convert
           end

diff --git a/service/lib/agama/storage/config_conversions/from_model_conversions/filesystem_type.rb b/service/lib/agama/storage/config_conversions/from_model_conversions/filesystem_type.rb
@@ -44,7 +44,7 @@ def default_config
           # @return [Hash]
           def conversions
             {
-              default: false,
+              default: filesystem_model[:default],
               fs_type: convert_type,
               btrfs:   convert_btrfs
             }
@@ -53,6 +53,8 @@ def conversions
           # @return [Y2Storage::Filesystems::Type, nil]
           def convert_type
             value = filesystem_model[:type]
+            return unless value
+
             Y2Storage::Filesystems::Type.find(value.to_sym)
           end
 

diff --git a/service/lib/agama/storage/config_conversions/from_model_conversions/size.rb b/service/lib/agama/storage/config_conversions/from_model_conversions/size.rb
@@ -43,7 +43,7 @@ def default_config
           # @return [Hash]
           def conversions
             {
-              default: false,
+              default: size_model[:default],
               min:     convert_min_size,
               max:     convert_max_size
             }
@@ -57,10 +57,10 @@ def convert_min_size
             disk_size(value)
           end
 
-          # @return [Y2Storage::DiskSize, nil]
+          # @return [Y2Storage::DiskSize]
           def convert_max_size
             value = size_model[:max]
-            return unless value
+            return Y2Storage::DiskSize.unlimited unless value
 
             disk_size(value)
           end

diff --git a/service/lib/agama/storage/config_conversions/from_model_conversions/with_filesystem.rb b/service/lib/agama/storage/config_conversions/from_model_conversions/with_filesystem.rb
@@ -29,6 +29,8 @@ module FromModelConversions
         module WithFilesystem
           # @return [Configs::Filesystem, nil]
           def convert_filesystem
+            return unless model_json[:mountPath] || model_json[:filesystem]
+
             FromModelConversions::Filesystem.new(model_json).convert
           end
         end

diff --git a/service/lib/agama/storage/config_conversions/from_model_conversions/with_size.rb b/service/lib/agama/storage/config_conversions/from_model_conversions/with_size.rb
@@ -33,7 +33,7 @@ def convert_size
             return Configs::Size.new_for_shrink_if_needed if model_json[:resizeIfNeeded]
 
             size_model = model_json[:size]
-            return if size_model.nil? || size_model[:default]
+            return if size_model.nil?
 
             FromModelConversions::Size.new(size_model).convert
           end

diff --git a/service/lib/agama/storage/configs/size.rb b/service/lib/agama/storage/configs/size.rb
@@ -19,6 +19,8 @@
 # To contact SUSE LLC about this file by physical or electronic mail, you may
 # find current contact information at www.suse.com.
 
+require "y2storage/disk_size"
+
 module Agama
   module Storage
     module Configs
@@ -30,7 +32,7 @@ class Size
         def self.new_for_shrink_if_needed
           new.tap do |config|
             config.default = false
-            config.min = 0
+            config.min = Y2Storage::DiskSize.zero
           end
         end