x/ranger
Code Issues Proposed changes

Group assign role to add in role table

Browse Source 
Change-Id: Ia716ab0d88bb26efab8df7c7003ad0652949617b
This commit is contained in:
hs571j
2019-06-12 12:04:13 -07:00
committed by hosingh000
parent 12d038d826
commit 3a309e1d25
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orm/services/customer_manager/cms_rest/logic/group_logic.py
View File

@@ -149,8 +149,8 @@ class GroupLogic(object):
region)] region)]
for role_assignment in role_assignments: for role_assignment in role_assignments:
for role in role_assignment.roles: for role in role_assignment.roles:
role_id = datamanager.get_role_id_by_name(role) sql_role = datamanager.add_role(role)
role_id = sql_role.id
for group_region in groups_regions: for group_region in groups_regions:
region_id = group_region.region_id region_id = group_region.region_id

4
orm/tests/unit/cms/test_group_logic.py
View File

@@ -283,7 +283,7 @@ class TestGroupLogic(FunctionalTest):
assert data_manager_mock.add_groups_role_on_customer.called assert data_manager_mock.add_groups_role_on_customer.called
assert data_manager_mock.get_customer_id_by_uuid.called assert data_manager_mock.get_customer_id_by_uuid.called
assert data_manager_mock.commit.called assert data_manager_mock.commit.called
assert data_manager_mock.get_role_id_by_name.called assert data_manager_mock.add_role.called
assert not data_manager_mock.rollback.called assert not data_manager_mock.rollback.called
assert record_mock.read_group_by_uuid.called assert record_mock.read_group_by_uuid.called
assert record_mock.get_regions_for_group.called assert record_mock.get_regions_for_group.called
@@ -299,7 +299,7 @@ class TestGroupLogic(FunctionalTest):
assert data_manager_mock.add_groups_role_on_customer.called assert data_manager_mock.add_groups_role_on_customer.called
assert data_manager_mock.get_customer_id_by_uuid.called assert data_manager_mock.get_customer_id_by_uuid.called
assert data_manager_mock.commit.called assert data_manager_mock.commit.called
assert data_manager_mock.get_role_id_by_name.called assert data_manager_mock.add_role.called
assert not data_manager_mock.rollback.called assert not data_manager_mock.rollback.called
assert record_mock.read_group_by_uuid.called assert record_mock.read_group_by_uuid.called
assert record_mock.get_region_by_keys.called assert record_mock.get_region_by_keys.called