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

cli: support new property NM_SETTING_IP_CONFIG_ROUTE_METRIC

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-08-28 18:42:58 +02:00
parent 7a55191079
commit 36d99dbed5
1 changed files with 51 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
clients/cli/settings.c
View File

@@ -258,14 +258,15 @@ NmcOutputField nmc_fields_setting_ip4_config[] = {
SETTING_FIELD (NM_SETTING_IP_CONFIG_DNS_SEARCH, 15), /* 3 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_ADDRESSES, 20), /* 4 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_GATEWAY, 20), /* 5 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_ROUTES, 20), /* 7 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, 19), /* 7 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, 16), /* 8 */
SETTING_FIELD (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, 15), /* 9 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, 19), /* 10 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, 14), /* 11 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_NEVER_DEFAULT, 15), /* 12 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_MAY_FAIL, 12), /* 13 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_ROUTES, 20), /* 6 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_ROUTE_METRIC, 15), /* 7 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, 19), /* 8 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, 16), /* 9 */
SETTING_FIELD (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, 15), /* 10 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, 19), /* 11 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, 14), /* 12 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_NEVER_DEFAULT, 15), /* 13 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_MAY_FAIL, 12), /* 14 */
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_IP4_CONFIG_ALL "name"","\
@@ -275,6 +276,7 @@ NmcOutputField nmc_fields_setting_ip4_config[] = {
NM_SETTING_IP_CONFIG_ADDRESSES","\
NM_SETTING_IP_CONFIG_GATEWAY","\
NM_SETTING_IP_CONFIG_ROUTES","\
NM_SETTING_IP_CONFIG_ROUTE_METRIC","\
NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES","\
NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS","\
NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID","\
@@ -293,13 +295,14 @@ NmcOutputField nmc_fields_setting_ip6_config[] = {
SETTING_FIELD (NM_SETTING_IP_CONFIG_ADDRESSES, 20), /* 4 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_GATEWAY, 20), /* 5 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_ROUTES, 20), /* 6 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, 19), /* 7 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, 16), /* 8 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_NEVER_DEFAULT, 15), /* 9 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_MAY_FAIL, 12), /* 10 */
SETTING_FIELD (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, 15), /* 11 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, 19), /* 12 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, 14), /* 13 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_ROUTE_METRIC, 15), /* 7 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, 19), /* 8 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, 16), /* 9 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_NEVER_DEFAULT, 15), /* 10 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_MAY_FAIL, 12), /* 11 */
SETTING_FIELD (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, 15), /* 12 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, 19), /* 13 */
SETTING_FIELD (NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, 14), /* 14 */
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_IP6_CONFIG_ALL "name"","\
@@ -309,6 +312,7 @@ NmcOutputField nmc_fields_setting_ip6_config[] = {
NM_SETTING_IP_CONFIG_ADDRESSES","\
NM_SETTING_IP_CONFIG_GATEWAY","\
NM_SETTING_IP_CONFIG_ROUTES","\
NM_SETTING_IP_CONFIG_ROUTE_METRIC","\
NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES","\
NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS","\
NM_SETTING_IP_CONFIG_NEVER_DEFAULT","\
@@ -1273,6 +1277,7 @@ nmc_property_ipv4_get_routes (NMSetting *setting)
}
DEFINE_GETTER (nmc_property_ipv4_get_gateway, NM_SETTING_IP_CONFIG_GATEWAY)
DEFINE_GETTER (nmc_property_ipv4_get_route_metric, NM_SETTING_IP_CONFIG_ROUTE_METRIC)
DEFINE_GETTER (nmc_property_ipv4_get_ignore_auto_routes, NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES)
DEFINE_GETTER (nmc_property_ipv4_get_ignore_auto_dns, NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS)
DEFINE_GETTER (nmc_property_ipv4_get_dhcp_client_id, NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID)
@@ -1324,6 +1329,7 @@ nmc_property_ipv6_get_routes (NMSetting *setting)
}
DEFINE_GETTER (nmc_property_ipv6_get_gateway, NM_SETTING_IP_CONFIG_GATEWAY)
DEFINE_GETTER (nmc_property_ipv6_get_route_metric, NM_SETTING_IP_CONFIG_ROUTE_METRIC)
DEFINE_GETTER (nmc_property_ipv6_get_ignore_auto_routes, NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES)
DEFINE_GETTER (nmc_property_ipv6_get_ignore_auto_dns, NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS)
DEFINE_GETTER (nmc_property_ipv6_get_never_default, NM_SETTING_IP_CONFIG_NEVER_DEFAULT)
@@ -5471,6 +5477,13 @@ nmc_properties_init (void)
nmc_property_ipv4_describe_routes,
NULL,
nmc_property_out2in_routes);
nmc_add_prop_funcs (GLUE_IP (4, ROUTE_METRIC),
nmc_property_ipv4_get_route_metric,
nmc_property_set_int64,
NULL,
NULL,
NULL,
NULL);
nmc_add_prop_funcs (GLUE_IP (4, IGNORE_AUTO_ROUTES),
nmc_property_ipv4_get_ignore_auto_routes,
nmc_property_set_bool,
@@ -5564,6 +5577,13 @@ nmc_properties_init (void)
nmc_property_ipv6_describe_routes,
NULL,
nmc_property_out2in_routes);
nmc_add_prop_funcs (GLUE_IP (6, ROUTE_METRIC),
nmc_property_ipv6_get_route_metric,
nmc_property_set_int64,
NULL,
NULL,
NULL,
NULL);
nmc_add_prop_funcs (GLUE_IP (6, IGNORE_AUTO_ROUTES),
nmc_property_ipv6_get_ignore_auto_routes,
nmc_property_set_bool,
@@ -6766,13 +6786,14 @@ setting_ip4_config_details (NMSetting *setting, NmCli *nmc, const char *one_pro
set_val_str (arr, 4, nmc_property_ip_get_addresses (setting));
set_val_str (arr, 5, nmc_property_ipv4_get_gateway (setting));
set_val_str (arr, 6, nmc_property_ipv4_get_routes (setting));
set_val_str (arr, 7, nmc_property_ipv4_get_ignore_auto_routes (setting));
set_val_str (arr, 8, nmc_property_ipv4_get_ignore_auto_dns (setting));
set_val_str (arr, 9, nmc_property_ipv4_get_dhcp_client_id (setting));
set_val_str (arr, 10, nmc_property_ipv4_get_dhcp_send_hostname (setting));
set_val_str (arr, 11, nmc_property_ipv4_get_dhcp_hostname (setting));
set_val_str (arr, 12, nmc_property_ipv4_get_never_default (setting));
set_val_str (arr, 13, nmc_property_ipv4_get_may_fail (setting));
set_val_str (arr, 7, nmc_property_ipv4_get_route_metric (setting));
set_val_str (arr, 8, nmc_property_ipv4_get_ignore_auto_routes (setting));
set_val_str (arr, 9, nmc_property_ipv4_get_ignore_auto_dns (setting));
set_val_str (arr, 10, nmc_property_ipv4_get_dhcp_client_id (setting));
set_val_str (arr, 11, nmc_property_ipv4_get_dhcp_send_hostname (setting));
set_val_str (arr, 12, nmc_property_ipv4_get_dhcp_hostname (setting));
set_val_str (arr, 13, nmc_property_ipv4_get_never_default (setting));
set_val_str (arr, 14, nmc_property_ipv4_get_may_fail (setting));
g_ptr_array_add (nmc->output_data, arr);
print_data (nmc); /* Print all data */
@@ -6804,13 +6825,14 @@ setting_ip6_config_details (NMSetting *setting, NmCli *nmc, const char *one_pro
set_val_str (arr, 4, nmc_property_ip_get_addresses (setting));
set_val_str (arr, 5, nmc_property_ipv6_get_gateway (setting));
set_val_str (arr, 6, nmc_property_ipv6_get_routes (setting));
set_val_str (arr, 7, nmc_property_ipv6_get_ignore_auto_routes (setting));
set_val_str (arr, 8, nmc_property_ipv6_get_ignore_auto_dns (setting));
set_val_str (arr, 9, nmc_property_ipv6_get_never_default (setting));
set_val_str (arr, 10, nmc_property_ipv6_get_may_fail (setting));
set_val_str (arr, 11, nmc_property_ipv6_get_ip6_privacy (setting));
set_val_str (arr, 12, nmc_property_ipv6_get_dhcp_send_hostname (setting));
set_val_str (arr, 13, nmc_property_ipv6_get_dhcp_hostname (setting));
set_val_str (arr, 7, nmc_property_ipv6_get_route_metric (setting));
set_val_str (arr, 8, nmc_property_ipv6_get_ignore_auto_routes (setting));
set_val_str (arr, 9, nmc_property_ipv6_get_ignore_auto_dns (setting));
set_val_str (arr, 10, nmc_property_ipv6_get_never_default (setting));
set_val_str (arr, 11, nmc_property_ipv6_get_may_fail (setting));
set_val_str (arr, 12, nmc_property_ipv6_get_ip6_privacy (setting));
set_val_str (arr, 13, nmc_property_ipv6_get_dhcp_send_hostname (setting));
set_val_str (arr, 14, nmc_property_ipv6_get_dhcp_hostname (setting));
g_ptr_array_add (nmc->output_data, arr);
print_data (nmc); /* Print all data */