091e3ea8fd
We recently discovered that nova.test.SubclassSignatureTestCase has not worked properly since support for python 2.7 was dropped. The reason is the use of the inspect.ismethod() function; in python 2.7 it returned true if the object was a bound or an unbound method [2] but as of python 3, it only returns true if the object is a bound method [2]. Because of this, LibvirtBaseVolumeDriverSubclassSignatureTestCase was not actually checking any signatures. This replaces the use of inspect.ismethod() with inspect.isfunction() to fix the issue. It also adds a skip for subclass private functions as these are expected to be different among subclasses. One subclass method signature caught by the test is also updated to match the base class. [1] https://docs.python.org/2.7/library/inspect.html#inspect.ismethod [2] https://docs.python.org/3.5/library/inspect.html#inspect.ismethod Closes-Bug: #2019772 Change-Id: I5644effac7206035de77e0d1cd450a9fb96c3a0d
65 lines
2.7 KiB
Python
65 lines
2.7 KiB
Python
# Copyright (C) 2016-2020 Lightbits Labs Ltd.
|
|
# Copyright (C) 2020 Intel 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 nova.conf
|
|
from nova import utils
|
|
from nova.virt.libvirt.volume import volume as libvirt_volume
|
|
from os_brick import initiator
|
|
from os_brick.initiator import connector
|
|
from oslo_log import log as logging
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
CONF = nova.conf.CONF
|
|
|
|
|
|
class LibvirtLightOSVolumeDriver(libvirt_volume.LibvirtVolumeDriver):
|
|
"""Driver to attach NVMe volumes to libvirt."""
|
|
VERSION = '2.3.12'
|
|
|
|
def __init__(self, connection):
|
|
super(LibvirtLightOSVolumeDriver, self).__init__(connection)
|
|
self.connector = connector.InitiatorConnector.factory(
|
|
initiator.LIGHTOS,
|
|
root_helper=utils.get_root_helper(),
|
|
device_scan_attempts=CONF.libvirt.num_nvme_discover_tries)
|
|
|
|
def connect_volume(self, connection_info, instance):
|
|
device_info = self.connector.connect_volume(connection_info['data'])
|
|
LOG.debug("Connecting NVMe volume with device_info %s", device_info)
|
|
connection_info['data']['device_path'] = device_info['path']
|
|
|
|
def disconnect_volume(self, connection_info, instance, force=False):
|
|
"""Detach the volume from the instance."""
|
|
LOG.debug("Disconnecting NVMe disk. instance:%s, volume_id:%s",
|
|
connection_info.get("instance", ""),
|
|
connection_info.get("volume_id", ""))
|
|
self.connector.disconnect_volume(
|
|
connection_info['data'], None, force=force)
|
|
super(LibvirtLightOSVolumeDriver, self).disconnect_volume(
|
|
connection_info, instance, force=force)
|
|
|
|
def extend_volume(self, connection_info, instance, requested_size):
|
|
"""Extend the volume."""
|
|
LOG.debug("calling os-brick to extend LightOS Volume."
|
|
"instance:%s, volume_id:%s",
|
|
connection_info.get("instance", ""),
|
|
connection_info.get("volume_id", ""))
|
|
new_size = self.connector.extend_volume(connection_info['data'])
|
|
LOG.debug("Extend LightOS Volume %s; new_size=%s",
|
|
connection_info['data']['device_path'], new_size)
|
|
return new_size
|