From: Hirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp>
Date: Thu, 12 Mar 2015 09:26:57 +0000 (+0900)
Subject: Fix l3_agentschedulers_db for consistency of code
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=5b5eee766bb1891fc55660f8f45df561c42ccb90;p=openstack-build%2Fneutron-build.git

Fix l3_agentschedulers_db for consistency of code

Fix for consistency between l3_agentschedulers_db and agentschedulers_db.

Change-Id: I62d411a3effec5eb3335306298959635768c0999
---

diff --git a/neutron/db/l3_agentschedulers_db.py b/neutron/db/l3_agentschedulers_db.py
index c0142b22b..d658b5bcf 100644
--- a/neutron/db/l3_agentschedulers_db.py
+++ b/neutron/db/l3_agentschedulers_db.py
@@ -260,8 +260,6 @@ class L3AgentSchedulerDbMixin(l3agentscheduler.L3AgentSchedulerPluginBase,
                 context, [router_id], new_agent.host)
 
     def list_routers_on_l3_agent(self, context, agent_id):
-        # Exception thrown if the requested agent does not exist.
-        self._get_agent(context, agent_id)
         query = context.session.query(RouterL3AgentBinding.router_id)
         query = query.filter(RouterL3AgentBinding.l3_agent_id == agent_id)
 
@@ -270,6 +268,8 @@ class L3AgentSchedulerDbMixin(l3agentscheduler.L3AgentSchedulerPluginBase,
             return {'routers':
                     self.get_routers(context, filters={'id': router_ids})}
         else:
+            # Exception will be thrown if the requested agent does not exist.
+            self._get_agent(context, agent_id)
             return {'routers': []}
 
     def _get_active_l3_agent_routers_sync_data(self, context, host, agent,