Allow to select no driver (auto)

src/lib/y2network/driver.rb

@@ -67,9 +67,10 @@ def initialize(name, params = "")
 
     # Determines whether two drivers are equal
     #
-    # @param other [Driver] Driver to compare with
-    # @return [Boolean]
+    # @param other [Object] Driver to compare with
+    # @return [Boolean] true if +other+ is a Driver instance with the same name and params; false otherwise.
     def ==(other)
+      return false unless other.is_a?(Driver)
       name == other.name && params == other.params
     end
 

src/lib/y2network/interface_config_builder.rb

@@ -126,9 +126,9 @@ def save
         firewall_interface.zone = firewall_zone if !firewall_interface.zone || firewall_zone != firewall_interface.zone.name
       end
 
-      if interface.respond_to?(:custom_driver) && driver
-        interface.custom_driver = driver.name if driver.name != interface.current_driver
-        yast_config.add_or_update_driver(driver)
+      if interface.respond_to?(:custom_driver)
+        interface.custom_driver = driver_auto? ? nil : driver.name
+        yast_config.add_or_update_driver(driver) unless driver_auto?
       end
       yast_config.rename_interface(@old_name, name, renaming_mechanism) if renamed_interface?
       yast_config.add_or_update_connection_config(@connection_config)
@@ -243,9 +243,8 @@ def ifplugd_priority
     # gets currently assigned kernel module
     def driver
       return @driver if @driver
-      driver_name = @interface.custom_driver || @interface.current_driver
-      return nil unless driver_name
-      @driver = yast_config.drivers.find { |d| d.name == driver_name }
+      @driver = yast_config.drivers.find { |d| d.name == @interface.custom_driver } if @interface.custom_driver
+      @driver ||= :auto
     end
 
     # sets kernel module for interface
@@ -461,5 +460,12 @@ def original_hostname
       names = Yast::Host.names(@original_ip_config.address.to_s)
       @original_hostname = names.first || ""
     end
+
+    # Determines whether the driver should be set automatically
+    #
+    # @return [Boolean]
+    def driver_auto?
+      :auto == driver
+    end
   end
 end

src/lib/y2network/widgets/driver.rb

@@ -53,35 +53,59 @@ def contents
         )
       end
 
+      def init
+        disable_kernel_options if @builder.driver == :auto
+      end
+
       def handle(event)
         return unless event["ID"] == "kernel_module" && event["EventReason"] == "ValueChanged"
         return nil if @old_kernel_module == kernel_module_widget.value
 
-        new_driver = @builder.drivers.find { |d| d.name == kernel_module_widget.value }
-        kernel_options_widget.value = new_driver.params if new_driver
+        if kernel_module_widget.value == :auto
+          disable_kernel_options
+        else
+          enable_kernel_options
+        end
+
         @old_kernel_module = kernel_module_widget.value
 
         nil
       end
 
       def store
-        @builder.driver = Y2Network::Driver.new(kernel_module_widget.value, kernel_options_widget.value)
+        @builder.driver =
+          if kernel_module_widget.value == :auto
+            :auto
+          else
+            Y2Network::Driver.new(kernel_module_widget.value, kernel_options_widget.value)
+          end
       end
 
     private
 
       def kernel_module_widget
         return @kernel_module_widget if @kernel_module_widget
         drivers_names = @builder.drivers.map(&:name)
-        selected_driver = @builder.driver.name if @builder.driver
+        selected_driver = @builder.driver.name if @builder.driver != :auto
         @kernel_module_widget = KernelModule.new(drivers_names, selected_driver)
       end
 
       def kernel_options_widget
         return @kernel_options_widget if @kernel_options_widget
-        options = @builder.driver ? @builder.driver.params : ""
+        options = @builder.driver != :auto ? @builder.driver.params : ""
         @kernel_options_widget ||= KernelOptions.new(options)
       end
+
+      def disable_kernel_options
+        kernel_options_widget.value = ""
+        kernel_options_widget.disable
+      end
+
+      def enable_kernel_options
+        new_driver = @builder.drivers.find { |d| d.name == kernel_module_widget.value }
+        kernel_options_widget.value = new_driver.params if new_driver
+        kernel_options_widget.enable
+      end
     end
   end
 end

src/lib/y2network/widgets/kernel_module.rb

@@ -50,12 +50,17 @@ def opt
       end
 
       def items
-        @names.map { |n| [n, n] }
+        @items ||= [["", _("Auto")]] + @names.map { |n| [n, n] }
       end
 
       def init
         self.value = @selected if @selected
       end
+
+      def value
+        ret = super
+        ret == "" ? :auto : ret
+      end
     end
   end
 end

test/y2network/interface_config_builder_test.rb

@@ -70,26 +70,34 @@
       subject.save
     end
 
-    context "when the selected driver is different from the current one" do
+    context "when a driver is selected" do
       before do
-        allow(eth0).to receive(:current_driver).and_return("e1000")
+        config_builder.driver = driver
       end
 
       it "sets the interface driver" do
         expect(eth0).to receive(:custom_driver=).with(driver.name)
-        config_builder.driver = driver
+        subject.save
+      end
+
+      it "updates the driver" do
+        expect(config).to receive(:add_or_update_driver).with(driver)
         subject.save
       end
     end
 
-    context "when the selected driver is the same than the current one" do
+    context "when no driver is selected" do
       before do
-        allow(eth0).to receive(:current_driver).and_return("virtio_net")
+        config_builder.driver = :auto
       end
 
-      it "sets the interface driver" do
-        expect(eth0).to_not receive(:custom_driver=)
-        config_builder.driver = driver
+      it "sets the interface driver to nil" do
+        expect(eth0).to receive(:custom_driver=).with(nil)
+        subject.save
+      end
+
+      it "does not update any driver" do
+        expect(config).to_not receive(:add_or_update_driver)
         subject.save
       end
     end

test/y2network/widgets/driver_test.rb

@@ -29,10 +29,12 @@
     Y2Network::InterfaceConfigBuilder.for("eth")
   end
   let(:virtio_net) { Y2Network::Driver.new("virtio_net", "csum=1") }
+  let(:eth0) { Y2Network::PhysicalInterface.new("eth0") }
 
   before do
     allow(builder).to receive(:drivers).and_return([virtio_net])
     allow(builder).to receive(:driver).and_return(virtio_net)
+    allow(builder).to receive(:interface).and_return(eth0)
   end
 
   include_examples "CWM::CustomWidget"

test/y2network/widgets/kernel_module_test.rb

@@ -23,7 +23,7 @@
 require "y2network/widgets/kernel_module"
 
 describe Y2Network::Widgets::KernelModule do
-  subject { described_class.new(["virtio_net"], "virtio_net") }
+  subject { described_class.new(["virtio_net", "alt"], "virtio_net") }
 
   include_examples "CWM::ComboBox"
 end