openstack
/
nova
Code Issues Proposed changes

Merge "Honor [neutron]http_retries in the manual client"

This commit is contained in:
Zuul 2021-06-02 15:33:10 +00:00 committed by Gerrit Code Review
parent 84cfbddf34 56eb253e9f
commit 7cabd6dc40
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

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

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

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