Add available volume groups to the system

joseivanlopez · joseivanlopez · commit 3143ac1292f6 · 2026-03-24T16:15:36.000Z
diff --git a/service/lib/agama/dbus/storage/manager.rb b/service/lib/agama/dbus/storage/manager.rb
@@ -36,7 +36,7 @@ module Agama
   module DBus
     module Storage
       # D-Bus object to manage storage installation
-      class Manager < BaseObject
+      class Manager < BaseObject # rubocop:disable Metrics/ClassLength
         extend Yast::I18n
         include Yast::I18n
         include WithIssues
@@ -384,15 +384,16 @@ def serialize_system
           return serialize_nil unless manager.probed?
 
           json = {
-            devices:            devices_json(:probed),
-            availableDrives:    available_drives,
-            availableMdRaids:   available_md_raids,
-            candidateDrives:    candidate_drives,
-            candidateMdRaids:   candidate_md_raids,
-            issues:             system_issues_json,
-            productMountPoints: product_mount_points,
-            encryptionMethods:  encryption_methods,
-            volumeTemplates:    volume_templates
+            devices:               devices_json(:probed),
+            availableDrives:       available_drives,
+            availableMdRaids:      available_md_raids,
+            availableVolumeGroups: available_volume_groups,
+            candidateDrives:       candidate_drives,
+            candidateMdRaids:      candidate_md_raids,
+            issues:                system_issues_json,
+            productMountPoints:    product_mount_points,
+            encryptionMethods:     encryption_methods,
+            volumeTemplates:       volume_templates
           }
           JSON.pretty_generate(json)
         end
@@ -510,6 +511,12 @@ def candidate_md_raids
           proposal.storage_system.candidate_md_raids.map(&:sid)
         end
 
+        # @see Storage::System#available_volume_groups
+        # @return [Array<Integer>]
+        def available_volume_groups
+          proposal.storage_system.available_volume_groups.map(&:sid)
+        end
+
         # Meaningful mount points for the current product.
         #
         # @return [Array<String>]
diff --git a/service/lib/agama/storage/system.rb b/service/lib/agama/storage/system.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2025] SUSE LLC
+# Copyright (c) [2025-2026] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -66,8 +66,7 @@ def candidate_drives
 
       # All devices that can be referenced by an mdRaid entry at the Agama config
       #
-      # This excludes devices with any mounted filesystem and devices that contain a repository
-      # for installation.
+      # This excludes MD RAIDs that are not based on available devices.
       #
       # @return [Array<Y2Storage::Md>]
       def available_md_raids
@@ -92,14 +91,34 @@ def candidate_md_raids
         available_md_raids.reject { |r| r.is?(:software_raid) }
       end
 
-      # Whether the device is usable as drive or mdRaid
+      # All devices that can be referenced by a volumeGroups entry at the Agama config
       #
-      # See {#available_drives} and {#available_md_raids}
+      # This excludes volume groups that are not based on available devices.
+      #
+      # @return [Array<Y2Storage::LvmVg>]
+      def available_volume_groups
+        return [] unless devicegraph
+
+        devicegraph.lvm_vgs.select { |v| available?(v) }
+      end
+
+      # Whether the device is usable for the installation.
+      #
+      # A device is usable if it contains neither a mounted filesystem nor a repository for the
+      # installation.
+      #
+      # For "compounded" devices like MD RAIDs or volume groups, all the devices used for creating
+      # it has to be usable for the installation too.
+      #
+      # See {#available_drives}, {#available_md_raids} and {#available_volume_groups}
       #
       # @param device [Y2Storage::Partitionable, Y2Storage::Md]
       # @return [Boolean]
       def available?(device)
-        analyzer.available_device?(device)
+        devices = device.ancestors.select { |a| a.parents.none? }
+        devices << device  if devices.empty?
+
+        devices.all? { |d| analyzer.available_device?(d) }
       end
 
       # Whether the device can be used for installation, including the boot partitions
