schema: Allow iSCSI source to have interleaved children

There is no need to require users to produce iSCSI disk source
following our ordering of children elements. In fact, we don't
even accept our own order in the schema :(.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Laine Stump <laine@redhat.com>
This commit is contained in:
Michal Privoznik 2020-01-08 17:03:42 +01:00
parent 832656fa8e
commit 8b58b5ee03
3 changed files with 34 additions and 12 deletions

View File

@ -1772,6 +1772,7 @@
<value>iscsi</value>
</attribute>
<attribute name="name"/>
<interleave>
<ref name="diskSourceCommon"/>
<ref name="diskSourceNetworkHost"/>
<optional>
@ -1783,6 +1784,7 @@
<optional>
<ref name="initiatorinfo"/>
</optional>
</interleave>
</element>
</define>

View File

@ -58,4 +58,11 @@ file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,\
file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,\
id=drive-scsi0-0-0-1 \
-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=1,\
drive=drive-scsi0-0-0-1,id=scsi0-0-0-1
drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
-drive file.driver=iscsi,file.portal=example.org:3260,\
file.target=iqn.1992-01.com.example:server,file.lun=0,file.transport=tcp,\
file.user=myname,file.password-secret=AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A,\
file.initiator-name=iqn.1992-01.com.example:client,format=raw,if=none,\
id=drive-scsi0-0-0-2 \
-device scsi-block,bus=scsi0.0,channel=0,scsi-id=0,lun=2,\
drive=drive-scsi0-0-0-2,id=scsi0-0-0-2

View File

@ -65,6 +65,19 @@
</source>
<target dev='sdb' bus='scsi'/>
</disk>
<disk type='network' device='lun'>
<driver name='qemu' type='raw'/>
<source protocol='iscsi' name='iqn.1992-01.com.example:server/0'>
<host name='example.org' port='3260'/>
<initiator>
<iqn name='iqn.1992-01.com.example:client'/>
</initiator>
<auth username='myname'>
<secret type='iscsi' usage='mycluster_myname'/>
</auth>
</source>
<target dev='sdc' bus='scsi'/>
</disk>
<controller type='usb' index='0'/>
<controller type='pci' index='0' model='pci-root'/>
<controller type='scsi' index='0' model='virtio-scsi'/>