diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2014-07-21 13:08:53 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2014-11-20 16:21:21 +0100 |
| commit | 24b2ae5b2c4c2f9f4b1460c1eba9b3ac16735862 (patch) | |
| tree | a83bd14adf24c1548fb0738bfdc4e547d66f2aa1 | |
| parent | cf1666f0cc3f6907d58ef32da17c6cafa409684b (diff) | |
| download | NetworkManager-jk/rh1114681-vlan-unmanaged.tar.gz | |
cli: add parent device information for VLAN devicesjk/rh1114681-vlan-unmanaged
| -rw-r--r-- | clients/cli/devices.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 2b153362eb..437e426967 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -191,11 +191,12 @@ static NmcOutputField nmc_fields_dev_show_master_prop[] = { /* Available fields for 'device show' - VLAN part */ static NmcOutputField nmc_fields_dev_show_vlan_prop[] = { {"NAME", N_("NAME"), 18}, /* 0 */ - {"ID", N_("ID"), 5}, /* 1 */ + {"PARENT", N_("PARENT"), 10}, /* 1 */ + {"ID", N_("ID"), 5}, /* 2 */ {NULL, NULL, 0} }; -#define NMC_FIELDS_DEV_SHOW_VLAN_PROP_ALL "NAME,ID" -#define NMC_FIELDS_DEV_SHOW_VLAN_PROP_COMMON "NAME,ID" +#define NMC_FIELDS_DEV_SHOW_VLAN_PROP_ALL "NAME,PARENT,ID" +#define NMC_FIELDS_DEV_SHOW_VLAN_PROP_COMMON "NAME,PARENT,ID" /* Available fields for 'device show' - BLUETOOTH part */ static NmcOutputField nmc_fields_dev_show_bluetooth[] = { @@ -1083,6 +1084,7 @@ show_device_info (NMDevice *device, NmCli *nmc) if ((NM_IS_DEVICE_VLAN (device))) { if (!strcasecmp (nmc_fields_dev_show_sections[section_idx].name, nmc_fields_dev_show_sections[14].name)) { char * vlan_id_str = g_strdup_printf ("%u", nm_device_vlan_get_vlan_id (NM_DEVICE_VLAN (device))); + NMDevice *parent = nm_device_vlan_get_parent (NM_DEVICE_VLAN (device)); tmpl = nmc_fields_dev_show_vlan_prop; tmpl_len = sizeof (nmc_fields_dev_show_vlan_prop); @@ -1093,7 +1095,8 @@ show_device_info (NMDevice *device, NmCli *nmc) arr = nmc_dup_fields_array (tmpl, tmpl_len, NMC_OF_FLAG_SECTION_PREFIX); set_val_strc (arr, 0, nmc_fields_dev_show_sections[14].name); /* "VLAN" */ - set_val_str (arr, 1, vlan_id_str); + set_val_strc (arr, 1, parent ? nm_device_get_iface (parent) : NULL); + set_val_str (arr, 2, vlan_id_str); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ |