Hello community, here is the log from the commit of package yast2-network for openSUSE:Factory checked in at 2020-09-18 14:28:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-network (Old) and /work/SRC/openSUSE:Factory/.yast2-network.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-network" Fri Sep 18 14:28:20 2020 rev:432 rq:834821 version:4.3.20 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-network/yast2-network.changes 2020-09-15 16:15:29.817868198 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-network.new.4249/yast2-network.changes 2020-09-18 14:30:36.191423471 +0200 @@ -1,0 +2,7 @@ +Tue Sep 15 19:51:36 UTC 2020 - Knut Anderssen <[email protected]> + +- Infer the vlan_id from the interface file name when the attribute + is not declared explicitly (bsc#1176575) +- 4.3.20 + +------------------------------------------------------------------- Old: ---- yast2-network-4.3.19.tar.bz2 New: ---- yast2-network-4.3.20.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-network.spec ++++++ --- /var/tmp/diff_new_pack.y1sXqR/_old 2020-09-18 14:30:39.591426895 +0200 +++ /var/tmp/diff_new_pack.y1sXqR/_new 2020-09-18 14:30:39.595426899 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 4.3.19 +Version: 4.3.20 Release: 0 Summary: YaST2 - Network Configuration License: GPL-2.0-only ++++++ yast2-network-4.3.19.tar.bz2 -> yast2-network-4.3.20.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.3.19/package/yast2-network.changes new/yast2-network-4.3.20/package/yast2-network.changes --- old/yast2-network-4.3.19/package/yast2-network.changes 2020-09-10 13:39:04.000000000 +0200 +++ new/yast2-network-4.3.20/package/yast2-network.changes 2020-09-16 09:25:56.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Sep 15 19:51:36 UTC 2020 - Knut Anderssen <[email protected]> + +- Infer the vlan_id from the interface file name when the attribute + is not declared explicitly (bsc#1176575) +- 4.3.20 + +------------------------------------------------------------------- Thu Sep 10 08:16:52 UTC 2020 - Knut Anderssen <[email protected]> - When proposing the virtualization network configuration, force a diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.3.19/package/yast2-network.spec new/yast2-network-4.3.20/package/yast2-network.spec --- old/yast2-network-4.3.19/package/yast2-network.spec 2020-09-10 13:39:04.000000000 +0200 +++ new/yast2-network-4.3.20/package/yast2-network.spec 2020-09-16 09:25:56.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-network -Version: 4.3.19 +Version: 4.3.20 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.3.19/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb new/yast2-network-4.3.20/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb --- old/yast2-network-4.3.19/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb 2020-09-10 13:39:04.000000000 +0200 +++ new/yast2-network-4.3.20/src/lib/y2network/sysconfig/connection_config_readers/vlan.rb 2020-09-16 09:25:56.000000000 +0200 @@ -30,7 +30,14 @@ # @see Y2Network::Sysconfig::ConnectionConfigReaders::Base#update_connection_config def update_connection_config(conn) conn.parent_device = file.etherdevice - conn.vlan_id = file.vlan_id + conn.vlan_id = vlan_id_for(file) + end + + def vlan_id_for(file) + return file.vlan_id if file.vlan_id + return file.interface.gsub("vlan", "").to_i if file.interface.start_with?("vlan") + + file.interface.split(".")[1].to_i end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.3.19/test/data/scr_read/etc/sysconfig/network/ifcfg-eth0.200 new/yast2-network-4.3.20/test/data/scr_read/etc/sysconfig/network/ifcfg-eth0.200 --- old/yast2-network-4.3.19/test/data/scr_read/etc/sysconfig/network/ifcfg-eth0.200 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-4.3.20/test/data/scr_read/etc/sysconfig/network/ifcfg-eth0.200 2020-09-16 09:25:56.000000000 +0200 @@ -0,0 +1,4 @@ +BOOTPROTO='static' +IPADDR='192.168.200.20/24' +STARTMODE='auto' +ETHERDEVICE=eth0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.3.19/test/data/scr_read/etc/sysconfig/network/ifcfg-vlan100 new/yast2-network-4.3.20/test/data/scr_read/etc/sysconfig/network/ifcfg-vlan100 --- old/yast2-network-4.3.19/test/data/scr_read/etc/sysconfig/network/ifcfg-vlan100 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-network-4.3.20/test/data/scr_read/etc/sysconfig/network/ifcfg-vlan100 2020-09-16 09:25:56.000000000 +0200 @@ -0,0 +1,4 @@ +BOOTPROTO='static' +IPADDR='192.168.100.21/24' +STARTMODE='auto' +ETHERDEVICE=eth1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-network-4.3.19/test/y2network/sysconfig/connection_config_readers/vlan_test.rb new/yast2-network-4.3.20/test/y2network/sysconfig/connection_config_readers/vlan_test.rb --- old/yast2-network-4.3.19/test/y2network/sysconfig/connection_config_readers/vlan_test.rb 2020-09-10 13:39:04.000000000 +0200 +++ new/yast2-network-4.3.20/test/y2network/sysconfig/connection_config_readers/vlan_test.rb 2020-09-16 09:25:56.000000000 +0200 @@ -43,5 +43,27 @@ expect(vlan_conn.parent_device).to eq("eth0") expect(vlan_conn.bootproto).to eq(Y2Network::BootProtocol::STATIC) end + + context "when the interface file does not contain the VLAN_ID" do + context "and the interface name uses the vlan prefix" do + let(:interface_name) { "vlan100" } + + it "infers the vlan_id from the interface name" do + vlan_conn = handler.connection_config + expect(vlan_conn.interface).to eq("vlan100") + expect(vlan_conn.vlan_id).to eq(100) + end + end + + context "and the interface name uses the name.<VLAN-ID> scheme" do + let(:interface_name) { "eth0.100" } + + it "infers the vlan_id from the interface name" do + vlan_conn = handler.connection_config + expect(vlan_conn.interface).to eq("eth0.100") + expect(vlan_conn.vlan_id).to eq(100) + end + end + end end end
