mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-23 06:23:10 +00:00
virsh: Print cephx and iscsi usage
When using virsh secret-list - if the secret types are cephx or iscsi, then allow fetch/print of the usage information. Prior to the change the following would print: UUID Usage ----------------------------------------------------------- 1b40a534-8301-45d5-b1aa-11894ebb1735 Unused a5ba3efe-6adf-4a6a-b243-f010a043e314 Unused Afterwards: UUID Usage ----------------------------------------------------------- 1b40a534-8301-45d5-b1aa-11894ebb1735 ceph ceph_example a5ba3efe-6adf-4a6a-b243-f010a043e314 iscsi libvirtiscsi
This commit is contained in:
parent
6aea4ebcd0
commit
db1382f322
@ -38,6 +38,7 @@
|
|||||||
#include "virfile.h"
|
#include "virfile.h"
|
||||||
#include "virutil.h"
|
#include "virutil.h"
|
||||||
#include "virxml.h"
|
#include "virxml.h"
|
||||||
|
#include "conf/secret_conf.h"
|
||||||
|
|
||||||
static virSecretPtr
|
static virSecretPtr
|
||||||
vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name)
|
vshCommandOptSecret(vshControl *ctl, const vshCmd *cmd, const char **name)
|
||||||
@ -536,15 +537,10 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
|
|||||||
|
|
||||||
for (i = 0; i < list->nsecrets; i++) {
|
for (i = 0; i < list->nsecrets; i++) {
|
||||||
virSecretPtr sec = list->secrets[i];
|
virSecretPtr sec = list->secrets[i];
|
||||||
const char *usageType = NULL;
|
int usageType = virSecretGetUsageType(sec);
|
||||||
|
const char *usageStr = virSecretUsageTypeTypeToString(usageType);
|
||||||
switch (virSecretGetUsageType(sec)) {
|
|
||||||
case VIR_SECRET_USAGE_TYPE_VOLUME:
|
|
||||||
usageType = _("Volume");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
char uuid[VIR_UUID_STRING_BUFLEN];
|
char uuid[VIR_UUID_STRING_BUFLEN];
|
||||||
|
|
||||||
if (virSecretGetUUIDString(list->secrets[i], uuid) < 0) {
|
if (virSecretGetUUIDString(list->secrets[i], uuid) < 0) {
|
||||||
vshError(ctl, "%s", _("Failed to get uuid of secret"));
|
vshError(ctl, "%s", _("Failed to get uuid of secret"));
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
@ -552,7 +548,7 @@ cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED)
|
|||||||
|
|
||||||
if (usageType) {
|
if (usageType) {
|
||||||
vshPrint(ctl, "%-36s %s %s\n",
|
vshPrint(ctl, "%-36s %s %s\n",
|
||||||
uuid, usageType,
|
uuid, usageStr,
|
||||||
virSecretGetUsageID(sec));
|
virSecretGetUsageID(sec));
|
||||||
} else {
|
} else {
|
||||||
vshPrint(ctl, "%-36s %s\n",
|
vshPrint(ctl, "%-36s %s\n",
|
||||||
|
Loading…
Reference in New Issue
Block a user