x/tobiko
Code Issues Proposed changes

Merge "Retry neutron agent list requests upon any exception"

Browse Source
This commit is contained in:
Zuul 2021-07-21 20:00:10 +00:00 committed by Gerrit Code Review
commit 8b322e3e99
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tobiko/openstack/neutron/__init__.py
View File

@ -45,6 +45,7 @@ skip_if_is_old_ovn = _agent.skip_if_is_old_ovn
NeutronClientFixture = _client.NeutronClientFixture
ServiceUnavailable = _client.ServiceUnavailable
NeutronClientException = _client.NeutronClientException
neutron_client = _client.neutron_client
get_neutron_client = _client.get_neutron_client
find_subnet = _client.find_subnet

1
tobiko/openstack/neutron/_client.py
View File

@ -23,6 +23,7 @@ import tobiko
from tobiko.openstack import _client
NeutronClientException = neutronclient.exceptions.NeutronClientException
ServiceUnavailable = neutronclient.exceptions.ServiceUnavailable

3
tobiko/openstack/tests/_neutron.py
View File

@ -44,7 +44,8 @@ def test_neutron_agents_are_alive(timeout=300., interval=5.) \
try:
# get Neutron agent list
agents = neutron.list_agents()
except neutron.ServiceUnavailable as ex:
except (neutron.ServiceUnavailable,
neutron.NeutronClientException) as ex:
if attempt.is_last:
raise
else: