openstack
/
neutron
Code Issues Proposed changes

Merge "Fullstack: add availability zone to host descriptor"

This commit is contained in:
Jenkins 2017-10-05 21:04:22 +00:00 committed by Gerrit Code Review
parent 91c7b8d4d2 dd57eba46a
commit e50434f059
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,6 +284,10 @@ class L3ConfigFixture(ConfigFixture):
'debug': 'True',
'test_namespace_suffix': self._generate_namespace_suffix(),
})
if host_desc.availability_zone:
self.config['agent'].update({
'availability_zone': host_desc.availability_zone
})
def _prepare_config_with_ovs_agent(self, integration_bridge):
self.config.update({
@ -325,6 +329,10 @@ class DhcpConfigFixture(ConfigFixture):
'dhcp_confs': self._generate_dhcp_path(),
'test_namespace_suffix': self._generate_namespace_suffix()
})
if host_desc.availability_zone:
self.config['agent'].update({
'availability_zone': host_desc.availability_zone
})
def _setUp(self):
super(DhcpConfigFixture, self)._setUp()

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

@ -63,13 +63,14 @@ 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'):
firewall_driver='noop', availability_zone=None):
self.l2_agent_type = l2_agent_type
self.l3_agent = l3_agent
self.dhcp_agent = dhcp_agent
self.of_interface = of_interface
self.ovsdb_interface = ovsdb_interface
self.firewall_driver = firewall_driver
self.availability_zone = availability_zone
class Host(fixtures.Fixture):