-
Notifications
You must be signed in to change notification settings - Fork 43
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
## Problem More information is required to properly represent the storage proposal result: * Device description * Filesystem label This is a follow-up of #1071. ## Solution Add new D-Bus interfaces `Device` , `Partition`, `LVM.LogicalVolume` and adapt `Filesystem` interface. This changes require yast/yast-storage-ng#1373. NOTE: This PR goes to a feature branch instead of master. ## Testing * Added unit tests * Tested manually
- Loading branch information
Showing
15 changed files
with
507 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
service/lib/agama/dbus/storage/interfaces/device/device.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,82 @@ | ||
# 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" | ||
require "y2storage/device_description" | ||
|
||
module Agama | ||
module DBus | ||
module Storage | ||
module Interfaces | ||
module Device | ||
# Interface for a device. | ||
# | ||
# @note This interface is intended to be included by {Agama::DBus::Storage::Device}. | ||
module Device | ||
# Whether this interface should be implemented for the given device. | ||
# | ||
# @note All devices implement this interface. | ||
# | ||
# @param _storage_device [Y2Storage::Device] | ||
# @return [Boolean] | ||
def self.apply?(_storage_device) | ||
true | ||
end | ||
|
||
DEVICE_INTERFACE = "org.opensuse.Agama.Storage1.Device" | ||
private_constant :DEVICE_INTERFACE | ||
|
||
# sid of the device. | ||
# | ||
# @return [Integer] | ||
def device_sid | ||
storage_device.sid | ||
end | ||
|
||
# Name to represent the device. | ||
# | ||
# @return [String] e.g., "/dev/sda". | ||
def device_name | ||
storage_device.display_name || "" | ||
end | ||
|
||
# Description of the device. | ||
# | ||
# @return [String] e.g., "EXT4 Partition". | ||
def device_description | ||
Y2Storage::DeviceDescription.new(storage_device).to_s | ||
end | ||
|
||
def self.included(base) | ||
base.class_eval do | ||
dbus_interface DEVICE_INTERFACE do | ||
dbus_reader :device_sid, "u", dbus_name: "SID" | ||
dbus_reader :device_name, "s", dbus_name: "Name" | ||
dbus_reader :device_description, "s", dbus_name: "Description" | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
66 changes: 66 additions & 0 deletions
66
service/lib/agama/dbus/storage/interfaces/device/lvm_lv.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
# 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 | ||
module Device | ||
# Interface for LVM logical volume. | ||
# | ||
# @note This interface is intended to be included by {Agama::DBus::Storage::Device} if | ||
# needed. | ||
module LvmLv | ||
# Whether this interface should be implemented for the given device. | ||
# | ||
# @note LVM logical volumes implement this interface. | ||
# | ||
# @param storage_device [Y2Storage::Device] | ||
# @return [Boolean] | ||
def self.apply?(storage_device) | ||
storage_device.is?(:lvm_lv) | ||
end | ||
|
||
LOGICAL_VOLUME_INTERFACE = "org.opensuse.Agama.Storage1.LVM.LogicalVolume" | ||
private_constant :LOGICAL_VOLUME_INTERFACE | ||
|
||
# LVM volume group hosting the this logical volume. | ||
# | ||
# @return [Array<::DBus::ObjectPath>] | ||
def lvm_lv_vg | ||
tree.path_for(storage_device.lvm_vg) | ||
end | ||
|
||
def self.included(base) | ||
base.class_eval do | ||
dbus_interface LOGICAL_VOLUME_INTERFACE do | ||
dbus_reader :lvm_lv_vg, "o", dbus_name: "VolumeGroup" | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
service/lib/agama/dbus/storage/interfaces/device/partition.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,74 @@ | ||
# 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 | ||
module Device | ||
# Interface for partition. | ||
# | ||
# @note This interface is intended to be included by {Agama::DBus::Storage::Device} if | ||
# needed. | ||
module Partition | ||
# Whether this interface should be implemented for the given device. | ||
# | ||
# @note Partitions implement this interface. | ||
# | ||
# @param storage_device [Y2Storage::Device] | ||
# @return [Boolean] | ||
def self.apply?(storage_device) | ||
storage_device.is?(:partition) | ||
end | ||
|
||
PARTITION_INTERFACE = "org.opensuse.Agama.Storage1.Partition" | ||
private_constant :PARTITION_INTERFACE | ||
|
||
# Device hosting the partition table of this partition. | ||
# | ||
# @return [Array<::DBus::ObjectPath>] | ||
def partition_device | ||
tree.path_for(storage_device.partitionable) | ||
end | ||
|
||
# Whether it is a (valid) EFI System partition | ||
# | ||
# @return [Boolean] | ||
def partition_efi | ||
storage_device.efi_system? | ||
end | ||
|
||
def self.included(base) | ||
base.class_eval do | ||
dbus_interface PARTITION_INTERFACE do | ||
dbus_reader :partition_device, "o", dbus_name: "Device" | ||
dbus_reader :partition_efi, "b", dbus_name: "EFI" | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.