Differential D17185 Diff 46380 autotests/settings/iptunnelsettingtest.cpp

Changeset View

Standalone View

View Options

autotests/settings/iptunnelsettingtest.cpp

Context not available.
76 76​
77 QVariantMap map; 77​ QVariantMap map;
78 78​
79 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MODE), mode); 79​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_MODE), mode);
jgrulichUnsubmitted
Done

Use NetworkManager defines, do not define your own new defines, there is no reason for that.

jgrulich: Use NetworkManager defines, do not define your own new defines, there is no reason for that.
pranavgadeAuthorUnsubmitted
Done

I tried to follow the way it is done in ipv6settings.

pranavgade: I tried to follow the way it is done in ipv6settings.
jgrulichUnsubmitted
Done

Only IPv4Setting and IPv6Setting do that this way, other setting classes don't.

jgrulich: Only IPv4Setting and IPv6Setting do that this way, other setting classes don't.
80 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PATH_MTU_DISCOVERY), pathMtuDiscovery); 80​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_PATH_MTU_DISCOVERY), pathMtuDiscovery);
81 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_ENCAPSULATION_LIMIT), encapsulationLimit); 81​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_OUTPUT_KEY), encapsulationLimit);
jgrulichUnsubmitted
Done

This seems to be wrong.

jgrulich: This seems to be wrong.
82 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLAGS), flags); 82​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_FLAGS), flags);
83 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_FLOW_LABEL), flowLabel); 83​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_FLOW_LABEL), flowLabel);
84 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_MTU), mtu); 84​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_MTU), mtu);
85 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TOS), tos); 85​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_TOS), tos);
86 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_TTL), ttl); 86​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_TTL), ttl);
87 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_INPUT_KEY), inputKey); 87​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_INPUT_KEY), inputKey);
88 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_LOCAL), local); 88​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_LOCAL), local);
89 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_PARENT), parent); 89​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_PARENT), parent);
90 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_OUTPUT_KEY), outputKey); 90​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_OUTPUT_KEY), outputKey);
91 map.insert(QLatin1String(NMQT_SETTING_IP_TUNNEL_CONFIG_REMOTE), remote); 91​ map.insert(QLatin1String(NM_SETTING_IP_TUNNEL_REMOTE), remote);
92 92​
93 NetworkManager::IpTunnelSetting setting; 93​ NetworkManager::IpTunnelSetting setting;
94 setting.fromMap(map); 94​ setting.fromMap(map);
Context not available.