36322fdf48
We were initialising libvirt volume drivers by passing the LibvirtDriver object. However, this is only ever used to fetch the Host. We update the interface to pass the Host instead. This is cleaner, but also better represents the intent of the interface. They should not be able to access arbitrary attributes of the LibvirtDriver object. Change-Id: I87ceeee1ec46dc22754321574b16e6c47b27a848
63 lines
2.5 KiB
Python
63 lines
2.5 KiB
Python
# Copyright (c) 2015 EMC Corporation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import mock
|
|
|
|
from os_brick.initiator import connector
|
|
|
|
from nova.tests.unit.virt.libvirt.volume import test_volume
|
|
from nova.virt.libvirt.volume import scaleio
|
|
|
|
|
|
class LibvirtScaleIOVolumeDriverTestCase(
|
|
test_volume.LibvirtVolumeBaseTestCase):
|
|
|
|
def test_libvirt_scaleio_driver(self):
|
|
libvirt_driver = scaleio.LibvirtScaleIOVolumeDriver(
|
|
self.fake_host)
|
|
self.assertIsInstance(libvirt_driver.connector,
|
|
connector.ScaleIOConnector)
|
|
|
|
def test_libvirt_scaleio_driver_connect(self):
|
|
def brick_conn_vol(data):
|
|
return {'path': '/dev/vol01'}
|
|
|
|
sio = scaleio.LibvirtScaleIOVolumeDriver(self.fake_host)
|
|
sio.connector.connect_volume = brick_conn_vol
|
|
disk_info = {'path': '/dev/vol01', 'name': 'vol01'}
|
|
conn = {'data': disk_info}
|
|
sio.connect_volume(conn, None)
|
|
self.assertEqual('/dev/vol01',
|
|
conn['data']['device_path'])
|
|
|
|
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)
|
|
self.assertEqual('block', conf.source_type)
|
|
self.assertEqual('/dev/vol01', conf.source_path)
|
|
|
|
def test_libvirt_scaleio_driver_disconnect(self):
|
|
sio = scaleio.LibvirtScaleIOVolumeDriver(self.fake_host)
|
|
sio.connector.disconnect_volume = mock.MagicMock()
|
|
disk_info = {'path': '/dev/vol01', 'name': 'vol01', 'type': 'raw',
|
|
'dev': 'vda1', 'bus': 'pci0', 'device_path': '/dev/vol01'}
|
|
conn = {'data': disk_info}
|
|
sio.disconnect_volume(conn, disk_info)
|
|
sio.connector.disconnect_volume.assert_called_once_with(
|
|
disk_info, None)
|