Fix libvirt volume tests passing invalid disk_info
The tests for some libvirt volume were following the same pattern of passing invalid disk_info data to get_config. They seemed to expect connection_info['data'] to contain the same data as disk_info, which has never been true. Part of bp local-disk-serial-numbers Change-Id: I0fc5ebc9eeae8feb644adaa96537e69521acec78
This commit is contained in:
parent
d1e38f06bb
commit
30cd052d09
@ -46,11 +46,8 @@ class LibvirtDISCOVolumeDriverTestCase(
|
|||||||
def test_libvirt_disco_driver_get_config(self):
|
def test_libvirt_disco_driver_get_config(self):
|
||||||
dcon = disco.LibvirtDISCOVolumeDriver(self.fake_host)
|
dcon = disco.LibvirtDISCOVolumeDriver(self.fake_host)
|
||||||
|
|
||||||
disk_info = {'path': '/dev/dms1234567', 'name': 'aDiscoVolume',
|
conn = {'data': {'device_path': '/dev/dms1234567'}}
|
||||||
'type': 'raw', 'dev': 'vda1', 'bus': 'pci0',
|
conf = dcon.get_config(conn, self.disk_info)
|
||||||
'device_path': '/dev/dms1234567'}
|
|
||||||
conn = {'data': disk_info}
|
|
||||||
conf = dcon.get_config(conn, disk_info)
|
|
||||||
self.assertEqual('file', conf.source_type)
|
self.assertEqual('file', conf.source_type)
|
||||||
self.assertEqual('/dev/dms1234567', conf.source_path)
|
self.assertEqual('/dev/dms1234567', conf.source_path)
|
||||||
self.assertEqual('disco', conf.source_protocol)
|
self.assertEqual('disco', conf.source_protocol)
|
||||||
|
@ -44,10 +44,8 @@ class LibvirtHGSTVolumeDriverTestCase(test_volume.LibvirtVolumeBaseTestCase):
|
|||||||
|
|
||||||
def test_libvirt_hgst_driver_get_config(self):
|
def test_libvirt_hgst_driver_get_config(self):
|
||||||
drvr = hgst.LibvirtHGSTVolumeDriver(self.fake_host)
|
drvr = hgst.LibvirtHGSTVolumeDriver(self.fake_host)
|
||||||
di = {'path': '/dev/space01', 'name': 'space01', 'type': 'raw',
|
ci = {'data': {'device_path': '/dev/space01'}}
|
||||||
'dev': 'vda1', 'bus': 'pci0', 'device_path': '/dev/space01'}
|
conf = drvr.get_config(ci, self.disk_info)
|
||||||
ci = {'data': di}
|
|
||||||
conf = drvr.get_config(ci, di)
|
|
||||||
self.assertEqual('block', conf.source_type)
|
self.assertEqual('block', conf.source_type)
|
||||||
self.assertEqual('/dev/space01', conf.source_path)
|
self.assertEqual('/dev/space01', conf.source_path)
|
||||||
|
|
||||||
|
@ -44,10 +44,8 @@ class LibvirtScaleIOVolumeDriverTestCase(
|
|||||||
|
|
||||||
def test_libvirt_scaleio_driver_get_config(self):
|
def test_libvirt_scaleio_driver_get_config(self):
|
||||||
sio = scaleio.LibvirtScaleIOVolumeDriver(self.fake_host)
|
sio = scaleio.LibvirtScaleIOVolumeDriver(self.fake_host)
|
||||||
disk_info = {'path': '/dev/vol01', 'name': 'vol01', 'type': 'raw',
|
conn = {'data': {'device_path': '/dev/vol01'}}
|
||||||
'dev': 'vda1', 'bus': 'pci0', 'device_path': '/dev/vol01'}
|
conf = sio.get_config(conn, self.disk_info)
|
||||||
conn = {'data': disk_info}
|
|
||||||
conf = sio.get_config(conn, disk_info)
|
|
||||||
self.assertEqual('block', conf.source_type)
|
self.assertEqual('block', conf.source_type)
|
||||||
self.assertEqual('/dev/vol01', conf.source_path)
|
self.assertEqual('/dev/vol01', conf.source_path)
|
||||||
|
|
||||||
|
@ -35,15 +35,9 @@ class LibvirtHyperScaleVolumeDriverTestCase(
|
|||||||
hs = vrtshyperscale.LibvirtHyperScaleVolumeDriver(self.fake_host)
|
hs = vrtshyperscale.LibvirtHyperScaleVolumeDriver(self.fake_host)
|
||||||
|
|
||||||
# expect valid conf is returned if called with proper arguments
|
# expect valid conf is returned if called with proper arguments
|
||||||
disk_info = {'name': DEVICE_NAME,
|
conn = {'data': {'device_path': DEVICE_PATH}}
|
||||||
'type': None,
|
|
||||||
'dev': None,
|
|
||||||
'bus': None,
|
|
||||||
'device_path': DEVICE_PATH,
|
|
||||||
}
|
|
||||||
conn = {'data': disk_info}
|
|
||||||
|
|
||||||
conf = hs.get_config(conn, disk_info)
|
conf = hs.get_config(conn, self.disk_info)
|
||||||
|
|
||||||
self.assertEqual("block", conf.source_type)
|
self.assertEqual("block", conf.source_type)
|
||||||
self.assertEqual(DEVICE_PATH, conf.source_path)
|
self.assertEqual(DEVICE_PATH, conf.source_path)
|
||||||
|
Loading…
Reference in New Issue
Block a user