Browse Source

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

changes/60/794360/1
Zuul 4 months ago
committed by Gerrit Code Review
parent
commit
7cabd6dc40
  1. 1
      nova/network/neutron.py
  2. 2
      nova/tests/unit/network/test_neutron.py

1
nova/network/neutron.py

@ -272,6 +272,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

@ -251,6 +251,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):

Loading…
Cancel
Save