diff --git a/service/test/agama/dbus/storage/manager_test.rb b/service/test/agama/dbus/storage/manager_test.rb
@@ -209,12 +209,14 @@ def parse(string)
       allow(proposal.storage_system).to receive(:candidate_md_raids).and_return(candidate_raids)
       allow(proposal.storage_system).to receive(:candidate_devices)
         .and_return(candidate_drives + candidate_raids)
+      allow(proposal.storage_system).to receive(:available_volume_groups).and_return(available_vgs)
     end
 
     let(:available_drives) { [] }
     let(:candidate_drives) { [] }
     let(:available_raids) { [] }
     let(:candidate_raids) { [] }
+    let(:available_vgs) { [] }
 
     describe "serialized_system[:availableDrives]" do
       context "if there is no available drives" do
@@ -306,6 +308,29 @@ def parse(string)
       end
     end
 
+    describe "serialized_system[:availableVolumeGroups]" do
+      context "if there is no available volume groups" do
+        let(:available_vgs) { [] }
+
+        it "returns an empty list" do
+          expect(parse(subject.serialized_system)[:availableVolumeGroups]).to eq([])
+        end
+      end
+
+      context "if there are available volume groups" do
+        let(:available_vgs) { [vg1, vg2, vg3] }
+
+        let(:vg1) { instance_double(Y2Storage::LvmVg, sid: 200) }
+        let(:vg2) { instance_double(Y2Storage::LvmVg, sid: 201) }
+        let(:vg3) { instance_double(Y2Storage::LvmVg, sid: 202) }
+
+        it "retuns the id of each volume group" do
+          result = parse(subject.serialized_system)[:availableVolumeGroups]
+          expect(result).to contain_exactly(200, 201, 202)
+        end
+      end
+    end
+
     describe "serialized_system[:issues]" do
       context "if there is no candidate drives" do
         let(:candidate_drives) { [] }
diff --git a/service/test/agama/storage/system_test.rb b/service/test/agama/storage/system_test.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2025] SUSE LLC
+# Copyright (c) [2025-2026] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -67,14 +67,18 @@
   end
 
   describe "#available_md_raids" do
-    let(:scenario) { "md_raids.yaml" }
+    let(:scenario) { "available_md_raids.yaml" }
 
-    before do
-      allow(disk_analyzer).to receive(:available_device?) { |d| d.name != "/dev/md0" }
+    it "includes all software RAIDs that are not in use" do
+      expect(subject.available_md_raids.map(&:name)).to contain_exactly("/dev/md0", "/dev/md1")
     end
 
-    it "includes all software RAIDs that are not in use" do
-      expect(subject.available_md_raids.map(&:name)).to contain_exactly("/dev/md1", "/dev/md2")
+    it "does not include software RAIDs in use" do
+      expect(subject.available_md_raids.map(&:name)).to_not include("/dev/md2")
+    end
+
+    it "does not include software RAIDs over devices in use" do
+      expect(subject.available_md_raids.map(&:name)).to_not include("/dev/md3")
     end
   end
 
@@ -85,4 +89,20 @@
       expect(subject.candidate_md_raids).to be_empty
     end
   end
+
+  describe "#available_volume_groups  " do
+    let(:scenario) { "available_volume_groups.yaml" }
+
+    it "includes all volume groups that are not in use" do
+      expect(subject.available_volume_groups.map(&:name)).to contain_exactly("/dev/vg0", "/dev/vg1")
+    end
+
+    it "does not include volume groups in use" do
+      expect(subject.available_volume_groups.map(&:name)).to_not include("/dev/vg2")
+    end
+
+    it "does not include volume groups over devices in use" do
+      expect(subject.available_volume_groups.map(&:name)).to_not include("/dev/vg3")
+    end
+  end
 end
diff --git a/service/test/fixtures/available_md_raids.yaml b/service/test/fixtures/available_md_raids.yaml
@@ -0,0 +1,108 @@
+---
+- disk:
+    name: /dev/vda
+    size: 500 GiB
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 10 GiB
+        name: /dev/vda1
+    - partition:
+        size: 10 GiB
+        name: /dev/vda2
+- disk:
+    name: /dev/vdb
+    size: 500 GiB
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 10 GiB
+        name: /dev/vdb1
+    - partition:
+        size: 10 GiB
+        name: /dev/vdb2
+- disk:
+    name: /dev/vdc
+    size: 500 GiB
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 10 GiB
+        name: /dev/vdc1
+- disk:
+    name: /dev/vdd
+    size: 500 GiB
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 10 GiB
+        name: /dev/vdd1
+- disk:
+    name: /dev/vde
+    size: 500 GiB
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 10 GiB
+        name: /dev/vde1
+- disk:
+    name: /dev/vdf
+    size: 500 GiB
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 10 GiB
+        name: /dev/vdf1
+    - partition:
+        size: 10 GiB
+        name: /dev/vdf2
+        file_system:  ext4
+        mount_point: /test1
+
+- md:
+    name: "/dev/md0"
+    chunk_size: 16 KiB
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 1 GiB
+        name: /dev/md0p1
+    - partition:
+        size: 1 GiB
+        name: /dev/md0p2
+    md_devices:
+    - md_device:
+        blk_device: /dev/vda1
+    - md_device:
+        blk_device: /dev/vdb1
+- md:
+    name: "/dev/md1"
+    chunk_size: 16 KiB
+    md_devices:
+    - md_device:
+        blk_device: /dev/vda2
+    - md_device:
+        blk_device: /dev/vdb2
+- md:
+    name: "/dev/md2"
+    chunk_size: 16 KiB
+    md_devices:
+    - md_device:
+        blk_device: /dev/vdc1
+    - md_device:
+        blk_device: /dev/vdd1
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 10 GiB
+        name: /dev/md2p1
+        file_system:  ext4
+        mount_point: /test1
+- md:
+    name: "/dev/md3"
+    chunk_size: 16 KiB
+    md_devices:
+    - md_device:
+        blk_device: /dev/vde1
+    - md_device:
+        blk_device: /dev/vdf1
diff --git a/service/test/fixtures/available_volume_groups.yaml b/service/test/fixtures/available_volume_groups.yaml
@@ -0,0 +1,72 @@
+---
+- disk:
+    name: /dev/vda
+    size: 500 GiB
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 10 GiB
+        name: /dev/vda1
+    - partition:
+        size: 10 GiB
+        name: /dev/vda2
+- disk:
+    name: /dev/vdb
+    size: 500 GiB
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 10 GiB
+        name: /dev/vdb1
+- disk:
+    name: /dev/vdc
+    size: 500 GiB
+    partition_table: gpt
+    partitions:
+    - partition:
+        size: 10 GiB
+        name: /dev/vdc1
+    - partition:
+        size: 10 GiB
+        name: /dev/vdc2
+        file_system:  ext4
+        mount_point: /test1
+- lvm_vg:
+    vg_name: vg0
+    lvm_pvs:
+        - lvm_pv:
+            blk_device: /dev/vda1
+    lvm_lvs:
+        - lvm_lv:
+            size:         10 GiB
+            lv_name:      lv1
+- lvm_vg:
+    vg_name: vg1
+    lvm_pvs:
+        - lvm_pv:
+            blk_device: /dev/vda2
+    lvm_lvs:
+        - lvm_lv:
+            size:         10 GiB
+            lv_name:      lv1
+            file_system:  btrfs
+- lvm_vg:
+    vg_name: vg2
+    lvm_pvs:
+        - lvm_pv:
+            blk_device: /dev/vdb1
+    lvm_lvs:
+        - lvm_lv:
+            size:         10 GiB
+            lv_name:      lv1
+            file_system:  btrfs
+            mount_point: /test2
+- lvm_vg:
+    vg_name: vg3
+    lvm_pvs:
+        - lvm_pv:
+            blk_device: /dev/vdc1
+    lvm_lvs:
+        - lvm_lv:
+            size:         10 GiB
+            lv_name:      lv1
