colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: allow editing existing connections in interactive editor

Browse Source 
So the syntax is now:
nmcli con edit [id | uuid | path ] <ID>
  - for editing an existing connection

nmcli con edit [type <new connection type>] [con-name <new connection name>]
  - for adding a new connection
This commit is contained in:
Jiří Klimeš
2013-04-19 21:06:20 +02:00
parent da7cd4720c
commit f96cd68d90
1 changed files with 106 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

148
cli/src/connections.c
View File

@@ -210,7 +210,7 @@ usage (void)
#endif #endif
" down [ id | uuid | path | apath ] <ID>\n\n" " down [ id | uuid | path | apath ] <ID>\n\n"
" add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n\n" " add COMMON_OPTIONS TYPE_SPECIFIC_OPTIONS IP_OPTIONS\n\n"
" edit [type <new_con_type>] [con-name <new_con_name>]\n\n" " edit [ id | uuid | path ] <ID> | [type <new_con_type>] [con-name <new_con_name>]\n\n"
" delete [ id | uuid | path ] <ID>\n\n" " delete [ id | uuid | path ] <ID>\n\n"
" reload\n\n\n" " reload\n\n\n"
)); ));
@@ -4184,21 +4184,33 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
const char *type = NULL; const char *type = NULL;
char *type_ask = NULL; char *type_ask = NULL;
const char *con_name = NULL; const char *con_name = NULL;
const char *con = NULL;
const char *con_id = NULL;
const char *con_uuid = NULL;
const char *con_path = NULL;
const char *selector = NULL;
char *tmp_str; char *tmp_str;
GError *error = NULL; GError *error = NULL;
GError *err1 = NULL; GError *err1 = NULL;
GModule *edit_lib_module = NULL; GModule *edit_lib_module = NULL;
nmc_arg_t exp_args[] = { {"type", TRUE, &type, FALSE}, nmc_arg_t exp_args[] = { {"type", TRUE, &type, FALSE},
{"con-name", TRUE, &con_name, FALSE}, {"con-name", TRUE, &con_name, FALSE},
{"id", TRUE, &con_id, FALSE},
{"uuid", TRUE, &con_uuid, FALSE},
{"path", TRUE, &con_path, FALSE},
{NULL} }; {NULL} };
nmc->return_value = NMC_RESULT_SUCCESS; nmc->return_value = NMC_RESULT_SUCCESS;
if (!nmc_parse_args (exp_args, TRUE, &argc, &argv, &error)) { if (argc == 1)
g_string_assign (nmc->return_text, error->message); con = *argv;
nmc->return_value = error->code; else {
g_clear_error (&error); if (!nmc_parse_args (exp_args, TRUE, &argc, &argv, &error)) {
goto error; g_string_assign (nmc->return_text, error->message);
nmc->return_value = error->code;
g_clear_error (&error);
goto error;
}
} }
/* Load line editing library */ /* Load line editing library */
@@ -4214,51 +4226,103 @@ do_connection_edit (NmCli *nmc, int argc, char **argv)
edit_lib_symbols.rl_startup_hook_x = NULL; edit_lib_symbols.rl_startup_hook_x = NULL;
} }
connection_type = check_valid_name (type, nmc_valid_connection_types, &err1); if (!con) {
tmp_str = get_valid_options_string (nmc_valid_connection_types); if (con_id && !con_uuid && !con_path) {
con = con_id;
while (!connection_type) { selector = "id";
if (!type) } else if (con_uuid && !con_id && !con_path) {
printf (_("Valid connection types: %s\n"), tmp_str); con = con_uuid;
else selector = "uuid";
printf (_("Error: invalid connection type; %s\n"), err1->message); } else if (con_path && !con_id && !con_uuid) {
g_clear_error (&err1); con = con_path;
selector = "path";
type_ask = readline_x (EDITOR_PROMPT_CON_TYPE); } else if (!con_path && !con_id && !con_uuid) {
type = type_ask = type_ask ? g_strstrip (type_ask) : NULL; /* no-op */
connection_type = check_valid_name (type_ask, nmc_valid_connection_types, &err1); } else {
g_free (type_ask); g_string_printf (nmc->return_text,
_("Error: only one of 'id', uuid, or 'path' can be provided."));
nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
goto error;
}
} }
g_free (tmp_str);
/* Create a new connection object */ if (con) {
connection = nm_connection_new (); /* Existing connection */
NMConnection *found_con;
/* Build up the 'connection' setting */ found_con = find_connection (nmc->system_connections, selector, con);
s_con = (NMSettingConnection *) nm_setting_connection_new (); if (!found_con) {
uuid = nm_utils_uuid_generate (); g_string_printf (nmc->return_text, _("Error: Unknown connection '%s'."), con);
if (con_name) nmc->return_value = NMC_RESULT_ERROR_USER_INPUT;
default_name = g_strdup (con_name); goto error;
else }
default_name = unique_connection_name (nmc->system_connections,
get_name_alias (connection_type, nmc_valid_connection_types));
g_object_set (s_con, /* Duplicate the connection and use that so that we need not
NM_SETTING_CONNECTION_ID, default_name, * differentiate existing vs. new later
NM_SETTING_CONNECTION_UUID, uuid, */
NM_SETTING_CONNECTION_TYPE, connection_type, connection = nm_connection_duplicate (found_con);
NULL);
g_free (uuid);
g_free (default_name);
nm_connection_add_setting (connection, NM_SETTING (s_con));
/* Initialize the new connection so that it is valid from the start */ s_con = nm_connection_get_setting_connection (connection);
editor_init_new_connection (nmc, connection); g_assert (s_con);
connection_type = nm_setting_connection_get_connection_type (s_con);
if (type)
printf (_("Warning: editing existing connection '%s'; 'type' argument is ignored\n"),
nm_connection_get_id (connection));
if (con_name)
printf (_("Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"),
nm_connection_get_id (connection));
} else {
/* New connection */
connection_type = check_valid_name (type, nmc_valid_connection_types, &err1);
tmp_str = get_valid_options_string (nmc_valid_connection_types);
while (!connection_type) {
if (!type)
printf (_("Valid connection types: %s\n"), tmp_str);
else
printf (_("Error: invalid connection type; %s\n"), err1->message);
g_clear_error (&err1);
type_ask = readline_x (EDITOR_PROMPT_CON_TYPE);
type = type_ask = type_ask ? g_strstrip (type_ask) : NULL;
connection_type = check_valid_name (type_ask, nmc_valid_connection_types, &err1);
g_free (type_ask);
}
g_free (tmp_str);
/* Create a new connection object */
connection = nm_connection_new ();
/* Build up the 'connection' setting */
s_con = (NMSettingConnection *) nm_setting_connection_new ();
uuid = nm_utils_uuid_generate ();
if (con_name)
default_name = g_strdup (con_name);
else
default_name = unique_connection_name (nmc->system_connections,
get_name_alias (connection_type, nmc_valid_connection_types));
g_object_set (s_con,
NM_SETTING_CONNECTION_ID, default_name,
NM_SETTING_CONNECTION_UUID, uuid,
NM_SETTING_CONNECTION_TYPE, connection_type,
NULL);
g_free (uuid);
g_free (default_name);
nm_connection_add_setting (connection, NM_SETTING (s_con));
/* Initialize the new connection so that it is valid from the start */
editor_init_new_connection (nmc, connection);
}
printf ("\n"); printf ("\n");
printf (_("===| nmcli interactive connection editor |===")); printf (_("===| nmcli interactive connection editor |==="));
printf ("\n\n"); printf ("\n\n");
printf (_("Adding a new '%s' connection"), connection_type); if (con)
printf (_("Editing existing '%s' connection: '%s'"), connection_type, con);
else
printf (_("Adding a new '%s' connection"), connection_type);
printf ("\n\n"); printf ("\n\n");
printf (_("Type 'help' or '?' for available commands.")); printf (_("Type 'help' or '?' for available commands."));
printf ("\n\n"); printf ("\n\n");