[libvirt] [PATCH 0/4] Fix up rest of the list APIs to correct format
Peter Krempa (4): virsh-pool: Unify spacing of listing function virsh-nwfilter: Unify list command column alignment virsh-interface: Unify list column alignment virsh-secret: Unify list column alignment tools/virsh-interface.c | 6 +++--- tools/virsh-nwfilter.c | 8 ++++---- tools/virsh-pool.c | 10 +++++----- tools/virsh-secret.c | 9 +++++---- 4 files changed, 17 insertions(+), 16 deletions(-) -- 1.8.4.3
Change the alignment to match the domain listing function. Before: $ virsh pool-list Name State Autostart ----------------------------------------- boot-scratch active no default active no glusterpool active no $ virsh pool-list --details Name State Autostart Persistent Capacity Allocation Available ------------------------------------------------------------------------------- boot-scratch running no yes 117.99 GiB 101.40 GiB 16.60 GiB default running no yes 117.99 GiB 101.40 GiB 16.60 GiB glusterpool running no yes 29.40 GiB 44.23 MiB 29.36 GiB After: $ virsh pool-list Name State Autostart ------------------------------------------- boot-scratch active no default active no glusterpool active no $ virsh pool-list --details Name State Autostart Persistent Capacity Allocation Available --------------------------------------------------------------------------------- boot-scratch running no yes 117.99 GiB 101.40 GiB 16.60 GiB default running no yes 117.99 GiB 101.40 GiB 16.60 GiB glusterpool running no yes 29.40 GiB 44.23 MiB 29.36 GiB --- tools/virsh-pool.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index c771226..18fe242 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1191,14 +1191,14 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) /* Output basic info then return if --details option not selected */ if (!details) { /* Output old style header */ - vshPrintExtra(ctl, "%-20s %-10s %-10s\n", _("Name"), _("State"), + vshPrintExtra(ctl, " %-20s %-10s %-10s\n", _("Name"), _("State"), _("Autostart")); - vshPrintExtra(ctl, "-----------------------------------------\n"); + vshPrintExtra(ctl, "-------------------------------------------\n"); /* Output old style pool info */ for (i = 0; i < list->npools; i++) { const char *name = virStoragePoolGetName(list->pools[i]); - vshPrint(ctl, "%-20s %-10s %-10s\n", + vshPrint(ctl, " %-20s %-10s %-10s\n", name, poolInfoTexts[i].state, poolInfoTexts[i].autostart); @@ -1266,7 +1266,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) * the longest string. */ ret = virAsprintf(&outputStr, - "%%-%lus %%-%lus %%-%lus %%-%lus %%%lus %%%lus %%%lus\n", + " %%-%lus %%-%lus %%-%lus %%-%lus %%%lus %%%lus %%%lus\n", (unsigned long) nameStrLength, (unsigned long) stateStrLength, (unsigned long) autostartStrLength, @@ -1285,7 +1285,7 @@ cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) for (i = nameStrLength + stateStrLength + autostartStrLength + persistStrLength + capStrLength + allocStrLength + availStrLength - + 12; i > 0; i--) + + 14; i > 0; i--) vshPrintExtra(ctl, "-"); vshPrintExtra(ctl, "\n"); -- 1.8.4.3
Before: $ virsh nwfilter-list UUID Name ---------------------------------------------------------------- 651d902c-165c-4bcc-8d73-41319af1e6bc allow-arp 9ae11362-df6b-407f-8864-3bdf5125bf77 allow-dhcp 53b5a9ed-7d46-480f-a201-6d8a503d6533 allow-dhcp-server After: $ virsh nwfilter-list UUID Name ------------------------------------------------------------------ 651d902c-165c-4bcc-8d73-41319af1e6bc allow-arp 9ae11362-df6b-407f-8864-3bdf5125bf77 allow-dhcp 53b5a9ed-7d46-480f-a201-6d8a503d6533 allow-dhcp-server --- tools/virsh-nwfilter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index e5fcb8f..6f2c88c 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -370,15 +370,15 @@ cmdNWFilterList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (!(list = vshNWFilterListCollect(ctl, 0))) return false; - vshPrintExtra(ctl, "%-36s %-20s \n", _("UUID"), _("Name")); - vshPrintExtra(ctl, - "----------------------------------------------------------------\n"); + vshPrintExtra(ctl, " %-36s %-20s \n", _("UUID"), _("Name")); + vshPrintExtra(ctl, "---------------------------------" + "---------------------------------\n"); for (i = 0; i < list->nfilters; i++) { virNWFilterPtr nwfilter = list->filters[i]; virNWFilterGetUUIDString(nwfilter, uuid); - vshPrint(ctl, "%-36s %-20s\n", + vshPrint(ctl, " %-36s %-20s\n", uuid, virNWFilterGetName(nwfilter)); } -- 1.8.4.3
Before: $ virsh iface-list Name State MAC Address -------------------------------------------- br0 active f0:de:f1:dc:b8:b0 virbr2 active 52:54:00:61:78:0c After: $ virsh iface-list Name State MAC Address --------------------------------------------------- br0 active f0:de:f1:dc:b8:b0 virbr2 active 52:54:00:61:78:0c --- tools/virsh-interface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 3720c8c..147583c 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -360,14 +360,14 @@ cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (!(list = vshInterfaceListCollect(ctl, flags))) return false; - vshPrintExtra(ctl, "%-20s %-10s %s\n", _("Name"), _("State"), + vshPrintExtra(ctl, " %-20s %-10s %s\n", _("Name"), _("State"), _("MAC Address")); - vshPrintExtra(ctl, "--------------------------------------------\n"); + vshPrintExtra(ctl, "---------------------------------------------------\n"); for (i = 0; i < list->nifaces; i++) { virInterfacePtr iface = list->ifaces[i]; - vshPrint(ctl, "%-20s %-10s %s\n", + vshPrint(ctl, " %-20s %-10s %s\n", virInterfaceGetName(iface), virInterfaceIsActive(iface) ? _("active") : _("inactive"), virInterfaceGetMACString(iface)); -- 1.8.4.3
Before: $ virsh secret-list UUID Usage ----------------------------------------------------------- 0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f volume /var/lib/libvirt/images/puppyname.img 0a81f5b2-8403-7b23-c8d6-2deadbeefd6f Unused After: $ virsh secret-list UUID Usage -------------------------------------------------------------------------------- 0a81f5b2-8403-7b23-c8d6-21ccc2f80d6f volume /var/lib/libvirt/images/puppyname.img 0a81f5b2-8403-7b23-c8d6-2deadbeefd6f Unused --- tools/virsh-secret.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index e849a79..b5acfda 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -532,8 +532,9 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) if (!(list = vshSecretListCollect(ctl, flags))) return false; - vshPrintExtra(ctl, "%-36s %s\n", _("UUID"), _("Usage")); - vshPrintExtra(ctl, "-----------------------------------------------------------\n"); + vshPrintExtra(ctl, " %-36s %s\n", _("UUID"), _("Usage")); + vshPrintExtra(ctl, "----------------------------------------" + "----------------------------------------\n"); for (i = 0; i < list->nsecrets; i++) { virSecretPtr sec = list->secrets[i]; @@ -547,11 +548,11 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) } if (usageType) { - vshPrint(ctl, "%-36s %s %s\n", + vshPrint(ctl, " %-36s %s %s\n", uuid, usageStr, virSecretGetUsageID(sec)); } else { - vshPrint(ctl, "%-36s %s\n", + vshPrint(ctl, " %-36s %s\n", uuid, _("Unused")); } } -- 1.8.4.3
On 11/12/2013 06:48 PM, Peter Krempa wrote:
Peter Krempa (4): virsh-pool: Unify spacing of listing function virsh-nwfilter: Unify list command column alignment virsh-interface: Unify list column alignment virsh-secret: Unify list column alignment
tools/virsh-interface.c | 6 +++--- tools/virsh-nwfilter.c | 8 ++++---- tools/virsh-pool.c | 10 +++++----- tools/virsh-secret.c | 9 +++++---- 4 files changed, 17 insertions(+), 16 deletions(-)
ACK series.
On 11/13/13 12:22, Laine Stump wrote:
On 11/12/2013 06:48 PM, Peter Krempa wrote:
Peter Krempa (4): virsh-pool: Unify spacing of listing function virsh-nwfilter: Unify list command column alignment virsh-interface: Unify list column alignment virsh-secret: Unify list column alignment
tools/virsh-interface.c | 6 +++--- tools/virsh-nwfilter.c | 8 ++++---- tools/virsh-pool.c | 10 +++++----- tools/virsh-secret.c | 9 +++++---- 4 files changed, 17 insertions(+), 16 deletions(-)
ACK series.
Thanks! Pushed now. Peter
participants (2)
-
Laine Stump -
Peter Krempa