agama-project · joseivanlopez · Mar 27, 2025 · Feb 27, 2025 · Feb 28, 2025 · Mar 3, 2025
diff --git a/rust/agama-lib/share/examples/storage/model.json b/rust/agama-lib/share/examples/storage/model.json
@@ -13,7 +13,6 @@
   "drives": [
     {
       "name": "/dev/vda",
-      "alias": "root",
       "mountPath": "/",
       "filesystem": {
         "default": true,
@@ -75,6 +74,33 @@
           }
         }
       ]
+    },
+    {
+      "name": "/dev/vdc",
+      "spacePolicy": "delete"
+    }
+  ],
+  "volumeGroups": [
+    {
+      "vgName": "vg0",
+      "extentSize": 1024,
+      "targetDevices": ["/dev/vdc"],
+      "logicalVolumes": [
+        {
+          "lvName": "lv0",
+          "mountPath": "/data",
+          "filesystem": {
+            "default": false,
+            "type": "ext4"
+          },
+          "size": {
+            "default": true,
+            "min": 1111
+          },
+          "stripes": 8,
+          "stripeSize": 1204
+        }
+      ]
     }
   ]
 }
diff --git a/rust/agama-lib/share/storage.model.schema.json b/rust/agama-lib/share/storage.model.schema.json
@@ -9,6 +9,10 @@
     "drives": {
       "type": "array",
       "items": { "$ref": "#/$defs/drive" }
+    },
+    "volumeGroups": {
+      "type": "array",
+      "items": { "$ref": "#/$defs/volumeGroup" }
     }
   },
   "$defs": {
@@ -52,7 +56,6 @@
       "required": ["name"],
       "properties": {
         "name": { "type": "string" },
-        "alias": { "$ref": "#/$defs/alias" },
         "mountPath": { "type": "string" },
         "filesystem": { "$ref": "#/$defs/filesystem" },
         "spacePolicy": { "$ref": "#/$defs/spacePolicy" },
@@ -68,7 +71,6 @@
       "additionalProperties": false,
       "properties": {
         "name": { "type": "string" },
-        "alias": { "$ref": "#/$defs/alias" },
         "id": { "$ref": "#/$defs/partitionId" },
         "mountPath": { "type": "string" },
         "filesystem": { "$ref": "#/$defs/filesystem" },
@@ -79,9 +81,34 @@
         "resizeIfNeeded": { "type": "boolean" }
       }
     },
-    "alias": {
-      "description": "Alias used to reference a device.",
-      "type": "string"
+    "volumeGroup": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": ["vgName"],
+      "properties": {
+        "vgName": { "type": "string" },
+        "extentSize": { "type": "integer" },
+        "targetDevices": {
+          "type": "array",
+          "items": { "type": "string" }
+        },
+        "logicalVolumes": {
+          "type": "array",
+          "items": { "$ref": "#/$defs/logicalVolume" }
+        }
+      }
+    },
+    "logicalVolume": {
+      "type": "object",
+      "additionalProperties": false,
+      "properties": {
+        "lvName": { "type": "string" },
+        "mountPath": { "type": "string" },
+        "filesystem": { "$ref": "#/$defs/filesystem" },
+        "size": { "$ref": "#/$defs/size" },
+        "stripes": { "type": "integer" },
+        "stripeSize": { "type": "integer" }
+      }
     },
     "spacePolicy": {
       "enum": ["delete", "resize", "keep", "custom"]

diff --git a/rust/agama-lib/share/storage.schema.json b/rust/agama-lib/share/storage.schema.json
@@ -159,6 +159,7 @@
       "description": "LVM volume group.",
       "type": "object",
       "additionalProperties": false,
+      "required": ["name"],
       "properties": {
         "name": {
           "description": "Volume group name.",

diff --git a/rust/package/agama.changes b/rust/package/agama.changes
@@ -50,6 +50,11 @@ Mon Mar 10 12:13:19 UTC 2025 - José Iván López González <jlopez@suse.com>
 - Package and install the storage model schema
   (gh#agama-project/agama#2135).
 
+-------------------------------------------------------------------
+Fri Mar  7 11:40:56 UTC 2025 - José Iván López González <jlopez@suse.com>
+
+- Extend storage model schema with LVM (gh#agama-project/agama#2089).
+
 -------------------------------------------------------------------
 Thu Mar  6 12:51:42 UTC 2025 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 

diff --git a/service/lib/agama/storage/config.rb b/service/lib/agama/storage/config.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2024] SUSE LLC
+# Copyright (c) [2024-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -60,16 +60,39 @@ def initialize
         @nfs_mounts = []
       end
 
-      # Name of the device that will be used to boot the target system, if any.
-      #
-      # @note The config has to be solved.
-      #
-      # @return [String, nil]
+      # @return [Configs::Drive, nil]
       def boot_device
         return unless boot.configure? && boot.device.device_alias
 
-        boot_drive = drives.find { |d| d.alias?(boot.device.device_alias) }
-        boot_drive&.found_device&.name
+        drives.find { |d| d.alias?(boot.device.device_alias) }
+      end
+
+      # Device config containing root.
+      #
+      # @return [Configs::Drive, Configs::VolumeGroup, nil]
+      def root_device
+        root_drive || root_volume_group
+      end
+
+      # Drive config containing root.
+      #
+      # @return [Configs::Drive, nil]
+      def root_drive
+        drives.find { |d| d.root? || d.partitions.any?(&:root?) }
+      end
+
+      # Volume group config containing a logical volume for root.
+      #
+      # @return [Configs::LogicalVolume, nil]
+      def root_volume_group
+        volume_groups.find { |v| v.logical_volumes.any?(&:root?) }
+      end
+
+      # Drive with the given alias.
+      #
+      # @return [Configs::Drive, nil]
+      def drive(device_alias)
+        drives.find { |d| d.alias?(device_alias) }
       end
 
       # @return [Array<Configs::Partition>]

diff --git a/service/lib/agama/storage/config_checkers/boot.rb b/service/lib/agama/storage/config_checkers/boot.rb
@@ -51,16 +51,17 @@ def device_alias
           storage_config.boot.device.device_alias
         end
 
+        # Error if a boot device is required and unknown.
+        #
+        # This happens when the config solver is not able to infer a boot device, see
+        # {ConfigSolvers::Boot}.
+        #
         # @return [Issue, nil]
         def missing_alias_issue
           return unless configure? && device_alias.nil?
 
-          # Currently this situation only happens because the config solver was not able to find
-          # a device config containing a root volume. The message could become inaccurate if the
-          # solver logic changes.
           error(
-            _("The boot device cannot be automatically selected because there is no root (/) " \
-              "file system"),
+            _("The boot device cannot be automatically selected"),
             kind: :no_root
           )
         end

diff --git a/service/lib/agama/storage/config_checkers/volume_group.rb b/service/lib/agama/storage/config_checkers/volume_group.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2024] SUSE LLC
+# Copyright (c) [2024-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -41,23 +41,33 @@ def initialize(config, storage_config, product_config)
           @config = config
         end
 
-        # Volume group config issues.
+        # Issues from a volume group config.
         #
         # @return [Array<Issue>]
         def issues
           [
+            name_issue,
             logical_volumes_issues,
             physical_volumes_issues,
             physical_volumes_devices_issues,
             physical_volumes_encryption_issues
-          ].flatten
+          ].compact.flatten
         end
 
       private
 
         # @return [Configs::VolumeGroup]
         attr_reader :config
 
+        # Issue if the volume group name is missing.
+        #
+        # @return [Issue, nil]
+        def name_issue
+          return if config.name && !config.name.empty?
+
+          error(_("There is a volume group without name"))
+        end
+
         # Issues from logical volumes.
         #
         # @return [Array<Issue>]

diff --git a/service/lib/agama/storage/config_conversions/from_model_conversions.rb b/service/lib/agama/storage/config_conversions/from_model_conversions.rb
@@ -26,9 +26,11 @@
 require "agama/storage/config_conversions/from_model_conversions/encryption"
 require "agama/storage/config_conversions/from_model_conversions/filesystem"
 require "agama/storage/config_conversions/from_model_conversions/filesystem_type"
+require "agama/storage/config_conversions/from_model_conversions/logical_volume"
 require "agama/storage/config_conversions/from_model_conversions/partition"
 require "agama/storage/config_conversions/from_model_conversions/search"
 require "agama/storage/config_conversions/from_model_conversions/size"
+require "agama/storage/config_conversions/from_model_conversions/volume_group"
 
 module Agama
   module Storage

diff --git a/service/lib/agama/storage/config_conversions/from_model_conversions/boot.rb b/service/lib/agama/storage/config_conversions/from_model_conversions/boot.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2024] SUSE LLC
+# Copyright (c) [2024-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -29,8 +29,18 @@ module ConfigConversions
       module FromModelConversions
         # Boot conversion from model according to the JSON schema.
         class Boot < Base
+          # @param model_json [Hash] Boot model.
+          # @param drives [Array<Configs::Drive>]
+          def initialize(model_json, drives)
+            super(model_json)
+            @drives = drives
+          end
+
         private
 
+          # @return [Array<Configs::Drive>]
+          attr_reader :drives
+
           # @see Base
           # @return [Configs::Boot]
           def default_config
@@ -51,7 +61,7 @@ def convert_device
             boot_device_model = model_json[:device]
             return if boot_device_model.nil?
 
-            FromModelConversions::BootDevice.new(boot_device_model).convert
+            FromModelConversions::BootDevice.new(boot_device_model, drives).convert
           end
         end
       end

diff --git a/service/lib/agama/storage/config_conversions/from_model_conversions/boot_device.rb b/service/lib/agama/storage/config_conversions/from_model_conversions/boot_device.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright (c) [2024] SUSE LLC
+# Copyright (c) [2024-2025] SUSE LLC
 #
 # All Rights Reserved.
 #
@@ -28,8 +28,18 @@ module ConfigConversions
       module FromModelConversions
         # Boot device conversion from model according to the JSON schema.
         class BootDevice < Base
+          # @param model_json [Hash] Boot device model.
+          # @param drives [Array<Configs::Drive>]
+          def initialize(model_json, drives)
+            super(model_json)
+            @drives = drives
+          end
+
         private
 
+          # @return [Array<Configs::Drive>]
+          attr_reader :drives
+
           # @see Base
           # @return [Configs::Boot]
           def default_config
@@ -40,9 +50,24 @@ def default_config
           # @return [Hash]
           def conversions
             {
-              default: model_json[:default]
+              default:      model_json[:default],
+              device_alias: convert_device_alias
             }
           end
+
+          # @return [String, nil]
+          def convert_device_alias
+            # Avoid setting an alias if using the default boot device.
+            return if model_json[:default]
+
+            name = model_json[:name]
+            return unless name
+
+            drive = drives.find { |d| d.device_name == name }
+            return unless drive
+
+            drive.ensure_alias
+          end
         end
       end
     end