fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-28 11:00:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

all: don't add proxy setting during normalization

Browse source 
It doesn't seem useful to always add the proxy setting to each
connection profile that supports IP configuration. This normalization
requires additional code and especially, it creates a new empty
section in every new keyfile:

 # nmcli connection add type dummy ifname dummy1
 # cat /etc/NetworkManager/system-connections/dummy-dummy1.nmconnection
 [connection]
 id=dummy-dummy1
 uuid=8dd2bb73-b338-428f-ad6d-082c37a58566
 type=dummy
 interface-name=dummy1

 [dummy]

 [ipv4]
 method=disabled

 [ipv6]
 addr-gen-mode=default
 method=disabled

 [proxy]

Since an empty (with method=none) proxy setting is the same as no
proxy setting, avoid the normalization.
This commit is contained in:
Beniamino Galvani 2023-01-25 17:01:15 +01:00
parent e013074c89
commit aa76b9fb3f
51 changed files with 422 additions and 1349 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-bridge-component-b.cexpected
View file

@ -4,8 +4,6 @@ NAME="System test-bridge-component"
UUID=${UUID}
DEVICE=eth0
ONBOOT=no
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-System_test-wired-802-1X-subj-matches.cexpected
View file

@ -10,8 +10,6 @@ IEEE_8021X_SUBJECT_MATCH=server1.yourdomain.tld
IEEE_8021X_PHASE2_SUBJECT_MATCH=server2.yourdomain.tld
IEEE_8021X_ALTSUBJECT_MATCHES="a.yourdomain.tld b.yourdomain.tld c.yourdomain.tld"
IEEE_8021X_PHASE2_ALTSUBJECT_MATCHES="x.yourdomain.tld y.yourdomain.tld"
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_User_1.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
NM_USER__M_Y___053=val=MY.+
NM_USER__M_Y___055=val=MY.-
NM_USER__M_Y___057=val=MY./

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Bond_Main.cexpected
View file

@ -2,8 +2,6 @@ BONDING_OPTS="mode=balance-rr downdelay=5 miimon=100 updelay=10"
TYPE=Bond
BONDING_MASTER=yes
HWADDR=
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=none
IPADDR=1.1.1.3
PREFIX=24

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Permissions.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Routing_Rules.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_LINK_LOCAL=enabled

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_VLAN_reorder_hdr.cexpected
View file

@ -6,8 +6,6 @@ REORDER_HDR=yes
GVRP=no
MVRP=no
HWADDR=
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_AP_Mode.cexpected
View file

@ -4,8 +4,6 @@ CHANNEL=196
MAC_ADDRESS_RANDOMIZATION=default
AP_ISOLATION=yes
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Band_A.cexpected
View file

@ -3,8 +3,6 @@ MODE=Managed
BAND=a
MAC_ADDRESS_RANDOMIZATION=default
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_Hidden.cexpected
View file

@ -2,8 +2,6 @@ ESSID="Test SSID"
SSID_HIDDEN=yes
MAC_ADDRESS_RANDOMIZATION=default
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_always.cexpected
View file

@ -3,8 +3,6 @@ ESSID="Test SSID"
MODE=Managed
MAC_ADDRESS_RANDOMIZATION=always
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_default.cexpected
View file

@ -2,8 +2,6 @@ ESSID="Test SSID"
MODE=Managed
MAC_ADDRESS_RANDOMIZATION=default
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_missing.cexpected
View file

@ -3,8 +3,6 @@ ESSID="Test SSID"
MODE=Managed
MAC_ADDRESS_RANDOMIZATION=never
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_WiFi_MAC_never.cexpected
View file

@ -3,8 +3,6 @@ ESSID="Test SSID"
MODE=Managed
MAC_ADDRESS_RANDOMIZATION=never
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_LEAP.cexpected
View file

@ -5,8 +5,6 @@ SECURITYMODE=leap
IEEE_8021X_IDENTITY="Bill Smith"
MAC_ADDRESS_RANDOMIZATION=default
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wifi_WEP_104_ASCII.cexpected
View file

