Removed callback concept on VM driver methods:

 * pause
 * unpause
 * suspend
 * resume
 * rescue
 * unrescue

Worked off blueprint remove-virt-driver-callbacks

Change-Id: Ie3ef4c8155320f72106d7a39e5817516e180ba52

3 files changed, 21 insertions, 32 deletions

diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py
index be77dab2f..1550d64f3 100644
--- a/nova/tests/test_virt_drivers.py
+++ b/nova/tests/test_virt_drivers.py
@@ -153,24 +153,22 @@ class _VirtDriverTestCase(test.TestCase):
         instance_ref = test_utils.get_test_instance()
         network_info = test_utils.get_test_network_info()
         self.connection.spawn(self.ctxt, instance_ref, network_info)
-        self.connection.rescue(self.ctxt, instance_ref,
-                               lambda x: None, network_info)
+        self.connection.rescue(self.ctxt, instance_ref, network_info)
 
     @catch_notimplementederror
     def test_unrescue_unrescued_instance(self):
         instance_ref = test_utils.get_test_instance()
         network_info = test_utils.get_test_network_info()
         self.connection.spawn(self.ctxt, instance_ref, network_info)
-        self.connection.unrescue(instance_ref, lambda x: None, network_info)
+        self.connection.unrescue(instance_ref, network_info)
 
     @catch_notimplementederror
     def test_unrescue_rescued_instance(self):
         instance_ref = test_utils.get_test_instance()
         network_info = test_utils.get_test_network_info()
         self.connection.spawn(self.ctxt, instance_ref, network_info)
-        self.connection.rescue(self.ctxt, instance_ref,
-                               lambda x: None, network_info)
-        self.connection.unrescue(instance_ref, lambda x: None, network_info)
+        self.connection.rescue(self.ctxt, instance_ref, network_info)
+        self.connection.unrescue(instance_ref, network_info)
 
     @catch_notimplementederror
     def test_poll_rebooting_instances(self):
@@ -197,44 +195,44 @@ class _VirtDriverTestCase(test.TestCase):
         instance_ref = test_utils.get_test_instance()
         network_info = test_utils.get_test_network_info()
         self.connection.spawn(self.ctxt, instance_ref, network_info)
-        self.connection.pause(instance_ref, None)
+        self.connection.pause(instance_ref)
 
     @catch_notimplementederror
     def test_unpause_unpaused_instance(self):
         instance_ref = test_utils.get_test_instance()
         network_info = test_utils.get_test_network_info()
         self.connection.spawn(self.ctxt, instance_ref, network_info)
-        self.connection.unpause(instance_ref, None)
+        self.connection.unpause(instance_ref)
 
     @catch_notimplementederror
     def test_unpause_paused_instance(self):
         instance_ref = test_utils.get_test_instance()
         network_info = test_utils.get_test_network_info()
         self.connection.spawn(self.ctxt, instance_ref, network_info)
-        self.connection.pause(instance_ref, None)
-        self.connection.unpause(instance_ref, None)
+        self.connection.pause(instance_ref)
+        self.connection.unpause(instance_ref)
 
     @catch_notimplementederror
     def test_suspend(self):
         instance_ref = test_utils.get_test_instance()
         network_info = test_utils.get_test_network_info()
         self.connection.spawn(self.ctxt, instance_ref, network_info)
-        self.connection.suspend(instance_ref, None)
+        self.connection.suspend(instance_ref)
 
     @catch_notimplementederror
     def test_resume_unsuspended_instance(self):
         instance_ref = test_utils.get_test_instance()
         network_info = test_utils.get_test_network_info()
         self.connection.spawn(self.ctxt, instance_ref, network_info)
-        self.connection.resume(instance_ref, None)
+        self.connection.resume(instance_ref)
 
     @catch_notimplementederror
     def test_resume_suspended_instance(self):
         instance_ref = test_utils.get_test_instance()
         network_info = test_utils.get_test_network_info()
         self.connection.spawn(self.ctxt, instance_ref, network_info)
-        self.connection.suspend(instance_ref, None)
-        self.connection.resume(instance_ref, None)
+        self.connection.suspend(instance_ref)
+        self.connection.resume(instance_ref)
 
     @catch_notimplementederror
     def test_destroy_instance_nonexistant(self):
diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/test_vmwareapi.py
index e6da1690f..704e362fd 100644
--- a/nova/tests/test_vmwareapi.py
+++ b/nova/tests/test_vmwareapi.py
@@ -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
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index e2ed14495..c807186e1 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -654,13 +654,13 @@ class XenAPIVMTestCase(test.TestCase):
     def test_rescue(self):
         instance = self._create_instance()
         conn = xenapi_conn.get_connection(False)
-        conn.rescue(self.context, instance, None, [])
+        conn.rescue(self.context, instance, [])
 
     def test_unrescue(self):
         instance = self._create_instance()
         conn = xenapi_conn.get_connection(False)
         # Ensure that it will not unrescue a non-rescued instance.
-        self.assertRaises(Exception, conn.unrescue, instance, None)
+        self.assertRaises(Exception, conn.unrescue, instance)
 
     def test_finish_revert_migration(self):
         instance = self._create_instance()