openstack
/
tempest
Code Issues Proposed changes

Allows identity endpoint to be specified as URI 

Deprecates the piecemeal identity URL buildup and
replaces with a simple uri configuration setting.
Gets rid of the /tokens path stuff that was not
necessary to have in configuration file.

Change-Id: I5e80177073f756781f813438d054fede2d6334a3
This commit is contained in:
Jay Pipes 2013-01-16 21:32:43 -05:00
parent cd8eaec4fe
commit 7c88eb2b3e
17 changed files with 54 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etc/tempest.conf.sample
View File

@ -10,18 +10,8 @@ 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
# be accessed over HTTPS
use_ssl = False
# This is the main host address of the authentication service API
host = 127.0.0.1
# Port that the authentication service API is running on
port = 5000
# Version of the authentication service API (a string)
api_version = v2.0
# Path to the authentication service tokens resource (do not modify unless you
# have a custom authentication API and are not using Keystone)
path = tokens
# URL for where to find the OpenStack Identity API endpoint (Keystone)
uri = http://127.0.0.1:5000/v2.0/
# Should typically be left as keystone unless you have a non-Keystone
# authentication API service
strategy = keystone

2
stress/tools/nova_destroy_all.py
View File

@ -24,7 +24,7 @@ identity = tempest.config.TempestConfig().identity
compute = tempest.config.TempestConfig().compute
nt = client.Client(compute.username, compute.password,
compute.tenant_name, identity.auth_url)
compute.tenant_name, identity.uri)
flavor_list = nt.flavors.list()
server_list = nt.servers.list()

4
stress/tools/nova_status.py
View File

@ -23,10 +23,10 @@ import tempest.config
identity = tempest.config.TempestConfig().identity
compute = tempest.config.TempestConfig().compute
print compute.username, compute.password,\
compute.tenant_name, identity.auth_url
compute.tenant_name, identity.uri
nt = client.Client(compute.username, compute.password,
compute.tenant_name, identity.auth_url)
compute.tenant_name, identity.uri)
flavor_list = nt.flavors.list()
server_list = nt.servers.list()

2
tempest/clients.py
View File

