summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-28 16:21:59 +0000
committerGerrit Code Review <review@openstack.org>2018-08-28 16:21:59 +0000
commitf6ad3f236f45011d1c7a57547caf4e8b86fe8b7d (patch)
treebcfecc566bf7a6a9153439a81b9cc528fa2910f4
parent865a8241910f8bb3943bb6c33316df071e7b968d (diff)
parent86904543ebabcc2abe0ac3fea881afa2df81ff07 (diff)
Merge "Handle DiscoveryFailure errors"
-rw-r--r--keystonemiddleware/auth_token/__init__.py1
-rw-r--r--keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py11
2 files changed, 12 insertions, 0 deletions
diff --git a/keystonemiddleware/auth_token/__init__.py b/keystonemiddleware/auth_token/__init__.py
index f4917bd..46a6b1e 100644
--- a/keystonemiddleware/auth_token/__init__.py
+++ b/keystonemiddleware/auth_token/__init__.py
@@ -763,6 +763,7 @@ class AuthProtocol(BaseAuthProtocol):
763 self._token_cache.set(token_hashes[0], data) 763 self._token_cache.set(token_hashes[0], data)
764 764
765 except (ksa_exceptions.ConnectFailure, 765 except (ksa_exceptions.ConnectFailure,
766 ksa_exceptions.DiscoveryFailure,
766 ksa_exceptions.RequestTimeout, 767 ksa_exceptions.RequestTimeout,
767 ksm_exceptions.RevocationListError, 768 ksm_exceptions.RevocationListError,
768 ksm_exceptions.ServiceError) as e: 769 ksm_exceptions.ServiceError) as e:
diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
index 4d36be1..f9916cc 100644
--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
@@ -1070,6 +1070,17 @@ class CommonAuthTokenMiddlewareTest(object):
1070 self.assertIsNone(self._get_cached_token(ERROR_TOKEN)) 1070 self.assertIsNone(self._get_cached_token(ERROR_TOKEN))
1071 self.assert_valid_last_url(ERROR_TOKEN) 1071 self.assert_valid_last_url(ERROR_TOKEN)
1072 1072
1073 def test_discovery_failure(self):
1074 def discovery_failure_response(request, context):
1075 raise ksa_exceptions.DiscoveryFailure(
1076 "Could not determine a suitable URL for the plugin")
1077
1078 self.requests_mock.get(BASE_URI, text=discovery_failure_response)
1079 self.call_middleware(headers={'X-Auth-Token': 'token'},
1080 expected_status=503)
1081 self.assertIsNone(self._get_cached_token('token'))
1082 self.assertEqual(BASE_URI, self.requests_mock.last_request.url)
1083
1073 def test_http_request_max_retries(self): 1084 def test_http_request_max_retries(self):
1074 times_retry = 10 1085 times_retry = 10
1075 body_string = 'The Keystone service is temporarily unavailable.' 1086 body_string = 'The Keystone service is temporarily unavailable.'