87fc1748f3
Add missing extend_volume to libvirt NFS volume driver. This allows LibvirtDriver.extend_volume to resize an NFS volume in QEMU. Change-Id: Ia255a25da081e7ac42b4caba7a4cbd8d76ac5848 Partial-Bug: #1870367
116 lines
5.0 KiB
Python
116 lines
5.0 KiB
Python
# 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 os
|
|
|
|
import mock
|
|
from oslo_utils.fixture import uuidsentinel as uuids
|
|
|
|
from nova.tests.unit.virt.libvirt.volume import test_mount
|
|
from nova.tests.unit.virt.libvirt.volume import test_volume
|
|
from nova import utils
|
|
from nova.virt.libvirt.volume import mount
|
|
from nova.virt.libvirt.volume import nfs
|
|
|
|
|
|
class LibvirtNFSVolumeDriverTestCase(test_volume.LibvirtVolumeBaseTestCase):
|
|
"""Tests the libvirt NFS volume driver."""
|
|
|
|
def setUp(self):
|
|
super(LibvirtNFSVolumeDriverTestCase, self).setUp()
|
|
|
|
self.useFixture(test_mount.MountFixture(self))
|
|
|
|
m = mount.get_manager()
|
|
m._reset_state()
|
|
|
|
self.mnt_base = '/mnt'
|
|
m.host_up(self.fake_host)
|
|
self.flags(nfs_mount_point_base=self.mnt_base, group='libvirt')
|
|
|
|
def test_libvirt_nfs_driver(self):
|
|
libvirt_driver = nfs.LibvirtNFSVolumeDriver(self.fake_host)
|
|
|
|
export_string = '192.168.1.1:/nfs/share1'
|
|
export_mnt_base = os.path.join(self.mnt_base,
|
|
utils.get_hash_str(export_string))
|
|
|
|
connection_info = {'data': {'export': export_string,
|
|
'name': self.name}}
|
|
instance = mock.sentinel.instance
|
|
instance.uuid = uuids.instance
|
|
libvirt_driver.connect_volume(connection_info, instance)
|
|
libvirt_driver.disconnect_volume(connection_info,
|
|
mock.sentinel.instance)
|
|
|
|
device_path = os.path.join(export_mnt_base,
|
|
connection_info['data']['name'])
|
|
self.assertEqual(connection_info['data']['device_path'], device_path)
|
|
self.mock_ensure_tree.assert_has_calls([mock.call(export_mnt_base)])
|
|
self.mock_mount.assert_has_calls([mock.call('nfs', export_string,
|
|
export_mnt_base, [])])
|
|
self.mock_umount.assert_has_calls([mock.call(export_mnt_base)])
|
|
self.mock_rmdir.assert_has_calls([mock.call(export_mnt_base)])
|
|
|
|
def test_libvirt_nfs_driver_get_config(self):
|
|
libvirt_driver = nfs.LibvirtNFSVolumeDriver(self.fake_host)
|
|
export_string = '192.168.1.1:/nfs/share1'
|
|
export_mnt_base = os.path.join(self.mnt_base,
|
|
utils.get_hash_str(export_string))
|
|
file_path = os.path.join(export_mnt_base, self.name)
|
|
|
|
connection_info = {'data': {'export': export_string,
|
|
'name': self.name,
|
|
'device_path': file_path}}
|
|
conf = libvirt_driver.get_config(connection_info, self.disk_info)
|
|
tree = conf.format_dom()
|
|
self._assertFileTypeEquals(tree, file_path)
|
|
self.assertEqual('raw', tree.find('./driver').get('type'))
|
|
self.assertEqual('native', tree.find('./driver').get('io'))
|
|
|
|
def test_libvirt_nfs_driver_with_opts(self):
|
|
libvirt_driver = nfs.LibvirtNFSVolumeDriver(self.fake_host)
|
|
export_string = '192.168.1.1:/nfs/share1'
|
|
options = '-o intr,nfsvers=3'
|
|
export_mnt_base = os.path.join(self.mnt_base,
|
|
utils.get_hash_str(export_string))
|
|
|
|
connection_info = {'data': {'export': export_string,
|
|
'name': self.name,
|
|
'options': options}}
|
|
instance = mock.sentinel.instance
|
|
instance.uuid = uuids.instance
|
|
libvirt_driver.connect_volume(connection_info, instance)
|
|
libvirt_driver.disconnect_volume(connection_info,
|
|
mock.sentinel.instance)
|
|
|
|
self.mock_ensure_tree.assert_has_calls([mock.call(export_mnt_base)])
|
|
self.mock_mount.assert_has_calls([mock.call('nfs', export_string,
|
|
export_mnt_base,
|
|
['-o', 'intr,nfsvers=3'])])
|
|
self.mock_umount.assert_has_calls([mock.call(export_mnt_base)])
|
|
self.mock_rmdir.assert_has_calls([mock.call(export_mnt_base)])
|
|
|
|
def test_extend_volume(self):
|
|
libvirt_driver = nfs.LibvirtNFSVolumeDriver(self.fake_host)
|
|
export_string = '192.168.1.1:/nfs/share1'
|
|
connection_info = {'data': {'export': export_string,
|
|
'name': self.name}}
|
|
instance = mock.sentinel.instance
|
|
requested_size = 10
|
|
|
|
new_size = libvirt_driver.extend_volume(connection_info,
|
|
instance,
|
|
requested_size)
|
|
|
|
self.assertEqual(requested_size, new_size)
|