adaffe4a2d
Unlike other hypervisor to directly using image for VM, rootfs need to be mounted in setup_container() for lxc before launching the domain. However, this leads to several problems: * previously spawned container polluted later spawned container, which in turn causing lvm device refused to be removed, as bug descirbes * container rootfs not mounted after nova stop/start sequence This commit addresses above two issues. Fixes bug 1091639 Change-Id: I718baa6e46cf07a5458a5b80d42139dd353ae51c
140 lines
5.2 KiB
Python
140 lines
5.2 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2011 Isaku Yamahata
|
|
# 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 os
|
|
|
|
from nova import test
|
|
from nova import utils
|
|
from nova.virt.disk import api as disk_api
|
|
from nova.virt import driver
|
|
|
|
|
|
class TestVirtDriver(test.TestCase):
|
|
def test_block_device(self):
|
|
swap = {'device_name': '/dev/sdb',
|
|
'swap_size': 1}
|
|
ephemerals = [{'num': 0,
|
|
'virtual_name': 'ephemeral0',
|
|
'device_name': '/dev/sdc1',
|
|
'size': 1}]
|
|
block_device_mapping = [{'mount_device': '/dev/sde',
|
|
'device_path': 'fake_device'}]
|
|
block_device_info = {
|
|
'root_device_name': '/dev/sda',
|
|
'swap': swap,
|
|
'ephemerals': ephemerals,
|
|
'block_device_mapping': block_device_mapping}
|
|
|
|
empty_block_device_info = {}
|
|
|
|
self.assertEqual(
|
|
driver.block_device_info_get_root(block_device_info), '/dev/sda')
|
|
self.assertEqual(
|
|
driver.block_device_info_get_root(empty_block_device_info), None)
|
|
self.assertEqual(
|
|
driver.block_device_info_get_root(None), None)
|
|
|
|
self.assertEqual(
|
|
driver.block_device_info_get_swap(block_device_info), swap)
|
|
self.assertEqual(driver.block_device_info_get_swap(
|
|
empty_block_device_info)['device_name'], None)
|
|
self.assertEqual(driver.block_device_info_get_swap(
|
|
empty_block_device_info)['swap_size'], 0)
|
|
self.assertEqual(
|
|
driver.block_device_info_get_swap({'swap': None})['device_name'],
|
|
None)
|
|
self.assertEqual(
|
|
driver.block_device_info_get_swap({'swap': None})['swap_size'],
|
|
0)
|
|
self.assertEqual(
|
|
driver.block_device_info_get_swap(None)['device_name'], None)
|
|
self.assertEqual(
|
|
driver.block_device_info_get_swap(None)['swap_size'], 0)
|
|
|
|
self.assertEqual(
|
|
driver.block_device_info_get_ephemerals(block_device_info),
|
|
ephemerals)
|
|
self.assertEqual(
|
|
driver.block_device_info_get_ephemerals(empty_block_device_info),
|
|
[])
|
|
self.assertEqual(
|
|
driver.block_device_info_get_ephemerals(None),
|
|
[])
|
|
|
|
def test_swap_is_usable(self):
|
|
self.assertFalse(driver.swap_is_usable(None))
|
|
self.assertFalse(driver.swap_is_usable({'device_name': None}))
|
|
self.assertFalse(driver.swap_is_usable({'device_name': '/dev/sdb',
|
|
'swap_size': 0}))
|
|
self.assertTrue(driver.swap_is_usable({'device_name': '/dev/sdb',
|
|
'swap_size': 1}))
|
|
|
|
|
|
class TestVirtDisk(test.TestCase):
|
|
def setUp(self):
|
|
super(TestVirtDisk, self).setUp()
|
|
self.executes = []
|
|
|
|
def fake_execute(*cmd, **kwargs):
|
|
self.executes.append(cmd)
|
|
return None, None
|
|
|
|
self.stubs.Set(utils, 'execute', fake_execute)
|
|
|
|
def test_lxc_teardown_container(self):
|
|
|
|
def proc_mounts(self, mount_point):
|
|
mount_points = {
|
|
'/mnt/loop/nopart': '/dev/loop0',
|
|
'/mnt/loop/part': '/dev/mapper/loop0p1',
|
|
'/mnt/nbd/nopart': '/dev/nbd15',
|
|
'/mnt/nbd/part': '/dev/mapper/nbd15p1',
|
|
}
|
|
return mount_points[mount_point]
|
|
|
|
self.stubs.Set(os.path, 'exists', lambda _: True)
|
|
self.stubs.Set(disk_api._DiskImage, '_device_for_path', proc_mounts)
|
|
expected_commands = []
|
|
|
|
disk_api.teardown_container('/mnt/loop/nopart')
|
|
expected_commands += [
|
|
('umount', '/dev/loop0'),
|
|
('losetup', '--detach', '/dev/loop0'),
|
|
]
|
|
|
|
disk_api.teardown_container('/mnt/loop/part')
|
|
expected_commands += [
|
|
('umount', '/dev/mapper/loop0p1'),
|
|
('kpartx', '-d', '/dev/loop0'),
|
|
('losetup', '--detach', '/dev/loop0'),
|
|
]
|
|
|
|
disk_api.teardown_container('/mnt/nbd/nopart')
|
|
expected_commands += [
|
|
('umount', '/dev/nbd15'),
|
|
('qemu-nbd', '-d', '/dev/nbd15'),
|
|
]
|
|
|
|
disk_api.teardown_container('/mnt/nbd/part')
|
|
expected_commands += [
|
|
('umount', '/dev/mapper/nbd15p1'),
|
|
('kpartx', '-d', '/dev/nbd15'),
|
|
('qemu-nbd', '-d', '/dev/nbd15'),
|
|
]
|
|
|
|
self.assertEqual(self.executes, expected_commands)
|