Use roles_client in keystone

roles_client is splitted out from identity_client in
tempest in recent commit. Hence, using the same.
This should fix current gate issue.

Change-Id: Ia152f2b4bbacf53cd691d623fa3885e9b99ff072
This commit is contained in:
Anusha Ramineni 2015-12-18 11:27:19 +05:30
parent f4466ad752
commit 81605e8abc
2 changed files with 3 additions and 2 deletions

View File

@ -43,6 +43,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
cls.os = clients.Manager(cls.admin_manager.auth_provider.credentials)
cls.keystone = cls.os.identity_client
cls.tenants_client = cls.os.tenants_client
cls.roles_client = cls.os.roles_client
cls.datasource_id = manager_congress.get_datasource_id(
cls.admin_manager.congress_client, 'keystone')
@ -99,7 +100,7 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
def _check_data_table_keystone_roles():
# Fetch data from keystone each time, because this test may start
# before keystone has all the users.
roles = self.keystone.list_roles()['roles']
roles = self.roles_client.list_roles()['roles']
roles_map = {}
for role in roles:
roles_map[role['id']] = role

View File

@ -117,7 +117,7 @@ class ScenarioPolicyBase(manager.NetworkScenarioTest):
return self.keypairs[server['key_name']]['private_key']
def _check_tenant_network_connectivity(self):
ssh_login = CONF.compute.image_ssh_user
ssh_login = CONF.validation.image_ssh_user
for server in self.servers:
# call the common method in the parent class
super(ScenarioPolicyBase, self)._check_tenant_network_connectivity(