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

clients: reorder properties of connection setting

Browse source 
The order matters for the 'nmcli connection show' output and for the
interactive mode of nmcli. Users should not rely on the order in both
cases, but since we have an extensive test suite for the interactive
mode, restore the order as it was in 1.8.
This commit is contained in:
Beniamino Galvani 2017-06-21 14:50:40 +02:00
parent afac7621ae
commit 46d2168393
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
clients/common/nm-meta-setting-desc.c
View file

@ -4994,6 +4994,18 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_STABLE_ID,
.property_type = &_pt_gobject_string,
),
[_NM_META_PROPERTY_TYPE_CONNECTION_TYPE] =
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_TYPE,
.is_cli_option = TRUE,
.property_alias = "type",
.inf_flags = NM_META_PROPERTY_INF_FLAG_REQD,
.prompt = NM_META_TEXT_PROMPT_CON_TYPE,
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_connection_type,
.complete_fcn = _complete_fcn_connection_type,
),
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_INTERFACE_NAME,
.is_cli_option = TRUE,
.property_alias = "ifname",
@ -5005,18 +5017,6 @@ static const NMMetaPropertyInfo *const property_infos_CONNECTION[] = {
.complete_fcn = _complete_fcn_gobject_devices,
),
),
[_NM_META_PROPERTY_TYPE_CONNECTION_TYPE] =
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_TYPE,
.is_cli_option = TRUE,
.property_alias = "type",
.inf_flags = NM_META_PROPERTY_INF_FLAG_REQD,
.prompt = NM_META_TEXT_PROMPT_CON_TYPE,
.property_type = DEFINE_PROPERTY_TYPE (
.get_fcn = _get_fcn_gobject,
.set_fcn = _set_fcn_connection_type,
.complete_fcn = _complete_fcn_connection_type,
),
),
PROPERTY_INFO_WITH_DESC (NM_SETTING_CONNECTION_AUTOCONNECT,
.is_cli_option = TRUE,
.property_alias = "autoconnect",

2
clients/common/nm-meta-setting-desc.h
View file

@ -277,7 +277,7 @@ typedef enum {
enum {
_NM_META_PROPERTY_TYPE_VPN_SERVICE_TYPE = 0,
_NM_META_PROPERTY_TYPE_CONNECTION_TYPE = 4,
_NM_META_PROPERTY_TYPE_CONNECTION_TYPE = 3,
};
#define nm_meta_property_info_connection_type (nm_meta_setting_infos_editor[NM_META_SETTING_TYPE_CONNECTION].properties[_NM_META_PROPERTY_TYPE_CONNECTION_TYPE])