1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
|
diff --git a/tests/data/cli/compare/virt-install-many-devices.xml b/tests/data/cli/compare/virt-install-many-devices.xml
index 49e9dcc..cf48427 100644
--- a/tests/data/cli/compare/virt-install-many-devices.xml
+++ b/tests/data/cli/compare/virt-install-many-devices.xml
@@ -71,7 +71,7 @@
<source file="/var/lib/libvirt/images/disk.qcow2"/>
<target dev="vdc" bus="virtio"/>
</disk>
- <disk type="block" device="lun" sgio="unfiltered" rawio="yes">
+ <disk type="block" device="lun" sgio="filtered" rawio="yes">
<driver name="qemu" type="raw"/>
<source dev="/iscsi-pool/diskvol1"/>
<target dev="sdab" bus="scsi"/>
diff --git a/tests/data/testdriver/testdriver.xml b/tests/data/testdriver/testdriver.xml
index ea90f0f..beed8f0 100644
--- a/tests/data/testdriver/testdriver.xml
+++ b/tests/data/testdriver/testdriver.xml
@@ -245,7 +245,7 @@ Foo bar baz & yeah boii < > yeahfoo
<shareable/>
</disk>
- <disk type='block' device='lun' rawio='no' sgio='unfiltered'>
+ <disk type='block' device='lun' rawio='no'>
<driver name='qemu' type='raw'/>
<source dev='/dev/szz'>
<reservations managed="yes"/>
diff --git a/tests/data/xmlparse/change-disk-out.xml b/tests/data/xmlparse/change-disk-out.xml
index f65a1bc..263c9f9 100644
--- a/tests/data/xmlparse/change-disk-out.xml
+++ b/tests/data/xmlparse/change-disk-out.xml
@@ -37,7 +37,7 @@
<disk type="file" device="floppy">
<target dev="fde" bus="fdc"/>
</disk>
- <disk type="block" device="lun" sgio="unfiltered" rawio="yes">
+ <disk type="block" device="lun">
<driver name="qemu" type="raw"/>
<source dev="/dev/sda"/>
<target dev="hdd" bus="scsi"/>
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 5e69a13..72ff4df 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -590,7 +590,7 @@ vcpus.vcpu1.id=2,vcpus.vcpu1.enabled=yes
--disk source.file=%(NEWIMG1)s,sparse=false,size=.001,perms=ro,error_policy=enospace,discard=unmap,detect_zeroes=unmap,address.type=drive,address.controller=0,address.target=2,address.unit=0
--disk device=cdrom,bus=sata,read_bytes_sec=1,read_iops_sec=2,write_bytes_sec=5,write_iops_sec=6,driver.copy_on_read=on,geometry.cyls=16383,geometry.heads=16,geometry.secs=63,geometry.trans=lba
--disk size=1
---disk /iscsi-pool/diskvol1,total_bytes_sec=10,total_iops_sec=20,bus=scsi,device=lun,sgio=unfiltered,rawio=yes
+--disk /iscsi-pool/diskvol1,total_bytes_sec=10,total_iops_sec=20,bus=scsi,device=lun,sgio=filtered,rawio=yes
--disk /dev/default-pool/iso-vol,seclabel.model=dac,seclabel1.model=selinux,seclabel1.relabel=no,seclabel0.label=foo,bar,baz,iotune.read_bytes_sec=1,iotune.read_iops_sec=2,iotune.write_bytes_sec=5,iotune.write_iops_sec=6
--disk /dev/default-pool/iso-vol,format=qcow2,startup_policy=optional,iotune.total_bytes_sec=10,iotune.total_iops_sec=20,
--disk source_pool=rbd-ceph,source_volume=some-rbd-vol,size=.1,driver_type=raw
diff --git a/tests/test_xmlparse.py b/tests/test_xmlparse.py
index 6d1aadd..116fd35 100644
--- a/tests/test_xmlparse.py
+++ b/tests/test_xmlparse.py
@@ -311,8 +311,6 @@ def testAlterDisk():
check = _make_checker(disk)
check("type", "block")
check("device", "lun")
- check("sgio", None, "unfiltered")
- check("rawio", None, "yes")
disk = _get_disk("sda")
check = _make_checker(disk)
|
