Merge "Remove an unused method"

Author: Zuul

nova/compute/api.py

@@ -4839,21 +4839,6 @@ def get_instance_host_status(self, instance):
             host_status = fields_obj.HostStatus.NONE
         return host_status
 
-    def get_instances_host_statuses(self, instance_list):
-        host_status_dict = dict()
-        host_statuses = dict()
-        for instance in instance_list:
-            if instance.host:
-                if instance.host not in host_status_dict:
-                    host_status = self.get_instance_host_status(instance)
-                    host_status_dict[instance.host] = host_status
-                else:
-                    host_status = host_status_dict[instance.host]
-            else:
-                host_status = fields_obj.HostStatus.NONE
-            host_statuses[instance.uuid] = host_status
-        return host_statuses
-
 
 def target_host_cell(fn):
     """Target a host-based function to a cell.

nova/tests/unit/compute/test_compute_api.py

@@ -5377,56 +5377,6 @@ def test_populate_instance_names_host_name_is_empty_multi(self):
         self.compute_api._populate_instance_names(instance, 2, 1)
         self.assertEqual('Server-%s' % instance.uuid, instance.hostname)
 
-    def test_host_statuses(self):
-        instances = [
-            objects.Instance(uuid=uuids.instance_1, host='host1', services=
-                             self._obj_to_list_obj(objects.ServiceList(
-                             self.context), objects.Service(id=0, host='host1',
-                             disabled=True, forced_down=True,
-                             binary='nova-compute'))),
-            objects.Instance(uuid=uuids.instance_2, host='host2', services=
-                             self._obj_to_list_obj(objects.ServiceList(
-                             self.context), objects.Service(id=0, host='host2',
-                             disabled=True, forced_down=False,
-                             binary='nova-compute'))),
-            objects.Instance(uuid=uuids.instance_3, host='host3', services=
-                             self._obj_to_list_obj(objects.ServiceList(
-                             self.context), objects.Service(id=0, host='host3',
-                             disabled=False, last_seen_up=timeutils.utcnow()
-                             - datetime.timedelta(minutes=5),
-                             forced_down=False, binary='nova-compute'))),
-            objects.Instance(uuid=uuids.instance_4, host='host4', services=
-                             self._obj_to_list_obj(objects.ServiceList(
-                             self.context), objects.Service(id=0, host='host4',
-                             disabled=False, last_seen_up=timeutils.utcnow(),
-                             forced_down=False, binary='nova-compute'))),
-            objects.Instance(uuid=uuids.instance_5, host='host5', services=
-                             objects.ServiceList()),
-            objects.Instance(uuid=uuids.instance_6, host=None, services=
-                             self._obj_to_list_obj(objects.ServiceList(
-                             self.context), objects.Service(id=0, host='host6',
-                             disabled=True, forced_down=False,
-                             binary='nova-compute'))),
-            objects.Instance(uuid=uuids.instance_7, host='host2', services=
-                             self._obj_to_list_obj(objects.ServiceList(
-                             self.context), objects.Service(id=0, host='host2',
-                             disabled=True, forced_down=False,
-                             binary='nova-compute')))
-            ]
-
-        host_statuses = self.compute_api.get_instances_host_statuses(
-                        instances)
-        expect_statuses = {uuids.instance_1: fields_obj.HostStatus.DOWN,
-                           uuids.instance_2: fields_obj.HostStatus.MAINTENANCE,
-                           uuids.instance_3: fields_obj.HostStatus.UNKNOWN,
-                           uuids.instance_4: fields_obj.HostStatus.UP,
-                           uuids.instance_5: fields_obj.HostStatus.NONE,
-                           uuids.instance_6: fields_obj.HostStatus.NONE,
-                           uuids.instance_7: fields_obj.HostStatus.MAINTENANCE}
-        for instance in instances:
-            self.assertEqual(expect_statuses[instance.uuid],
-                             host_statuses[instance.uuid])
-
     @mock.patch.object(objects.Migration, 'get_by_id_and_instance')
     @mock.patch.object(objects.InstanceAction, 'action_start')
     def test_live_migrate_force_complete_succeeded(