storage: fix btrfs config

- Do not pre-assign default values, otherwise it is impossible to know whether such values have to be solved.
agama-project · Oct 17, 2024 · 259b652 · 259b652
1 parent 12fb25d
commit 259b652
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/service/lib/agama/storage/configs/btrfs.rb b/service/lib/agama/storage/configs/btrfs.rb
@@ -39,12 +39,6 @@ class Btrfs
         # @return [String, nil]
         attr_accessor :default_subvolume
 
-        # Constructor
-        def initialize
-          @snapshots = false
-          @read_only = false
-        end
-
         # @return [Boolean]
         def snapshots?
           !!snapshots

diff --git a/service/test/agama/storage/config_solver_test.rb b/service/test/agama/storage/config_solver_test.rb
@@ -46,7 +46,7 @@
             "mount_path" => "/", "filesystem" => "btrfs",
             "size" => { "auto" => true, "min" => "5 GiB", "max" => "10 GiB" },
             "btrfs" => {
-              "snapshots" => true, "default_subvolume" => "@",
+              "snapshots" => true, "default_subvolume" => "@", "read_only" => true,
               "subvolumes" => ["home", "opt", "root", "srv"]
             },
             "outline" => {
@@ -188,12 +188,42 @@
         expect(filesystem.type.fs_type).to eq(Y2Storage::Filesystems::Type::BTRFS)
         expect(filesystem.type.btrfs).to be_a(Agama::Storage::Configs::Btrfs)
         expect(filesystem.type.btrfs.snapshots?).to eq(true)
-        expect(filesystem.type.btrfs.read_only?).to eq(false)
+        expect(filesystem.type.btrfs.read_only?).to eq(true)
         expect(filesystem.type.btrfs.default_subvolume).to eq("@")
         expect(filesystem.type.btrfs.subvolumes).to all(be_a(Y2Storage::SubvolSpecification))
       end
     end
 
+    context "if a config does not specify all the btrfs properties" do
+      let(:config_json) do
+        {
+          drives: [
+            {
+              filesystem: {
+                path: "/",
+                type: {
+                  btrfs: {
+                    snapshots: false
+                  }
+                }
+              }
+            }
+          ]
+        }
+      end
+
+      it "completes the btrfs config according to the product info" do
+        subject.solve(config)
+
+        drive = config.drives.first
+        btrfs = drive.filesystem.type.btrfs
+        expect(btrfs.snapshots?).to eq(false)
+        expect(btrfs.read_only?).to eq(true)
+        expect(btrfs.default_subvolume).to eq("@")
+        expect(btrfs.subvolumes).to all(be_a(Y2Storage::SubvolSpecification))
+      end
+    end
+
     partition_proc = proc { |c| c.drives.first.partitions.first }
 
     context "if a config does not specify size" do