From 30cd052d09363a2598ab54cb68f0a87852c3c18d Mon Sep 17 00:00:00 2001 From: Matthew Booth Date: Sat, 16 Dec 2017 17:06:28 +0000 Subject: [PATCH] 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 --- nova/tests/unit/virt/libvirt/volume/test_disco.py | 7 ++----- nova/tests/unit/virt/libvirt/volume/test_hgst.py | 6 ++---- nova/tests/unit/virt/libvirt/volume/test_scaleio.py | 6 ++---- .../unit/virt/libvirt/volume/test_vrtshyperscale.py | 10 ++-------- 4 files changed, 8 insertions(+), 21 deletions(-) diff --git a/nova/tests/unit/virt/libvirt/volume/test_disco.py b/nova/tests/unit/virt/libvirt/volume/test_disco.py index f236c4348308..8b45ca06eada 100644 --- a/nova/tests/unit/virt/libvirt/volume/test_disco.py +++ b/nova/tests/unit/virt/libvirt/volume/test_disco.py @@ -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) diff --git a/nova/tests/unit/virt/libvirt/volume/test_hgst.py b/nova/tests/unit/virt/libvirt/volume/test_hgst.py index b1c94fbadb75..6bfe0b05468a 100644 --- a/nova/tests/unit/virt/libvirt/volume/test_hgst.py +++ b/nova/tests/unit/virt/libvirt/volume/test_hgst.py @@ -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) diff --git a/nova/tests/unit/virt/libvirt/volume/test_scaleio.py b/nova/tests/unit/virt/libvirt/volume/test_scaleio.py index 5dd29ef2d3d9..1c3aa23cdce5 100644 --- a/nova/tests/unit/virt/libvirt/volume/test_scaleio.py +++ b/nova/tests/unit/virt/libvirt/volume/test_scaleio.py @@ -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) diff --git a/nova/tests/unit/virt/libvirt/volume/test_vrtshyperscale.py b/nova/tests/unit/virt/libvirt/volume/test_vrtshyperscale.py index 3511c06e1401..789d1906b346 100644 --- a/nova/tests/unit/virt/libvirt/volume/test_vrtshyperscale.py +++ b/nova/tests/unit/virt/libvirt/volume/test_vrtshyperscale.py @@ -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)