Several small fixes

service/lib/agama/dbus/storage/proposal_settings_conversion/to_dbus.rb

@@ -36,7 +36,7 @@ def initialize(settings)
           def convert # rubocop:disable Metrics/AbcSize
             {
               "BootDevice"             => settings.boot_device.to_s,
-              "LVM"                    => settings.lvm,
+              "LVM"                    => settings.lvm.enabled,
               "SystemVGDevices"        => settings.lvm.system_vg_devices,
               "EncryptionPassword"     => settings.encryption.password,
               "EncryptionMethod"       => settings.encryption.method.id.to_s,

service/lib/agama/dbus/storage/volume_conversion/to_dbus.rb

@@ -37,8 +37,8 @@ def convert
             {
               "MountPath"    => volume.mount_path.to_s,
               "MountOptions" => volume.mount_options,
-              "TargetDevice" => volume.target_device.to_s,
-              "TargetVG"     => volume.target_vg.to_s,
+              "TargetDevice" => volume.device.to_s,
+              "TargetVG"     => volume.separate_vg_name.to_s,
               "FsType"       => volume.fs_type&.to_human_string,
               "MinSize"      => volume.min_size&.to_i,
               "MaxSize"      => volume.max_size&.to_i,
@@ -58,8 +58,8 @@ def outline_conversion
             outline = volume.outline
             {
               "Required"              => outline.required?,
-              "FsTypes"               => outline.fs_types.map(&:to_human_string),
-              "SupportAutoSize"       => outline.support_auto_size?,
+              "FsTypes"               => outline.filesystems.map(&:to_human_string),
+              "SupportAutoSize"       => outline.adaptive_sizes?,
               "SnapshotsConfigurable" => outline.snapshots_configurable?,
               "SnapshotsAffectSizes"  => outline.snapshots_affect_sizes?,
               "SizeRelevantVolumes"   => outline.size_relevant_volumes

service/lib/agama/storage/btrfs_settings.rb

@@ -27,7 +27,7 @@ class BtrfsSettings
       #
       # @return [Boolean]
       attr_accessor :snapshots
-      alias_method :snapshtos?, :snapshots
+      alias_method :snapshots?, :snapshots
 
       # @return [Boolean]
       attr_accessor :read_only

service/lib/agama/storage/proposal_settings_reader.rb

@@ -55,7 +55,7 @@ def read
         "volumes"      => :volumes_reader
       }.freeze
 
-      private_constant :CONFIG_READERS
+      private_constant :READERS
 
       # @param settings [Agama::Storage::ProposalSettings]
       # @param value [Boolean]

service/lib/agama/storage/volume.rb

@@ -91,8 +91,12 @@ def initialize(mount_path)
       # Whether it makes sense to have automatic size limits for the volume
       #
       # @return [Boolean]
-      def adaptive_sizes?
-        outlilne.snapshots_affect_sizes?(btrfs.snapshots?) || outline.size_relevant_volumes.any?
+      def auto_size_supported?
+        # At some point, this method contained logic for ignoring outline.snapshots_affect_sizes?
+        # when both btrfs.snapshots and outline.snapshots_configurable? were false. But we don't
+        # need to have such a senseless scenario into account (a product that contains size rules
+        # for the snapshots but does not allow to enable them).
+        outline.adaptive_sizes?
       end
     end
   end

service/lib/agama/storage/volume_outline.rb

@@ -79,7 +79,7 @@ class VolumeOutline
       def initialize
         @filesystems = []
         @base_min_size = Y2Storage::DiskSize.zero
-        @base_max_size = Y2Storage::DiskSize.Unlimited
+        @base_max_size = Y2Storage::DiskSize.unlimited
         @size_relevant_volumes = []
         @max_size_fallback_for = []
         @min_size_fallback_for = []
@@ -89,22 +89,24 @@ def initialize
       #
       # @return [Array<String>]
       def size_relevant_volumes
-        (max_size_fallbacks_for + min_size_fallbacks_for).sort.uniq
+        (max_size_fallback_for + min_size_fallback_for).sort.uniq
       end
 
       # Whether snapshots affect the automatic calculation of the size limits
       #
-      # @param snapshots [Booelan] Whether snapshots is active
       # @return [Boolean]
-      def snapshots_affect_sizes?(snapshots)
-        # FIXME: this should be a responsibility of the Proposal (since it's calculated by
-        # Proposal::DevicesPlanner)
-        return false unless snapshots || snapshots_configurable
-
+      def snapshots_affect_sizes?
         return true if snapshots_size && !snapshots_size.zero?
 
         snapshots_percentage && !snapshots_percentage.zero?
       end
+
+      # Whether it makes sense to have automatic size limits for the volume
+      #
+      # @return [Boolean]
+      def adaptive_sizes?
+        size_relevant_volumes.any? || adjust_by_ram? || snapshots_affect_sizes?
+      end
     end
   end
 end

service/lib/agama/storage/volume_templates_builder.rb

@@ -60,7 +60,7 @@ def for(path)
           volume.filesystem = data[:filesystem]
           volume.mount_options = data[:mount_options]
 
-          if data[:auto_size] && volume.adaptive_sizes?
+          if data[:auto_size] && volume.auto_size_supported?
             volume.auto_size = true
           else
             volume.auto_size = false

service/test/agama/dbus/storage/proposal_test.rb

@@ -32,28 +32,27 @@
   let(:logger) { Logger.new($stdout, level: :warn) }
 
   let(:backend) do
-    instance_double(Agama::Storage::Proposal, calculated_settings: settings)
+    instance_double(Agama::Storage::Proposal, settings: settings)
   end
 
   let(:settings) { nil }
 
-  describe "#candidate_devices" do
+  describe "#boot_device" do
     context "if a proposal has not been calculated yet" do
       let(:settings) { nil }
 
-      it "returns an empty list" do
-        expect(subject.candidate_devices).to eq([])
+      it "returns an empty string" do
+        expect(subject.boot_device).to eq ""
       end
     end
 
     context "if a proposal has been calculated" do
       let(:settings) do
-        instance_double(Agama::Storage::ProposalSettings,
-          candidate_devices: ["/dev/vda", "/dev/vdb"])
+        Agama::Storage::ProposalSettings.new.tap { |s| s.boot_device = "/dev/vda" }
       end
 
       it "returns the candidate devices used by the proposal" do
-        expect(subject.candidate_devices).to contain_exactly("/dev/vda", "/dev/vdb")
+        expect(subject.boot_device).to eq "/dev/vda"
       end
     end
   end
@@ -69,7 +68,7 @@
 
     context "if a proposal has been calculated" do
       let(:settings) do
-        instance_double(Agama::Storage::ProposalSettings, lvm: true)
+        Agama::Storage::ProposalSettings.new.tap { |s| s.lvm.enabled = true }
       end
 
       it "return whether LVM was used" do
@@ -89,7 +88,7 @@
 
     context "if a proposal has been calculated" do
       let(:settings) do
-        instance_double(Agama::Storage::ProposalSettings, encryption_password: "n0ts3cr3t")
+        Agama::Storage::ProposalSettings.new.tap { |s| s.encryption.password = "n0ts3cr3t" }
       end
 
       it "return the encryption password used by the proposal" do
@@ -113,27 +112,17 @@
 
     context "if the calculated settings has volumes" do
       let(:calculated_volumes) { [calculated_volume1, calculated_volume2] }
-
-      let(:calculated_volume1) do
-        Agama::Storage::Volume.new.tap do |volume|
-          volume.mount_point = "/test1"
-        end
-      end
-
-      let(:calculated_volume2) do
-        Agama::Storage::Volume.new.tap do |volume|
-          volume.mount_point = "/test2"
-        end
-      end
+      let(:calculated_volume1) { Agama::Storage::Volume.new("/test1") }
+      let(:calculated_volume2) { Agama::Storage::Volume.new("/test2") }
 
       it "returns a list with a hash for each volume" do
         expect(subject.volumes.size).to eq(2)
         expect(subject.volumes).to all(be_a(Hash))
 
         volume1, volume2 = subject.volumes
 
-        expect(volume1).to include("MountPoint" => "/test1")
-        expect(volume2).to include("MountPoint" => "/test2")
+        expect(volume1).to include("MountPath" => "/test1")
+        expect(volume2).to include("MountPath" => "/test2")
       end
     end
   end