@ -4,8 +4,6 @@ SECURITYMODE=open
DEFAULTKEY=1
MAC_ADDRESS_RANDOMIZATION=default
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Auto-Negotiate.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="autoneg off speed 10 duplex half"
BOOTPROTO=dhcp
DEFROUTE=yes

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Static_Routes.cexpected
View file

@ -1,8 +1,6 @@
TYPE=Ethernet
HWADDR=31:33:33:37:BE:CD
MTU=1492
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=none
IPADDR=1.1.1.3
PREFIX=24

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_Wake-on-LAN.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="wol umgs sopass 00:00:00:11:22:33"
BOOTPROTO=dhcp
DEFROUTE=yes

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Test_Write_Wired_match.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
MATCH_DRIVER="!virtio e1000e"
MATCH_INTERFACE_NAME="ens* eth\\ 1? !veth*"
MATCH_KERNEL_COMMAND_LINE=!ip=

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-Vlan_test-vlan-interface.cexpected
View file

@ -10,8 +10,6 @@ MVRP=no
VLAN_INGRESS_PRIORITY_MAP=0:1,2:5
VLAN_EGRESS_PRIORITY_MAP=3:1,12:3,14:7
HWADDR=
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=none
IPADDR=192.168.43.149
PREFIX=24

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-dcb-test.cexpected
View file

@ -24,8 +24,6 @@ DCB_PG_PCT=10,20,15,10,2,3,35,5
DCB_PG_UPPCT=10,20,30,40,50,10,0,25
DCB_PG_STRICT=10110001
DCB_PG_UP2TC=34721056
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-netmask-1.cexpected
View file

@ -13,8 +13,6 @@ IPV6INIT=yes
#end
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
PREFIX=15
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection.cexpected
View file

@ -2,8 +2,6 @@ ESSID=blahblah
MODE=Managed
MAC_ADDRESS_RANDOMIZATION=default
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-random_wifi_connection_2.cexpected
View file

@ -2,8 +2,6 @@ ESSID=SomeSSID
MODE=Managed
MAC_ADDRESS_RANDOMIZATION=default
TYPE=Wireless
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-ip6-disabled.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-sriov-write.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
SRIOV_TOTAL_VFS=64
SRIOV_AUTOPROBE_DRIVERS=1
SRIOV_VF2="mac=55:55:55:55:55:55 vlans=3.10.ad;10"

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-static-routes-legacy.cexpected
View file

@ -1,7 +1,5 @@
TYPE=Ethernet
HWADDR=00:16:41:11:22:33
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write-empty.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
TC_COMMIT=yes
BOOTPROTO=none
IPADDR=1.1.1.3

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-tc-write.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
QDISC1="parent 2468:2 pfifo_fast"
FILTER1="parent 1234: matchall action simple sdata Hello"
BOOTPROTO=none

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-vlanid-use.cexpected
View file

@ -6,8 +6,6 @@ REORDER_HDR=yes
GVRP=no
MVRP=no
HWADDR=
PROXY_METHOD=none
BROWSER_ONLY=no
IPV6INIT=no
IPV6_DEFROUTE=yes
IPV6_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-1.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
BOOTPROTO=dhcp
DEFROUTE=yes
IPV4_FAILURE_FATAL=no

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-2.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="-A net0"
BOOTPROTO=dhcp
DEFROUTE=yes

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-3.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="autoneg on"
BOOTPROTO=dhcp
DEFROUTE=yes

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-4.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="-K net0 rx on"
BOOTPROTO=dhcp
DEFROUTE=yes

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-5.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="autoneg on ; -K net0 rx on"
BOOTPROTO=dhcp
DEFROUTE=yes

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-6.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="autoneg on ; -A net0 pause-autoneg off"
BOOTPROTO=dhcp
DEFROUTE=yes

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-7.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="autoneg on ; -G net0 rx 512"
BOOTPROTO=dhcp
DEFROUTE=yes

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-8.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="autoneg on ; -A net0"
BOOTPROTO=dhcp
DEFROUTE=yes

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_roundtrip_ethtool-9.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="autoneg on ; -G net0 rx 512 ; -A net0 pause-autoneg off"
BOOTPROTO=dhcp
DEFROUTE=yes

