x/python-ganttclient
Code Issues Proposed changes

Merge "Allow VMs to be resumed after a hypervisor reboot"

Browse Source
This commit is contained in:
Jenkins
2012-11-26 00:53:31 +00:00
committed by Gerrit Code Review
parent 1dedb69f6d 4bb9a5df44
commit 77e1037985
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
nova/tests/test_hypervapi.py
View File

@@ -274,12 +274,18 @@ class HyperVAPITestCase(basetestcase.BaseTestCase):
constants.HYPERV_VM_STATE_SUSPENDED,
constants.HYPERV_VM_STATE_SUSPENDED)
# NOTE (rmk): Resume now takes 3 mandatory args. These tests need to
# be updated but cannot be without involvement from the maintainers
# of the HyperV driver/tests.
def test_resume(self):
self.skipTest("Requires updating.")
self._test_vm_state_change(self._conn.resume,
constants.HYPERV_VM_STATE_SUSPENDED,
constants.HYPERV_VM_STATE_ENABLED)
# NOTE: (rmk): See comment for test_resume().
def test_resume_already_running(self):
self.skipTest("Requires updating.")
self._test_vm_state_change(self._conn.resume, None,
constants.HYPERV_VM_STATE_ENABLED)

4
nova/tests/test_virt_drivers.py
View File

@@ -344,13 +344,13 @@ class _VirtDriverTestCase(_FakeDriverBackendTestCase):
@catch_notimplementederror
def test_resume_unsuspended_instance(self):
instance_ref, network_info = self._get_running_instance()
self.connection.resume(instance_ref)
self.connection.resume(instance_ref, network_info)
@catch_notimplementederror
def test_resume_suspended_instance(self):
instance_ref, network_info = self._get_running_instance()
self.connection.suspend(instance_ref)
self.connection.resume(instance_ref)
self.connection.resume(instance_ref, network_info)
@catch_notimplementederror
def test_destroy_instance_nonexistent(self):

6
nova/tests/test_vmwareapi.py
View File

@@ -215,21 +215,21 @@ class VMWareAPIVMTestCase(test.TestCase):
self.conn.suspend(self.instance)
info = self.conn.get_info({'name': 1})
self._check_vm_info(info, power_state.PAUSED)
self.conn.resume(self.instance)
self.conn.resume(self.instance, self.network_info)
info = self.conn.get_info({'name': 1})
self._check_vm_info(info, power_state.RUNNING)
def test_resume_non_existent(self):
self._create_instance_in_the_db()
self.assertRaises(exception.InstanceNotFound, self.conn.resume,
self.instance)
self.instance, self.network_info)
def test_resume_not_suspended(self):
self._create_vm()
info = self.conn.get_info({'name': 1})
self._check_vm_info(info, power_state.RUNNING)
self.assertRaises(exception.InstanceResumeFailure, self.conn.resume,
self.instance)
self.instance, self.network_info)
def test_get_info(self):
self._create_vm()