提交 e6a7fa26 编写于 作者: A Ashish Mittal 提交者: John Ferlan

docs: Add schema and docs for Veritas HyperScale (VxHS)

Alter the schema to allow a VxHS block device. Sample XML is:

  <disk type='network' device='disk'>
    <driver name='qemu' type='raw' cache='none'/>
    <source protocol='vxhs' name='eb90327c-8302-4725-9e1b-4e85ed4dc251'>
      <host name='192.168.0.1' port='9999'/>
    </source>
    <target dev='vda' bus='virtio'/>
    <serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial>
    <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
  </disk>

Update the html docs to describe the capability for VxHS.

Alter the qemuxml2xmltest to validate the formatting.
Signed-off-by: NAshish Mittal <Ashish.Mittal@veritas.com>
Signed-off-by: NJohn Ferlan <jferlan@redhat.com>
上级 029c36c9
...@@ -2514,9 +2514,9 @@ ...@@ -2514,9 +2514,9 @@
<dd> <dd>
The <code>protocol</code> attribute specifies the protocol to The <code>protocol</code> attribute specifies the protocol to
access to the requested image. Possible values are "nbd", access to the requested image. Possible values are "nbd",
"iscsi", "rbd", "sheepdog" or "gluster". If the "iscsi", "rbd", "sheepdog", "gluster" or "vxhs". If the
<code>protocol</code> attribute is "rbd", "sheepdog" or <code>protocol</code> attribute is "rbd", "sheepdog", "gluster"
"gluster", an additional attribute <code>name</code> is or "vxhs", an additional attribute <code>name</code> is
mandatory to specify which volume/image will be used. For "nbd", mandatory to specify which volume/image will be used. For "nbd",
the <code>name</code> attribute is optional. For "iscsi" the <code>name</code> attribute is optional. For "iscsi"
(<span class="since">since 1.0.4</span>), the <code>name</code> (<span class="since">since 1.0.4</span>), the <code>name</code>
...@@ -2524,6 +2524,9 @@ ...@@ -2524,6 +2524,9 @@
target's name by a slash (e.g., target's name by a slash (e.g.,
<code>iqn.2013-07.com.example:iscsi-pool/1</code>). If not <code>iqn.2013-07.com.example:iscsi-pool/1</code>). If not
specified, the default LUN is zero. specified, the default LUN is zero.
For "vxhs" (<span class="since">since 3.8.0</span>), the
<code>name</code> is the UUID of the volume, assigned by the
HyperScale server.
<span class="since">Since 0.8.7</span> <span class="since">Since 0.8.7</span>
</dd> </dd>
<dt><code>volume</code></dt> <dt><code>volume</code></dt>
...@@ -2626,6 +2629,12 @@ ...@@ -2626,6 +2629,12 @@
<td> one or more (<span class="since">Since 2.1.0</span>), just one prior to that </td> <td> one or more (<span class="since">Since 2.1.0</span>), just one prior to that </td>
<td> 24007 </td> <td> 24007 </td>
</tr> </tr>
<tr>
<td> vxhs </td>
<td> a server running Veritas HyperScale daemon </td>
<td> only one </td>
<td> 9999 </td>
</tr>
</table> </table>
<p> <p>
gluster supports "tcp", "rdma", "unix" as valid values for the gluster supports "tcp", "rdma", "unix" as valid values for the
......
...@@ -1636,6 +1636,18 @@ ...@@ -1636,6 +1636,18 @@
</element> </element>
</define> </define>
<define name="diskSourceNetworkProtocolVxHS">
<element name="source">
<attribute name="protocol">
<choice>
<value>vxhs</value>
</choice>
</attribute>
<attribute name="name"/>
<ref name="diskSourceNetworkHost"/>
</element>
</define>
<define name="diskSourceNetwork"> <define name="diskSourceNetwork">
<attribute name="type"> <attribute name="type">
<value>network</value> <value>network</value>
...@@ -1646,6 +1658,7 @@ ...@@ -1646,6 +1658,7 @@
<ref name="diskSourceNetworkProtocolRBD"/> <ref name="diskSourceNetworkProtocolRBD"/>
<ref name="diskSourceNetworkProtocolHTTP"/> <ref name="diskSourceNetworkProtocolHTTP"/>
<ref name="diskSourceNetworkProtocolSimple"/> <ref name="diskSourceNetworkProtocolSimple"/>
<ref name="diskSourceNetworkProtocolVxHS"/>
</choice> </choice>
</define> </define>
......
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='i686' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='network' device='disk'>
<driver name='qemu' type='raw' cache='none'/>
<source protocol='vxhs' name='eb90327c-8302-4725-9e1b-4e85ed4dc251'>
<host name='192.168.0.1' port='9999'/>
</source>
<target dev='vda' bus='virtio'/>
<serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</disk>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='none'/>
</devices>
</domain>
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
<memory unit='KiB'>219136</memory>
<currentMemory unit='KiB'>219136</currentMemory>
<vcpu placement='static'>1</vcpu>
<os>
<type arch='i686' machine='pc'>hvm</type>
<boot dev='hd'/>
</os>
<clock offset='utc'/>
<on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash>
<devices>
<emulator>/usr/bin/qemu-system-x86_64</emulator>
<disk type='network' device='disk'>
<driver name='qemu' type='raw' cache='none'/>
<source protocol='vxhs' name='eb90327c-8302-4725-9e1b-4e85ed4dc251'>
<host name='192.168.0.1' port='9999'/>
</source>
<target dev='vda' bus='virtio'/>
<serial>eb90327c-8302-4725-9e1b-4e85ed4dc251</serial>
<address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
</disk>
<controller type='usb' index='0'>
<address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
</controller>
<controller type='pci' index='0' model='pci-root'/>
<input type='mouse' bus='ps2'/>
<input type='keyboard' bus='ps2'/>
<memballoon model='none'/>
</devices>
</domain>
...@@ -474,6 +474,7 @@ mymain(void) ...@@ -474,6 +474,7 @@ mymain(void)
DO_TEST("disk-drive-network-rbd-ipv6", NONE); DO_TEST("disk-drive-network-rbd-ipv6", NONE);
DO_TEST("disk-drive-network-rbd-ceph-env", NONE); DO_TEST("disk-drive-network-rbd-ceph-env", NONE);
DO_TEST("disk-drive-network-sheepdog", NONE); DO_TEST("disk-drive-network-sheepdog", NONE);
DO_TEST("disk-drive-network-vxhs", NONE);
DO_TEST("disk-scsi-device", DO_TEST("disk-scsi-device",
QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_LSI); QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_SCSI_LSI);
DO_TEST("disk-scsi-vscsi", NONE); DO_TEST("disk-scsi-vscsi", NONE);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册