openstack/nova
Code Issues Proposed changes

Removed callback concept on VM driver methods:

Browse Source 
* pause
 * unpause
 * suspend
 * resume
 * rescue
 * unrescue

Worked off blueprint remove-virt-driver-callbacks

Change-Id: Ie3ef4c8155320f72106d7a39e5817516e180ba52
This commit is contained in:
Brian Lamar
2011-10-25 17:15:49 -05:00
parent ace2628dfa
commit e8b0ff71fa
11 changed files with 83 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nova/tests/test_vmwareapi.py
View File

@@ -183,7 +183,7 @@ class VMWareAPIVMTestCase(test.TestCase):
self._create_vm()
info = self.conn.get_info(1)
self._check_vm_info(info, power_state.RUNNING)
self.conn.suspend(self.instance, self.dummy_callback_handler)
self.conn.suspend(self.instance)
info = self.conn.get_info(1)
self._check_vm_info(info, power_state.PAUSED)
self.assertRaises(Exception, self.conn.reboot, self.instance)
@@ -192,37 +192,34 @@ class VMWareAPIVMTestCase(test.TestCase):
self._create_vm()
info = self.conn.get_info(1)
self._check_vm_info(info, power_state.RUNNING)
self.conn.suspend(self.instance, self.dummy_callback_handler)
self.conn.suspend(self.instance)
info = self.conn.get_info(1)
self._check_vm_info(info, power_state.PAUSED)
def test_suspend_non_existent(self):
self._create_instance_in_the_db()
self.assertRaises(Exception, self.conn.suspend, self.instance,
self.dummy_callback_handler)
self.assertRaises(Exception, self.conn.suspend, self.instance)
def test_resume(self):
self._create_vm()
info = self.conn.get_info(1)
self._check_vm_info(info, power_state.RUNNING)
self.conn.suspend(self.instance, self.dummy_callback_handler)
self.conn.suspend(self.instance)
info = self.conn.get_info(1)
self._check_vm_info(info, power_state.PAUSED)
self.conn.resume(self.instance, self.dummy_callback_handler)
self.conn.resume(self.instance)
info = self.conn.get_info(1)
self._check_vm_info(info, power_state.RUNNING)
def test_resume_non_existent(self):
self._create_instance_in_the_db()
self.assertRaises(Exception, self.conn.resume, self.instance,
self.dummy_callback_handler)
self.assertRaises(Exception, self.conn.resume, self.instance)
def test_resume_not_suspended(self):
self._create_vm()
info = self.conn.get_info(1)
self._check_vm_info(info, power_state.RUNNING)
self.assertRaises(Exception, self.conn.resume, self.instance,
self.dummy_callback_handler)
self.assertRaises(Exception, self.conn.resume, self.instance)
def test_get_info(self):
self._create_vm()
@@ -258,9 +255,3 @@ class VMWareAPIVMTestCase(test.TestCase):
def test_get_ajax_console(self):
pass
def dummy_callback_handler(self, ret):
"""
Dummy callback function to be passed to suspend, resume, etc., calls.
"""
pass