← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-security

« back to all changes in this revision

Viewing changes to nova/api/openstack/compute/flavors.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Adam Gandelman
  • Date: 2012-06-22 12:39:57 UTC
  • mfrom: (1.1.57)
  • Revision ID: package-import@ubuntu.com-20120622123957-hbzwg84nt9rqwg8r
Tags: 2012.2~f2~20120621.14517-0ubuntu1
[ Chuck Short ]
* New upstream version.

[ Adam Gandelman ]
* debian/rules: Temporarily disable test suite while blocking
  tests are investigated. 
* debian/patches/kombu_tests_timeout.patch: Dropped.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/compute/flavors.py
94
94
    def _get_flavors(self, req):
95
95
        """Helper function that returns a list of flavor dicts."""
96
96
        filters = {}
 
97
 
 
98
        context = req.environ['nova.context']
 
99
        if not context.is_admin:
 
100
            filters['disabled'] = False
 
101
 
97
102
        if 'minRam' in req.params:
98
103
            try:
99
104
                filters['min_memory_mb'] = int(req.params['minRam'])