Merge e5399e8 into 2c27dd6

yast · May 4, 2019 · 76edc4a · 76edc4a
2 parents 2c27dd6 + e5399e8
commit 76edc4a
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 15 deletions.
diff --git a/package/yast2-network.changes b/package/yast2-network.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat May  4 15:06:10 UTC 2019 - kanderssen@suse.com
+
+- bnc#1086454
+  - do not enforce particular mode for IPoIB devices by default
+- 3.4.5
+
 -------------------------------------------------------------------
 Fri Apr 12 10:00:58 UTC 2019 - Michal Filka <mfilka@suse.com>
 

diff --git a/package/yast2-network.spec b/package/yast2-network.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-network
-Version:        3.4.4
+Version:        3.4.5
 Release:        0
 BuildArch:      noarch
 

diff --git a/src/data/network/sysconfig_defaults.yml b/src/data/network/sysconfig_defaults.yml
@@ -41,5 +41,4 @@ WIRELESS_AP_SCANMODE: '1'
 BONDING_MODULE_OPTS: mode=active-backup miimon=100
 TUNNEL_SET_OWNER: ''
 TUNNEL_SET_GROUP: ''
-IPOIB_MODE: connected
 BRIDGE_PORTS: ''
diff --git a/src/include/network/widgets.rb b/src/include/network/widgets.rb
@@ -212,10 +212,16 @@ def MakeStartmode(ids)
       deep_copy(ret)
     end
 
-    def init_ipoib_mode_widget(key)
-      ipoib_mode = LanItems.ipoib_mode
+    def ipoib_modes
+      {
+        # translators: a possible value for: IPoIB device mode
+        "connected" => _("connected"),
+        "datagram"  => _("datagram")
+      }
+    end
 
-      return unless LanItems.ipoib_modes.keys.include?(ipoib_mode)
+    def init_ipoib_mode_widget(key)
+      ipoib_mode = LanItems.ipoib_mode || "default"
 
       UI.ChangeWidget(
         Id(key),
@@ -225,13 +231,16 @@ def init_ipoib_mode_widget(key)
     end
 
     def store_ipoib_mode_widget(key, _event)
-      LanItems.ipoib_mode = UI.QueryWidget(Id(key), :CurrentButton)
+      ipoib_mode = UI.QueryWidget(Id(key), :CurrentButton)
+      LanItems.ipoib_mode = ipoib_mode == "default" ? nil : ipoib_mode
     end
 
     def ipoib_mode_widget
       {
         "widget" => :radio_buttons,
-        "items"  => LanItems.ipoib_modes.to_a,
+        # ipoib_modes contains known IPoIB modes, "default" is place holder for
+        # "do not set anything explicitly -> driver will choose"
+        "items"  => [["default", _("default")]] + ipoib_modes.to_a,
         "label"  => _("IPoIB Device Mode"),
         "opt"    => [:hstretch],
         "init"   => fun_ref(method(:init_ipoib_mode_widget), "void (string)"),

diff --git a/src/modules/LanItems.rb b/src/modules/LanItems.rb
@@ -197,11 +197,6 @@ def main
 
       # infiniband options
       @ipoib_mode = ""
-      @ipoib_modes = {
-        # translators: a possible value for: IPoIB device mode
-        "connected" => _("connected"),
-        "datagram"  => _("datagram")
-      }
 
       Yast.include self, "network/hardware.rb"
 
@@ -2111,7 +2106,6 @@ def Commit
 
       when "ib"
         newdev["IPOIB_MODE"] = @ipoib_mode
-
       end
 
       if DriverType(@type) == "ctc"

diff --git a/test/widgets_test.rb b/test/widgets_test.rb
@@ -19,6 +19,13 @@ def initialize
     widget_def = subject.ipoib_mode_widget
     expect(widget_def).to include("items")
 
-    expect(widget_def["items"]).to be_eql Yast::LanItems.ipoib_modes.to_a
+    Yast::LanItems.ipoib_modes.to_a.each do |item|
+      expect(widget_def["items"]).to include(item)
+    end
+  end
+
+  it "contains an item allowing implicit mode setup" do
+    widget_def = subject.ipoib_mode_widget
+    expect(widget_def["items"]).to include(["default", //])
   end
 end
diff --git a/test/yaml_defaults_test.rb b/test/yaml_defaults_test.rb
@@ -38,7 +38,6 @@
     expect(lan_items.bootproto).to eql "static"
     expect(lan_items.startmode).to eql "manual"
     expect(lan_items.ifplugd_priority).to eql "0"
-    expect(lan_items.ipoib_mode).to eql "connected"
   end
 end