From c4b47047837361a5a1ea80479dcfc634cca59286 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Mon, 1 Feb 2021 17:28:25 +0000 Subject: [PATCH] scheduler: Remove 'hosts_up' This hasn't had any users since we removed the 'ChanceScheduler' in change I44f9c1cabf9fc64b1a6903236bc88f5ed8619e9e. Change-Id: I5c009b2cf5d64d28c706795de06c0ea1dedf054b Signed-off-by: Stephen Finucane --- nova/scheduler/driver.py | 9 --------- .../unit/scheduler/test_filter_scheduler.py | 17 ----------------- 2 files changed, 26 deletions(-) diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index b66c9c54a3..83e0765606 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -21,7 +21,6 @@ Scheduler base class that all Schedulers should inherit from import abc -from nova import objects from nova.scheduler import host_manager from nova import servicegroup @@ -33,14 +32,6 @@ class Scheduler(metaclass=abc.ABCMeta): self.host_manager = host_manager.HostManager() self.servicegroup_api = servicegroup.API() - def hosts_up(self, context, topic): - """Return the list of hosts that have a running service for topic.""" - - services = objects.ServiceList.get_by_topic(context, topic) - return [service.host - for service in services - if self.servicegroup_api.service_is_up(service)] - @abc.abstractmethod def select_destinations(self, context, spec_obj, instance_uuids, alloc_reqs_by_rp_uuid, provider_summaries, diff --git a/nova/tests/unit/scheduler/test_filter_scheduler.py b/nova/tests/unit/scheduler/test_filter_scheduler.py index 18809b6d7b..c2f39c9c0f 100644 --- a/nova/tests/unit/scheduler/test_filter_scheduler.py +++ b/nova/tests/unit/scheduler/test_filter_scheduler.py @@ -70,23 +70,6 @@ class FilterSchedulerTestCase(test.NoDBTestCase): self.topic = 'fake_topic' self.servicegroup_api = servicegroup.API() - @mock.patch('nova.objects.ServiceList.get_by_topic') - @mock.patch('nova.servicegroup.API.service_is_up') - def test_hosts_up(self, mock_service_is_up, mock_get_by_topic): - service1 = objects.Service(host='host1') - service2 = objects.Service(host='host2') - services = objects.ServiceList(objects=[service1, service2]) - - mock_get_by_topic.return_value = services - mock_service_is_up.side_effect = [False, True] - - result = self.driver.hosts_up(self.context, self.topic) - self.assertEqual(result, ['host2']) - - mock_get_by_topic.assert_called_once_with(self.context, self.topic) - calls = [mock.call(service1), mock.call(service2)] - self.assertEqual(calls, mock_service_is_up.call_args_list) - @mock.patch('nova.scheduler.utils.claim_resources') @mock.patch('nova.scheduler.filter_scheduler.FilterScheduler.' '_get_all_host_states')