openstack
/
tempest
Code Issues Proposed changes

Merge "Fix dsvm typo to dscv"

This commit is contained in:
Jenkins 2016-06-10 19:35:58 +00:00 committed by Gerrit Code Review
parent b15c5d5649 97aa60459b
commit 5023b4370d
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tempest/lib/auth.py
View File

@ -262,7 +262,7 @@ class KeystoneAuthProvider(AuthProvider):
disable_ssl_certificate_validation=None,
ca_certs=None, trace_requests=None, scope='project'):
super(KeystoneAuthProvider, self).__init__(credentials, scope)
self.dsvm = disable_ssl_certificate_validation
self.dscv = disable_ssl_certificate_validation
self.ca_certs = ca_certs
self.trace_requests = trace_requests
self.auth_url = auth_url
@ -341,7 +341,7 @@ class KeystoneV2AuthProvider(KeystoneAuthProvider):
def _auth_client(self, auth_url):
return json_v2id.TokenClient(
auth_url, disable_ssl_certificate_validation=self.dsvm,
auth_url, disable_ssl_certificate_validation=self.dscv,
ca_certs=self.ca_certs, trace_requests=self.trace_requests)
def _auth_params(self):
@ -428,7 +428,7 @@ class KeystoneV3AuthProvider(KeystoneAuthProvider):
def _auth_client(self, auth_url):
return json_v3id.V3TokenClient(
auth_url, disable_ssl_certificate_validation=self.dsvm,
auth_url, disable_ssl_certificate_validation=self.dscv,
ca_certs=self.ca_certs, trace_requests=self.trace_requests)
def _auth_params(self):
@ -631,9 +631,9 @@ def get_credentials(auth_url, fill_in=True, identity_version='v2',
creds = credential_class(**kwargs)
# Fill in the credentials fields that were not specified
if fill_in:
dsvm = disable_ssl_certificate_validation
dscv = disable_ssl_certificate_validation
auth_provider = auth_provider_class(
creds, auth_url, disable_ssl_certificate_validation=dsvm,
creds, auth_url, disable_ssl_certificate_validation=dscv,
ca_certs=ca_certs, trace_requests=trace_requests)
creds = auth_provider.fill_credentials()
return creds