openstack
/
manila-ui
Code Issues Proposed changes

Merge "Fix get_disabled_quotas"

This commit is contained in:
Jenkins 2016-08-25 15:58:13 +00:00 committed by Gerrit Code Review
parent 6dff822c6b 06c81a4a07
commit 12eab95a6a
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manila_ui/dashboards/project/shares/__init__.py
View File

@ -126,7 +126,7 @@ def get_tenant_quota_data(f, request, disabled_quotas=None, tenant_id=None):
@wrap(quotas.get_disabled_quotas)
def get_disabled_quotas(f, request):
disabled_quotas = f(request)
disabled_quotas.extend(_get_manila_disabled_quotas(request))
disabled_quotas.update(_get_manila_disabled_quotas(request))
return disabled_quotas

14
manila_ui/tests/dashboards/project/shares/shares/tests.py
View File

@ -21,6 +21,7 @@ from manila_ui.api import manila as api_manila
from manila_ui.tests.dashboards.project.shares import test_data
from manila_ui.tests import helpers as test
from openstack_dashboard.api import base
from openstack_dashboard.api import neutron
from openstack_dashboard.api import nova
from openstack_dashboard.usage import quotas
@ -28,6 +29,19 @@ from openstack_dashboard.usage import quotas
SHARE_INDEX_URL = reverse('horizon:project:shares:index')
class QuotaTests(test.TestCase):
def test_get_disabled_quotas(self):
self.mock_object(
base, "is_service_enabled", mock.Mock(return_value=False))
result_quotas = quotas.get_disabled_quotas(self.request)
expected_quotas = set(
quotas.QUOTA_FIELDS + quotas.MISSING_QUOTA_FIELDS)
self.assertItemsEqual(result_quotas, expected_quotas)
@ddt.ddt
class ShareViewTests(test.TestCase):