Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package yast2-network for openSUSE:Factory
checked in at 2021-11-12 15:59:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-network (Old)
and /work/SRC/openSUSE:Factory/.yast2-network.new.1890 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network"
Fri Nov 12 15:59:16 2021 rev:466 rq:930832 version:4.4.31
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes
2021-11-06 18:18:00.884884049 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-network.new.1890/yast2-network.changes
2021-11-12 15:59:59.658585188 +0100
@@ -1,0 +2,14 @@
+Wed Nov 10 21:41:54 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- Fixed interfaces table description for s390 Group devices
+ (bsc#1192560).
+- 4.4.31
+
+-------------------------------------------------------------------
+Wed Nov 10 16:45:32 UTC 2021 - Jos?? Iv??n L??pez Gonz??lez <jlo...@suse.com>
+
+- Replace calls to dropped method InterfacesTable#friendly_name
+ (bsc#1192560).
+- 4.4.30
+
+-------------------------------------------------------------------
Old:
----
yast2-network-4.4.29.tar.bz2
New:
----
yast2-network-4.4.31.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-network.spec ++++++
--- /var/tmp/diff_new_pack.9S4FCO/_old 2021-11-12 16:00:00.214585445 +0100
+++ /var/tmp/diff_new_pack.9S4FCO/_new 2021-11-12 16:00:00.218585447 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 4.4.29
+Version: 4.4.31
Release: 0
Summary: YaST2 - Network Configuration
License: GPL-2.0-only
++++++ yast2-network-4.4.29.tar.bz2 -> yast2-network-4.4.31.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.4.29/package/yast2-network.changes
new/yast2-network-4.4.31/package/yast2-network.changes
--- old/yast2-network-4.4.29/package/yast2-network.changes 2021-11-05
11:29:19.000000000 +0100
+++ new/yast2-network-4.4.31/package/yast2-network.changes 2021-11-11
11:19:17.000000000 +0100
@@ -1,4 +1,18 @@
-------------------------------------------------------------------
+Wed Nov 10 21:41:54 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- Fixed interfaces table description for s390 Group devices
+ (bsc#1192560).
+- 4.4.31
+
+-------------------------------------------------------------------
+Wed Nov 10 16:45:32 UTC 2021 - Jos?? Iv??n L??pez Gonz??lez <jlo...@suse.com>
+
+- Replace calls to dropped method InterfacesTable#friendly_name
+ (bsc#1192560).
+- 4.4.30
+
+-------------------------------------------------------------------
Thu Nov 4 15:02:24 UTC 2021 - Knut Anderssen <kanders...@suse.com>
- AutoYaST
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-network-4.4.29/package/yast2-network.spec
new/yast2-network-4.4.31/package/yast2-network.spec
--- old/yast2-network-4.4.29/package/yast2-network.spec 2021-11-05
11:29:19.000000000 +0100
+++ new/yast2-network-4.4.31/package/yast2-network.spec 2021-11-11
11:19:17.000000000 +0100
@@ -17,7 +17,7 @@
Name: yast2-network
-Version: 4.4.29
+Version: 4.4.31
Release: 0
Summary: YaST2 - Network Configuration
License: GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.29/src/lib/y2network/widgets/interfaces_table.rb
new/yast2-network-4.4.31/src/lib/y2network/widgets/interfaces_table.rb
--- old/yast2-network-4.4.29/src/lib/y2network/widgets/interfaces_table.rb
2021-11-05 11:29:19.000000000 +0100
+++ new/yast2-network-4.4.31/src/lib/y2network/widgets/interfaces_table.rb
2021-11-11 11:19:17.000000000 +0100
@@ -1,4 +1,4 @@
-# Copyright (c) [2019] SUSE LLC
+# Copyright (c) [2019-2021] SUSE LLC
#
# All Rights Reserved.
#
@@ -101,7 +101,7 @@
# Constructs device description for inactive s390 devices
def device_item(device)
- [device.id, friendly_name(device), _("Not activated"), device.id, ""]
+ [device.id, description_for(device), _("Not activated"), device.id, ""]
end
# Generic device description handler
@@ -143,17 +143,17 @@
summary.new(value, config).text
end
- # Returns the connection description if given or the interface friendly
name if not
+ # Returns the connection description if given or the device friendly
name if not
#
- # @param interface [Interface] Network interface
+ # @param device [Interface, S390GroupDevice] Network device
# @param conn [ConnectionConfig::Base, nil] Connection configuration
# @return [String] Connection description if given or the friendly name
for the interface (
# description or name) if not
- def description_for(interface, conn)
+ def description_for(device, conn = nil)
return conn.description unless conn&.description.to_s.empty?
- hwinfo = interface.hardware
- (hwinfo&.present?) ? hwinfo.description : interface.name
+ hwinfo = device.hardware
+ (hwinfo&.present?) ? hwinfo.description : device.name
end
def summary_class_name
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-network-4.4.29/test/y2network/widgets/interfaces_table_test.rb
new/yast2-network-4.4.31/test/y2network/widgets/interfaces_table_test.rb
--- old/yast2-network-4.4.29/test/y2network/widgets/interfaces_table_test.rb
2021-11-05 11:29:19.000000000 +0100
+++ new/yast2-network-4.4.31/test/y2network/widgets/interfaces_table_test.rb
2021-11-11 11:19:17.000000000 +0100
@@ -41,6 +41,7 @@
instance_double(Y2Network::Hwinfo, link: link, mac: mac, busid: busid,
exists?: exists?, present?: true, description: "Cool device", name:
"Cool device")
end
+
let(:mac) { "01:23:45:67:89:ab" }
let(:busid) { "0000:04:00.0" }
let(:link) { false }
@@ -53,9 +54,24 @@
Y2Network::ConnectionConfig::Bridge.new.tap { |c| c.name = "br0" }
end
+ let(:qeth_0700) do
+ instance_double(Y2Network::S390GroupDevice, type: "qeth", hardware:
hwinfo_0700,
+ id: "0.0.0700:0.0.0701:0.0.0702", offline?: true)
+ end
+
+ let(:hwinfo_0700) do
+ instance_double(Y2Network::Hwinfo, present?: true,
+ description: "OSA Express Network card
(0.0.0700)")
+ end
+
+ let(:s390_devices) do
+ Y2Network::S390GroupDevicesCollection.new([qeth_0700])
+ end
+
before do
allow(Yast::Lan).to receive(:yast_config)
- .and_return(double(interfaces: interfaces, connections: connections,
s390_devices: []))
+ .and_return(double(interfaces: interfaces, connections: connections,
s390_devices:
+ s390_devices))
allow(Yast::UI).to receive(:QueryWidget).and_return([])
allow(subject).to receive(:value).and_return("eth0")
end
@@ -87,10 +103,9 @@
it "shows the hwinfo interface description if present or the interface
name if not" do
expect(subject.items).to include(a_collection_including(/Cool device/,
/eth0/),
- a_collection_including(/br0/))
+ a_collection_including(/br0/), a_collection_including(/OSA Express
Network card/))
end
end
-
end
describe "#handle" do
