openstack
/
horizon
Code Issues Proposed changes

Merge "Disable add rules button when quotas are exceeded in security rule panel"

This commit is contained in:
Zuul 2019-06-06 03:13:14 +00:00 committed by Gerrit Code Review
parent 07e12d5b93 e13b74e4a2
commit 83a88bc67b
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openstack_dashboard/dashboards/project/security_groups/tables.py
View File

@ -135,6 +135,19 @@ class CreateRule(tables.LinkAction):
def get_link_url(self):
return reverse(self.url, args=[self.table.kwargs['security_group_id']])
def allowed(self, request, security_group=None):
usages = quotas.tenant_quota_usages(request,
targets=('security_group_rule', ))
self.classes = [c for c in self.classes if c != "disabled"]
if usages['security_group_rule'].get('available', 1) <= 0:
self.classes.append("disabled")
self.verbose_name = _("Add Rule (Quota exceeded)")
else:
self.verbose_name = _("Add Rule")
return True
class DeleteRule(tables.DeleteAction):
@staticmethod

8
openstack_dashboard/dashboards/project/security_groups/tests.py
View File

@ -286,15 +286,21 @@ class SecurityGroupsViewTests(test.TestCase):
sec_group.description)
@test.create_mocks({api.neutron: ('security_group_get',
'is_extension_supported')})
'is_extension_supported'),
quotas: ('tenant_quota_usages',)})
def test_detail_get(self):
sec_group = self.security_groups.first()
quota_data = self.neutron_quota_usages.first()
self.mock_tenant_quota_usages.return_value = quota_data
self.mock_security_group_get.return_value = sec_group
self.mock_is_extension_supported.return_value = True
res = self.client.get(self.detail_url)
self.assertTemplateUsed(res, SG_DETAIL_TEMPLATE)
self.mock_security_group_get.assert_called_once_with(
test.IsHttpRequest(), sec_group.id)
self.assert_mock_multiple_calls_with_same_arguments(
self.mock_tenant_quota_usages, 2,
mock.call(test.IsHttpRequest(), targets=('security_group_rule', )))
self.mock_is_extension_supported.assert_called_once_with(
test.IsHttpRequest(), 'standard-attr-description')