diff options
| author | Zuul <zuul@review.opendev.org> | 2021-08-20 22:52:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-08-20 22:52:57 +0000 |
| commit | 7c0a5c5c3cf73db62fc6afb3e23f7a22bbce5cea (patch) | |
| tree | 9e71843e907b7dedaf965654b731e780386d6615 | |
| parent | 4ab651f3df2559c79206dce81887e0965cdc9689 (diff) | |
| parent | b96f93ed8633d6fd0725c4a11366ffbf38056e65 (diff) | |
| download | nova-7c0a5c5c3cf73db62fc6afb3e23f7a22bbce5cea.tar.gz | |
Merge "Honor [neutron]http_retries in the manual client" into stable/ussuri
| -rw-r--r-- | nova/network/neutron.py | 1 | ||||
| -rw-r--r-- | nova/tests/unit/network/test_neutron.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/nova/network/neutron.py b/nova/network/neutron.py index 66194cb696..f3d763044e 100644 --- a/nova/network/neutron.py +++ b/nova/network/neutron.py @@ -273,6 +273,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 diff --git a/nova/tests/unit/network/test_neutron.py b/nova/tests/unit/network/test_neutron.py index 3e6dc6417b..5d7c2069eb 100644 --- a/nova/tests/unit/network/test_neutron.py +++ b/nova/tests/unit/network/test_neutron.py @@ -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): |