From a968d82258fe279e2204e5d71c7bee057136924d Mon Sep 17 00:00:00 2001 From: Hongbin Lu Date: Thu, 20 Sep 2018 17:08:44 +0000 Subject: [PATCH] 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 --- neutron_fwaas/tests/fullstack/resources/config.py | 4 ---- neutron_fwaas/tests/fullstack/resources/environment.py | 10 +++------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/neutron_fwaas/tests/fullstack/resources/config.py b/neutron_fwaas/tests/fullstack/resources/config.py index 778e4a528..60b2114ef 100644 --- a/neutron_fwaas/tests/fullstack/resources/config.py +++ b/neutron_fwaas/tests/fullstack/resources/config.py @@ -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') diff --git a/neutron_fwaas/tests/fullstack/resources/environment.py b/neutron_fwaas/tests/fullstack/resources/environment.py index e207cc290..454502a7f 100644 --- a/neutron_fwaas/tests/fullstack/resources/environment.py +++ b/neutron_fwaas/tests/fullstack/resources/environment.py @@ -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