Merge "Port "Make flavors is_public option .." to v3 tree"

openstack/nova

Code Issues Proposed changes

Browse Source

This commit is contained in:

Jenkins

2013年09月05日 20:01:03 +00:00

committed by Gerrit Code Review

parent a435ccb992 e220baf1b1

commit dce71ece90

4 changed files with 6 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/compute/plugins/v3/flavor_access.py

View File

@@ -95,7 +95,7 @@ class FlavorAccessController(object):

authorize(context)

try:

flavor = flavors.get_flavor_by_flavor_id(flavor_id)

flavor = flavors.get_flavor_by_flavor_id(flavor_id, ctxt=context)

except exception.FlavorNotFound as e:

raise webob.exc.HTTPNotFound(explanation=e.format_message())

3
nova/api/openstack/compute/plugins/v3/flavors.py

View File

@@ -93,8 +93,9 @@ class FlavorsController(wsgi.Controller):

@wsgi.serializers(xml=FlavorTemplate)

def show(self, req, id):

"""Return data about the given flavor id."""

context = req.environ['nova.context']

try:

flavor = flavors.get_flavor_by_flavor_id(id)

flavor = flavors.get_flavor_by_flavor_id(id, ctxt=context)

req.cache_db_flavor(flavor)

except exception.FlavorNotFound as e:

raise webob.exc.HTTPNotFound(explanation=e.format_message())

2
nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py

View File

@@ -68,7 +68,7 @@ def fake_get_flavor_access_by_flavor_id(flavorid):

return res

def fake_get_flavor_by_flavor_id(flavorid):

def fake_get_flavor_by_flavor_id(flavorid, ctxt=None):

return INSTANCE_TYPES[flavorid]

4
nova/tests/api/openstack/compute/plugins/v3/test_flavors.py

View File

@@ -58,7 +58,7 @@ FAKE_FLAVORS = {

}

def fake_flavor_get_by_flavor_id(flavorid):

def fake_flavor_get_by_flavor_id(flavorid, ctxt=None):

return FAKE_FLAVORS['flavor %s' % flavorid]

@@ -98,7 +98,7 @@ def empty_get_all_flavors_sorted_list(context=None, inactive=False,

return []

def return_flavor_not_found(flavor_id):

def return_flavor_not_found(flavor_id, ctxt=None):

raise exception.FlavorNotFound(flavor_id=flavor_id)