b912556ae0
_disconnect_volume was being passed disk_dev, which was is name of the disk as presented to the gust. However, _disconnect_volume is only concerned with unmounting the volume from the host, so this isn't relevant. A couple of volume drivers were using it for logging. We remove these because it wasn't done consistently, is better done by the caller, and isn't required as the information is available from other log messages. In the very minor associated debug log cleanup we also remove logging of connection_info from one volume driver, which is potential security bug. We also do some associated cleanup in a few volume driver tests which were assuming that disconnect_volume was being passed disk_info rather than disk_dev, and that connection_info['data'] is related to disk_info, which it isn't. Change-Id: I61a0bee9e71e9a67f6a7c04a7bfd6e77fe818a77
53 lines
2.0 KiB
Python
53 lines
2.0 KiB
Python
# Copyright 2015 HGST
|
|
# 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.
|
|
|
|
from os_brick import initiator
|
|
from os_brick.initiator import connector
|
|
|
|
import nova.conf
|
|
from nova import utils
|
|
from nova.virt.libvirt.volume import volume as libvirt_volume
|
|
|
|
|
|
CONF = nova.conf.CONF
|
|
|
|
|
|
class LibvirtHGSTVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver):
|
|
"""Driver to attach HGST volumes to libvirt."""
|
|
def __init__(self, host):
|
|
super(LibvirtHGSTVolumeDriver,
|
|
self).__init__(host, is_block_dev=True)
|
|
self.connector = connector.InitiatorConnector.factory(
|
|
initiator.HGST, utils.get_root_helper(),
|
|
device_scan_attempts=CONF.libvirt.num_volume_scan_tries)
|
|
|
|
def get_config(self, connection_info, disk_info):
|
|
"""Returns xml for libvirt."""
|
|
conf = super(LibvirtHGSTVolumeDriver,
|
|
self).get_config(connection_info, disk_info)
|
|
|
|
conf.source_type = "block"
|
|
conf.source_path = connection_info['data']['device_path']
|
|
return conf
|
|
|
|
def connect_volume(self, connection_info, instance):
|
|
device_info = self.connector.connect_volume(connection_info['data'])
|
|
connection_info['data']['device_path'] = device_info['path']
|
|
|
|
def disconnect_volume(self, connection_info, instance):
|
|
self.connector.disconnect_volume(connection_info['data'], None)
|
|
super(LibvirtHGSTVolumeDriver,
|
|
self).disconnect_volume(connection_info, instance)
|