From 01e3a9de7ea010d57d6469668ebe7dc1f355daa2 Mon Sep 17 00:00:00 2001
From: Rui Chen <chenrui.momo@gmail.com>
Date: Tue, 15 Sep 2015 14:38:33 +0800
Subject: [PATCH] Remove useless get_instance_faults()

Instance faults is filled in Instance object, so
compute.api.get_instance_faults() isn't called by
any code logic. Remove it and related test cases.

Change-Id: I6309ab114246bd5a98c238ad6965f9a9bbeee437
---
 etc/nova/policy.json                    |  1 -
 nova/compute/api.py                     | 12 --------
 nova/tests/unit/compute/test_compute.py | 38 -------------------------
 nova/tests/unit/fake_policy.py          |  1 -
 nova/tests/unit/test_policy.py          |  1 -
 5 files changed, 53 deletions(-)

diff --git a/etc/nova/policy.json b/etc/nova/policy.json
index 5f6023e5c388..4d4db8474982 100644
--- a/etc/nova/policy.json
+++ b/etc/nova/policy.json
@@ -22,7 +22,6 @@
     "compute:update_instance_metadata": "",
     "compute:delete_instance_metadata": "",
 
-    "compute:get_instance_faults": "",
     "compute:get_diagnostics": "",
     "compute:get_instance_diagnostics": "",
 
diff --git a/nova/compute/api.py b/nova/compute/api.py
index e800a518d1c5..d89d7fd3bd34 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -3224,18 +3224,6 @@ class API(base.Base):
                                                      diff=diff)
         return _metadata
 
-    def get_instance_faults(self, context, instances):
-        """Get all faults for a list of instance uuids."""
-
-        if not instances:
-            return {}
-
-        for instance in instances:
-            check_policy(context, 'get_instance_faults', instance)
-
-        uuids = [instance.uuid for instance in instances]
-        return self.db.instance_fault_get_by_instance_uuids(context, uuids)
-
     def _get_root_bdm(self, context, instance, bdms=None):
         if bdms is None:
             bdms = objects.BlockDeviceMappingList.get_by_instance_uuid(
diff --git a/nova/tests/unit/compute/test_compute.py b/nova/tests/unit/compute/test_compute.py
index cec61b9aed58..ed2013aa540b 100644
--- a/nova/tests/unit/compute/test_compute.py
+++ b/nova/tests/unit/compute/test_compute.py
@@ -8470,30 +8470,6 @@ class ComputeAPITestCase(BaseTestCase):
                 self.compute_api.update_instance_metadata, self.context,
                 instance, "key")
 
-    def test_get_instance_faults(self):
-        # Get an instances latest fault.
-        instance = self._create_fake_instance_obj()
-
-        fault_fixture = {
-                'code': 404,
-                'instance_uuid': instance['uuid'],
-                'message': "HTTPNotFound",
-                'details': "Stock details for test",
-                'created_at': datetime.datetime(2010, 10, 10, 12, 0, 0),
-            }
-
-        def return_fault(_ctxt, instance_uuids):
-            return dict.fromkeys(instance_uuids, [fault_fixture])
-
-        self.stubs.Set(nova.db,
-                       'instance_fault_get_by_instance_uuids',
-                       return_fault)
-
-        _context = context.get_admin_context()
-        output = self.compute_api.get_instance_faults(_context, [instance])
-        expected = {instance['uuid']: [fault_fixture]}
-        self.assertEqual(output, expected)
-
     @staticmethod
     def _parse_db_block_device_mapping(bdm_ref):
         attr_list = ('delete_on_termination', 'device_name', 'no_device',
@@ -10888,20 +10864,6 @@ class ComputePolicyTestCase(BaseTestCase):
         self.assertRaises(exception.PolicyNotAuthorized,
                           self.compute_api.get_all, self.context)
 
-    def test_get_instance_faults(self):
-        instance1 = self._create_fake_instance_obj()
-        instance2 = self._create_fake_instance_obj()
-        instances = [instance1, instance2]
-
-        rules = {
-            "compute:get_instance_faults": [["false:false"]],
-        }
-        self.policy.set_rules(rules)
-
-        self.assertRaises(exception.PolicyNotAuthorized,
-                          self.compute_api.get_instance_faults,
-                          context.get_admin_context(), instances)
-
     def test_force_host_fail(self):
         rules = {"compute:create": [],
                  "compute:create:forced_host": [["role:fake"]],
diff --git a/nova/tests/unit/fake_policy.py b/nova/tests/unit/fake_policy.py
index be87db5816d2..ad9aa3836c5b 100644
--- a/nova/tests/unit/fake_policy.py
+++ b/nova/tests/unit/fake_policy.py
@@ -36,7 +36,6 @@ policy_data = """
     "compute:update_instance_metadata": "",
     "compute:delete_instance_metadata": "",
 
-    "compute:get_instance_faults": "",
     "compute:get_diagnostics": "",
     "compute:get_instance_diagnostics": "",
 
diff --git a/nova/tests/unit/test_policy.py b/nova/tests/unit/test_policy.py
index a99f79a04c49..3d1d50552ae6 100644
--- a/nova/tests/unit/test_policy.py
+++ b/nova/tests/unit/test_policy.py
@@ -432,7 +432,6 @@ class RealRolePolicyTestCase(test.NoDBTestCase):
 "compute:detach_volume",
 "compute:backup",
 "compute:get_instance_diagnostics",
-"compute:get_instance_faults",
 "compute:get_instance_metadata",
 "compute:get_lock",
 "compute:get_mks_console",