Review feedback

4 files changed, 9 insertions, 50 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 4fcefb384..3f700349a 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -305,11 +305,7 @@ class ComputeAPI(base.Base):
     def actions(self, context, instance_id):
         """Retrieve actions for the given instance."""
         instance = self.db.instance_get_by_internal_id(context, instance_id)
-        host = instance["host"]
-        return rpc.call(context,
-            self.db.queue_get_for(context, FLAGS.compute_topic, host),
-            {"method": "get_actions",
-             "args": {"instance_id": instance["id"]}})
+        return self.db.instance_get_actions(context, instance["id"])
 
     def suspend(self, context, instance_id):
         """suspend the instance with instance_id"""
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index c4768d266..c9aff75ac 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -327,17 +327,6 @@ class ComputeManager(manager.Manager):
                 instance_ref["internal_id"])
             return self.driver.get_diagnostics(instance_ref)
 
-    @exception.wrap_exception
-    def get_actions(self, context, instance_id):
-        """Retrieve actions for an instance on this server."""
-        instance_ref = self.db.instance_get(context, instance_id)
-
-        logging.debug(_("instance %s: retrieving actions"),
-            instance_ref["internal_id"])
-        return self.db.instance_get_actions(
-            context,
-            instance_id)
-
     def suspend_instance(self, context, instance_id):
         """suspend the instance with instance_id"""
         context = context.elevated()
diff --git a/nova/tests/test_compute.py b/nova/tests/test_compute.py
index e3679b6b6..2664adc0d 100644
--- a/nova/tests/test_compute.py
+++ b/nova/tests/test_compute.py
@@ -102,15 +102,13 @@ class ComputeTestCase(test.TestCase):
 
         instances = db.instance_get_all(context.get_admin_context())
         logging.info(_("Running instances: %s"), instances)
-
-        instance_count = len(instances)
-        self.assertNotEqual(instance_count, 0)
+        self.assertEqual(len(instances), 1)
 
         self.compute.terminate_instance(self.context, instance_id)
 
         instances = db.instance_get_all(context.get_admin_context())
         logging.info(_("After terminating instances: %s"), instances)
-        self.assertEqual(instance_count, len(instances) + 1)
+        self.assertEqual(len(instances), 0)
 
     def test_run_terminate_timestamps(self):
         """Make sure timestamps are set for launched and destroyed"""
@@ -158,11 +156,6 @@ class ComputeTestCase(test.TestCase):
         instance_id = self._create_instance()
         self.compute.get_diagnostics(self.context, instance_id)
 
-    def test_actions(self):
-        """Ensure instance actions are available"""
-        instance_id = self._create_instance()
-        self.compute.get_actions(self.context, instance_id)
-
     def test_snapshot(self):
         """Ensure instance can be snapshotted"""
         instance_id = self._create_instance()
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 3528d7bfe..a09750672 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -156,10 +156,11 @@ class XenAPIVMTestCase(test.TestCase):
         self.stubs = stubout.StubOutForTesting()
         FLAGS.xenapi_connection_url = 'test_url'
         FLAGS.xenapi_connection_password = 'test_pass'
-
-        fake.reset()
-        fakes.stub_out_db_instance_api(self.stubs)
-        fake.create_network('fake', FLAGS.flat_network_bridge)
+        xenapi_fake.reset()
+        db_fakes.stub_out_db_instance_api(self.stubs)
+        xenapi_fake.create_network('fake', FLAGS.flat_network_bridge)
+        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
+        self.conn = xenapi_conn.get_connection(False)
         self.values = {
             "name": 1,
             "id": 1,
@@ -171,12 +172,6 @@ class XenAPIVMTestCase(test.TestCase):
             "instance_type": "m1.large",
             "mac_address": "aa:bb:cc:dd:ee:ff"}
 
-        xenapi_fake.reset()
-        db_fakes.stub_out_db_instance_api(self.stubs)
-        xenapi_fake.create_network('fake', FLAGS.flat_network_bridge)
-        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
-        self.conn = xenapi_conn.get_connection(False)
-
     def test_list_instances_0(self):
         instances = self.conn.list_instances()
         self.assertEquals(instances, [])
@@ -228,11 +223,6 @@ class XenAPIVMTestCase(test.TestCase):
         check()
 
     def test_spawn(self):
-        stubs.stubout_session(self.stubs, stubs.FakeSessionForVMTests)
-        conn = xenapi_conn.get_connection(False)
-        instance = db.instance_create(self.values)
-        conn.spawn(instance)
-
         instance = self._create_instance()
 
         def check():
@@ -275,15 +265,6 @@ class XenAPIVMTestCase(test.TestCase):
 
     def _create_instance(self):
         """Creates and spawns a test instance"""
-        values = {'name': 1, 'id': 1,
-                  'project_id': self.project.id,
-                  'user_id': self.user.id,
-                  'image_id': 1,
-                  'kernel_id': 2,
-                  'ramdisk_id': 3,
-                  'instance_type': 'm1.large',
-                  'mac_address': 'aa:bb:cc:dd:ee:ff',
-                  }
-        instance = db.instance_create(values)
+        instance = db.instance_create(self.values)
         self.conn.spawn(instance)
         return instance