openstack
/
nova
Code Issues Proposed changes

Merge "Honor [neutron]http_retries in the manual client" into stable/victoria

This commit is contained in:
Zuul 2021-07-08 12:36:11 +00:00 committed by Gerrit Code Review
parent 66fb0ecb5a f20346bc00
commit cf6288bbe4
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/network/neutron.py
View File

@ -271,6 +271,7 @@ def _get_ksa_client(context, admin=False):
client = utils.get_ksa_adapter(
'network', ksa_auth=auth_plugin, ksa_session=session)
client.additional_headers = {'accept': 'application/json'}
client.connect_retries = CONF.neutron.http_retries
return client

2
nova/tests/unit/network/test_neutron.py
View File

@ -253,6 +253,8 @@ class TestNeutronClient(test.NoDBTestCase):
auth_token='token')
cl = neutronapi.get_client(my_context)
self.assertEqual(retries, cl.httpclient.connect_retries)
kcl = neutronapi._get_ksa_client(my_context)
self.assertEqual(retries, kcl.connect_retries)
class TestAPIBase(test.TestCase):