2
src/core/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test_write_wired_auto_negotiate_on.cexpected
View file

@ -1,6 +1,4 @@
TYPE=Ethernet
PROXY_METHOD=none
BROWSER_ONLY=no
ETHTOOL_OPTS="autoneg on ; -K net0 rxvlan off tx on"
BOOTPROTO=dhcp
DEFROUTE=yes

16
src/core/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
View file

@ -4425,8 +4425,6 @@ test_write_wired_static(void)
g_assert_cmpint(nm_setting_ip_config_get_route_metric(reread_s_ip4), ==, 204);
g_assert_cmpint(nm_setting_ip_config_get_route_metric(reread_s_ip6), ==, 206);
_nm_connection_new_setting(connection, NM_TYPE_SETTING_PROXY);
nmtst_assert_connection_equals(connection, FALSE, reread, FALSE);
}
@ -4570,8 +4568,6 @@ test_write_wired_static_with_generic(void)
g_assert_cmpint(nm_setting_ip_config_get_route_metric(reread_s_ip4), ==, 204);
g_assert_cmpint(nm_setting_ip_config_get_route_metric(reread_s_ip6), ==, 206);
_nm_connection_new_setting(connection, NM_TYPE_SETTING_PROXY);
{
gs_unref_hashtable GHashTable *diffs = NULL;
@ -7639,8 +7635,6 @@ test_write_bridge_main(void)
_nm_connection_new_setting(connection, NM_TYPE_SETTING_WIRED);
_nm_connection_new_setting(connection, NM_TYPE_SETTING_PROXY);
nmtst_assert_connection_verifies_without_normalization(connection);
_writer_new_connection(connection, TEST_SCRATCH_DIR, &testfile);
@ -8231,8 +8225,6 @@ test_write_bond_main(void)
s_ip6 = _nm_connection_new_setting(connection, NM_TYPE_SETTING_IP6_CONFIG);
g_object_set(s_ip6, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_IGNORE, NULL);
_nm_connection_new_setting(connection, NM_TYPE_SETTING_PROXY);
nmtst_assert_connection_verifies_without_normalization(connection);
_writer_new_connec_exp(connection,
@ -9023,8 +9015,6 @@ test_write_team_master(void)
s_ip6 = _nm_connection_new_setting(connection, NM_TYPE_SETTING_IP6_CONFIG);
g_object_set(s_ip6, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP6_CONFIG_METHOD_AUTO, NULL);
_nm_connection_new_setting(connection, NM_TYPE_SETTING_PROXY);
nmtst_assert_connection_verifies_without_normalization(connection);
_writer_new_connection(connection, TEST_SCRATCH_DIR, &testfile);
@ -10064,8 +10054,6 @@ test_sriov_write(void)
NM_TERNARY_TRUE,
NULL);
_nm_connection_new_setting(connection, NM_TYPE_SETTING_PROXY);
nmtst_assert_connection_verifies_without_normalization(connection);
_writer_new_connec_exp(connection,
@ -10159,8 +10147,6 @@ test_tc_write_empty(void)
_nm_connection_new_setting(connection, NM_TYPE_SETTING_TC_CONFIG);
_nm_connection_new_setting(connection, NM_TYPE_SETTING_PROXY);
nmtst_assert_connection_verifies_without_normalization(connection);
_writer_new_connec_exp(connection,
@ -10237,8 +10223,6 @@ test_tc_write(void)
nm_setting_tc_config_add_tfilter(s_tc, tfilter);
nm_tc_tfilter_unref(tfilter);
_nm_connection_new_setting(connection, NM_TYPE_SETTING_PROXY);
nmtst_assert_connection_verifies_without_normalization(connection);
_writer_new_connec_exp(connection,

9
src/core/settings/plugins/keyfile/tests/test-keyfile-settings.c
View file

@ -84,20 +84,11 @@ assert_reread(NMConnection *connection, gboolean normalize_connection, const cha
{
gs_unref_object NMConnection *reread = NULL;
gs_unref_object NMConnection *connection_clone = NULL;
NMSettingConnection *s_con;
g_assert(NM_IS_CONNECTION(connection));
reread = keyfile_read_connection_from_file(testfile);
if (!normalize_connection && (s_con = nm_connection_get_setting_connection(connection))
&& !nm_setting_connection_get_master(s_con)
&& !nm_connection_get_setting_proxy(connection)) {
connection_clone = nmtst_clone_connection(connection);
connection = connection_clone;
nm_connection_add_setting(connection, nm_setting_proxy_new());
}
nmtst_assert_connection_equals(connection, normalize_connection, reread, FALSE);
}

22
src/libnm-core-impl/nm-connection.c
View file

@ -1315,13 +1315,7 @@ _normalize_ip_config(NMConnection *self, GHashTable *parameters)
}
}
if (_supports_addr_family(self, AF_UNSPEC)) {
if (!s_proxy) {
setting = nm_setting_proxy_new();
nm_connection_add_setting(self, setting);
changed = TRUE;
}
} else {
if (!_supports_addr_family(self, AF_UNSPEC)) {
if (s_proxy) {
nm_connection_remove_setting(self, NM_TYPE_SETTING_PROXY);
changed = TRUE;
@ -1889,19 +1883,7 @@ _nm_connection_verify(NMConnection *connection, GError **error)
}
}
if (_supports_addr_family(connection, AF_UNSPEC)) {
if (!s_proxy && normalizable_error_type == NM_SETTING_VERIFY_SUCCESS) {
g_set_error_literal(&normalizable_error,
NM_CONNECTION_ERROR,
NM_CONNECTION_ERROR_MISSING_SETTING,
_("setting is required for non-slave connections"));
g_prefix_error(&normalizable_error, "%s: ", NM_SETTING_PROXY_SETTING_NAME);
/* having a master without proxy config was not a verify() error, accept
* it for backward compatibility. */
normalizable_error_type = NM_SETTING_VERIFY_NORMALIZABLE;
}
} else {
if (!_supports_addr_family(connection, AF_UNSPEC)) {
if (s_proxy) {
g_clear_error(&normalizable_error);
g_set_error_literal(&normalizable_error,

12
src/libnm-core-impl/tests/test-general.c
View file

@ -6248,7 +6248,6 @@ test_connection_normalize_gateway_never_default(void)
nm_connection_add_setting(con, (NMSetting *) s_ip4);
nm_connection_add_setting(con, (NMSetting *) s_ip6);
nm_connection_add_setting(con, nm_setting_proxy_new());
nmtst_assert_connection_verifies_without_normalization(con);
g_assert_cmpstr("1.1.1.254", ==, nm_setting_ip_config_get_gateway(s_ip4));
@ -6293,7 +6292,7 @@ test_connection_normalize_may_fail(void)
nm_connection_add_setting(con, (NMSetting *) s_ip4);
nm_connection_add_setting(con, (NMSetting *) s_ip6);
nmtst_assert_connection_verifies_and_normalizable(con);
nmtst_assert_connection_verifies_without_normalization(con);
/* Now set method=disabled/ignore and check that may-fail becomes TRUE
* after normalization
@ -6335,7 +6334,7 @@ test_connection_normalize_shared_addresses(void)
nm_connection_add_setting(con, (NMSetting *) s_ip4);
nm_connection_add_setting(con, (NMSetting *) s_ip6);
nmtst_assert_connection_verifies_and_normalizable(con);
nmtst_assert_connection_verifies_without_normalization(con);
/* Now we add other addresses and check that they are
* removed during normalization
@ -6547,7 +6546,6 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da
NM_SETTING_CONNECTION_SETTING_NAME,
NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME,
NM_SETTING_PROXY_SETTING_NAME,
NM_SETTING_OVS_INTERFACE_SETTING_NAME);
g_assert(s_con == nm_connection_get_setting_connection(con));
g_assert(s_ovs_if == nm_connection_get_setting_ovs_interface(con));
@ -6571,7 +6569,6 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da
NM_SETTING_CONNECTION_SETTING_NAME,
NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME,
NM_SETTING_PROXY_SETTING_NAME,
NM_SETTING_OVS_INTERFACE_SETTING_NAME);
g_assert(s_con == nm_connection_get_setting_connection(con));
g_assert(s_ovs_if == nm_connection_get_setting_ovs_interface(con));
@ -6591,7 +6588,6 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da
NM_SETTING_CONNECTION_SETTING_NAME,
NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME,
NM_SETTING_PROXY_SETTING_NAME,
NM_SETTING_OVS_INTERFACE_SETTING_NAME);
g_assert(s_con == nm_connection_get_setting_connection(con));
g_assert(s_ovs_if == nm_connection_get_setting_ovs_interface(con));
@ -6610,7 +6606,6 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da
g_object_set(s_ovs_if, NM_SETTING_OVS_INTERFACE_TYPE, "internal", NULL);
nm_connection_add_setting(con, nm_setting_ip4_config_new());
nm_connection_add_setting(con, nm_setting_ip6_config_new());
nm_connection_add_setting(con, nm_setting_proxy_new());
s_ip4 = NM_SETTING_IP4_CONFIG(nm_connection_get_setting_ip4_config(con));
s_ip6 = NM_SETTING_IP6_CONFIG(nm_connection_get_setting_ip6_config(con));
g_object_set(s_ip4, NM_SETTING_IP_CONFIG_METHOD, "auto", NULL);
@ -6620,7 +6615,6 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da
NM_SETTING_CONNECTION_SETTING_NAME,
NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME,
NM_SETTING_PROXY_SETTING_NAME,
NM_SETTING_OVS_INTERFACE_SETTING_NAME);
break;
case 6:
@ -6637,7 +6631,6 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da
NM_SETTING_CONNECTION_SETTING_NAME,
NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME,
NM_SETTING_PROXY_SETTING_NAME,
NM_SETTING_OVS_INTERFACE_SETTING_NAME);
g_assert(s_con == nm_connection_get_setting_connection(con));
g_assert(s_ovs_if == nm_connection_get_setting_ovs_interface(con));
@ -6729,7 +6722,6 @@ test_connection_normalize_ovs_interface_type_ovs_interface(gconstpointer test_da
NM_SETTING_CONNECTION_SETTING_NAME,
NM_SETTING_IP4_CONFIG_SETTING_NAME,
NM_SETTING_IP6_CONFIG_SETTING_NAME,
NM_SETTING_PROXY_SETTING_NAME,
NM_SETTING_OVS_INTERFACE_SETTING_NAME,
NM_SETTING_OVS_PATCH_SETTING_NAME);
g_assert(s_con == nm_connection_get_setting_connection(con));

11
src/libnm-core-impl/tests/test-keyfile.c
View file

@ -193,17 +193,6 @@ _nm_keyfile_read(GKeyFile *keyfile,
nmtst_assert_connection_verifies_after_normalization(con, 0, 0);
nmtst_connection_normalize(con);
} else {
{
NMSettingConnection *s_con;
/* a non-slave connection must have a proxy setting, but
* keyfile reader does not add that (unless a [proxy] section
* is present. */
s_con = nm_connection_get_setting_connection(con);
if (s_con && !nm_setting_connection_get_master(s_con)
&& !nm_connection_get_setting_proxy(con))
nm_connection_add_setting(con, nm_setting_proxy_new());
}
nmtst_assert_connection_verifies_without_normalization(con);
}
return con;

8
src/libnm-core-impl/tests/test-setting.c
View file

@ -3598,8 +3598,6 @@ test_roundtrip_conversion(gconstpointer test_data)
"[ipv6]\n"
"addr-gen-mode=default\n"
"method=auto\n"
"\n"
"[proxy]\n"
"",
ID,
UUID,
@ -3662,8 +3660,6 @@ test_roundtrip_conversion(gconstpointer test_data)
"[ipv6]\n"
"addr-gen-mode=default\n"
"method=disabled\n"
"\n"
"[proxy]\n"
"",
ID,
UUID,
@ -3716,8 +3712,6 @@ test_roundtrip_conversion(gconstpointer test_data)
"[ipv6]\n"
"addr-gen-mode=default\n"
"method=disabled\n"
"\n"
"[proxy]\n"
"",
ID,
UUID,
@ -3800,8 +3794,6 @@ test_roundtrip_conversion(gconstpointer test_data)
"routing-rule1=priority 1 from ::/0 table 1000\n"
"routing-rule2=priority 2 from 1:2:3:b::/65 table 1001\n"
"routing-rule3=priority 3 from 1:2:3:c::/66 table 1002\n"
"\n"
"[proxy]\n"
"",
ID,
UUID,

702
src/tests/client/test-client.check-on-disk/test_003.expected
View file

File diff suppressed because it is too large Load diff

888
src/tests/client/test-client.check-on-disk/test_004.expected
View file

File diff suppressed because it is too large Load diff

18
src/tests/client/test-client.check-on-disk/test_offline.expected
View file

@ -8,12 +8,12 @@ stderr: 136 bytes
Error: Could not create NMClient object: Key/Value pair 0, 'invalid', in address element 'very:invalid' does not contain an equal sign.
<<<
size: 312
size: 303
location: src/tests/client/test-client.py:test_offline()/2
cmd: $NMCLI --offline c add type ethernet
lang: C
returncode: 0
stdout: 162 bytes
stdout: 153 bytes
>>>
[connection]
id=ethernet
@ -29,8 +29,6 @@ method=auto
addr-gen-mode=default
method=auto
[proxy]
<<<
size: 183
location: src/tests/client/test-client.py:test_offline()/3
@ -62,12 +60,12 @@ stderr: 47 bytes
Error: command doesn't support --offline mode.
<<<
size: 436
size: 427
location: src/tests/client/test-client.py:test_offline()/6
cmd: $NMCLI --offline c add type wifi ssid lala 802-1x.eap pwd 802-1x.identity foo 802-1x.password bar
lang: C
returncode: 0
stdout: 225 bytes
stdout: 216 bytes
>>>
[connection]
id=wifi
@ -90,15 +88,13 @@ method=auto
addr-gen-mode=default
method=auto
[proxy]
<<<
size: 474
size: 465
location: src/tests/client/test-client.py:test_offline()/7
cmd: $NMCLI --offline c add type wifi ssid lala 802-1x.eap pwd 802-1x.identity foo 802-1x.password bar 802-1x.password-flags agent-owned
lang: C
returncode: 0
stdout: 229 bytes
stdout: 220 bytes
>>>
[connection]
id=wifi
@ -121,8 +117,6 @@ method=auto
addr-gen-mode=default
method=auto
[proxy]
<<<
size: 199
location: src/tests/client/test-client.py:test_offline()/8

3
src/tests/client/test-client.py
View file

@ -1880,9 +1880,6 @@ class TestNmcli(NmTestBase):
nmc.expect("There are 2 optional settings for IPv6 protocol.")
nmc.expect("Do you want to provide them\? \(yes/no\) \[yes]")
nmc.sendline("no")
nmc.expect("There are 4 optional settings for Proxy.")
nmc.expect("Do you want to provide them\? \(yes/no\) \[yes]")
nmc.sendline("no")
nmc.expect("Connection 'ethernet' \(.*\) successfully added.")
nmc.expect(pexpect.EOF)