openstack
/
neutron
Code Issues Proposed changes

Merge "Use Agent OVO in l3_agentschedulers_db"

This commit is contained in:
Zuul 2017-11-14 20:44:48 +00:00 committed by Gerrit Code Review
parent db9c7a3c44 7f969fa855
commit c7b380e390
3 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
neutron/db/l3_agentschedulers_db.py
View File

@ -20,7 +20,6 @@ from oslo_config import cfg
from oslo_db import exception as db_exc from oslo_db import exception as db_exc
from oslo_log import log as logging from oslo_log import log as logging
import oslo_messaging import oslo_messaging
from sqlalchemy import or_
from neutron.agent.common import utils as agent_utils from neutron.agent.common import utils as agent_utils
from neutron.common import constants as l_consts from neutron.common import constants as l_consts
@ -374,30 +373,31 @@ class L3AgentSchedulerDbMixin(l3agentscheduler.L3AgentSchedulerPluginBase,
for router_model, agent_count in l3_model_list] for router_model, agent_count in l3_model_list]
def get_l3_agents(self, context, active=None, filters=None): def get_l3_agents(self, context, active=None, filters=None):
query = context.session.query(agent_model.Agent) agent_filters = {'agent_type': constants.AGENT_TYPE_L3}
query = query.filter(
agent_model.Agent.agent_type == constants.AGENT_TYPE_L3)
if active is not None: if active is not None:
query = (query.filter(agent_model.Agent.admin_state_up == active)) agent_filters['admin_state_up'] = active
config_filters = []
if filters: if filters:
for key, value in filters.items(): for key, value in filters.items():
column = getattr(agent_model.Agent, key, None) column = getattr(agent_model.Agent, key, None)
if column: if column:
if not value: if not value:
return [] return []
query = query.filter(column.in_(value))
agent_modes = filters.get('agent_modes', []) agent_modes = filters.pop('agent_modes', [])
if agent_modes: if agent_modes:
agent_mode_key = '\"agent_mode\": \"' config_filters = set('\"agent_mode\": \"%s\"' % agent_mode
configuration_filter = ( for agent_mode in agent_modes)
[agent_model.Agent.configurations.contains('%s%s\"' % agent_filters.update(filters)
(agent_mode_key, agent_mode)) agent_objs = []
for agent_mode in agent_modes]) if config_filters:
query = query.filter(or_(*configuration_filter)) for conf_filter in config_filters:
agent_objs.extend(ag_obj.Agent.get_objects_by_agent_mode(
context, conf_filter, **agent_filters))
else:
agent_objs = ag_obj.Agent.get_objects(context, **agent_filters)
return [l3_agent return [l3_agent
for l3_agent in query for l3_agent in agent_objs
if agentschedulers_db.AgentSchedulerDbMixin.is_eligible_agent( if agentschedulers_db.AgentSchedulerDbMixin.is_eligible_agent(
active, l3_agent)] active, l3_agent)]

5
neutron/objects/agent.py
View File

@ -156,3 +156,8 @@ class Agent(base.NeutronDbObject):
agent_model.Agent.availability_zone.in_(availability_zones)).all() agent_model.Agent.availability_zone.in_(availability_zones)).all()
agents = [cls._load_object(context, record) for record in query] agents = [cls._load_object(context, record) for record in query]
return agents return agents
@classmethod
def get_objects_by_agent_mode(cls, context, agent_mode=None, **kwargs):
mode_filter = obj_utils.StringContains(agent_mode)
return cls.get_objects(context, configurations=mode_filter, **kwargs)

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

@ -1932,7 +1932,7 @@ class TestGetL3AgentsWithAgentModeFilter(TestGetL3AgentsWithFilter):
self.assertEqual(len(self.expected_agent_modes), len(l3_agents)) self.assertEqual(len(self.expected_agent_modes), len(l3_agents))
returned_agent_modes = [self._get_agent_mode(agent) returned_agent_modes = [self._get_agent_mode(agent)
for agent in l3_agents] for agent in l3_agents]
self.assertEqual(self.expected_agent_modes, returned_agent_modes) self.assertItemsEqual(self.expected_agent_modes, returned_agent_modes)
class TestGetL3AgentsWithHostFilter(TestGetL3AgentsWithFilter): class TestGetL3AgentsWithHostFilter(TestGetL3AgentsWithFilter):