NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Add source-protocol-ver for pool commands

Browse Source 
Allow the addition of the <protocol ver='n'/> to the provided XML.

Signed-off-by: John Ferlan <jferlan@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
John Ferlan 2019-01-11 14:48:31 -05:00
parent 3d3647e14f
commit a3dbaa3647
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/virsh-pool.c
View File

@ -136,6 +136,10 @@
{.name = "adapter-parent-fabric-wwn", \ {.name = "adapter-parent-fabric-wwn", \
.type = VSH_OT_STRING, \ .type = VSH_OT_STRING, \
.help = N_("adapter parent scsi_hostN fabric_wwn to be used for underlying vHBA storage") \ .help = N_("adapter parent scsi_hostN fabric_wwn to be used for underlying vHBA storage") \
}, \
{.name = "source-protocol-ver", \
.type = VSH_OT_STRING, \
.help = N_("nfsvers value for NFS pool mount option") \
} }
virStoragePoolPtr virStoragePoolPtr
@ -319,7 +323,7 @@ virshBuildPoolXML(vshControl *ctl,
*secretUsage = NULL, *adapterName = NULL, *adapterParent = NULL, *secretUsage = NULL, *adapterName = NULL, *adapterParent = NULL,
*adapterWwnn = NULL, *adapterWwpn = NULL, *secretUUID = NULL, *adapterWwnn = NULL, *adapterWwpn = NULL, *secretUUID = NULL,
*adapterParentWwnn = NULL, *adapterParentWwpn = NULL, *adapterParentWwnn = NULL, *adapterParentWwpn = NULL,
*adapterParentFabricWwn = NULL; *adapterParentFabricWwn = NULL, *protoVer = NULL;
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
VSH_EXCLUSIVE_OPTIONS("secret-usage", "secret-uuid"); VSH_EXCLUSIVE_OPTIONS("secret-usage", "secret-uuid");
@ -345,7 +349,8 @@ virshBuildPoolXML(vshControl *ctl,
vshCommandOptStringReq(ctl, cmd, "adapter-parent", &adapterParent) < 0 || vshCommandOptStringReq(ctl, cmd, "adapter-parent", &adapterParent) < 0 ||
vshCommandOptStringReq(ctl, cmd, "adapter-parent-wwnn", &adapterParentWwnn) < 0 || vshCommandOptStringReq(ctl, cmd, "adapter-parent-wwnn", &adapterParentWwnn) < 0 ||
vshCommandOptStringReq(ctl, cmd, "adapter-parent-wwpn", &adapterParentWwpn) < 0 || vshCommandOptStringReq(ctl, cmd, "adapter-parent-wwpn", &adapterParentWwpn) < 0 ||
vshCommandOptStringReq(ctl, cmd, "adapter-parent-fabric-wwn", &adapterParentFabricWwn) < 0) vshCommandOptStringReq(ctl, cmd, "adapter-parent-fabric-wwn", &adapterParentFabricWwn) < 0 ||
vshCommandOptStringReq(ctl, cmd, "source-protocol-ver", &protoVer) < 0)
goto cleanup; goto cleanup;
virBufferAsprintf(&buf, "<pool type='%s'>\n", type); virBufferAsprintf(&buf, "<pool type='%s'>\n", type);
@ -394,6 +399,9 @@ virshBuildPoolXML(vshControl *ctl,
if (srcName) if (srcName)
virBufferAsprintf(&buf, "<name>%s</name>\n", srcName); virBufferAsprintf(&buf, "<name>%s</name>\n", srcName);
if (protoVer)
virBufferAsprintf(&buf, "<protocol ver='%s'/>\n", protoVer);
virBufferAdjustIndent(&buf, -2); virBufferAdjustIndent(&buf, -2);
virBufferAddLit(&buf, "</source>\n"); virBufferAddLit(&buf, "</source>\n");
} }

5
tools/virsh.pod
View File

@ -3887,6 +3887,7 @@ just I<--build> is provided, then B<pool-build> is called with no flags.
[I<--source-name name>] [I<--target path>] [I<--source-format format>] [I<--source-name name>] [I<--target path>] [I<--source-format format>]
[I<--auth-type authtype> I<--auth-username username> [I<--auth-type authtype> I<--auth-username username>
[I<--secret-usage usage> | I<--secret-uuid uuid>]] [I<--secret-usage usage> | I<--secret-uuid uuid>]]
[I<--source-protocol-ver ver>]
[[I<--adapter-name name>] | [I<--adapter-wwnn> wwnn I<--adapter-wwpn> wwpn] [[I<--adapter-name name>] | [I<--adapter-wwnn> wwnn I<--adapter-wwpn> wwpn]
[I<--adapter-parent parent> | [I<--adapter-parent parent> |
I<--adapter-parent-wwnn parent_wwnn> I<adapter-parent-wwpn parent_wwpn> | I<--adapter-parent-wwnn parent_wwnn> I<adapter-parent-wwpn parent_wwpn> |
@ -3929,6 +3930,10 @@ the storage pool. The I<authtype> is either chap for iscsi I<type> pools or
ceph for rbd I<type> pools. Either the secret I<usage> or I<uuid> value may ceph for rbd I<type> pools. Either the secret I<usage> or I<uuid> value may
be provided, but not both. be provided, but not both.
[I<--source-protocol-ver ver>] provides the NFS protocol version number used
to contact the server's NFS service via nfs mount option 'nfsvers=n'. It is
expect the I<ver> value is an unsigned integer.
[I<--adapter-name name>] defines the scsi_hostN adapter name to be used for [I<--adapter-name name>] defines the scsi_hostN adapter name to be used for
the scsi_host adapter type pool. the scsi_host adapter type pool.