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

Author: Zuul

nova/network/neutron.py

@@ -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
 
 

nova/tests/unit/network/test_neutron.py

@@ -253,6 +253,8 @@ def test_neutron_http_retries(self):
                                             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):