Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wicked2nm for openSUSE:Factory checked in at 2026-07-15 16:39:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wicked2nm (Old) and /work/SRC/openSUSE:Factory/.wicked2nm.new.1991 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wicked2nm" Wed Jul 15 16:39:06 2026 rev:10 rq:1365675 version:1.5.1 Changes: -------- --- /work/SRC/openSUSE:Factory/wicked2nm/wicked2nm.changes 2026-06-17 16:18:29.303487906 +0200 +++ /work/SRC/openSUSE:Factory/.wicked2nm.new.1991/wicked2nm.changes 2026-07-15 16:59:26.946739908 +0200 @@ -1,0 +2,12 @@ +Tue Jul 14 13:44:39 UTC 2026 - Jorik Cronenberg <[email protected]> + +- Update v1.5.1 + * Update agama to fix default vlan flags. + Previously the default vlan flags in NM was set to 0, which + overrides default kernel behavior and thus differed from + wicked. It is now set to 1. + [bsc#1271079] + * Tests: Sort wicked show-config output by interface name + * Add leap16.1 to CI + +------------------------------------------------------------------- Old: ---- wicked2nm-1.5.0.obscpio New: ---- wicked2nm-1.5.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wicked2nm.spec ++++++ --- /var/tmp/diff_new_pack.zjiLpD/_old 2026-07-15 16:59:28.314785877 +0200 +++ /var/tmp/diff_new_pack.zjiLpD/_new 2026-07-15 16:59:28.318786011 +0200 @@ -16,7 +16,7 @@ # Name: wicked2nm -Version: 1.5.0 +Version: 1.5.1 Release: 0 Summary: Migration tool from wicked to NetworkManager License: GPL-2.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.zjiLpD/_old 2026-07-15 16:59:28.354787221 +0200 +++ /var/tmp/diff_new_pack.zjiLpD/_new 2026-07-15 16:59:28.358787356 +0200 @@ -3,7 +3,7 @@ <param name="url">https://github.com/openSUSE/wicked2nm</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v1.5.0</param> + <param name="revision">v1.5.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> </service> ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/wicked2nm/vendor.tar.gz /work/SRC/openSUSE:Factory/.wicked2nm.new.1991/vendor.tar.gz differ: char 13, line 1 ++++++ wicked2nm-1.5.0.obscpio -> wicked2nm-1.5.1.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/Cargo.lock new/wicked2nm-1.5.1/Cargo.lock --- old/wicked2nm-1.5.0/Cargo.lock 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/Cargo.lock 2026-07-14 15:36:02.000000000 +0200 @@ -11,7 +11,7 @@ [[package]] name = "agama-locale-data" version = "0.1.0" -source = "git+https://github.com/agama-project/agama#249333efd053cc76d0a904e6ac50e03751ebce80"; +source = "git+https://github.com/agama-project/agama#2e797a5152ddb19a1dfbd7ae5fe0cbf1a8e4811b"; dependencies = [ "chrono-tz", "flate2", @@ -25,7 +25,7 @@ [[package]] name = "agama-network" version = "0.1.0" -source = "git+https://github.com/agama-project/agama#249333efd053cc76d0a904e6ac50e03751ebce80"; +source = "git+https://github.com/agama-project/agama#2e797a5152ddb19a1dfbd7ae5fe0cbf1a8e4811b"; dependencies = [ "agama-utils", "anyhow", @@ -50,7 +50,7 @@ [[package]] name = "agama-utils" version = "0.1.0" -source = "git+https://github.com/agama-project/agama#249333efd053cc76d0a904e6ac50e03751ebce80"; +source = "git+https://github.com/agama-project/agama#2e797a5152ddb19a1dfbd7ae5fe0cbf1a8e4811b"; dependencies = [ "agama-locale-data", "anyhow", @@ -747,6 +747,17 @@ ] [[package]] +name = "futures-macro" +version = "0.3.32" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] name = "futures-task" version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -759,6 +770,7 @@ checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-core", + "futures-macro", "futures-task", "pin-project-lite", "slab", @@ -1118,6 +1130,15 @@ ] [[package]] +name = "lock_api" +version = "0.4.14" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965" +dependencies = [ + "scopeguard", +] + +[[package]] name = "log" version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1199,9 +1220,9 @@ [[package]] name = "mio" -version = "1.1.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" dependencies = [ "libc", "wasi", @@ -1334,6 +1355,29 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] +name = "parking_lot" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-link", +] + +[[package]] name = "percent-encoding" version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1509,6 +1553,15 @@ checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] +name = "redox_syscall" +version = "0.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d" +dependencies = [ + "bitflags", +] + +[[package]] name = "ref-cast" version = "1.0.25" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -1622,6 +1675,12 @@ ] [[package]] +name = "scopeguard" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index"; +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" + +[[package]] name = "semver" version = "1.0.27" source = "registry+https://github.com/rust-lang/crates.io-index"; @@ -2039,13 +2098,14 @@ [[package]] name = "tokio" -version = "1.50.0" +version = "1.52.3" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" +checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" dependencies = [ "bytes", "libc", "mio", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -2056,9 +2116,9 @@ [[package]] name = "tokio-macros" -version = "2.6.1" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index"; -checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" +checksum = "385a6cb71ab9ab790c5fe8d67f1645e6c450a7ce006a33de03daa956cf70a496" dependencies = [ "proc-macro2", "quote", @@ -2367,7 +2427,7 @@ [[package]] name = "wicked2nm" -version = "1.5.0" +version = "1.5.1" dependencies = [ "agama-network", "anyhow", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/Cargo.toml new/wicked2nm-1.5.1/Cargo.toml --- old/wicked2nm-1.5.0/Cargo.toml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/Cargo.toml 2026-07-14 15:36:02.000000000 +0200 @@ -1,6 +1,6 @@ [package] name = "wicked2nm" -version = "1.5.0" +version = "1.5.1" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/src/interface.rs new/wicked2nm-1.5.1/src/interface.rs --- old/wicked2nm-1.5.0/src/interface.rs 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/src/interface.rs 2026-07-14 15:36:02.000000000 +0200 @@ -801,8 +801,8 @@ ipconfig_result.ip_config = IpConfig { addresses, - method4, - method6, + method4: Some(method4), + method6: Some(method6), routes4, routes6, dhcp4_settings, @@ -1083,12 +1083,18 @@ let static_connection: model::Connection = static_interface.to_connection(&None).unwrap().connections[0].to_owned(); - assert_eq!(static_connection.ip_config.method4, Ipv4Method::Manual); + assert_eq!( + static_connection.ip_config.method4, + Some(Ipv4Method::Manual) + ); assert_eq!( static_connection.ip_config.addresses[0].to_string(), "127.0.0.1/8" ); - assert_eq!(static_connection.ip_config.method6, Ipv6Method::Manual); + assert_eq!( + static_connection.ip_config.method6, + Some(Ipv6Method::Manual) + ); assert_eq!(static_connection.ip_config.addresses[1].to_string(), "::1"); assert_eq!( static_connection.ip_config.addresses[1] @@ -1139,8 +1145,8 @@ let dhcp_connection: model::Connection = dhcp_interface.to_connection(&None).unwrap().connections[0].to_owned(); - assert_eq!(dhcp_connection.ip_config.method4, Ipv4Method::Auto); - assert_eq!(dhcp_connection.ip_config.method6, Ipv6Method::Auto); + assert_eq!(dhcp_connection.ip_config.method4, Some(Ipv4Method::Auto)); + assert_eq!(dhcp_connection.ip_config.method6, Some(Ipv6Method::Auto)); assert_eq!(dhcp_connection.ip_config.addresses.len(), 0); assert_eq!( dhcp_connection @@ -1401,7 +1407,7 @@ }; let conn_res = ifc.to_connection(&None).unwrap(); let connection = &conn_res.connections[0]; - assert!(connection.ip_config.method4 == Ipv4Method::LinkLocal); + assert!(connection.ip_config.method4 == Some(Ipv4Method::LinkLocal)); assert!(connection.ip_config.link_local4 == LinkLocal::Auto); assert!(!conn_res.has_warnings); @@ -1414,7 +1420,7 @@ }; let conn_res = ifc.to_connection(&None).unwrap(); let connection = &conn_res.connections[0]; - assert!(connection.ip_config.method4 == Ipv4Method::LinkLocal); + assert!(connection.ip_config.method4 == Some(Ipv4Method::LinkLocal)); assert!(connection.ip_config.link_local4 == LinkLocal::Auto); assert!(!conn_res.has_warnings); @@ -1427,7 +1433,7 @@ }; let conn_res = ifc.to_connection(&None).unwrap(); let connection = &conn_res.connections[0]; - assert!(connection.ip_config.method4 == Ipv4Method::LinkLocal); + assert!(connection.ip_config.method4 == Some(Ipv4Method::LinkLocal)); assert!(connection.ip_config.link_local4 == LinkLocal::Enabled); assert!(!conn_res.has_warnings); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/src/migrate.rs new/wicked2nm-1.5.1/src/migrate.rs --- old/wicked2nm-1.5.0/src/migrate.rs 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/src/migrate.rs 2026-07-14 15:36:02.000000000 +0200 @@ -258,8 +258,8 @@ Connection { id: "lo".to_string(), ip_config: IpConfig { - method4: Ipv4Method::Manual, - method6: Ipv6Method::Manual, + method4: Some(Ipv4Method::Manual), + method6: Some(Ipv6Method::Manual), addresses: vec![ IpInet::from_str("127.0.0.1/8").unwrap(), IpInet::from_str("::1/128").unwrap(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/src/vlan.rs new/wicked2nm-1.5.1/src/vlan.rs --- old/wicked2nm-1.5.0/src/vlan.rs 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/src/vlan.rs 2026-07-14 15:36:02.000000000 +0200 @@ -30,6 +30,7 @@ parent: vlan.device.clone(), id: (vlan.tag as u32), protocol: (&vlan.protocol).into(), + ..Default::default() }) } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/dhcp4_client_id/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/dhcp4_client_id/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/dhcp4_client_id/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/dhcp4_client_id/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,5 +1,5 @@ -<interface origin="compat:suse:/tests/dhcp4_client_id/netconfig/ifcfg-eth6"> - <name>eth6</name> +<interface origin="compat:suse:/tests/dhcp4_client_id/netconfig/ifcfg-eth5"> + <name>eth5</name> <control> <mode>boot</mode> </control> @@ -13,6 +13,7 @@ <update>default-route,hostname,dns,nis,ntp,nds,mtu,tz,boot</update> <recover-lease>true</recover-lease> <release-lease>false</release-lease> + <client-id>52:54:00:dc:8e:94</client-id> </ipv4:dhcp> <ipv6> <enabled>true</enabled> @@ -29,8 +30,8 @@ <release-lease>false</release-lease> </ipv6:dhcp> </interface> -<interface origin="compat:suse:/tests/dhcp4_client_id/netconfig/ifcfg-eth5"> - <name>eth5</name> +<interface origin="compat:suse:/tests/dhcp4_client_id/netconfig/ifcfg-eth6"> + <name>eth6</name> <control> <mode>boot</mode> </control> @@ -44,7 +45,6 @@ <update>default-route,hostname,dns,nis,ntp,nds,mtu,tz,boot</update> <recover-lease>true</recover-lease> <release-lease>false</release-lease> - <client-id>52:54:00:dc:8e:94</client-id> </ipv4:dhcp> <ipv6> <enabled>true</enabled> @@ -61,8 +61,8 @@ <release-lease>false</release-lease> </ipv6:dhcp> </interface> -<interface origin="compat:suse:/tests/dhcp4_client_id/netconfig/ifcfg-eth9"> - <name>eth9</name> +<interface origin="compat:suse:/tests/dhcp4_client_id/netconfig/ifcfg-eth7"> + <name>eth7</name> <control> <mode>boot</mode> </control> @@ -76,7 +76,7 @@ <update>default-route,hostname,dns,nis,ntp,nds,mtu,tz,boot</update> <recover-lease>true</recover-lease> <release-lease>false</release-lease> - <create-cid>rfc4361</create-cid> + <create-cid>disable</create-cid> </ipv4:dhcp> <ipv6> <enabled>true</enabled> @@ -93,8 +93,8 @@ <release-lease>false</release-lease> </ipv6:dhcp> </interface> -<interface origin="compat:suse:/tests/dhcp4_client_id/netconfig/ifcfg-eth7"> - <name>eth7</name> +<interface origin="compat:suse:/tests/dhcp4_client_id/netconfig/ifcfg-eth8"> + <name>eth8</name> <control> <mode>boot</mode> </control> @@ -108,7 +108,7 @@ <update>default-route,hostname,dns,nis,ntp,nds,mtu,tz,boot</update> <recover-lease>true</recover-lease> <release-lease>false</release-lease> - <create-cid>disable</create-cid> + <create-cid>rfc2132</create-cid> </ipv4:dhcp> <ipv6> <enabled>true</enabled> @@ -125,8 +125,8 @@ <release-lease>false</release-lease> </ipv6:dhcp> </interface> -<interface origin="compat:suse:/tests/dhcp4_client_id/netconfig/ifcfg-eth8"> - <name>eth8</name> +<interface origin="compat:suse:/tests/dhcp4_client_id/netconfig/ifcfg-eth9"> + <name>eth9</name> <control> <mode>boot</mode> </control> @@ -140,7 +140,7 @@ <update>default-route,hostname,dns,nis,ntp,nds,mtu,tz,boot</update> <recover-lease>true</recover-lease> <release-lease>false</release-lease> - <create-cid>rfc2132</create-cid> + <create-cid>rfc4361</create-cid> </ipv4:dhcp> <ipv6> <enabled>true</enabled> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/dhcp4_default_route/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/dhcp4_default_route/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/dhcp4_default_route/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/dhcp4_default_route/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,5 +1,5 @@ -<interface origin="compat:suse:/tests/dhcp4_default_route/netconfig/ifcfg-eth9"> - <name>eth9</name> +<interface origin="compat:suse:/tests/dhcp4_default_route/netconfig/ifcfg-eth10"> + <name>eth10</name> <control> <mode>boot</mode> </control> @@ -10,30 +10,10 @@ <ipv4:dhcp> <enabled>true</enabled> <flags>group</flags> - <update>hostname,dns,nis,ntp,nds,mtu,tz,boot</update> + <update>default-route,hostname,dns,nis,ntp,nds,mtu,tz,boot</update> <recover-lease>true</recover-lease> <release-lease>false</release-lease> </ipv4:dhcp> - <ipv4:static> - <address> - <local>192.168.2.123/24</local> - </address> - <route> - <destination>192.168.2.0/24</destination> - </route> - <route> - <destination>10.23.2.0/24</destination> - <nexthop> - <gateway>192.168.2.200</gateway> - </nexthop> - </route> - <route> - <destination>0.0.0.0/0</destination> - <nexthop> - <gateway>192.168.2.1</gateway> - </nexthop> - </route> - </ipv4:static> <ipv6> <enabled>true</enabled> <privacy>prefer-public</privacy> @@ -49,8 +29,8 @@ <release-lease>false</release-lease> </ipv6:dhcp> </interface> -<interface origin="compat:suse:/tests/dhcp4_default_route/netconfig/ifcfg-eth10"> - <name>eth10</name> +<interface origin="compat:suse:/tests/dhcp4_default_route/netconfig/ifcfg-eth9"> + <name>eth9</name> <control> <mode>boot</mode> </control> @@ -61,10 +41,30 @@ <ipv4:dhcp> <enabled>true</enabled> <flags>group</flags> - <update>default-route,hostname,dns,nis,ntp,nds,mtu,tz,boot</update> + <update>hostname,dns,nis,ntp,nds,mtu,tz,boot</update> <recover-lease>true</recover-lease> <release-lease>false</release-lease> </ipv4:dhcp> + <ipv4:static> + <address> + <local>192.168.2.123/24</local> + </address> + <route> + <destination>192.168.2.0/24</destination> + </route> + <route> + <destination>10.23.2.0/24</destination> + <nexthop> + <gateway>192.168.2.200</gateway> + </nexthop> + </route> + <route> + <destination>0.0.0.0/0</destination> + <nexthop> + <gateway>192.168.2.1</gateway> + </nexthop> + </route> + </ipv4:static> <ipv6> <enabled>true</enabled> <privacy>prefer-public</privacy> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/ovs-bridge1.1/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/ovs-bridge1.1/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/ovs-bridge1.1/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/ovs-bridge1.1/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -18,8 +18,8 @@ <privacy>prefer-public</privacy> </ipv6> </interface> -<interface origin="compat:suse:/tests/ovs-bridge1.1/netconfig/ifcfg-tap20"> - <name>tap20</name> +<interface origin="compat:suse:/tests/ovs-bridge1.1/netconfig/ifcfg-tap10"> + <name>tap10</name> <control> <mode>boot</mode> </control> @@ -38,8 +38,8 @@ <enabled>false</enabled> </ipv6> </interface> -<interface origin="compat:suse:/tests/ovs-bridge1.1/netconfig/ifcfg-tap10"> - <name>tap10</name> +<interface origin="compat:suse:/tests/ovs-bridge1.1/netconfig/ifcfg-tap20"> + <name>tap20</name> <control> <mode>boot</mode> </control> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/ovs-bridge2.1/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/ovs-bridge2.1/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/ovs-bridge2.1/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/ovs-bridge2.1/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,21 +1,17 @@ -<interface origin="compat:suse:/tests/ovs-bridge2.1/netconfig/ifcfg-ovsbrA"> - <name>ovsbrA</name> +<interface origin="compat:suse:/tests/ovs-bridge2.1/netconfig/ifcfg-en0"> + <name>en0</name> <control> <mode>boot</mode> </control> - <ovs-bridge/> - <link/> + <link> + <master>ovsbrA</master> + <port type="ovs-bridge"/> + </link> <ipv4> - <enabled>true</enabled> + <enabled>false</enabled> </ipv4> - <ipv4:static> - <address> - <local>198.18.10.10/24</local> - </address> - </ipv4:static> <ipv6> - <enabled>true</enabled> - <privacy>prefer-public</privacy> + <enabled>false</enabled> </ipv6> </interface> <interface origin="compat:suse:/tests/ovs-bridge2.1/netconfig/ifcfg-en1"> @@ -34,6 +30,26 @@ <enabled>false</enabled> </ipv6> </interface> +<interface origin="compat:suse:/tests/ovs-bridge2.1/netconfig/ifcfg-ovsbrA"> + <name>ovsbrA</name> + <control> + <mode>boot</mode> + </control> + <ovs-bridge/> + <link/> + <ipv4> + <enabled>true</enabled> + </ipv4> + <ipv4:static> + <address> + <local>198.18.10.10/24</local> + </address> + </ipv4:static> + <ipv6> + <enabled>true</enabled> + <privacy>prefer-public</privacy> + </ipv6> +</interface> <interface origin="compat:suse:/tests/ovs-bridge2.1/netconfig/ifcfg-ovsbrB"> <name>ovsbrB</name> <control> @@ -59,19 +75,3 @@ <privacy>prefer-public</privacy> </ipv6> </interface> -<interface origin="compat:suse:/tests/ovs-bridge2.1/netconfig/ifcfg-en0"> - <name>en0</name> - <control> - <mode>boot</mode> - </control> - <link> - <master>ovsbrA</master> - <port type="ovs-bridge"/> - </link> - <ipv4> - <enabled>false</enabled> - </ipv4> - <ipv6> - <enabled>false</enabled> - </ipv6> -</interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/team_activebackup_arp/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/team_activebackup_arp/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/team_activebackup_arp/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/team_activebackup_arp/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -16,6 +16,24 @@ <enabled>false</enabled> </ipv6> </interface> +<interface origin="compat:suse:/tests/team_activebackup_arp/netconfig/ifcfg-eth8"> + <name>eth8</name> + <control> + <mode>hotplug</mode> + </control> + <link> + <master>team0</master> + <port type="team"> + <prio>50</prio> + </port> + </link> + <ipv4> + <enabled>false</enabled> + </ipv4> + <ipv6> + <enabled>false</enabled> + </ipv6> +</interface> <interface origin="compat:suse:/tests/team_activebackup_arp/netconfig/ifcfg-eth9"> <name>eth9</name> <control> @@ -67,21 +85,3 @@ <privacy>prefer-public</privacy> </ipv6> </interface> -<interface origin="compat:suse:/tests/team_activebackup_arp/netconfig/ifcfg-eth8"> - <name>eth8</name> - <control> - <mode>hotplug</mode> - </control> - <link> - <master>team0</master> - <port type="team"> - <prio>50</prio> - </port> - </link> - <ipv4> - <enabled>false</enabled> - </ipv4> - <ipv6> - <enabled>false</enabled> - </ipv6> -</interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/team_activebackup_notifications/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/team_activebackup_notifications/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/team_activebackup_notifications/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/team_activebackup_notifications/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,3 +1,19 @@ +<interface origin="compat:suse:/tests/team_activebackup_notifications/netconfig/ifcfg-eth8"> + <name>eth8</name> + <control> + <mode>hotplug</mode> + </control> + <link> + <master>team0</master> + <port type="team"/> + </link> + <ipv4> + <enabled>false</enabled> + </ipv4> + <ipv6> + <enabled>false</enabled> + </ipv6> +</interface> <interface origin="compat:suse:/tests/team_activebackup_notifications/netconfig/ifcfg-eth9"> <name>eth9</name> <control> @@ -52,19 +68,3 @@ <privacy>prefer-public</privacy> </ipv6> </interface> -<interface origin="compat:suse:/tests/team_activebackup_notifications/netconfig/ifcfg-eth8"> - <name>eth8</name> - <control> - <mode>hotplug</mode> - </control> - <link> - <master>team0</master> - <port type="team"/> - </link> - <ipv4> - <enabled>false</enabled> - </ipv4> - <ipv6> - <enabled>false</enabled> - </ipv6> -</interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/team_activebackup_nsna/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/team_activebackup_nsna/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/team_activebackup_nsna/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/team_activebackup_nsna/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,3 +1,20 @@ +<interface origin="compat:suse:/tests/team_activebackup_nsna/netconfig/ifcfg-eth8"> + <name>eth8</name> + <control> + <mode>hotplug</mode> + </control> + <link> + <master>team0</master> + <port type="team"/> + </link> + <ipv4> + <enabled>false</enabled> + </ipv4> + <ipv6> + <enabled>true</enabled> + <accept-ra>disable</accept-ra> + </ipv6> +</interface> <interface origin="compat:suse:/tests/team_activebackup_nsna/netconfig/ifcfg-eth9"> <name>eth9</name> <control> @@ -46,20 +63,3 @@ </address> </ipv6:static> </interface> -<interface origin="compat:suse:/tests/team_activebackup_nsna/netconfig/ifcfg-eth8"> - <name>eth8</name> - <control> - <mode>hotplug</mode> - </control> - <link> - <master>team0</master> - <port type="team"/> - </link> - <ipv4> - <enabled>false</enabled> - </ipv4> - <ipv6> - <enabled>true</enabled> - <accept-ra>disable</accept-ra> - </ipv6> -</interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/team_lacp_ethtool/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/team_lacp_ethtool/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/team_lacp_ethtool/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/team_lacp_ethtool/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,3 +1,19 @@ +<interface origin="compat:suse:/tests/team_lacp_ethtool/netconfig/ifcfg-en0"> + <name>en0</name> + <control> + <mode>hotplug</mode> + </control> + <link> + <master>team0</master> + <port type="team"/> + </link> + <ipv4> + <enabled>false</enabled> + </ipv4> + <ipv6> + <enabled>false</enabled> + </ipv6> +</interface> <interface origin="compat:suse:/tests/team_lacp_ethtool/netconfig/ifcfg-en1"> <name>en1</name> <control> @@ -52,19 +68,3 @@ <privacy>prefer-public</privacy> </ipv6> </interface> -<interface origin="compat:suse:/tests/team_lacp_ethtool/netconfig/ifcfg-en0"> - <name>en0</name> - <control> - <mode>hotplug</mode> - </control> - <link> - <master>team0</master> - <port type="team"/> - </link> - <ipv4> - <enabled>false</enabled> - </ipv4> - <ipv6> - <enabled>false</enabled> - </ipv6> -</interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/team_loadbalance_txhash/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/team_loadbalance_txhash/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/team_loadbalance_txhash/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/team_loadbalance_txhash/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,3 +1,19 @@ +<interface origin="compat:suse:/tests/team_loadbalance_txhash/netconfig/ifcfg-eth8"> + <name>eth8</name> + <control> + <mode>hotplug</mode> + </control> + <link> + <master>team0</master> + <port type="team"/> + </link> + <ipv4> + <enabled>false</enabled> + </ipv4> + <ipv6> + <enabled>false</enabled> + </ipv6> +</interface> <interface origin="compat:suse:/tests/team_loadbalance_txhash/netconfig/ifcfg-eth9"> <name>eth9</name> <control> @@ -47,19 +63,3 @@ <privacy>prefer-public</privacy> </ipv6> </interface> -<interface origin="compat:suse:/tests/team_loadbalance_txhash/netconfig/ifcfg-eth8"> - <name>eth8</name> - <control> - <mode>hotplug</mode> - </control> - <link> - <master>team0</master> - <port type="team"/> - </link> - <ipv4> - <enabled>false</enabled> - </ipv4> - <ipv6> - <enabled>false</enabled> - </ipv6> -</interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/team_random/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/team_random/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/team_random/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/team_random/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,3 +1,19 @@ +<interface origin="compat:suse:/tests/team_random/netconfig/ifcfg-eth8"> + <name>eth8</name> + <control> + <mode>hotplug</mode> + </control> + <link> + <master>team0</master> + <port type="team"/> + </link> + <ipv4> + <enabled>false</enabled> + </ipv4> + <ipv6> + <enabled>false</enabled> + </ipv6> +</interface> <interface origin="compat:suse:/tests/team_random/netconfig/ifcfg-eth9"> <name>eth9</name> <control> @@ -42,19 +58,3 @@ <privacy>prefer-public</privacy> </ipv6> </interface> -<interface origin="compat:suse:/tests/team_random/netconfig/ifcfg-eth8"> - <name>eth8</name> - <control> - <mode>hotplug</mode> - </control> - <link> - <master>team0</master> - <port type="team"/> - </link> - <ipv4> - <enabled>false</enabled> - </ipv4> - <ipv6> - <enabled>false</enabled> - </ipv6> -</interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/team_roundrobin_arp/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/team_roundrobin_arp/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/team_roundrobin_arp/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/team_roundrobin_arp/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,3 +1,19 @@ +<interface origin="compat:suse:/tests/team_roundrobin_arp/netconfig/ifcfg-eth8"> + <name>eth8</name> + <control> + <mode>hotplug</mode> + </control> + <link> + <master>team0</master> + <port type="team"/> + </link> + <ipv4> + <enabled>false</enabled> + </ipv4> + <ipv6> + <enabled>false</enabled> + </ipv6> +</interface> <interface origin="compat:suse:/tests/team_roundrobin_arp/netconfig/ifcfg-eth9"> <name>eth9</name> <control> @@ -44,19 +60,3 @@ <privacy>prefer-public</privacy> </ipv6> </interface> -<interface origin="compat:suse:/tests/team_roundrobin_arp/netconfig/ifcfg-eth8"> - <name>eth8</name> - <control> - <mode>hotplug</mode> - </control> - <link> - <master>team0</master> - <port type="team"/> - </link> - <ipv4> - <enabled>false</enabled> - </ipv4> - <ipv6> - <enabled>false</enabled> - </ipv6> -</interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/team_roundrobin_arp2/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/team_roundrobin_arp2/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/team_roundrobin_arp2/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/team_roundrobin_arp2/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,3 +1,19 @@ +<interface origin="compat:suse:/tests/team_roundrobin_arp2/netconfig/ifcfg-eth8"> + <name>eth8</name> + <control> + <mode>hotplug</mode> + </control> + <link> + <master>team0</master> + <port type="team"/> + </link> + <ipv4> + <enabled>false</enabled> + </ipv4> + <ipv6> + <enabled>false</enabled> + </ipv6> +</interface> <interface origin="compat:suse:/tests/team_roundrobin_arp2/netconfig/ifcfg-eth9"> <name>eth9</name> <control> @@ -44,19 +60,3 @@ <privacy>prefer-public</privacy> </ipv6> </interface> -<interface origin="compat:suse:/tests/team_roundrobin_arp2/netconfig/ifcfg-eth8"> - <name>eth8</name> - <control> - <mode>hotplug</mode> - </control> - <link> - <master>team0</master> - <port type="team"/> - </link> - <ipv4> - <enabled>false</enabled> - </ipv4> - <ipv6> - <enabled>false</enabled> - </ipv6> -</interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/team_warnings/wicked_xml/config.xml new/wicked2nm-1.5.1/tests/team_warnings/wicked_xml/config.xml --- old/wicked2nm-1.5.0/tests/team_warnings/wicked_xml/config.xml 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/team_warnings/wicked_xml/config.xml 2026-07-14 15:36:02.000000000 +0200 @@ -1,3 +1,19 @@ +<interface origin="compat:suse:/tests/team_warnings/netconfig/ifcfg-eth8"> + <name>eth8</name> + <control> + <mode>hotplug</mode> + </control> + <link> + <master>team0</master> + <port type="team"/> + </link> + <ipv4> + <enabled>false</enabled> + </ipv4> + <ipv6> + <enabled>false</enabled> + </ipv6> +</interface> <interface origin="compat:suse:/tests/team_warnings/netconfig/ifcfg-eth9"> <name>eth9</name> <control> @@ -45,19 +61,3 @@ <privacy>prefer-public</privacy> </ipv6> </interface> -<interface origin="compat:suse:/tests/team_warnings/netconfig/ifcfg-eth8"> - <name>eth8</name> - <control> - <mode>hotplug</mode> - </control> - <link> - <master>team0</master> - <port type="team"/> - </link> - <ipv4> - <enabled>false</enabled> - </ipv4> - <ipv6> - <enabled>false</enabled> - </ipv6> -</interface> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/test.sh new/wicked2nm-1.5.1/tests/test.sh --- old/wicked2nm-1.5.0/tests/test.sh 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/test.sh 2026-07-14 15:36:02.000000000 +0200 @@ -42,6 +42,23 @@ return 1 # Not found } +fixup_interface_xml_order() { + local file=${1:?Missing file argument} + gawk -v RS='</interface>' ' +/<interface/ { + sub(/^[[:space:]]+/, "", $0) + match($0, /<name>([^<]+)<\/name>/, m) + data[m[1]] = $0 +} +END { + n = asorti(data, sorted) + for (i=1; i<=n; i++) { + printf "%s</interface>\n", data[sorted[i]] + } +}' "$file" > "$file.tmp" && + mv "$file.tmp" "$file" +} + refresh_connections() { local filename @@ -67,7 +84,7 @@ nmcli con delete "$UUID" while nmcli -t -f UUID c s | grep -P "^$UUID$" >/dev/null; do echo " -> Wait for $NAME($UUID) deletion" - sleep 1 + sleep 1 done done } @@ -97,7 +114,7 @@ POSITIONAL_ARGS=() while [[ $# -gt 0 ]]; do - opt=$1; + opt=$1; shift; case $opt in -v|--verbose) @@ -241,6 +258,8 @@ # https://unix.stackexchange.com/a/209744 regex_esc_test_dir="$(printf '%s' "$test_dir" | sed 's/[\/.[\(*^$+?{|]/\\&/g')" sed -i -E 's/[^:]+(\/tests\/'"$regex_esc_test_dir"')/\1/' "$cfg_out" + + fixup_interface_xml_order "$cfg_out" fi log_verbose "RUN: $MIGRATE_WICKED_BIN show $test_dir/wicked_xml" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/wicked2nm-1.5.0/tests/vlan/system-connections/eth9.10.nmconnection new/wicked2nm-1.5.1/tests/vlan/system-connections/eth9.10.nmconnection --- old/wicked2nm-1.5.0/tests/vlan/system-connections/eth9.10.nmconnection 2026-05-12 15:40:06.000000000 +0200 +++ new/wicked2nm-1.5.1/tests/vlan/system-connections/eth9.10.nmconnection 2026-07-14 15:36:02.000000000 +0200 @@ -8,7 +8,7 @@ cloned-mac-address=DE:EA:DD:BE:EE:FF [vlan] -flags=0 +flags=1 id=10 parent=eth9 protocol=802.1Q ++++++ wicked2nm.obsinfo ++++++ --- /var/tmp/diff_new_pack.zjiLpD/_old 2026-07-15 16:59:29.078811550 +0200 +++ /var/tmp/diff_new_pack.zjiLpD/_new 2026-07-15 16:59:29.082811685 +0200 @@ -1,5 +1,5 @@ name: wicked2nm -version: 1.5.0 -mtime: 1778593206 -commit: 3f7b965db3c3cc1ab79b2072d76e51136991f6c6 +version: 1.5.1 +mtime: 1784036162 +commit: 4951df1510f3a1c97d47d4d01f31c353e62c9089
