From 7dce31272d17902458cfe0b80a9abb6574cc1021 Mon Sep 17 00:00:00 2001 From: Armando Migliaccio Date: Wed, 11 Oct 2017 16:27:59 -0700 Subject: [PATCH] Fullstack: add ability to specify router scheduler This is done in preparation to adding a few AZ related tests Change-Id: I65a103da2a291ebaf88832f3803a76eb78dbe0e4 --- neutron/tests/fullstack/resources/config.py | 3 +++ neutron/tests/fullstack/resources/environment.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/neutron/tests/fullstack/resources/config.py b/neutron/tests/fullstack/resources/config.py index c405ebc22e4..6b8f02ed913 100644 --- a/neutron/tests/fullstack/resources/config.py +++ b/neutron/tests/fullstack/resources/config.py @@ -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({ diff --git a/neutron/tests/fullstack/resources/environment.py b/neutron/tests/fullstack/resources/environment.py index 5fddfa8af70..353c12f1c96 100644 --- a/neutron/tests/fullstack/resources/environment.py +++ b/neutron/tests/fullstack/resources/environment.py @@ -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: