Merge "Add helper property to get the current user id"
This commit is contained in:
commit
11746a8c3d
|
@ -722,6 +722,12 @@ class OpenStackCloud(
|
||||||
# We don't need to track validity here, just get_token() each time.
|
# We don't need to track validity here, just get_token() each time.
|
||||||
return self.keystone_session.get_token()
|
return self.keystone_session.get_token()
|
||||||
|
|
||||||
|
@property
|
||||||
|
def current_user_id(self):
|
||||||
|
"""Get the id of the currently logged-in user from the token."""
|
||||||
|
return self.keystone_session.auth.get_access(
|
||||||
|
self.keystone_session).user_id
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def current_project_id(self):
|
def current_project_id(self):
|
||||||
"""Get the current project ID.
|
"""Get the current project ID.
|
||||||
|
|
|
@ -63,8 +63,7 @@ class TestProject(base.KeystoneBaseFunctionalTestCase):
|
||||||
self.assertEqual(project_name, project['name'])
|
self.assertEqual(project_name, project['name'])
|
||||||
self.assertEqual('test_create_project', project['description'])
|
self.assertEqual('test_create_project', project['description'])
|
||||||
|
|
||||||
user_id = self.operator_cloud.keystone_session.auth.get_access(
|
user_id = self.operator_cloud.current_user_id
|
||||||
self.operator_cloud.keystone_session).user_id
|
|
||||||
|
|
||||||
# Grant the current user access to the project
|
# Grant the current user access to the project
|
||||||
self.assertTrue(self.operator_cloud.grant_role(
|
self.assertTrue(self.operator_cloud.grant_role(
|
||||||
|
|
Loading…
Reference in New Issue