x/ranger
Code Issues Proposed changes

Put users id in a list per domain

Browse Source 
This patch put users id in a list per domain in the get group
users response.

Change-Id: I08375e23d6be9a796388848f15fd28afcc51ef2a
This commit is contained in:
Chi Lo 2019-05-04 14:54:20 -07:00
parent 97fc5779ae
commit cf78b0eaf5
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
orm/services/customer_manager/cms_rest/data/sql_alchemy/models.py
View File

@ -137,10 +137,17 @@ class Groups(Base, CMSBaseModel):
roles = sorted(set(customer_roles + domain_roles)) roles = sorted(set(customer_roles + domain_roles))
users = [] users = []
unique_domain = {}
for user in self.groups_users: for user in self.groups_users:
if user.region_id == -1: if user.region_id == -1:
users.append(GroupWsmeModels.User(id=[user.user.name], if user.domain_name in unique_domain:
domain=user.domain_name)) unique_domain[user.domain_name].append(user.user.name)
else:
unique_domain[user.domain_name] = [user.user.name]
for domain, domain_user in unique_domain.items():
users.append(GroupWsmeModels.User(id=domain_user,
domain=domain))
result = GroupWsmeModels.Group(description=description, result = GroupWsmeModels.Group(description=description,
name=name, name=name,
@ -198,12 +205,19 @@ class GroupsRegion(Base, CMSBaseModel):
def to_wsme(self): def to_wsme(self):
name = self.region.name name = self.region.name
type = self.region.type type = self.region.type
users = []
users = []
unique_domain = {}
for user in self.group_region_users: for user in self.group_region_users:
if user.region_id != -1: if user.region_id != -1:
users.append(GroupWsmeModels.User(id=[user.user.name], if user.domain_name in unique_domain:
domain=user.domain_name)) unique_domain[user.domain_name].append(user.user.name)
else:
unique_domain[user.domain_name] = [user.user.name]
for domain, domain_user in unique_domain.items():
users.append(GroupWsmeModels.User(id=domain_user,
domain=domain))
region = GroupWsmeModels.Region(name=name, region = GroupWsmeModels.Region(name=name,
type=type, type=type,