diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-23 01:04:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-23 01:04:07 +0000 |
| commit | 41fc98942cd6f037fd18cd62198c5f02719c52a1 (patch) | |
| tree | 79ca59b5e4d4bd3f1ff06acc257bf88a5ace0c69 /nova/api | |
| parent | 7fb4cce61b96843956397a475e22c449a3ddddc6 (diff) | |
| parent | 656052036374086f785f02bf288d23af14ab2ab5 (diff) | |
Merge "List servers having non-existent flavor should return empty list"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 308530b8e..f7f186870 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -540,8 +540,9 @@ class Controller(wsgi.Controller): msg = _('marker [%s] not found') % marker raise exc.HTTPBadRequest(explanation=msg) except exception.FlavorNotFound as e: - msg = _("Flavor could not be found") - raise exc.HTTPUnprocessableEntity(explanation=msg) + log_msg = _("Flavor '%s' could not be found ") + LOG.debug(log_msg, search_opts['flavor']) + instance_list = [] if is_detail: self._add_instance_faults(context, instance_list) |