Remove is_lvm_vg option

yast · May 20, 2020 · ebe4112 · ebe4112
1 parent becf436
commit ebe4112
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 102 deletions.
diff --git a/src/lib/autoinstall/widgets/storage/is_lvm_vg.rb b/src/lib/autoinstall/widgets/storage/is_lvm_vg.rb
diff --git a/src/lib/autoinstall/widgets/storage/lvm_page.rb b/src/lib/autoinstall/widgets/storage/lvm_page.rb
@@ -20,7 +20,6 @@
 require "yast"
 require "y2storage"
 require "autoinstall/widgets/storage/drive_page"
-require "autoinstall/widgets/storage/is_lvm_vg"
 require "autoinstall/widgets/storage/vg_device"
 require "autoinstall/widgets/storage/pesize"
 require "autoinstall/widgets/storage/keep_unknown_lv"
@@ -42,9 +41,8 @@ def contents
             VBox(
               Left(Heading(_("LVM"))),
               HBox(
-                HWeight(1, lvm_vg_widget),
                 HWeight(1, vg_device_widget),
-                HWeight(1, Empty())
+                HWeight(2, Empty())
               ),
               HBox(
                 HWeight(1, pesize_widget),
@@ -61,7 +59,6 @@ def contents
         # @macro seeAbstractWidget
         def init
           vg_device_widget.value       = drive.device
-          lvm_vg_widget.value          = drive.is_lvm_vg
           pesize_widget.value          = drive.pesize
           keep_unknown_lv_widget.value = drive.keep_unknown_lv
         end
@@ -72,7 +69,6 @@ def init
         def values
           {
             "device"          => vg_device_widget.value,
-            "is_lvm_vg"       => lvm_vg_widget.value,
             "pesize"          => pesize_widget.value,
             "keep_unknown_lv" => keep_unknown_lv_widget.value
           }
@@ -87,11 +83,6 @@ def vg_device_widget
           @vg_device_widget ||= VgDevice.new
         end
 
-        # Widget for setting if will be an LVM VG
-        def lvm_vg_widget
-          @lvm_vg_widget ||= IsLvmVg.new
-        end
-
         # Widget for LVM VG Physical Extent Size (pesize)
         #
         # @return [Pesize]

diff --git a/test/lib/widgets/storage/is_lvm_vg_test.rb b/test/lib/widgets/storage/is_lvm_vg_test.rb
diff --git a/test/lib/widgets/storage/lvm_page_test.rb b/test/lib/widgets/storage/lvm_page_test.rb
@@ -40,23 +40,18 @@
     {
       "type"            => :CT_LVM,
       "device"          => device,
-      "is_lvm_vg"       => is_lvm_vg,
       "pesize"          => pesize,
       "keep_unknown_lv" => keep_unknown_lv
     }
   end
 
   let(:device) { "/dev/system" }
-  let(:is_lvm_vg) { true }
   let(:pesize) { 64 }
   let(:keep_unknown_lv) { false }
 
   let(:vg_device_widget) do
     instance_double(Y2Autoinstallation::Widgets::Storage::VgDevice, value: device)
   end
-  let(:is_lvm_vg_widget) do
-    instance_double(Y2Autoinstallation::Widgets::Storage::IsLvmVg, value: is_lvm_vg)
-  end
   let(:pesize_widget) do
     instance_double(Y2Autoinstallation::Widgets::Storage::Pesize, value: pesize)
   end
@@ -67,16 +62,13 @@
   before do
     allow(Y2Autoinstallation::Widgets::Storage::VgDevice)
       .to receive(:new).and_return(vg_device_widget)
-    allow(Y2Autoinstallation::Widgets::Storage::IsLvmVg)
-      .to receive(:new).and_return(is_lvm_vg_widget)
     allow(Y2Autoinstallation::Widgets::Storage::Pesize)
       .to receive(:new).and_return(pesize_widget)
     allow(Y2Autoinstallation::Widgets::Storage::KeepUnknownLv)
       .to receive(:new).and_return(keep_unknown_lv_widget)
 
     allow(vg_device_widget).to receive(:value=)
     allow(vg_device_widget).to receive(:value=)
-    allow(is_lvm_vg_widget).to receive(:value=)
     allow(pesize_widget).to receive(:value=)
     allow(keep_unknown_lv_widget).to receive(:value=)
   end
@@ -87,11 +79,6 @@
       lvm_page.init
     end
 
-    it "sets is_lvm_vg" do
-      expect(is_lvm_vg_widget).to receive(:value=).with(is_lvm_vg)
-      lvm_page.init
-    end
-
     it "sets the vg physical extent size" do
       expect(pesize_widget).to receive(:value=).with(pesize)
       lvm_page.init
@@ -108,10 +95,6 @@
       expect(lvm_page.values).to include("device" => device)
     end
 
-    it "includes is_lvm_vg" do
-      expect(lvm_page.values).to include("is_lvm_vg" => is_lvm_vg)
-    end
-
     it "includes pesize" do
       expect(lvm_page.values).to include("pesize" => pesize)
     end