openstack
/
neutron
Code Issues Proposed changes

Fix tempest api testing 

This change adds the identity v2 paths to the list of copied modules
and updates the identity client init.

Change-Id: Ic02ba41eabfb78c49b23c905f1c5cc1d033e2d72
This commit is contained in:
Maru Newby 2015-03-09 18:56:59 +00:00
parent 96716b5f4e
commit 4f4aba36de
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/tests/api/contrib/clients.py
View File

@ -97,9 +97,12 @@ class Manager(manager.Manager):
self.region_client = RegionClientJSON(self.auth_provider, **params)
self.credentials_client = CredentialsClientJSON(self.auth_provider,
**params)
self.token_client = TokenClientJSON()
# Token clients do not use the catalog. They only need default_params.
self.token_client = TokenClientJSON(CONF.identity.uri,
**self.default_params)
if CONF.identity_feature_enabled.api_v3:
self.token_v3_client = V3TokenClientJSON()
self.token_v3_client = V3TokenClientJSON(CONF.identity.uri_v3,
**self.default_params)
class AdminManager(Manager):

2
tools/copy_api_tests_from_tempest.sh
View File

@ -32,6 +32,8 @@ function copy_files {
'tempest/common/utils'
'tempest/services'
'tempest/services/identity'
'tempest/services/identity/v2'
'tempest/services/identity/v2/json'
'tempest/services/identity/v3'
'tempest/services/identity/v3/json'
'tempest/services/network'