Find space section

service/lib/agama/dbus/storage/device.rb

@@ -27,6 +27,7 @@
 require "agama/dbus/storage/interfaces/md"
 require "agama/dbus/storage/interfaces/block"
 require "agama/dbus/storage/interfaces/partition_table"
+require "agama/dbus/storage/interfaces/filesystem"
 
 module Agama
   module DBus
@@ -77,14 +78,15 @@ def storage_device=(value)
         attr_reader :tree
 
         # Adds the required interfaces according to the storage object
-        def add_interfaces # rubocop:disable Metrics/CyclomaticComplexity
+        def add_interfaces # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           interfaces = []
           interfaces << Interfaces::Drive if drive?
           interfaces << Interfaces::Raid if storage_device.is?(:dm_raid)
           interfaces << Interfaces::Md if storage_device.is?(:md)
           interfaces << Interfaces::Multipath if storage_device.is?(:multipath)
           interfaces << Interfaces::Block if storage_device.is?(:blk_device)
           interfaces << Interfaces::PartitionTable if partition_table?
+          interfaces << Interfaces::Filesystem if filesystem?
 
           interfaces.each { |i| singleton_class.include(i) }
         end
@@ -110,6 +112,13 @@ def partition_table?
             storage_device.respond_to?(:partition_table?) &&
             storage_device.partition_table?
         end
+
+        # Whether the storage device is formatted.
+        #
+        # @return [Boolean]
+        def filesystem?
+          !storage_device.filesystem.nil?
+        end
       end
     end
   end

service/lib/agama/dbus/storage/interfaces.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -35,4 +35,5 @@ module Interfaces
 require "agama/dbus/storage/interfaces/md"
 require "agama/dbus/storage/interfaces/block"
 require "agama/dbus/storage/interfaces/partition_table"
+require "agama/dbus/storage/interfaces/filesystem"
 require "agama/dbus/storage/interfaces/dasd_manager"

service/lib/agama/dbus/storage/interfaces/filesystem.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# Copyright (c) [2024] SUSE LLC
+#
+# All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms of version 2 of the GNU General Public License as published
+# by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, contact SUSE LLC.
+#
+# To contact SUSE LLC about this file by physical or electronic mail, you may
+# find current contact information at www.suse.com.
+
+require "dbus"
+
+module Agama
+  module DBus
+    module Storage
+      module Interfaces
+        # Interface for file systems.
+        #
+        # @note This interface is intended to be included by {Device} if needed.
+        module Filesystem
+          FILESYSTEM_INTERFACE = "org.opensuse.Agama.Storage1.Filesystem"
+          private_constant :FILESYSTEM_INTERFACE
+
+          # File system type.
+          #
+          # @return [String] e.g., "ext4"
+          def filesystem_type
+            storage_device.filesystem.type.to_s
+          end
+
+          # Whether the file system contains an EFI.
+          #
+          # @return [Boolean]
+          def filesystem_efi?
+            storage_device.filesystem.efi?
+          end
+
+          def self.included(base)
+            base.class_eval do
+              dbus_interface FILESYSTEM_INTERFACE  do
+                dbus_reader :filesystem_type, "s", dbus_name: "Type"
+                dbus_reader :filesystem_efi?, "b", dbus_name: "EFI"
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

service/lib/agama/dbus/storage/interfaces/md.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -46,22 +46,19 @@ def md_level
             storage_device.md_level.to_s
           end
 
-          # Member devices of the MD RAID
-          #
-          # TODO: return object paths once all possible members (e.g., partitions) are exported
-          #   on D-Bus.
+          # Paths of the D-Bus objects representing the member devices of the MD RAID.
           #
           # @return [Array<String>]
           def md_members
-            storage_device.plain_devices.map(&:name)
+            storage_device.plain_devices.map { |p| tree.path_for(p) }
           end
 
           def self.included(base)
             base.class_eval do
               dbus_interface MD_INTERFACE  do
                 dbus_reader :md_uuid, "s", dbus_name: "UUID"
                 dbus_reader :md_level, "s", dbus_name: "Level"
-                dbus_reader :md_members, "as", dbus_name: "Members"
+                dbus_reader :md_members, "ao", dbus_name: "Members"
               end
             end
           end

service/lib/agama/dbus/storage/interfaces/multipath.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -32,19 +32,17 @@ module Multipath
           MULTIPATH_INTERFACE = "org.opensuse.Agama.Storage1.Multipath"
           private_constant :MULTIPATH_INTERFACE
 
-          # Multipath wires
-          #
-          # TODO: return object paths
+          # Paths of the D-Bus objects representing the multipath wires.
           #
           # @return [Array<String>]
           def multipath_wires
-            storage_device.parents.map(&:name)
+            storage_device.parents.map { |p| tree.path_for(p) }
           end
 
           def self.included(base)
             base.class_eval do
               dbus_interface MULTIPATH_INTERFACE do
-                dbus_reader :multipath_wires, "as", dbus_name: "Wires"
+                dbus_reader :multipath_wires, "ao", dbus_name: "Wires"
               end
             end
           end

service/lib/agama/dbus/storage/interfaces/raid.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -32,19 +32,17 @@ module Raid
           RAID_INTERFACE = "org.opensuse.Agama.Storage1.RAID"
           private_constant :RAID_INTERFACE
 
-          # Devices used by the DM RAID
-          #
-          # TODO: return object paths
+          # Paths of the D-Bus objects representing the devices used by the DM RAID.
           #
           # @return [Array<String>]
           def raid_devices
-            storage_device.parents.map(&:name)
+            storage_device.parents.map { |p| tree.path_for(p) }
           end
 
           def self.included(base)
             base.class_eval do
               dbus_interface RAID_INTERFACE do
