x/vmware-nsx
Code Issues Proposed changes

Merge "Do not use auto_schedule_routers to add router to agent"

Browse Source
This commit is contained in:
Jenkins 2014-08-29 01:34:19 +00:00 committed by Gerrit Code Review
commit 0264c46327
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/db/l3_agentschedulers_db.py
View File

@ -17,6 +17,7 @@ import random
import time
from oslo.config import cfg
from oslo.db import exception as db_exc
import sqlalchemy as sa
from sqlalchemy import func
from sqlalchemy import orm
@ -181,8 +182,10 @@ class L3AgentSchedulerDbMixin(l3agentscheduler.L3AgentSchedulerPluginBase,
"""Create router to agent binding."""
router_id = router['id']
agent_id = agent['id']
result = self.auto_schedule_routers(context, agent.host, [router_id])
if not result:
if self.router_scheduler:
try:
self.router_scheduler.bind_router(context, router_id, agent)
except db_exc.DBError:
raise l3agentscheduler.RouterSchedulingFailed(
router_id=router_id, agent_id=agent_id)