Code Review
/
snaps.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Refactoring of ImageSettings to extend ImageConfig
[snaps.git]
/
snaps
/
openstack
/
utils
/
keystone_utils.py
diff --git
a/snaps/openstack/utils/keystone_utils.py
b/snaps/openstack/utils/keystone_utils.py
index
10ad68a
..
387f6c7
100644
(file)
--- a/
snaps/openstack/utils/keystone_utils.py
+++ b/
snaps/openstack/utils/keystone_utils.py
@@
-101,13
+101,16
@@
def get_endpoint(os_creds, service_type, interface='public'):
auth = get_session_auth(os_creds)
key_session = keystone_session(os_creds)
return key_session.get_endpoint(
auth = get_session_auth(os_creds)
key_session = keystone_session(os_creds)
return key_session.get_endpoint(
- auth=auth, service_type=service_type, interface=interface)
+ auth=auth, service_type=service_type, region_name=os_creds.region_name,
+ interface=interface)
def get_project(keystone=None, os_creds=None, project_settings=None,
project_name=None):
"""
def get_project(keystone=None, os_creds=None, project_settings=None,
project_name=None):
"""
- Returns the first project object or None if not found
+ Returns the first project where the project_settings is used for the query
+ if not None, else the project_name parameter is used for the query. If both
+ parameters are None, None is returned
:param keystone: the Keystone client
:param os_creds: the OpenStack credentials used to obtain the Keystone
client if the keystone parameter is None
:param keystone: the Keystone client
:param os_creds: the OpenStack credentials used to obtain the Keystone
client if the keystone parameter is None
@@
-131,6
+134,8
@@
def get_project(keystone=None, os_creds=None, project_settings=None,
proj_filter['description'] = project_settings.description
proj_filter['domain_name'] = project_settings.domain_name
proj_filter['enabled'] = project_settings.enabled
proj_filter['description'] = project_settings.description
proj_filter['domain_name'] = project_settings.domain_name
proj_filter['enabled'] = project_settings.enabled
+ else:
+ return None
if keystone.version == V2_VERSION_STR:
projects = keystone.tenants.list()
if keystone.version == V2_VERSION_STR:
projects = keystone.tenants.list()
@@
-171,6
+176,7
@@
def create_project(keystone, project_settings):
enabled=project_settings.enabled)
domain_id = os_project.domain_id
enabled=project_settings.enabled)
domain_id = os_project.domain_id
+ logger.info('Created project with name - %s', project_settings.name)
return Project(
name=os_project.name, project_id=os_project.id, domain_id=domain_id)
return Project(
name=os_project.name, project_id=os_project.id, domain_id=domain_id)
@@
-181,6
+187,7
@@
def delete_project(keystone, project):
:param keystone: the Keystone clien
:param project: the SNAPS-OO Project domain object
"""
:param keystone: the Keystone clien
:param project: the SNAPS-OO Project domain object
"""
+ logger.info('Deleting project with name - %s', project.name)
if keystone.version == V2_VERSION_STR:
keystone.tenants.delete(project.id)
else:
if keystone.version == V2_VERSION_STR:
keystone.tenants.delete(project.id)
else:
@@
-268,6
+275,7
@@
def create_user(keystone, user_settings):
project=os_project)
if os_user:
project=os_project)
if os_user:
+ logger.info('Created user with name - %s', os_user.name)
return User(name=os_user.name, user_id=os_user.id)
return User(name=os_user.name, user_id=os_user.id)
@@
-277,6
+285,7
@@
def delete_user(keystone, user):
:param keystone: the Keystone client
:param user: the SNAPS-OO User domain object
"""
:param keystone: the Keystone client
:param user: the SNAPS-OO User domain object
"""
+ logger.info('Deleting user with name - %s', user.name)
keystone.users.delete(user.id)
keystone.users.delete(user.id)
@@
-332,6
+341,7
@@
def create_role(keystone, name):
:return: a SNAPS-OO Role domain object
"""
role = keystone.roles.create(name)
:return: a SNAPS-OO Role domain object
"""
role = keystone.roles.create(name)
+ logger.info('Created role with name - %s', role.name)
return Role(name=role.name, role_id=role.id)
return Role(name=role.name, role_id=role.id)
@@
-342,6
+352,7
@@
def delete_role(keystone, role):
:param role: the SNAPS-OO Role domain object to delete
:return:
"""
:param role: the SNAPS-OO Role domain object to delete
:return:
"""
+ logger.info('Deleting role with name - %s', role.name)
keystone.roles.delete(role.id)
keystone.roles.delete(role.id)
@@
-356,6
+367,7
@@
def grant_user_role_to_project(keystone, role, user, project):
"""
os_role = get_role_by_id(keystone, role.id)
"""
os_role = get_role_by_id(keystone, role.id)
+ logger.info('Granting role %s to project %s', role.name, project.name)
if keystone.version == V2_VERSION_STR:
keystone.roles.add_user_role(user, os_role, tenant=project)
else:
if keystone.version == V2_VERSION_STR:
keystone.roles.add_user_role(user, os_role, tenant=project)
else: