Hello community, here is the log from the commit of package yast2-fcoe-client for openSUSE:Factory checked in at 2014-05-10 07:49:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-fcoe-client (Old) and /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-fcoe-client" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-fcoe-client/yast2-fcoe-client.changes 2014-04-15 07:35:30.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-fcoe-client.new/yast2-fcoe-client.changes 2014-05-10 07:49:05.000000000 +0200 @@ -1,0 +2,13 @@ +Wed May 7 12:01:31 CEST 2014 - [email protected] + +- Improve layout of services, configuration and edit dialog, + use latest Wizard methods + +------------------------------------------------------------------- +Mon May 5 12:26:54 CEST 2014 - [email protected] + +- Add columns for driver and private flags to table of interfaces + (bnc #841170) +- 3.1.6 + +------------------------------------------------------------------- Old: ---- yast2-fcoe-client-3.1.5.tar.bz2 New: ---- yast2-fcoe-client-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-fcoe-client.spec ++++++ --- /var/tmp/diff_new_pack.BbK4x0/_old 2014-05-10 07:49:06.000000000 +0200 +++ /var/tmp/diff_new_pack.BbK4x0/_new 2014-05-10 07:49:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-fcoe-client-3.1.5.tar.bz2 -> yast2-fcoe-client-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.5/package/yast2-fcoe-client.changes new/yast2-fcoe-client-3.1.6/package/yast2-fcoe-client.changes --- old/yast2-fcoe-client-3.1.5/package/yast2-fcoe-client.changes 2014-04-14 10:35:37.000000000 +0200 +++ new/yast2-fcoe-client-3.1.6/package/yast2-fcoe-client.changes 2014-05-07 15:05:44.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Wed May 7 12:01:31 CEST 2014 - [email protected] + +- Improve layout of services, configuration and edit dialog, + use latest Wizard methods + +------------------------------------------------------------------- +Mon May 5 12:26:54 CEST 2014 - [email protected] + +- Add columns for driver and private flags to table of interfaces + (bnc #841170) +- 3.1.6 + +------------------------------------------------------------------- Wed Apr 9 13:09:19 CEST 2014 - [email protected] - Don't show interfaces not available for network diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.5/package/yast2-fcoe-client.spec new/yast2-fcoe-client-3.1.6/package/yast2-fcoe-client.spec --- old/yast2-fcoe-client-3.1.5/package/yast2-fcoe-client.spec 2014-04-14 10:35:37.000000000 +0200 +++ new/yast2-fcoe-client-3.1.6/package/yast2-fcoe-client.spec 2014-05-07 15:05:44.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-fcoe-client -Version: 3.1.5 +Version: 3.1.6 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.5/src/include/fcoe-client/complex.rb new/yast2-fcoe-client-3.1.6/src/include/fcoe-client/complex.rb --- old/yast2-fcoe-client-3.1.5/src/include/fcoe-client/complex.rb 2014-04-14 10:35:37.000000000 +0200 +++ new/yast2-fcoe-client-3.1.6/src/include/fcoe-client/complex.rb 2014-05-07 15:05:44.000000000 +0200 @@ -185,15 +185,19 @@ table_items, Item( Id(row), - Ops.get_string(card, "dev_name", ""), - Ops.get_string(card, "mac_addr", ""), - Ops.get_string(card, "device", ""), - Ops.get_string(card, "vlan_interface", ""), - Ops.get_string(card, "fcoe_vlan", ""), - Ops.get_string(card, "fcoe_enable", ""), - Ops.get_string(card, "dcb_required", ""), - Ops.get_string(card, "auto_vlan", ""), - Ops.get_string(card, "dcb_capable", "") + card["dev_name"] || "", + card["mac_addr"] || "", + card["device"] || "", + card["vlan_interface"] ||"", + card["fcoe_vlan"] || "", + card["fcoe_enable"] || "", + card["dcb_required"] || "", + card["auto_vlan"] || "", + card["dcb_capable"] || "", + card["driver"] || "", + card["fcoe_flag"] || "", + card["iscsi_flag"] || "", + card["storage_only"] || "" ) ) row = Ops.add(row, 1) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.5/src/include/fcoe-client/dialogs.rb new/yast2-fcoe-client-3.1.6/src/include/fcoe-client/dialogs.rb --- old/yast2-fcoe-client-3.1.5/src/include/fcoe-client/dialogs.rb 2014-04-14 10:35:37.000000000 +0200 +++ new/yast2-fcoe-client-3.1.6/src/include/fcoe-client/dialogs.rb 2014-05-07 15:05:44.000000000 +0200 @@ -86,9 +86,13 @@ VStretch(), VSpacing(1), # heading is replaced later (InitEditDialog) - Label( - Id(:heading), - "Configuration of Interface ......................." + HBox( + HStretch(), + Label( + Id(:heading), Opt(:hstretch), + "Configuration of Interface ......................." + ), + HStretch() ), VSpacing(1), HBox( @@ -99,24 +103,24 @@ 10, 2, VBox( - # combo box label: enable FCoE (yes/no) ComboBox( Id(:fcoe), + # combo box label: enable FCoE (yes/no) _("&FCoE Enable"), [Item(Id("yes"), "yes"), Item(Id("no"), "no", true)] ), VSpacing(1), - # combo box label: require DCB (yes/no) ComboBox( Id(:dcb), Opt(:notify), + # combo box label: require DCB (yes/no) _("&DCB Required"), [Item(Id("yes"), "yes"), Item(Id("no"), "no", true)] ), VSpacing(1), - # combo box label: AUTO_VLAN setting (yes/no) ComboBox( Id(:auto), + # combo box label: AUTO_VLAN setting (yes/no) _("&AUTO_VLAN"), [Item(Id("yes"), "yes"), Item(Id("no"), "no", true)] ) @@ -137,18 +141,24 @@ @mbox_x, @mbox_y, VBox( - VSpacing(2.0), - # frame containing radio buttons for fcoe service start - Frame( - _("FCoE Service Start"), - VBox(RadioButtonGroup(Id("fcoe_service_startup"), @items_fcoe)) - ), VStretch(), - # frame containing radio buttons for lldpad service start - Frame( - _("Lldpad Service Start"), - VBox(RadioButtonGroup(Id("lldpad_service_startup"), @items_lldpad)) - ), + HBox( + HStretch(), + HSpacing(1), + VBox( + # frame containing radio buttons for fcoe service start + Frame( _("FCoE Service Start"), + VBox(RadioButtonGroup(Id("fcoe_service_startup"), @items_fcoe)) + ), + VSpacing(2), + # frame containing radio buttons for lldpad service start + Frame( _("Lldpad Service Start"), + VBox(RadioButtonGroup(Id("lldpad_service_startup"), @items_lldpad)) + ) + ), + HSpacing(1), + HStretch() + ), VStretch() ) ) @@ -164,24 +174,27 @@ Table( Id(:interfaces), Opt(:notify, :immediate, :keepSorting), - # column headers of a table with network interfaces (keep them short) Header( + # column headers of table of network interfaces (keep them short) _("Device"), _("MAC Address"), _("Model"), _("VLAN"), _("FCoE VLAN Interface"), - # continue column headers _("FCoE Enable"), _("DCB Required"), _("AUTO VLAN"), - _("DCB capable") + _("DCB capable"), + _("Driver"), + _("Flag FCoE"), + _("Flag iSCSI"), + _("Storage Only") ), [] ), - # button labels Left( HBox( + # button labels PushButton(Id(:retry), _("Retry &Detection")), PushButton(Id(:edit), _("Change &Settings")), PushButton(Id(:create), _("Create &FCoE Interface")), @@ -199,29 +212,42 @@ @mbox_x, @mbox_y, VBox( - VSpacing(2.0), - Frame( - # frame label - configuration settings of FCoE - _("Configuration Settings"), + VStretch(), + HBox( + HStretch(), + HSpacing(1), VBox( - # combo box label - Left( - ComboBox( - Id("debug"), - _("&Debug"), - [Item(Id("yes"), "yes"), Item(Id("no"), "no", true)] - ) - ), - # combo box label - Left( - ComboBox( - Id("syslog"), - _("&Use syslog"), - [Item(Id("yes"), "yes", true), Item(Id("no"), "no")] + Frame( + # frame label - configuration settings of FCoE + _("Configuration Settings"), + VBox( + HBox( + HSpacing(2), + MinWidth( 6, ComboBox( + Id("debug"), + # combo box label (debug setting yes/no) + _("&Debug"), + [Item(Id("yes"), "yes"), Item(Id("no"), "no", true)] + )), + HSpacing(2) + ), + VSpacing(2.0), + HBox( + HSpacing(2), + MinWidth( 6, ComboBox( + Id("syslog"), + # combo box label (use syslog yes/no) + _("&Use syslog"), + [Item(Id("yes"), "yes", true), Item(Id("no"), "no")] + )), + HSpacing(2) + ) ) ) - ) - ), + ), + HSpacing(1), + HStretch() + ), VStretch() ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.5/src/include/fcoe-client/wizards.rb new/yast2-fcoe-client-3.1.6/src/include/fcoe-client/wizards.rb --- old/yast2-fcoe-client-3.1.5/src/include/fcoe-client/wizards.rb 2014-04-14 10:35:37.000000000 +0200 +++ new/yast2-fcoe-client-3.1.6/src/include/fcoe-client/wizards.rb 2014-05-07 15:05:44.000000000 +0200 @@ -265,7 +265,7 @@ "edit" => { :abort => :abort, :next => "global" } } - Wizard.CreateDialog + Wizard.OpenNextBackDialog if Mode.normal Wizard.SetDesktopTitleAndIcon("fcoe-client") else @@ -274,7 +274,7 @@ ret = Sequencer.Run(aliases, sequence) - UI.CloseDialog + Wizard.CloseDialog deep_copy(ret) end @@ -294,7 +294,7 @@ "write" => { :abort => :abort, :next => :next } } - Wizard.CreateDialog + Wizard.OpenCancelOKDialog if Mode.normal Wizard.SetDesktopTitleAndIcon("fcoe-client") else @@ -303,7 +303,7 @@ ret = Sequencer.Run(aliases, sequence) - UI.CloseDialog + Wizard.CloseDialog deep_copy(ret) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.5/src/modules/FcoeClient.rb new/yast2-fcoe-client-3.1.6/src/modules/FcoeClient.rb --- old/yast2-fcoe-client-3.1.5/src/modules/FcoeClient.rb 2014-04-14 10:35:37.000000000 +0200 +++ new/yast2-fcoe-client-3.1.6/src/modules/FcoeClient.rb 2014-05-07 15:05:44.000000000 +0200 @@ -953,7 +953,11 @@ "dev_names" => ["eth1"], "device" => "TEST Ethernet Controller", "model" => "Intel PRO/1000 MT Desktop Adapter", - "resource" => { "hwaddr" => [{ "addr" => "08:00:27:11:64:e4" }] } + "resource" => { "hwaddr" => [{ "addr" => "08:00:27:11:64:e4" }] }, + "driver" => "bnx2x", + "fcoeoffload" => true, + "iscsioffload" => false, + "storageonly" => true }, { "bus" => "PCI", @@ -961,6 +965,8 @@ "class_id" => 2, "dev_name" => "eth15", "dev_names" => ["eth15"], + "driver" => "bnx2x", + "fcoeoffload" => false, "device" => "TEST Gigabit Ethernet Controller", "model" => "Intel PRO/1000 MT Desktop Adapter", "resource" => { "hwaddr" => [{ "addr" => "08:23:27:11:64:78" }] } @@ -1079,6 +1085,7 @@ "dev_name" => device, # network card, e.g. eth3 "mac_addr" => Ops.get_string(card, ["resource", "hwaddr", 0, "addr"], ""), # MAC address "device" => card["device"] || card["model"] || "", + "driver" => card["driver"] || "", "fcoe_vlan" => fcoe_vlan_interface, # FCoE VLAN interface, e.g. eth3.200 "fcoe_enable" => status_map["FCOE_ENABLE"] || "yes", # default for FCoE enable is yes "dcb_required" => status_map["DCB_REQUIRED"] || dcb_default, @@ -1087,7 +1094,23 @@ "vlan_interface" => vlan["vlan"] || "", # VLAN interface, e.g. 200 "cfg_device" => status_map["cfg_device"] || "" # part of cfg-file name, e.g. eth3.200 } - + if card["fcoeoffload"] == nil + # it's about a flag which is not set at all + info_map["fcoe_flag"] = _("not set") + else + # also about setting of a flag + info_map["fcoe_flag"] = card["fcoeoffload"]?_("true"):_("false") + end + if card["iscsioffload"] == nil + info_map["iscsi_flag"] = _("not set") + else + info_map["iscsi_flag"] = card["iscsioffload"]?_("true"):_("false") + end + if card["storageonly"] == nil + info_map["storage_only"] = _("not set") + else + info_map["storage_only"] = card["storageonly"]?_("true"):_("false") + end network_interfaces = network_interfaces << info_map end # do |vlan| end # else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-fcoe-client-3.1.5/test/DetectNetworkCards_spec.rb new/yast2-fcoe-client-3.1.6/test/DetectNetworkCards_spec.rb --- old/yast2-fcoe-client-3.1.5/test/DetectNetworkCards_spec.rb 2014-04-14 10:35:37.000000000 +0200 +++ new/yast2-fcoe-client-3.1.6/test/DetectNetworkCards_spec.rb 2014-05-07 15:05:44.000000000 +0200 @@ -38,6 +38,7 @@ "bus_hwcfg" => "pci", "class_id" => 2, "dev_name" => "eth1", + "driver" => "fcoe", "dev_names" => ["eth1"], "device" => "TEST Ethernet Controller", "model" => "Intel PRO/1000 MT Desktop Adapter", @@ -48,9 +49,13 @@ "bus_hwcfg" => "pci", "class_id" => 2, "dev_name" => "eth2", + "driver" => "bnx2x", "dev_names" => ["eth2"], "model" => "Intel PRO/1000 MT Desktop Adapter", - "resource" => { "hwaddr" => [{ "addr" => "08:23:27:99:64:78" }] } + "resource" => { "hwaddr" => [{ "addr" => "08:23:27:99:64:78" }] }, + "fcoeoffload" => true, + "storageonly" => true, + "iscsioffload"=> false } ]) answer.should eq([ @@ -59,24 +64,32 @@ "cfg_device"=> "", "dcb_capable" => "no", "dcb_required" => "no", - "dev_name" => "eth1", + "dev_name" => "eth1", + "driver" => "fcoe", "device" => "TEST Ethernet Controller", "fcoe_enable" => "yes", "fcoe_vlan" => "not configured", "mac_addr" => "08:00:27:11:64:e4", - "vlan_interface" => "300" + "vlan_interface" => "300", + "fcoe_flag" => "not set", + "iscsi_flag" => "not set", + "storage_only" => "not set" }, { "auto_vlan" => "no", "cfg_device" => "eth1.400", "dcb_capable" => "no", - "dcb_required" => "yes", + "dcb_required" => "yes", + "driver" => "fcoe", "dev_name" => "eth1", "device" => "TEST Ethernet Controller", "fcoe_enable" => "yes", "fcoe_vlan" => "eth1.400", "mac_addr" => "08:00:27:11:64:e4", - "vlan_interface" => "400" + "vlan_interface" => "400", + "fcoe_flag" => "not set", + "iscsi_flag" => "not set", + "storage_only" => "not set" }, { "auto_vlan" => "yes", @@ -84,11 +97,15 @@ "dcb_capable" => "no", "dcb_required" => "no", "dev_name" => "eth2", + "driver" => "bnx2x", "device" => "Intel PRO/1000 MT Desktop Adapter", "fcoe_enable" => "yes", "fcoe_vlan" => "not configured", "mac_addr" => "08:23:27:99:64:78", - "vlan_interface" => "200" + "vlan_interface" => "200", + "fcoe_flag" => "true", + "iscsi_flag" => "false", + "storage_only" => "true" } ]) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
