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

tests: Fix syntax in iSCSI auth/secret tests

Browse Source 
While working on the tests for the secret initialization vector, I found
that the existing iSCSI tests were lacking in how they defined the IQN.
Many had IQN's of just 'iqn.1992-01.com.example' for one disk while using
'iqn.1992-01.com.example/1' for the second disk (same for hostdevs - guess
how they were copied/generated).

Typically (and documented this way), IQN's would include be of the form
'iqn.1992-01.com.example:storage/1' indicating an IQN using "storage" for
naming authority specific string and "/1" for the iSCSI LUN.

So modify the input XML's to use the more proper format - this of course
has a ripple effect on the output XML and the args.

Also note that the "%3A" is generated by the virURIFormat/xmlSaveUri
to represent the colon.

Signed-off-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
John Ferlan
2016-04-16 08:11:00 -04:00
parent 905d1846cb
commit dd1400280e
11 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.args
View File

@@ -17,9 +17,9 @@ QEMU_AUDIO_DRV=none \
-boot c \
-usb \
-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:\
6000/iqn.1992-01.com.example,format=raw,if=virtio \
-drive file=iscsi://example.org:6000/iqn.1992-01.com.example/1,format=raw,\
if=virtio \
6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=virtio \
-drive file=iscsi://example.org:6000/iqn.1992-01.com.example%3Astorage/2,\
format=raw,if=virtio \
-net none \
-serial none \
-parallel none

4
tests/qemuargv2xmldata/qemuargv2xml-disk-drive-network-iscsi-auth.xml
View File

@@ -19,14 +19,14 @@
<auth username='myname'>
<secret type='iscsi' usage='qemuargv2xml_usage'/>
</auth>
<source protocol='iscsi' name='iqn.1992-01.com.example'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/1'>
<host name='example.org' port='6000'/>
</source>
<target dev='vda' bus='virtio'/>
</disk>
<disk type='network' device='disk'>
<driver name='qemu' type='raw'/>
<source protocol='iscsi' name='iqn.1992-01.com.example/1'>
<source protocol='iscsi' name='iqn.1992-01.com.example:storage/2'>
<host name='example.org' port='6000'/>
</source>
<target dev='vdb' bus='virtio'/>