openstack
/
nova
Code Issues Proposed changes

Merge "make flavors use common limit and marker"

This commit is contained in:
Jenkins 2014-09-23 07:50:26 +00:00 committed by Gerrit Code Review
parent 7680cccce8 98f5496cc2
commit 51de439a4d
3 changed files with 48 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/api/openstack/compute/flavors.py
View File

@ -15,6 +15,7 @@
import webob
from nova.api.openstack import common
from nova.api.openstack.compute.views import flavors as flavors_view
from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
@ -112,8 +113,7 @@ class Controller(wsgi.Controller):
filters = {}
sort_key = req.params.get('sort_key') or 'flavorid'
sort_dir = req.params.get('sort_dir') or 'asc'
limit = req.params.get('limit') or None
marker = req.params.get('marker') or None
limit, marker = common.get_limit_and_marker(req)
context = req.environ['nova.context']
if context.is_admin:

4
nova/api/openstack/compute/plugins/v3/flavors.py
View File

@ -15,6 +15,7 @@
import webob
from nova.api.openstack import common
from nova.api.openstack.compute.views import flavors as flavors_view
from nova.api.openstack import extensions
from nova.api.openstack import wsgi
@ -77,8 +78,7 @@ class FlavorsController(wsgi.Controller):
filters = {}
sort_key = req.params.get('sort_key') or 'flavorid'
sort_dir = req.params.get('sort_dir') or 'asc'
limit = req.params.get('limit') or None
marker = req.params.get('marker') or None
limit, marker = common.get_limit_and_marker(req)
context = req.environ['nova.context']
if context.is_admin:

44
nova/tests/api/openstack/compute/test_flavors.py
View File

@ -17,6 +17,7 @@ from lxml import etree
import six.moves.urllib.parse as urlparse
import webob
from nova.api.openstack import common
from nova.api.openstack.compute import flavors as flavors_v2
from nova.api.openstack.compute.plugins.v3 import flavors as flavors_v3
from nova.api.openstack import xmlutil
@ -93,6 +94,15 @@ def fake_get_all_flavors_sorted_list(context=None, inactive=False,
return output
def fake_get_limit_and_marker(request, max_limit=1):
params = common.get_pagination_params(request)
limit = params.get('limit', max_limit)
limit = min(max_limit, limit)
marker = params.get('marker')
return limit, marker
def empty_get_all_flavors_sorted_list(context=None, inactive=False,
filters=None, sort_key='flavorid',
sort_dir='asc', limit=None, marker=None):
@ -357,6 +367,40 @@ class FlavorsTestV21(test.TestCase):
self.assertThat({'limit': ['2'], 'marker': ['2']},
matchers.DictMatches(params))
def test_get_flavor_with_default_limit(self):
self.stubs.Set(common, "get_limit_and_marker",
fake_get_limit_and_marker)
self.flags(osapi_max_limit=1)
req = fakes.HTTPRequest.blank('/v2/fake/flavors?limit=2')
response = self.controller.index(req)
response_list = response["flavors"]
response_links = response["flavors_links"]
expected_flavors = [
{
"id": "1",
"name": "flavor 1",
"links": [
{
"rel": "self",
"href": "http://localhost/v2/fake/flavors/1",
},
{
"rel": "bookmark",
"href": "http://localhost/fake/flavors/1",
}
]
}
]
self.assertEqual(response_list, expected_flavors)
self.assertEqual(response_links[0]['rel'], 'next')
href_parts = urlparse.urlparse(response_links[0]['href'])
self.assertEqual('/v2/fake/flavors', href_parts.path)
params = urlparse.parse_qs(href_parts.query)
self.assertThat({'limit': ['2'], 'marker': ['1']},
matchers.DictMatches(params))
def test_get_flavor_list_detail(self):
req = self.fake_request.blank(self._prefix + '/flavors/detail')
flavor = self.controller.detail(req)