@ -164,7 +164,7 @@ class Manager(object):
"tenant_name: %(tenant_name)s") % locals()
raise exceptions.InvalidConfiguration(msg)
self.auth_url = self.config.identity.auth_url
self.auth_url = self.config.identity.uri
if self.config.identity.strategy == 'keystone':
client_args = (self.config, self.username, self.password,

4
tempest/common/rest_client.py
View File

@ -116,6 +116,10 @@ class RestClient(object):
Provides authentication via Keystone
"""
# Normalize URI to ensure /tokens is in it.
if 'tokens' not in auth_url:
auth_url = auth_url.rstrip('/') + '/tokens'
creds = {
'auth': {
'passwordCredentials': {

23
tempest/config.py
View File

@ -34,21 +34,25 @@ IdentityGroup = [
cfg.BoolOpt('disable_ssl_certificate_validation',
default=False,
help="Set to True if using self-signed SSL certificates."),
cfg.StrOpt('uri',
default=None,
help="Full URI of the OpenStack Identity API (Keystone)"),
cfg.StrOpt('host',
default="127.0.0.1",
help="Host IP for making Identity API requests."),
help="(DEPRECATED, use uri) Host IP for making Identity "
"API requests."),
cfg.IntOpt('port',
default=8773,
help="Port for the Identity service."),
help="(DEPRECATED, use uri) Port for the Identity service."),
cfg.StrOpt('api_version',
default="v1.1",
help="Version of the Identity API"),
help="(DEPRECATED, use uri) Version of the Identity API"),
cfg.StrOpt('path',
default='/',
help="Path of API request"),
help="(IGNORED) Path of API request"),
cfg.BoolOpt('use_ssl',
default=False,
help="Specifies if we are using https."),
help="(DEPRECATED, use uri) Specifies if we are using https."),
cfg.StrOpt('strategy',
default='keystone',
help="Which auth method does the environment use? "
@ -64,16 +68,15 @@ def register_identity_opts(conf):
for opt in IdentityGroup:
conf.register_opt(opt, group='identity')
# Fall back to piecemeal identity URI for legacy support
authurl = data_utils.build_url(conf.identity.host,
str(conf.identity.port),
conf.identity.api_version,
conf.identity.path,
path='', # Ignore path...
use_ssl=conf.identity.use_ssl)
auth_url = cfg.StrOpt('auth_url',
default=authurl,
help="The Identity URL (derived)")
conf.register_opt(auth_url, group="identity")
if not conf.identity.uri:
conf.identity.uri = authurl
identity_admin_group = cfg.OptGroup(name='identity-admin',

13
tempest/manager.py
View File

@ -126,8 +126,7 @@ class DefaultClientManager(Manager):
"tenant_name: %(tenant_name)s") % locals()
raise exceptions.InvalidConfiguration(msg)
# Novaclient adds a /tokens/ part to the auth URL automatically
auth_url = self.config.identity.auth_url.rstrip('tokens')
auth_url = self.config.identity.uri
dscv = self.config.identity.disable_ssl_certificate_validation
client_args = (username, password, tenant_name, auth_url)
@ -166,7 +165,7 @@ class DefaultClientManager(Manager):
"tenant_name: %(tenant_name)s") % locals()
raise exceptions.InvalidConfiguration(msg)
auth_url = self.config.identity.auth_url.rstrip('tokens')
auth_url = self.config.identity.uri
dscv = self.config.identity.disable_ssl_certificate_validation
return keystoneclient.v2_0.client.Client(username=username,
@ -192,7 +191,7 @@ class DefaultClientManager(Manager):
"tenant_name: %(tenant_name)s") % locals()
raise exceptions.InvalidConfiguration(msg)
auth_url = self.config.identity.auth_url.rstrip('tokens')
auth_url = self.config.identity.uri
dscv = self.config.identity.disable_ssl_certificate_validation
return quantumclient.v2_0.client.Client(username=username,
@ -233,7 +232,11 @@ class ComputeFuzzClientManager(FuzzClientManager):
"tenant_name: %(tenant_name)s") % locals()
raise exceptions.InvalidConfiguration(msg)
auth_url = self.config.identity.auth_url
auth_url = self.config.identity.uri
# Ensure /tokens is in the URL for Keystone...
if 'tokens' not in auth_url:
auth_url = auth_url.rstrip('/') + '/tokens'
if self.config.identity.strategy == 'keystone':
client_args = (self.config, username, password, auth_url,

4
tempest/services/boto/__init__.py
View File

@ -38,10 +38,6 @@ class BotoClientBase(object):
self.connection_timeout = str(config.boto.http_socket_timeout)
self.num_retries = str(config.boto.num_retries)
self.build_timeout = config.boto.build_timeout
# We do not need the "path": "/token" part
if auth_url:
auth_url = re.sub("(.*)" + re.escape(config.identity.path) + "$",
"\\1", auth_url)
self.ks_cred = {"username": username,
"password": password,
"auth_url": auth_url,

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

@ -206,7 +206,14 @@ class AdminClientJSON(RestClient):
class TokenClientJSON(RestClient):
def __init__(self, config):
self.auth_url = config.identity.auth_url
auth_url = config.identity.uri
# TODO(jaypipes) Why is this all repeated code in here?
# Normalize URI to ensure /tokens is in it.
if 'tokens' not in auth_url:
auth_url = auth_url.rstrip('/') + '/tokens'
self.auth_url = auth_url
self.config = config
def auth(self, user, password, tenant):

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

@ -242,7 +242,14 @@ class AdminClientXML(RestClientXML):
class TokenClientXML(RestClientXML):
def __init__(self, config):
self.auth_url = config.identity.auth_url
auth_url = config.identity.uri
# TODO(jaypipes) Why is this all repeated code in here?
# Normalize URI to ensure /tokens is in it.
if 'tokens' not in auth_url:
auth_url = auth_url.rstrip('/') + '/tokens'
self.auth_url = auth_url
self.config = config
def auth(self, user, password, tenant):

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

@ -42,8 +42,7 @@ class Service(BaseService):
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.uri
keystone = keystoneclient.v2_0.client.Client(
username=config.images.username,
password=config.images.password,

2
tempest/tests/compute/admin/test_quotas.py
View File

@ -30,7 +30,7 @@ class QuotasTest(BaseComputeTest):
adm_user = cls.config.compute_admin.username
adm_pass = cls.config.compute_admin.password
adm_tenant = cls.config.compute_admin.tenant_name
auth_url = cls.config.identity.auth_url
auth_url = cls.config.identity.uri
cls.adm_client = adm_quotas.AdminQuotasClient(cls.config, adm_user,
adm_pass, auth_url,

2
tempest/tests/compute/base.py
View File

@ -89,7 +89,7 @@ class BaseCompTest(unittest.TestCase):
cls.config,
cls.config.identity_admin.username,
cls.config.identity_admin.password,
cls.config.identity.auth_url
cls.config.identity.uri
)
@classmethod

2
tempest/tests/volume/admin/base.py
View File

@ -35,7 +35,7 @@ class BaseVolumeAdminTest(BaseVolumeTest):
cls.adm_user = cls.config.compute_admin.username
cls.adm_pass = cls.config.compute_admin.password
cls.adm_tenant = cls.config.compute_admin.tenant_name
cls.auth_url = cls.config.identity.auth_url
cls.auth_url = cls.config.identity.uri
if not cls.adm_user and cls.adm_pass and cls.adm_tenant:
msg = ("Missing Volume Admin API credentials "

2
tempest/tests/volume/admin/test_volume_types.py
View File

@ -28,7 +28,7 @@ class VolumeTypesTest(BaseVolumeTest):
adm_user = cls.config.compute_admin.username
adm_pass = cls.config.compute_admin.password
adm_tenant = cls.config.compute_admin.tenant_name
auth_url = cls.config.identity.auth_url
auth_url = cls.config.identity.uri
cls.client = volume_types_client.VolumeTypesClientJSON(cls.config,
adm_user,

2
tempest/tests/volume/admin/test_volume_types_extra_specs.py
View File

@ -29,7 +29,7 @@ class VolumeTypesExtraSpecsTest(BaseVolumeTest):
adm_user = cls.config.compute_admin.username
adm_pass = cls.config.compute_admin.password
adm_tenant = cls.config.compute_admin.tenant_name
auth_url = cls.config.identity.auth_url
auth_url = cls.config.identity.uri
cls.client = volume_types_client.VolumeTypesClientJSON(cls.config,
adm_user,

2
tools/tempest_coverage.py
View File

@ -139,7 +139,7 @@ def parse_opts(argv):
def main(argv):
CLI = parse_opts(argv)
client_args = (CONF, CONF.compute_admin.username,
CONF.compute_admin.password, CONF.identity.auth_url,
CONF.compute_admin.password, CONF.identity.uri,
CONF.compute_admin.tenant_name)
coverage_client = CoverageClientJSON(*client_args)