openstack
/
nova
Code Issues Proposed changes

Merge "Replace flavors.get_all_flavors_sorted_list() with object call"

This commit is contained in:
Jenkins 2016-10-18 12:13:09 +00:00 committed by Gerrit Code Review
parent 9719ee50ed 55f3f9854f
commit 8dc907789e
3 changed files with 2 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ from nova.api.openstack import wsgi
from nova.compute import flavors
from nova import exception
from nova.i18n import _
from nova import objects
from nova import utils
ALIAS = 'flavors'
@ -105,7 +106,7 @@ class FlavorsController(wsgi.Controller):
raise webob.exc.HTTPBadRequest(explanation=msg)
try:
limited_flavors = flavors.get_all_flavors_sorted_list(context,
limited_flavors = objects.FlavorList.get_all(context,
filters=filters, sort_key=sort_key, sort_dir=sort_dir,
limit=limit, marker=marker)
except exception.MarkerNotFound:

12
nova/compute/flavors.py
View File

@ -155,18 +155,6 @@ def create(name, memory, vcpus, root_gb, ephemeral_gb=0, flavorid=None,
return flavor
def get_all_flavors_sorted_list(ctxt=None, filters=None, sort_key='flavorid',
sort_dir='asc', limit=None, marker=None):
"""Get all non-deleted flavors as a sorted list.
"""
if ctxt is None:
ctxt = context.get_admin_context()
return objects.FlavorList.get_all(ctxt, filters=filters, sort_key=sort_key,
sort_dir=sort_dir, limit=limit,
marker=marker)
def get_default_flavor():
"""Get the default flavor."""
name = CONF.default_flavor

38
nova/tests/unit/test_flavors.py
View File

@ -93,44 +93,6 @@ class InstanceTypeTestCase(test.TestCase):
self.assertIsInstance(fetched, objects.Flavor)
self.assertEqual(default_instance_type.flavorid, fetched.flavorid)
def test_get_all_flavors_sorted_list_sort(self):
# Test default sort
all_flavors = flavors.get_all_flavors_sorted_list()
self.assertEqual(len(DEFAULT_FLAVORS), len(all_flavors))
for i in range(len(all_flavors)):
f = all_flavors[i]
self.assertIsInstance(f, objects.Flavor)
self.assertEqual(DEFAULT_FLAVORS[i]['flavorid'], f.flavorid)
# Test sorted by name
all_flavors = flavors.get_all_flavors_sorted_list(sort_key='name')
expected = sorted(DEFAULT_FLAVORS, key=lambda item: item['name'])
self.assertEqual(len(expected), len(all_flavors))
for i in range(len(all_flavors)):
f = all_flavors[i]
self.assertIsInstance(f, objects.Flavor)
self.assertEqual(expected[i]['flavorid'], f.flavorid)
def test_get_all_flavors_sorted_list_limit(self):
limited_flavors = flavors.get_all_flavors_sorted_list(limit=2)
self.assertEqual(2, len(limited_flavors))
def test_get_all_flavors_sorted_list_marker(self):
all_flavors = flavors.get_all_flavors_sorted_list()
# Set the 3rd result as the marker
marker_flavorid = all_flavors[2].flavorid
marked_flavors = flavors.get_all_flavors_sorted_list(
marker=marker_flavorid)
# We expect everything /after/ the 3rd result
expected_results = all_flavors[3:]
self.assertEqual(len(expected_results), len(marked_flavors))
for i in range(len(marked_flavors)):
f = marked_flavors[i]
self.assertIsInstance(f, objects.Flavor)
self.assertEqual(expected_results[i].flavorid,
f.flavorid)
class InstanceTypeToolsTest(test.TestCase):
def _dict_to_metadata(self, data):