Merge "Return from check_ports_exist_on_l3agent if no subnet found"
This commit is contained in:
commit
0590f3ba43
|
@ -375,6 +375,8 @@ class L3AgentSchedulerDbMixin(l3agentscheduler.L3AgentSchedulerPluginBase,
|
||||||
ports on the host, running the input l3agent.
|
ports on the host, running the input l3agent.
|
||||||
"""
|
"""
|
||||||
subnet_ids = self.get_subnet_ids_on_router(context, router_id)
|
subnet_ids = self.get_subnet_ids_on_router(context, router_id)
|
||||||
|
if not subnet_ids:
|
||||||
|
return False
|
||||||
|
|
||||||
core_plugin = manager.NeutronManager.get_plugin()
|
core_plugin = manager.NeutronManager.get_plugin()
|
||||||
filter = {'fixed_ips': {'subnet_id': subnet_ids}}
|
filter = {'fixed_ips': {'subnet_id': subnet_ids}}
|
||||||
|
|
|
@ -671,6 +671,17 @@ class L3SchedulerTestBaseMixin(object):
|
||||||
l3_agent, router['id'])
|
l3_agent, router['id'])
|
||||||
self.assertFalse(val)
|
self.assertFalse(val)
|
||||||
|
|
||||||
|
def test_check_ports_exist_on_l3agent_if_no_subnets_then_return(self):
|
||||||
|
l3_agent, router = self._prepare_check_ports_exist_tests()
|
||||||
|
with mock.patch.object(manager.NeutronManager,
|
||||||
|
'get_plugin') as getp:
|
||||||
|
getp.return_value = self.plugin
|
||||||
|
# no subnets and operation is remove_router_interface,
|
||||||
|
# so return immediately without calling get_ports
|
||||||
|
self.check_ports_exist_on_l3agent(self.adminContext,
|
||||||
|
l3_agent, router['id'])
|
||||||
|
self.assertFalse(self.plugin.get_ports.called)
|
||||||
|
|
||||||
def test_check_ports_exist_on_l3agent_no_subnet_match(self):
|
def test_check_ports_exist_on_l3agent_no_subnet_match(self):
|
||||||
l3_agent, router = self._prepare_check_ports_exist_tests()
|
l3_agent, router = self._prepare_check_ports_exist_tests()
|
||||||
# no matching subnet
|
# no matching subnet
|
||||||
|
@ -688,7 +699,7 @@ class L3SchedulerTestBaseMixin(object):
|
||||||
'device_owner': 'compute:',
|
'device_owner': 'compute:',
|
||||||
'id': 1234}
|
'id': 1234}
|
||||||
self.plugin.get_ports.return_value = [port]
|
self.plugin.get_ports.return_value = [port]
|
||||||
self.plugin.get_subnet_ids_on_router = mock.Mock(
|
self.get_subnet_ids_on_router = mock.Mock(
|
||||||
return_value=[port['subnet_id']])
|
return_value=[port['subnet_id']])
|
||||||
val = self.check_ports_exist_on_l3agent(self.adminContext,
|
val = self.check_ports_exist_on_l3agent(self.adminContext,
|
||||||
l3_agent, router['id'])
|
l3_agent, router['id'])
|
||||||
|
|
Loading…
Reference in New Issue