openstack
/
neutron
Code Issues Proposed changes

Merge "Fullstack: add ability to specify router scheduler"

This commit is contained in:
Zuul 2017-10-16 23:11:35 +00:00 committed by Gerrit Code Review
parent 048c880c30 7dce31272d
commit bfee15e481
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neutron/tests/fullstack/resources/config.py
View File

@ -98,6 +98,9 @@ class NeutronConfigFixture(ConfigFixture):
root_helper_daemon = os.environ.get('OS_ROOTWRAP_DAEMON_CMD')
if root_helper_daemon:
self.config['agent']['root_helper_daemon'] = root_helper_daemon
if env_desc.router_scheduler:
self.config['DEFAULT']['router_scheduler_driver'] = (
env_desc.router_scheduler)
def _setUp(self):
self.config['DEFAULT'].update({

3
neutron/tests/fullstack/resources/environment.py
View File

@ -36,7 +36,7 @@ class EnvironmentDescription(object):
def __init__(self, network_type='vxlan', l2_pop=True, qos=False,
mech_drivers='openvswitch,linuxbridge',
service_plugins='router,trunk', arp_responder=False,
agent_down_time=75):
agent_down_time=75, router_scheduler=None):
self.network_type = network_type
self.l2_pop = l2_pop
self.qos = qos
@ -44,6 +44,7 @@ class EnvironmentDescription(object):
self.mech_drivers = mech_drivers
self.arp_responder = arp_responder
self.agent_down_time = agent_down_time
self.router_scheduler = router_scheduler
self.service_plugins = service_plugins
if self.qos: