openstack/tempest
Code Issues Proposed changes

Merge "Adds setting to disable SSL cert validation"

Browse Source
This commit is contained in:
Jenkins
2013-01-17 18:41:10 +00:00
committed by Gerrit Code Review
parent 4a4c255e2e cd8eaec4fe
commit ac581fcd23
8 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
etc/tempest.conf.sample
View File

@@ -7,6 +7,9 @@
# custom Keystone service catalog implementation, you probably want to leave # custom Keystone service catalog implementation, you probably want to leave
# this value as "identity" # this value as "identity"
catalog_type = identity catalog_type = identity
# Ignore SSL certificate validation failures? Use when in testing
# environments that have self-signed SSL certs.
disable_ssl_certificate_validation = False
# Set to True if your test environment's Keystone authentication service should # Set to True if your test environment's Keystone authentication service should
# be accessed over HTTPS # be accessed over HTTPS
use_ssl = False use_ssl = False

9
tempest/common/rest_client.py
View File

@@ -103,7 +103,8 @@ class RestClient(object):
params['headers'] = {'User-Agent': 'Test-Client', 'X-Auth-User': user, params['headers'] = {'User-Agent': 'Test-Client', 'X-Auth-User': user,
'X-Auth-Key': password} 'X-Auth-Key': password}
self.http_obj = httplib2.Http(disable_ssl_certificate_validation=True) dscv = self.config.identity.disable_ssl_certificate_validation
self.http_obj = httplib2.Http(disable_ssl_certificate_validation=dscv)
resp, body = self.http_obj.request(auth_url, 'GET', **params) resp, body = self.http_obj.request(auth_url, 'GET', **params)
try: try:
return resp['x-auth-token'], resp['x-server-management-url'] return resp['x-auth-token'], resp['x-server-management-url']
@@ -125,7 +126,8 @@ class RestClient(object):
} }
} }
self.http_obj = httplib2.Http(disable_ssl_certificate_validation=True) dscv = self.config.identity.disable_ssl_certificate_validation
self.http_obj = httplib2.Http(disable_ssl_certificate_validation=dscv)
headers = {'Content-Type': 'application/json'} headers = {'Content-Type': 'application/json'}
body = json.dumps(creds) body = json.dumps(creds)
resp, body = self.http_obj.request(auth_url, 'POST', resp, body = self.http_obj.request(auth_url, 'POST',
@@ -200,7 +202,8 @@ class RestClient(object):
if (self.token is None) or (self.base_url is None): if (self.token is None) or (self.base_url is None):
self._set_auth() self._set_auth()
self.http_obj = httplib2.Http(disable_ssl_certificate_validation=True) dscv = self.config.identity.disable_ssl_certificate_validation
self.http_obj = httplib2.Http(disable_ssl_certificate_validation=dscv)
if headers is None: if headers is None:
headers = {} headers = {}
headers['X-Auth-Token'] = self.token headers['X-Auth-Token'] = self.token

3
tempest/config.py
View File

@@ -31,6 +31,9 @@ IdentityGroup = [
cfg.StrOpt('catalog_type', cfg.StrOpt('catalog_type',
default='identity', default='identity',
help="Catalog type of the Identity service."), help="Catalog type of the Identity service."),
cfg.BoolOpt('disable_ssl_certificate_validation',
default=False,
help="Set to True if using self-signed SSL certificates."),
cfg.StrOpt('host', cfg.StrOpt('host',
default="127.0.0.1", default="127.0.0.1",
help="Host IP for making Identity API requests."), help="Host IP for making Identity API requests."),

16
tempest/manager.py
View File

@@ -128,6 +128,7 @@ class DefaultClientManager(Manager):
# Novaclient adds a /tokens/ part to the auth URL automatically # Novaclient adds a /tokens/ part to the auth URL automatically
auth_url = self.config.identity.auth_url.rstrip('tokens') auth_url = self.config.identity.auth_url.rstrip('tokens')
dscv = self.config.identity.disable_ssl_certificate_validation
client_args = (username, password, tenant_name, auth_url) client_args = (username, password, tenant_name, auth_url)
@@ -136,14 +137,17 @@ class DefaultClientManager(Manager):
return novaclient.client.Client(self.NOVACLIENT_VERSION, return novaclient.client.Client(self.NOVACLIENT_VERSION,
*client_args, *client_args,
service_type=service_type, service_type=service_type,
no_cache=True) no_cache=True,
insecure=dscv)
def _get_image_client(self): def _get_image_client(self):
keystone = self._get_identity_client() keystone = self._get_identity_client()
token = keystone.auth_token token = keystone.auth_token
endpoint = keystone.service_catalog.url_for(service_type='image', endpoint = keystone.service_catalog.url_for(service_type='image',
endpoint_type='publicURL') endpoint_type='publicURL')
return glanceclient.Client('1', endpoint=endpoint, token=token) dscv = self.config.identity.disable_ssl_certificate_validation
return glanceclient.Client('1', endpoint=endpoint, token=token,
insecure=dscv)
def _get_identity_client(self, username=None, password=None, def _get_identity_client(self, username=None, password=None,
tenant_name=None): tenant_name=None):
@@ -163,11 +167,13 @@ class DefaultClientManager(Manager):
raise exceptions.InvalidConfiguration(msg) raise exceptions.InvalidConfiguration(msg)
auth_url = self.config.identity.auth_url.rstrip('tokens') auth_url = self.config.identity.auth_url.rstrip('tokens')
dscv = self.config.identity.disable_ssl_certificate_validation
return keystoneclient.v2_0.client.Client(username=username, return keystoneclient.v2_0.client.Client(username=username,
password=password, password=password,
tenant_name=tenant_name, tenant_name=tenant_name,
auth_url=auth_url) auth_url=auth_url,
insecure=dscv)
def _get_network_client(self): def _get_network_client(self):
# The intended configuration is for the network client to have # The intended configuration is for the network client to have
@@ -187,11 +193,13 @@ class DefaultClientManager(Manager):
raise exceptions.InvalidConfiguration(msg) raise exceptions.InvalidConfiguration(msg)
auth_url = self.config.identity.auth_url.rstrip('tokens') auth_url = self.config.identity.auth_url.rstrip('tokens')
dscv = self.config.identity.disable_ssl_certificate_validation
return quantumclient.v2_0.client.Client(username=username, return quantumclient.v2_0.client.Client(username=username,
password=password, password=password,
tenant_name=tenant_name, tenant_name=tenant_name,
auth_url=auth_url) auth_url=auth_url,
insecure=dscv)
class ComputeFuzzClientManager(FuzzClientManager): class ComputeFuzzClientManager(FuzzClientManager):

4
tempest/services/identity/json/admin_client.py
View File

@@ -207,6 +207,7 @@ class TokenClientJSON(RestClient):
def __init__(self, config): def __init__(self, config):
self.auth_url = config.identity.auth_url self.auth_url = config.identity.auth_url
self.config = config
def auth(self, user, password, tenant): def auth(self, user, password, tenant):
creds = { creds = {
@@ -225,7 +226,8 @@ class TokenClientJSON(RestClient):
def request(self, method, url, headers=None, body=None): def request(self, method, url, headers=None, body=None):
"""A simple HTTP request interface.""" """A simple HTTP request interface."""
self.http_obj = httplib2.Http() dscv = self.config.identity.disable_ssl_certificate_validation
self.http_obj = httplib2.Http(disable_ssl_certificate_validation=dscv)
if headers is None: if headers is None:
headers = {} headers = {}

4
tempest/services/identity/xml/admin_client.py
View File

@@ -243,6 +243,7 @@ class TokenClientXML(RestClientXML):
def __init__(self, config): def __init__(self, config):
self.auth_url = config.identity.auth_url self.auth_url = config.identity.auth_url
self.config = config
def auth(self, user, password, tenant): def auth(self, user, password, tenant):
passwordCreds = Element("passwordCredentials", passwordCreds = Element("passwordCredentials",
@@ -257,7 +258,8 @@ class TokenClientXML(RestClientXML):
def request(self, method, url, headers=None, body=None): def request(self, method, url, headers=None, body=None):
"""A simple HTTP request interface.""" """A simple HTTP request interface."""
self.http_obj = httplib2.Http() dscv = self.config.identity.disable_ssl_certificate_validation
self.http_obj = httplib2.Http(disable_ssl_certificate_validation=dscv)
if headers is None: if headers is None:
headers = {} headers = {}

8
tempest/services/image/service.py
View File

@@ -41,12 +41,15 @@ class Service(BaseService):
import glanceclient import glanceclient
import keystoneclient.v2_0.client import keystoneclient.v2_0.client
dscv = self.config.identity.disable_ssl_certificate_validation
auth_url = self.config.identity.auth_url.rstrip('tokens') auth_url = self.config.identity.auth_url.rstrip('tokens')
keystone = keystoneclient.v2_0.client.Client( keystone = keystoneclient.v2_0.client.Client(
username=config.images.username, username=config.images.username,
password=config.images.password, password=config.images.password,
tenant_name=config.images.tenant_name, tenant_name=config.images.tenant_name,
auth_url=auth_url) auth_url=auth_url,
insecure=dscv)
token = keystone.auth_token token = keystone.auth_token
endpoint = keystone.service_catalog.url_for( endpoint = keystone.service_catalog.url_for(
service_type='image', service_type='image',
@@ -54,7 +57,8 @@ class Service(BaseService):
self._client = glanceclient.Client('1', self._client = glanceclient.Client('1',
endpoint=endpoint, endpoint=endpoint,
token=token) token=token,
insecure=dscv)
else: else:
raise NotImplementedError raise NotImplementedError

3
tempest/services/object_storage/object_client.py
View File

@@ -133,7 +133,8 @@ class ObjectClientCustomizedHeader(RestClient):
def request(self, method, url, headers=None, body=None, wait=None): def request(self, method, url, headers=None, body=None, wait=None):
"""A simple HTTP request interface.""" """A simple HTTP request interface."""
self.http_obj = httplib2.Http() dscv = self.config.identity.disable_ssl_certificate_validation
self.http_obj = httplib2.Http(disable_ssl_certificate_validation=dscv)
if headers is None: if headers is None:
headers = {} headers = {}
if self.base_url is None: if self.base_url is None: