openstack/zun
Code Issues Proposed changes

Merge "Filter disabled service for Chance Filter"

Browse Source
This commit is contained in:
Zuul 2018-05-30 11:03:14 +00:00 committed by Gerrit Code Review
commit f05de4fc32
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
zun/scheduler/driver.py
View File

@ -40,7 +40,8 @@ class Scheduler(object):
services = objects.ZunService.list_by_binary(context, 'zun-compute') services = objects.ZunService.list_by_binary(context, 'zun-compute')
return [service.host return [service.host
for service in services for service in services
if self.servicegroup_api.service_is_up(service)] if self.servicegroup_api.service_is_up(service)
and not service.disabled]
@abc.abstractmethod @abc.abstractmethod
def select_destinations(self, context, containers, extra_spec): def select_destinations(self, context, containers, extra_spec):

8
zun/tests/unit/scheduler/test_scheduler.py
View File

@ -32,8 +32,12 @@ class SchedulerTestCase(base.TestCase):
@mock.patch('zun.objects.ZunService.list_by_binary') @mock.patch('zun.objects.ZunService.list_by_binary')
@mock.patch('zun.api.servicegroup.ServiceGroup.service_is_up') @mock.patch('zun.api.servicegroup.ServiceGroup.service_is_up')
def test_hosts_up(self, mock_service_is_up, mock_list_by_binary): def test_hosts_up(self, mock_service_is_up, mock_list_by_binary):
service1 = objects.ZunService(host='host1') service1 = objects.ZunService()
service2 = objects.ZunService(host='host2') service2 = objects.ZunService()
service1.host = 'host1'
service1.disabled = False
service2.host = 'host2'
service2.disabled = False
services = [service1, service2] services = [service1, service2]
mock_list_by_binary.return_value = services mock_list_by_binary.return_value = services