From dd0dde169f534e15b77ed292b5437db0cc27cc98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Tue, 14 Apr 2015 12:08:15 +0200 Subject: [PATCH] cli: add PHYS_PORT_ID property to devices The physical-port-id property was added to libnm (libnm-glib) in commit 47cc8b25f2efe015defde7e76e49e67086603bb3. (cherry picked from commit 825255361565588a428aad69eb7ea9ffe9475fc2) --- clients/cli/devices.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index a9abf5c548..3528f1167e 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -72,13 +72,15 @@ static NmcOutputField nmc_fields_dev_show_general[] = { {"NM-MANAGED", N_("NM-MANAGED"), 15}, /* 15 */ {"AUTOCONNECT", N_("AUTOCONNECT"), 15}, /* 16 */ {"FIRMWARE-MISSING", N_("FIRMWARE-MISSING"), 18}, /* 17 */ - {"CONNECTION", N_("CONNECTION"), 20}, /* 18 */ - {"CON-UUID", N_("CON-UUID"), 38}, /* 19 */ - {"CON-PATH", N_("CON-PATH"), 51}, /* 20 */ + {"PHYS-PORT-ID", N_("PHYS-PORT-ID"), 18}, /* 18 */ + {"CONNECTION", N_("CONNECTION"), 20}, /* 19 */ + {"CON-UUID", N_("CON-UUID"), 38}, /* 20 */ + {"CON-PATH", N_("CON-PATH"), 51}, /* 21 */ {NULL, NULL, 0} }; #define NMC_FIELDS_DEV_SHOW_GENERAL_ALL "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,DRIVER-VERSION,FIRMWARE-VERSION,HWADDR,MTU,STATE,REASON,"\ - "UDI,IP-IFACE,IS-SOFTWARE,NM-MANAGED,AUTOCONNECT,FIRMWARE-MISSING,CONNECTION,CON-UUID,CON-PATH" + "UDI,IP-IFACE,IS-SOFTWARE,NM-MANAGED,AUTOCONNECT,FIRMWARE-MISSING,PHYS-PORT-ID,"\ + "CONNECTION,CON-UUID,CON-PATH" #define NMC_FIELDS_DEV_SHOW_GENERAL_COMMON "NAME,DEVICE,TYPE,VENDOR,PRODUCT,DRIVER,HWADDR,STATE" /* Available fields for 'device show' - CONNECTIONS part */ @@ -849,9 +851,10 @@ show_device_info (NMDevice *device, NmCli *nmc) set_val_strc (arr, 15, nm_device_get_managed (device) ? _("yes") : _("no")); set_val_strc (arr, 16, nm_device_get_autoconnect (device) ? _("yes") : _("no")); set_val_strc (arr, 17, nm_device_get_firmware_missing (device) ? _("yes") : _("no")); - set_val_strc (arr, 18, get_active_connection_id (device)); - set_val_strc (arr, 19, acon ? nm_active_connection_get_uuid (acon) : NULL); - set_val_strc (arr, 20, acon ? nm_object_get_path (NM_OBJECT (acon)) : NULL); + set_val_strc (arr, 18, nm_device_get_physical_port_id (device)); + set_val_strc (arr, 19, get_active_connection_id (device)); + set_val_strc (arr, 20, acon ? nm_active_connection_get_uuid (acon) : NULL); + set_val_strc (arr, 21, acon ? nm_object_get_path (NM_OBJECT (acon)) : NULL); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */