diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-06-23 16:10:26 -0400 |
|---|---|---|
| committer | Alex Meade <alex.meade@rackspace.com> | 2011-06-23 16:10:26 -0400 |
| commit | 980ac0e981de248f9d687b2dd91ea93f5ebdae6a (patch) | |
| tree | 319eeb84955810465adb3ef2cd03e62e9923d434 | |
| parent | df8448f9f63c9f610c23cf092c14f4eb8547fe46 (diff) | |
| download | nova-980ac0e981de248f9d687b2dd91ea93f5ebdae6a.tar.gz nova-980ac0e981de248f9d687b2dd91ea93f5ebdae6a.tar.xz nova-980ac0e981de248f9d687b2dd91ea93f5ebdae6a.zip | |
Fixed issue with zero flavors returning HTTP 500
| -rw-r--r-- | nova/api/openstack/flavors.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/api/openstack/flavors.py b/nova/api/openstack/flavors.py index a21ff6cb2..be295b372 100644 --- a/nova/api/openstack/flavors.py +++ b/nova/api/openstack/flavors.py @@ -42,7 +42,10 @@ class Controller(object): def _get_flavors(self, req, is_detail=True): """Helper function that returns a list of flavor dicts.""" ctxt = req.environ['nova.context'] - flavors = db.api.instance_type_get_all(ctxt) + try: + flavors = db.api.instance_type_get_all(ctxt) + except exception.NoInstanceTypesFound: + flavors = {} builder = self._get_view_builder(req) items = [builder.build(flavor, is_detail=is_detail) for flavor in flavors.values()] |