openstack/horizon
Code Issues Proposed changes

Merge "NaNJSONEncoder should be used in api "cinder/tenantabsolutelimits""

Browse Source
This commit is contained in:
Zuul 2017-11-21 18:35:21 +00:00 committed by Gerrit Code Review
commit 2c079f423b
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/api/rest/cinder.py
View File

@ -17,6 +17,7 @@ from django.utils.translation import ugettext_lazy as _
from django.views import generic
from openstack_dashboard import api
from openstack_dashboard.api.rest import json_encoder
from openstack_dashboard.api.rest import urls
from openstack_dashboard.api.rest import utils as rest_utils
from openstack_dashboard.usage import quotas
@ -308,7 +309,7 @@ class QoSSpecs(generic.View):
class TenantAbsoluteLimits(generic.View):
url_regex = r'cinder/tenantabsolutelimits/$'
@rest_utils.ajax()
@rest_utils.ajax(json_encoder=json_encoder.NaNJSONEncoder)
def get(self, request):
return api.cinder.tenant_absolute_limits(request)

6
openstack_dashboard/test/api_tests/cinder_rest_tests.py
View File

@ -292,10 +292,12 @@ class CinderRestTestCase(test.TestCase):
def test_tenant_absolute_limits_get(self, cc):
request = self.mock_rest_request(GET={})
cc.tenant_absolute_limits.return_value = \
{'id': 'one'}
{'id': 'one', 'val': float('inf')}
response = cinder.TenantAbsoluteLimits().get(request)
self.assertStatusCode(response, 200)
self.assertEqual(response.content.decode("utf-8"), '{"id": "one"}')
response_as_json = json.loads(response.content.decode('utf-8'))
self.assertEqual(response_as_json['id'], 'one')
self.assertEqual(response_as_json['val'], 1e+999)
cc.tenant_absolute_limits.assert_called_once_with(request)
#