openstack/neutron
Code Issues Proposed changes

Merge "Solve unexpected NoneType returned by _get_routers_can_schedule." into stable/mitaka

Browse Source
This commit is contained in:
Jenkins 2017-01-13 06:51:35 +00:00 committed by Gerrit Code Review
commit 01b82c8e5d
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/scheduler/l3_agent_scheduler.py
View File

@ -411,7 +411,7 @@ class AZLeastRoutersScheduler(LeastRoutersScheduler):
target_routers.append(r)
if not target_routers:
return
return []
return super(AZLeastRoutersScheduler, self)._get_routers_can_schedule(
context, plugin, target_routers, l3_agent)

7
neutron/tests/unit/scheduler/test_l3_agent_scheduler.py
View File

@ -171,7 +171,7 @@ class L3SchedulerBaseTestCase(base.BaseTestCase):
self.scheduler,
'_get_routers_can_schedule') as mock_target_routers:
mock_unscheduled_routers.return_value = mock.ANY
mock_target_routers.return_value = None
mock_target_routers.return_value = []
result = self.scheduler.auto_schedule_routers(
self.plugin, mock.ANY, mock.ANY, mock.ANY)
self.assertTrue(self.plugin.get_enabled_agent_on_host.called)
@ -1985,6 +1985,11 @@ class L3AgentAZLeastRoutersSchedulerTestCase(L3HATestCaseMixin):
hosts = set([a['host'] for a in agents])
self.assertEqual(expected_hosts, hosts)
def test__get_routers_can_schedule_with_no_target_routers(self):
result = self.plugin.router_scheduler._get_routers_can_schedule(
self.plugin, mock.ANY, [], mock.ANY)
self.assertEqual([], result)
class L3DVRHAPlugin(db_v2.NeutronDbPluginV2,
l3_hamode_db.L3_HA_NAT_db_mixin,