openstack
/
neutron-fwaas
Code Issues Proposed changes

remove external_network_bridge option 

The external_network_bridge option is deprecated/legacy and being
removed from neutron [1]. This patch removes the external_network_bridge
option iniset from FWaaS.

[1] https://review.openstack.org/#/c/567369/

Change-Id: I5aa5617df81030d620b4190df1f67c1e880e79b8
This commit is contained in:
Hongbin Lu 2018-09-20 17:08:44 +00:00
parent 08ac104838
commit a968d82258
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron_fwaas/tests/fullstack/resources/config.py
View File

@ -272,7 +272,6 @@ class L3ConfigFixture(ConfigFixture):
'interface_driver': ('neutron.agent.linux.interface.'
'OVSInterfaceDriver'),
'ovs_integration_bridge': integration_bridge,
'external_network_bridge': self._generate_external_bridge(),
}
})
@ -287,8 +286,5 @@ class L3ConfigFixture(ConfigFixture):
def _generate_external_bridge(self):
return utils.get_rand_device_name(prefix='br-ex')
def get_external_bridge(self):
return self.config.DEFAULT.external_network_bridge
def _generate_namespace_suffix(self):
return utils.get_rand_name(prefix='test')

10
neutron_fwaas/tests/fullstack/resources/environment.py
View File

@ -113,15 +113,15 @@ class Host(fixtures.Fixture):
self.local_ip)
self.useFixture(agent_cfg_fixture)
br_phys = self.useFixture(
net_helpers.OVSBridgeFixture(
agent_cfg_fixture.get_br_phys_name())).bridge
if self.env_desc.tunneling_enabled:
self.useFixture(
net_helpers.OVSBridgeFixture(
agent_cfg_fixture.get_br_tun_name())).bridge
self.connect_to_internal_network_via_tunneling()
else:
br_phys = self.useFixture(
net_helpers.OVSBridgeFixture(
agent_cfg_fixture.get_br_phys_name())).bridge
self.connect_to_internal_network_via_vlans(br_phys)
self.ovs_agent = self.useFixture(
@ -135,10 +135,6 @@ class Host(fixtures.Fixture):
self.env_desc, self.host_desc,
self.neutron_config.temp_dir,
self.ovs_agent.agent_cfg_fixture.get_br_int_name()))
br_ex = self.useFixture(
net_helpers.OVSBridgeFixture(
self.l3_agent_cfg_fixture.get_external_bridge())).bridge
self.connect_to_external_network(br_ex)
def setup_host_with_linuxbridge_agent(self):
#First we need to provide connectivity for agent to prepare proper