-                dbus_reader :raid_devices, "as", dbus_name: "Devices"
+                dbus_reader :raid_devices, "ao", dbus_name: "Devices"
               end
             end
           end

service/lib/agama/dbus/storage/proposal.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022-2023] SUSE LLC
+# Copyright (c) [2022-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -58,6 +58,8 @@ def initialize(backend, logger)
 
           dbus_reader :space_policy, "s"
 
+          dbus_reader :space_actions, "aa{sv}"
+
           dbus_reader :volumes, "aa{sv}"
 
           dbus_reader :actions, "aa{sv}"
@@ -109,6 +111,13 @@ def space_policy
           dbus_settings.fetch("SpacePolicy", "")
         end
 
+        # Space actions
+        #
+        # @return [Array<Hash>]
+        def space_actions
+          dbus_settings.fetch("SpaceActions", [])
+        end
+
         # Volumes used to calculate the storage proposal
         #
         # @return [Array<Hash>]

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -130,9 +130,11 @@ def space_policy_conversion(target, value)
           end
 
           # @param target [Agama::Storage::ProposalSettings]
-          # @param value [Hash]
+          # @param value [Array<Hash>]
           def space_actions_conversion(target, value)
-            target.space.actions = value
+            target.space.actions = value.each_with_object({}) do |v, result|
+              result[v["Device"]] = v["Action"].to_sym
+            end
           end
 
           # @param target [Agama::Storage::ProposalSettings]

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -35,7 +35,7 @@ def initialize(settings)
           # Performs the conversion to D-Bus format.
           #
           # @return [Hash]
-          def convert # rubocop:disable Metrics/AbcSize
+          def convert
             {
               "BootDevice"             => settings.boot_device.to_s,
               "LVM"                    => settings.lvm.enabled?,
@@ -44,7 +44,7 @@ def convert # rubocop:disable Metrics/AbcSize
               "EncryptionMethod"       => settings.encryption.method.id.to_s,
               "EncryptionPBKDFunction" => settings.encryption.pbkd_function&.value || "",
               "SpacePolicy"            => settings.space.policy.to_s,
-              "SpaceActions"           => settings.space.actions,
+              "SpaceActions"           => space_actions_conversion,
               "Volumes"                => settings.volumes.map { |v| VolumeConversion.to_dbus(v) }
             }
           end
@@ -53,6 +53,13 @@ def convert # rubocop:disable Metrics/AbcSize
 
           # @return [Agama::Storage::ProposalSettings]
           attr_reader :settings
+
+          # @return [Array<Hash>]
+          def space_actions_conversion
+            settings.space.actions.each_with_object([]) do |(device, action), actions|
+              actions << { "Device" => device, "Action" => action.to_s }
+            end
+          end
         end
       end
     end

service/lib/agama/storage/proposal.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2022-2023] SUSE LLC
+# Copyright (c) [2022-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -85,10 +85,9 @@ def settings
           proposal.settings,
           config: config
         ).tap do |settings|
-          # FIXME: The conversion from Y2Storage cannot infer the space policy. Copying space
-          #   settings from the original settings.
+          # The conversion from Y2Storage cannot infer the space policy. Copying space policy from
+          # the original settings.
           settings.space.policy = original_settings.space.policy
-          settings.space.actions = original_settings.space.actions
           # FIXME: The conversion from Y2Storage cannot reliably infer the system VG devices in all
           #   cases. Copying system VG devices from the original settings.
           settings.lvm.system_vg_devices = original_settings.lvm.system_vg_devices

service/lib/agama/storage/proposal_settings_conversion/from_y2storage.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2023] SUSE LLC
+# Copyright (c) [2023-2024] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -82,9 +82,10 @@ def encryption_conversion(target)
           target.encryption.pbkd_function = settings.encryption_pbkdf
         end
 
+        # @note The space policy cannot be inferred from Y2Storage settings.
         # @param target [Agama::Storage::ProposalSettings]
         def space_settings_conversion(target)
-          # FIXME: No way to infer space settings from Y2Storage.
+          target.space.actions = settings.space_settings.actions
         end
 
         # @param target [Agama::Storage::ProposalSettings]

service/lib/agama/storage/proposal_settings_conversion/to_y2storage.rb

@@ -162,7 +162,7 @@ def find_max_size_fallback(mount_path)
 
         # All block devices affected by the space policy.
         #
-        # This includes the partitions from the root device, the candidate devices and from the
+        # This includes the partitions from the boot device, the candidate devices and from the
         # devices directly assigned to a volume as target device. If a device is not partitioned,
         # then the device itself is included.
         #

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

@@ -27,6 +27,7 @@
 require_relative "./interfaces/block_examples"
 require_relative "./interfaces/md_examples"
 require_relative "./interfaces/partition_table_examples"
+require_relative "./interfaces/filesystem_examples"
 require "agama/dbus/storage/device"
 require "agama/dbus/storage/devices_tree"
 require "dbus"
@@ -142,6 +143,8 @@
 
   include_examples "PartitionTable interface"
 
+  include_examples "Filesystem interface"
+
   describe "#storage_device=" do
     before do
       allow(subject).to receive(:dbus_properties_changed)

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

@@ -149,7 +149,7 @@
     context "if an exported D-Bus object does not represent any of the current devices" do
       let(:dbus_objects) { [dbus_object1] }
       let(:dbus_object1) { Agama::DBus::Storage::Device.new(sdd, subject.path_for(sdd), subject) }
-      let(:sdd) { instance_double(Y2Storage::Disk, sid: 1, is?: false) }
+      let(:sdd) { instance_double(Y2Storage::Disk, sid: 1, is?: false, filesystem: false) }
 
       it "unexports the D-Bus object" do
         expect(service).to unexport_object("#{root_path}/1")