openstack
/
neutron-dynamic-routing
Code Issues Proposed changes

Merge "Disembowel register_l3_agent code duplication in tests"

This commit is contained in:
Jenkins 2015-04-30 20:06:47 +00:00 committed by Gerrit Code Review
parent 0e6818215f 92bd9844ed
commit c45c0048ca
1 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
neutron/tests/common/helpers.py
View File

@ -15,6 +15,12 @@
import os
import neutron
from neutron.common import constants
from neutron.common import topics
from neutron import context
from neutron import manager
HOST = 'localhost'
def find_file(filename, path):
@ -29,3 +35,36 @@ def find_sample_file(filename):
return find_file(
filename,
path=os.path.join(neutron.__path__[0], '..', 'etc'))
def _get_l3_agent_dict(host, agent_mode, internal_only=True,
ext_net_id='', ext_bridge='', router_id=None):
return {
'agent_type': constants.AGENT_TYPE_L3,
'binary': 'neutron-l3-agent',
'host': host,
'topic': topics.L3_AGENT,
'configurations': {'agent_mode': agent_mode,
'handle_internal_only_routers': internal_only,
'external_network_bridge': ext_bridge,
'gateway_external_network_id': ext_net_id,
'router_id': router_id,
'use_namespaces': router_id is None}}
def _register_agent(agent):
core_plugin = manager.NeutronManager.get_plugin()
admin_context = context.get_admin_context()
core_plugin.create_or_update_agent(admin_context, agent)
return core_plugin.get_agents_db(
admin_context,
filters={'host': [agent['host']],
'agent_type': [agent['agent_type']]})[0]
def register_l3_agent(host=HOST, agent_mode=constants.L3_AGENT_MODE_LEGACY,
internal_only=True, ext_net_id='', ext_bridge='',
router_id=None):
agent = _get_l3_agent_dict(host, agent_mode, internal_only, ext_net_id,
ext_bridge, router_id)
return _register_agent(agent)