openstack/tempest
Code Issues Proposed changes

Merge "Fix usage of NotImplementedError exceptions in auth classes"

Browse Source
This commit is contained in:
Jenkins 2014-02-12 02:56:40 +00:00 committed by Gerrit Code Review
commit aeee47dc48
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tempest/auth.py
View File

@ -68,10 +68,10 @@ class AuthProvider(object):
""" """
Decorate request with authentication data Decorate request with authentication data
""" """
raise NotImplemented raise NotImplementedError
def _get_auth(self): def _get_auth(self):
raise NotImplemented raise NotImplementedError
@classmethod @classmethod
def check_credentials(cls, credentials): def check_credentials(cls, credentials):
@ -98,7 +98,7 @@ class AuthProvider(object):
self.cache = None self.cache = None
def is_expired(self, auth_data): def is_expired(self, auth_data):
raise NotImplemented raise NotImplementedError
def auth_request(self, method, url, headers=None, body=None, filters=None): def auth_request(self, method, url, headers=None, body=None, filters=None):
""" """
@ -176,7 +176,7 @@ class AuthProvider(object):
""" """
Extracts the base_url based on provided filters Extracts the base_url based on provided filters
""" """
raise NotImplemented raise NotImplementedError
class KeystoneAuthProvider(AuthProvider): class KeystoneAuthProvider(AuthProvider):
@ -208,10 +208,10 @@ class KeystoneAuthProvider(AuthProvider):
return _url, _headers, body return _url, _headers, body
def _auth_client(self): def _auth_client(self):
raise NotImplemented raise NotImplementedError
def _auth_params(self): def _auth_params(self):
raise NotImplemented raise NotImplementedError
def _get_auth(self): def _get_auth(self):
# Bypasses the cache # Bypasses the cache
@ -223,7 +223,7 @@ class KeystoneAuthProvider(AuthProvider):
token, auth_data = auth_func(**auth_params) token, auth_data = auth_func(**auth_params)
return token, auth_data return token, auth_data
else: else:
raise NotImplemented raise NotImplementedError
def get_token(self): def get_token(self):
return self.auth_data[0] return self.auth_data[0]
@ -250,7 +250,7 @@ class KeystoneV2AuthProvider(KeystoneAuthProvider):
else: else:
return xml_id.TokenClientXML() return xml_id.TokenClientXML()
else: else:
raise NotImplemented raise NotImplementedError
def _auth_params(self): def _auth_params(self):
if self.client_type == 'tempest': if self.client_type == 'tempest':
@ -260,7 +260,7 @@ class KeystoneV2AuthProvider(KeystoneAuthProvider):
tenant=self.credentials.get('tenant_name', None), tenant=self.credentials.get('tenant_name', None),
auth_data=True) auth_data=True)
else: else:
raise NotImplemented raise NotImplementedError
def base_url(self, filters, auth_data=None): def base_url(self, filters, auth_data=None):
""" """
@ -334,7 +334,7 @@ class KeystoneV3AuthProvider(KeystoneAuthProvider):
else: else:
return xml_v3id.V3TokenClientXML() return xml_v3id.V3TokenClientXML()
else: else:
raise NotImplemented raise NotImplementedError
def _auth_params(self): def _auth_params(self):
if self.client_type == 'tempest': if self.client_type == 'tempest':
@ -345,7 +345,7 @@ class KeystoneV3AuthProvider(KeystoneAuthProvider):
domain=self.credentials['domain_name'], domain=self.credentials['domain_name'],
auth_data=True) auth_data=True)
else: else:
raise NotImplemented raise NotImplementedError
def base_url(self, filters, auth_data=None): def base_url(self, filters, auth_data=None):
""" """