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
63 lines
2.4 KiB
Python
63 lines
2.4 KiB
Python
# Copyright (c) 2015 Industrial Technology Research Institute.
|
|
# 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.
|
|
|
|
"""Libvirt volume driver for DISCO."""
|
|
|
|
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 LibvirtDISCOVolumeDriver(libvirt_volume.LibvirtBaseVolumeDriver):
|
|
"""Class DISCO Libvirt volume Driver.
|
|
|
|
Implements Libvirt part of volume driver for DISCO cinder driver.
|
|
Uses the DISCO connector from the os-brick projects.
|
|
"""
|
|
|
|
def __init__(self, host):
|
|
"""Init DISCO connector for LibVirt."""
|
|
super(LibvirtDISCOVolumeDriver, self).__init__(host,
|
|
is_block_dev=False)
|
|
self.connector = connector.InitiatorConnector.factory(
|
|
initiator.DISCO, utils.get_root_helper(),
|
|
device_scan_attempts=CONF.libvirt.num_volume_scan_tries)
|
|
|
|
def get_config(self, connection_info, disk_info):
|
|
"""Get DISCO volume attachment configuration."""
|
|
conf = super(LibvirtDISCOVolumeDriver, self).get_config(
|
|
connection_info, disk_info)
|
|
|
|
conf.source_path = connection_info['data']['device_path']
|
|
conf.source_protocol = 'disco'
|
|
conf.source_type = 'file'
|
|
return conf
|
|
|
|
def connect_volume(self, connection_info, instance):
|
|
"""Connect a DISCO volume to a compute node."""
|
|
device_info = self.connector.connect_volume(connection_info['data'])
|
|
connection_info['data']['device_path'] = device_info['path']
|
|
|
|
def disconnect_volume(self, connection_info, instance):
|
|
"""Disconnect a DISCO volume of a compute node."""
|
|
self.connector.disconnect_volume(connection_info['data'], None)
|
|
super(LibvirtDISCOVolumeDriver, self).disconnect_volume(
|
|
connection_info, instance)
|