Merge "Fix libvirt volume tests passing invalid disk_info"

This commit is contained in:
Zuul 2018-11-02 17:31:34 +00:00 committed by Gerrit Code Review
commit ffa8074583
4 changed files with 8 additions and 21 deletions

View File

@ -46,11 +46,8 @@ class LibvirtDISCOVolumeDriverTestCase(
def test_libvirt_disco_driver_get_config(self):
dcon = disco.LibvirtDISCOVolumeDriver(self.fake_host)
disk_info = {'path': '/dev/dms1234567', 'name': 'aDiscoVolume',
'type': 'raw', 'dev': 'vda1', 'bus': 'pci0',
'device_path': '/dev/dms1234567'}
conn = {'data': disk_info}
conf = dcon.get_config(conn, disk_info)
conn = {'data': {'device_path': '/dev/dms1234567'}}
conf = dcon.get_config(conn, self.disk_info)
self.assertEqual('file', conf.source_type)
self.assertEqual('/dev/dms1234567', conf.source_path)
self.assertEqual('disco', conf.source_protocol)

View File

@ -44,10 +44,8 @@ class LibvirtHGSTVolumeDriverTestCase(test_volume.LibvirtVolumeBaseTestCase):
def test_libvirt_hgst_driver_get_config(self):
drvr = hgst.LibvirtHGSTVolumeDriver(self.fake_host)
di = {'path': '/dev/space01', 'name': 'space01', 'type': 'raw',
'dev': 'vda1', 'bus': 'pci0', 'device_path': '/dev/space01'}
ci = {'data': di}
conf = drvr.get_config(ci, di)
ci = {'data': {'device_path': '/dev/space01'}}
conf = drvr.get_config(ci, self.disk_info)
self.assertEqual('block', conf.source_type)
self.assertEqual('/dev/space01', conf.source_path)

View File

@ -44,10 +44,8 @@ class LibvirtScaleIOVolumeDriverTestCase(
def test_libvirt_scaleio_driver_get_config(self):
sio = scaleio.LibvirtScaleIOVolumeDriver(self.fake_host)
disk_info = {'path': '/dev/vol01', 'name': 'vol01', 'type': 'raw',
'dev': 'vda1', 'bus': 'pci0', 'device_path': '/dev/vol01'}
conn = {'data': disk_info}
conf = sio.get_config(conn, disk_info)
conn = {'data': {'device_path': '/dev/vol01'}}
conf = sio.get_config(conn, self.disk_info)
self.assertEqual('block', conf.source_type)
self.assertEqual('/dev/vol01', conf.source_path)

View File

@ -35,15 +35,9 @@ class LibvirtHyperScaleVolumeDriverTestCase(
hs = vrtshyperscale.LibvirtHyperScaleVolumeDriver(self.fake_host)
# expect valid conf is returned if called with proper arguments
disk_info = {'name': DEVICE_NAME,
'type': None,
'dev': None,
'bus': None,
'device_path': DEVICE_PATH,
}
conn = {'data': disk_info}
conn = {'data': {'device_path': DEVICE_PATH}}
conf = hs.get_config(conn, disk_info)
conf = hs.get_config(conn, self.disk_info)
self.assertEqual("block", conf.source_type)
self.assertEqual(DEVICE_PATH, conf.source_path)