Skip to content

Commit bb5a260

Browse files
Merge pull request #2070 from ramkishor-ch/issue_1956
Enable all user permissions doesn't get all permissions
2 parents cee55f4 + 454b14c commit bb5a260

2 files changed

Lines changed: 24 additions & 1 deletion

File tree

SoftLayer/CLI/user/permissions.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,12 @@ def permission_table(user_permissions, all_permissions):
4545
table.align['Assigned'] = 'l'
4646
for perm in all_permissions:
4747
assigned = user_permissions.get(perm['keyName'], False)
48-
table.add_row([perm['name'], perm['keyName'], assigned])
48+
hide_permission_list = ['ACCOUNT_SUMMARY_VIEW', 'REQUEST_COMPLIANCE_REPORT',
49+
'COMPANY_EDIT', 'ONE_TIME_PAYMENTS', 'UPDATE_PAYMENT_DETAILS',
50+
'EU_LIMITED_PROCESSING_MANAGE', 'TICKET_ADD', 'TICKET_EDIT',
51+
'TICKET_SEARCH', 'TICKET_VIEW', 'TICKET_VIEW_ALL']
52+
if perm['keyName'] not in hide_permission_list:
53+
table.add_row([perm['name'], perm['keyName'], assigned])
4954
return table
5055

5156

tests/managers/user_tests.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,24 @@ def test_format_permission_object_all(self):
183183
self.assert_called_with(service_name, 'getAllObjects')
184184
self.assertEqual(expected, result)
185185

186+
def test_hide_permissions(self):
187+
result = self.manager.get_all_permissions()
188+
hide_permissions = [
189+
{'keyName': 'ACCOUNT_SUMMARY_VIEW'},
190+
{'keyName': 'REQUEST_COMPLIANCE_REPORT'},
191+
{'keyName': 'COMPANY_EDIT'},
192+
{'keyName': 'ONE_TIME_PAYMENTS'},
193+
{'keyName': 'UPDATE_PAYMENT_DETAILS'},
194+
{'keyName': 'EU_LIMITED_PROCESSING_MANAGE'},
195+
{'keyName': 'TICKET_ADD'},
196+
{'keyName': 'TICKET_EDIT'},
197+
{'keyName': 'TICKET_SEARCH'},
198+
{'keyName': 'TICKET_VIEW'},
199+
{'keyName': 'TICKET_VIEW_ALL'}
200+
]
201+
self.assert_called_with('SoftLayer_User_Permission_Action', 'getAllObjects')
202+
self.assertNotEqual(hide_permissions, result)
203+
186204
def test_get_current_user(self):
187205
result = self.manager.get_current_user()
188206
self.assert_called_with('SoftLayer_Account', 'getCurrentUser', mask=mock.ANY)

0 commit comments

Comments
 (0)