x/python-ganttclient
Code Issues Proposed changes

Merge "Adds instance root disk size checks during resize"

Browse Source
This commit is contained in:
Jenkins
2013-05-10 01:35:05 +00:00
committed by Gerrit Code Review
parent a183731637 3a3adc896a
commit f79f5b2ab1
1 changed files with 72 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
nova/tests/test_hypervapi.py
View File

@@ -1043,95 +1043,120 @@ class HyperVAPITestCase(test.TestCase):
self.assertEquals(len(self._instance_volume_disks), 1) self.assertEquals(len(self._instance_volume_disks), 1)
def _setup_test_migrate_disk_and_power_off_mocks(self, same_host=False, def _setup_test_migrate_disk_and_power_off_mocks(self, same_host=False,
with_exception=False): copy_exception=False,
size_exception=False):
self._instance_data = self._get_instance_data() self._instance_data = self._get_instance_data()
instance = db.instance_create(self._context, self._instance_data) instance = db.instance_create(self._context, self._instance_data)
network_info = fake_network.fake_get_instance_nw_info( network_info = fake_network.fake_get_instance_nw_info(
self.stubs, spectacular=True) self.stubs, spectacular=True)
instance['root_gb'] = 10
fake_local_ip = '10.0.0.1' fake_local_ip = '10.0.0.1'
if same_host: if same_host:
fake_dest_ip = fake_local_ip fake_dest_ip = fake_local_ip
else: else:
fake_dest_ip = '10.0.0.2' fake_dest_ip = '10.0.0.2'
fake_root_vhd_path = 'C:\\FakePath\\root.vhd' if size_exception:
fake_revert_path = os.path.join(self._test_instance_dir, '_revert') flavor = 'm1.tiny'
func = mox.Func(self._check_instance_name)
vmutils.VMUtils.set_vm_state(func, constants.HYPERV_VM_STATE_DISABLED)
m = vmutils.VMUtils.get_vm_storage_paths(func)
m.AndReturn(([fake_root_vhd_path], []))
m = hostutils.HostUtils.get_local_ips()
m.AndReturn([fake_local_ip])
m = fake.PathUtils.get_instance_dir(mox.IsA(str))
m.AndReturn(self._test_instance_dir)
m = pathutils.PathUtils.get_instance_migr_revert_dir(instance['name'],
remove_dir=True)
m.AndReturn(fake_revert_path)
if same_host:
fake.PathUtils.makedirs(mox.IsA(str))
m = fake.PathUtils.copy(fake_root_vhd_path, mox.IsA(str))
if with_exception:
m.AndRaise(shutil.Error('Simulated copy error'))
m = fake.PathUtils.get_instance_dir(mox.IsA(str),
mox.IsA(str),
remove_dir=True)
m.AndReturn(self._test_instance_dir)
else: else:
fake.PathUtils.rename(mox.IsA(str), mox.IsA(str)) flavor = 'm1.small'
destroy_disks = True
instance_type = db.instance_type_get_by_name(self._context, flavor)
if not size_exception:
fake_root_vhd_path = 'C:\\FakePath\\root.vhd'
fake_revert_path = os.path.join(self._test_instance_dir, '_revert')
func = mox.Func(self._check_instance_name)
vmutils.VMUtils.set_vm_state(func,
constants.HYPERV_VM_STATE_DISABLED)
m = vmutils.VMUtils.get_vm_storage_paths(func)
m.AndReturn(([fake_root_vhd_path], []))
m = hostutils.HostUtils.get_local_ips()
m.AndReturn([fake_local_ip])
m = fake.PathUtils.get_instance_dir(mox.IsA(str))
m.AndReturn(self._test_instance_dir)
m = pathutils.PathUtils.get_instance_migr_revert_dir(
instance['name'], remove_dir=True)
m.AndReturn(fake_revert_path)
if same_host: if same_host:
fake.PathUtils.rename(mox.IsA(str), mox.IsA(str)) fake.PathUtils.makedirs(mox.IsA(str))
destroy_disks = False
self._setup_destroy_mocks(False) m = fake.PathUtils.copy(fake_root_vhd_path, mox.IsA(str))
if copy_exception:
if destroy_disks: m.AndRaise(shutil.Error('Simulated copy error'))
m = fake.PathUtils.get_instance_dir(mox.IsA(str), m = fake.PathUtils.get_instance_dir(mox.IsA(str),
mox.IsA(str), mox.IsA(str),
remove_dir=True) remove_dir=True)
m.AndReturn(self._test_instance_dir) m.AndReturn(self._test_instance_dir)
else:
fake.PathUtils.rename(mox.IsA(str), mox.IsA(str))
destroy_disks = True
if same_host:
fake.PathUtils.rename(mox.IsA(str), mox.IsA(str))
destroy_disks = False
return (instance, fake_dest_ip, network_info) self._setup_destroy_mocks(False)
if destroy_disks:
m = fake.PathUtils.get_instance_dir(mox.IsA(str),
mox.IsA(str),
remove_dir=True)
m.AndReturn(self._test_instance_dir)
return (instance, fake_dest_ip, network_info, instance_type)
def test_migrate_disk_and_power_off(self): def test_migrate_disk_and_power_off(self):
(instance, (instance,
fake_dest_ip, fake_dest_ip,
network_info) = self._setup_test_migrate_disk_and_power_off_mocks() network_info,
instance_type) = self._setup_test_migrate_disk_and_power_off_mocks()
self._mox.ReplayAll() self._mox.ReplayAll()
self._conn.migrate_disk_and_power_off(self._context, instance, self._conn.migrate_disk_and_power_off(self._context, instance,
fake_dest_ip, None, fake_dest_ip, instance_type,
network_info) network_info)
self._mox.VerifyAll() self._mox.VerifyAll()
def test_migrate_disk_and_power_off_same_host(self): def test_migrate_disk_and_power_off_same_host(self):
args = self._setup_test_migrate_disk_and_power_off_mocks( args = self._setup_test_migrate_disk_and_power_off_mocks(
same_host=True) same_host=True)
(instance, fake_dest_ip, network_info) = args (instance, fake_dest_ip, network_info, instance_type) = args
self._mox.ReplayAll() self._mox.ReplayAll()
self._conn.migrate_disk_and_power_off(self._context, instance, self._conn.migrate_disk_and_power_off(self._context, instance,
fake_dest_ip, None, fake_dest_ip, instance_type,
network_info) network_info)
self._mox.VerifyAll() self._mox.VerifyAll()
def test_migrate_disk_and_power_off_exception(self): def test_migrate_disk_and_power_off_copy_exception(self):
args = self._setup_test_migrate_disk_and_power_off_mocks( args = self._setup_test_migrate_disk_and_power_off_mocks(
with_exception=True) copy_exception=True)
(instance, fake_dest_ip, network_info) = args (instance, fake_dest_ip, network_info, instance_type) = args
self._mox.ReplayAll() self._mox.ReplayAll()
self.assertRaises(shutil.Error, self._conn.migrate_disk_and_power_off, self.assertRaises(shutil.Error, self._conn.migrate_disk_and_power_off,
self._context, instance, fake_dest_ip, None, self._context, instance, fake_dest_ip,
network_info) instance_type, network_info)
self._mox.VerifyAll()
def test_migrate_disk_and_power_off_smaller_root_vhd_size_exception(self):
args = self._setup_test_migrate_disk_and_power_off_mocks(
size_exception=True)
(instance, fake_dest_ip, network_info, instance_type) = args
self._mox.ReplayAll()
self.assertRaises(vmutils.VHDResizeException,
self._conn.migrate_disk_and_power_off,
self._context, instance, fake_dest_ip,
instance_type, network_info)
self._mox.VerifyAll() self._mox.VerifyAll()
def test_finish_migration(self): def test_finish_migration(self):