Find space section

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

@@ -27,6 +27,8 @@
 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/component"
 
 module Agama
  module DBus
@@ -77,14 +79,16 @@ 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 << Interfaces::Component if component?
 
  interfaces.each { |i| singleton_class.include(i) }
  end
@@ -110,6 +114,20 @@ 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.is?(:blk_device) && !storage_device.filesystem.nil?
+ end
+
+ # Whether the storage device is component of other devices.
+ #
+ # @return [Boolean]
+ def component?
+ storage_device.is?(:blk_device) && storage_device.component_of.any?
+ 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,6 @@ 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/component"
 require "agama/dbus/storage/interfaces/dasd_manager"

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

@@ -0,0 +1,89 @@
+# 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 devices that are used as component of other device (e.g., physical volume,
+ # MD RAID device, etc).
+ #
+ # @note This interface is intended to be included by {Device} if needed.
+ module Component
+ COMPONENT_INTERFACE = "org.opensuse.Agama.Storage1.Component"
+ private_constant :COMPONENT_INTERFACE
+
+ # Type of component.
+ #
+ # @return [String] Possible values:
+ # "physical_volume"
+ # "md_device"
+ # "raid_device"
+ # "multipath_wire"
+ # "bcache_device"
+ # "bcache_cset_device"
+ # "md_btrfs_device"
+ def component_type
+ types = {
+ lvm_vg: "physical_volume",
+ md: "md_device",
+ dm_raid: "raid_device",
+ multipath: "multipath_wire",
+ bcache: "bcache_device",
+ bcache_cset: "bcache_cset_device",
+ btrfs: "md_btrfs_device"
+ }
+
+ device = storage_device.component_of.first
+
+ types.find { |k, _v| device.is?(k) }&.last || ""
+ end
+
+ # Name of the devices for which this device is component of.
+ #
+ # @return [Array<String>]
+ def component_device_names
+ storage_device.component_of.map(&:display_name).compact
+ end
+
+ # Paths of the D-Bus objects representing the devices.
+ #
+ # @return [Array<::DBus::ObjectPath>]
+ def component_devices
+ storage_device.component_of.map { |p| tree.path_for(p) }
+ end
+
+ def self.included(base)
+ base.class_eval do
+ dbus_interface COMPONENT_INTERFACE do
+ dbus_reader :component_type, "s", dbus_name: "Type"
+ dbus_reader :component_device_names, "as", dbus_name: "DeviceNames"
+ dbus_reader :component_devices, "ao", dbus_name: "Devices"
+ end
+ end
+ end
+ end
+ end
+ end
+ end
+end

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 devices of the MD RAID.
  #
  # @return [Array<String>]
- def md_members
- storage_device.plain_devices.map(&:name)
+ def md_devices
+ 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_devices, "ao", dbus_name: "Devices"
  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]