From 46d2168393a8876098567a629d5baf59d6bf01d4 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Wed, 21 Jun 2017 14:50:40 +0200 Subject: [PATCH] clients: reorder properties of connection setting 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. --- clients/common/nm-meta-setting-desc.c | 24 ++++++++++++------------ clients/common/nm-meta-setting-desc.h | 2 +- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index e071fce668..7c620a1c61 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -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", diff --git a/clients/common/nm-meta-setting-desc.h b/clients/common/nm-meta-setting-desc.h index 5d6cfbbc8d..c1fd902210 100644 --- a/clients/common/nm-meta-setting-desc.h +++ b/clients/common/nm-meta-setting-desc.h @@ -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])