9:37 a.m.
Test that we can cope with a long useralias when generating SCSI hostdev
commandline.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../hostdev-scsi-virtio-scsi.x86_64-2.8.0.args | 8 +++++---
.../hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 8 +++++---
.../hostdev-scsi-virtio-scsi.x86_64-latest.args | 2 +-
tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml | 2 +-
tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml | 2 +-
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
index 07b7a5b113..3f007db2c3 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-2.8.0.args
@@ -37,9 +37,11 @@ drive=drive-hostdev0,id=hostdev0 \
-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=7,\
drive=drive-hostdev1,id=hostdev1 \
--drive file=/dev/sg0,if=none,format=raw,id=drive-ua-test \
--device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=6,drive=drive-ua-test,\
-id=ua-test \
+-drive file=/dev/sg0,if=none,format=raw,\
+id=drive-ua-7996c8dc-a4fa-4012-b76f-043d20144263 \
+-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=6,\
+drive=drive-ua-7996c8dc-a4fa-4012-b76f-043d20144263,\
+id=ua-7996c8dc-a4fa-4012-b76f-043d20144263 \
-drive file=iscsi://example.org:3260/iqn.1992-01.com.example/0,if=none,\
format=raw,id=drive-hostdev2 \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=2,lun=4,\
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
index 421edf90d0..eb11d8f733 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
@@ -36,9 +36,11 @@ drive=drive-hostdev0,id=hostdev0 \
-drive file=/dev/sg0,if=none,format=raw,id=drive-hostdev1,readonly=on \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=7,\
drive=drive-hostdev1,id=hostdev1 \
--drive file=/dev/sg0,if=none,format=raw,id=drive-ua-test \
--device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=6,drive=drive-ua-test,\
-id=ua-test \
+-drive file=/dev/sg0,if=none,format=raw,\
+id=drive-ua-7996c8dc-a4fa-4012-b76f-043d20144263 \
+-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=6,\
+drive=drive-ua-7996c8dc-a4fa-4012-b76f-043d20144263,\
+id=ua-7996c8dc-a4fa-4012-b76f-043d20144263 \
-drive file.driver=iscsi,file.portal=example.org:3260,\
file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,if=none,\
format=raw,id=drive-hostdev2 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
index 147ab40c9a..47c3f09db5 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-latest.args
@@ -45,7 +45,7 @@ drive=libvirt-3-backend,id=hostdev1 \
-blockdev
'{"driver":"host_device","filename":"/dev/sg0",\
"node-name":"libvirt-4-backend","read-only":false}' \
-device scsi-generic,bus=scsi0.0,channel=0,scsi-id=4,lun=6,\
-drive=libvirt-4-backend,id=ua-test \
+drive=libvirt-4-backend,id=ua-7996c8dc-a4fa-4012-b76f-043d20144263 \
-blockdev
'{"driver":"iscsi","portal":"example.org:3260",\
"target":"iqn.1992-01.com.example","lun":0,"transport":"tcp",\
"node-name":"libvirt-5-backend","read-only":false}' \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
index 8da3fb1bfc..4903a75d13 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.xml
@@ -45,7 +45,7 @@
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='2'/>
</source>
- <alias name='ua-test'/>
+ <alias name='ua-7996c8dc-a4fa-4012-b76f-043d20144263'/>
<address type='drive' controller='0' bus='0'
target='4' unit='6'/>
</hostdev>
<hostdev mode='subsystem' type='scsi' managed='yes'>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
index 733d1d72a0..3a2b10d815 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
@@ -52,7 +52,7 @@
<adapter name='scsi_host0'/>
<address bus='0' target='0' unit='2'/>
</source>
- <alias name='ua-test'/>
+ <alias name='ua-7996c8dc-a4fa-4012-b76f-043d20144263'/>
<address type='drive' controller='0' bus='0'
target='4' unit='6'/>
</hostdev>
<hostdev mode='subsystem' type='scsi' managed='yes'>
--
2.26.2