openstack/neutron
Code Issues Proposed changes

Merge "Assign local variable before being referred"

Browse Source
This commit is contained in:
Zuul
2020-01-22 16:10:16 +00:00
committed by Gerrit Code Review
parent 4b48de8e88 37521cee8d
commit 69af9ef73c
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
neutron/tests/fullstack/test_l3_agent.py
View File

@@ -189,6 +189,10 @@ class TestL3Agent(base.BaseFullStackTestCase):
return found_agents return found_agents
def _router_fip_qos_after_admin_state_down_up(self, ha=False): def _router_fip_qos_after_admin_state_down_up(self, ha=False):
def get_router_gw_interface():
devices = ip.get_devices()
return [dev.name for dev in devices if dev.name.startswith('qg-')]
tenant_id = uuidutils.generate_uuid() tenant_id = uuidutils.generate_uuid()
ext_net, ext_sub = self._create_external_network_and_subnet(tenant_id) ext_net, ext_sub = self._create_external_network_and_subnet(tenant_id)
external_vm = self._create_external_vm(ext_net, ext_sub) external_vm = self._create_external_vm(ext_net, ext_sub)
@@ -235,13 +239,12 @@ class TestL3Agent(base.BaseFullStackTestCase):
else: else:
qrouter_ns = self._get_namespace(router['id']) qrouter_ns = self._get_namespace(router['id'])
ip = ip_lib.IPWrapper(qrouter_ns) ip = ip_lib.IPWrapper(qrouter_ns)
common_utils.wait_until_true(lambda: ip.get_devices()) try:
common_utils.wait_until_true(get_router_gw_interface)
devices = ip.get_devices() except common_utils.WaitTimeout:
for dev in devices: self.fail('Router gateway interface "qg-*" not found')
if dev.name.startswith("qg-"):
interface_name = dev.name
interface_name = get_router_gw_interface()[0]
tc_wrapper = l3_tc_lib.FloatingIPTcCommand( tc_wrapper = l3_tc_lib.FloatingIPTcCommand(
interface_name, interface_name,
namespace=qrouter_ns) namespace=qrouter_ns)