openinfra/python-tempestconf
Code Issues Proposed changes

Replace tenant by project, part 1

Browse Source 
Replace use of tenant when it's setting to or reading from
tempest.conf (conf object).
The change is needed for correct reading of that value in
dependent patches - need to count on that it's project not
tenant anymore.

Change-Id: Ic2987ce322a0cd4a92d35b06a86aec95226f981e
Story: 2002116
Task: 19795
This commit is contained in:
Martin Kopec
2018-06-06 21:53:42 +00:00
parent 154fe8878d
commit 283de20574
13 changed files with 47 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config_tempest/users.py
View File

@@ -39,11 +39,11 @@ class Users(object):
sec = 'identity'
self.create_user_with_tenant(self._conf.get(sec, 'username'),
self._conf.get(sec, 'password'),
self._conf.get(sec, 'tenant_name'))
self._conf.get(sec, 'project_name'))
self.create_user_with_tenant(self._conf.get(sec, 'alt_username'),
self._conf.get(sec, 'alt_password'),
self._conf.get(sec, 'alt_tenant_name'))
self._conf.get(sec, 'alt_project_name'))
username = self._conf.get_defaulted('auth', 'admin_username')
if username is None:
@@ -67,7 +67,7 @@ class Users(object):
:type role_name: string
:type role_required: boolean
"""
tenant_name = self._conf.get('identity', 'tenant_name')
tenant_name = self._conf.get('identity', 'project_name')
tenant_id = self.tenants_client.get_project_by_name(tenant_name)['id']
users = self.users_client.list_users()
user_ids = [u['id'] for u in users['users'] if u['name'] == username]