Merge "Fullstack: Add l3_agent_mode for testing different agent types"

This commit is contained in:
Jenkins 2017-10-13 14:45:35 +00:00 committed by Gerrit Code Review
commit be47ae9dbf
2 changed files with 6 additions and 1 deletions
neutron/tests/fullstack/resources

@ -280,6 +280,9 @@ class L3ConfigFixture(ConfigFixture):
self._prepare_config_with_ovs_agent(integration_bridge)
elif host_desc.l2_agent_type == constants.AGENT_TYPE_LINUXBRIDGE:
self._prepare_config_with_linuxbridge_agent()
if host_desc.l3_agent_mode:
self.config['DEFAULT'].update({
'agent_mode': host_desc.l3_agent_mode})
self.config['DEFAULT'].update({
'debug': 'True',
'test_namespace_suffix': self._generate_namespace_suffix(),

@ -63,7 +63,8 @@ class HostDescription(object):
def __init__(self, l3_agent=False, dhcp_agent=False,
of_interface='ovs-ofctl', ovsdb_interface='vsctl',
l2_agent_type=constants.AGENT_TYPE_OVS,
firewall_driver='noop', availability_zone=None):
firewall_driver='noop', availability_zone=None,
l3_agent_mode=None):
self.l2_agent_type = l2_agent_type
self.l3_agent = l3_agent
self.dhcp_agent = dhcp_agent
@ -71,6 +72,7 @@ class HostDescription(object):
self.ovsdb_interface = ovsdb_interface
self.firewall_driver = firewall_driver
self.availability_zone = availability_zone
self.l3_agent_mode = l3_agent_mode
class Host(fixtures.Fixture):