diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-01 02:41:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-01 02:41:31 +0000 |
| commit | 92f9910325261c6eb2b10c284baec2d52e3dcf19 (patch) | |
| tree | 8b3439799e91216c9c82a8d213173809828d3efa | |
| parent | 5a0ebb687eeebd6c4262c10243a9019cbf31d3de (diff) | |
| parent | d3413fec3b01ae24e2395de1d5556f72407cf108 (diff) | |
| download | nova-92f9910325261c6eb2b10c284baec2d52e3dcf19.tar.gz | |
Merge "Fix traceback when sending invalid data." into milestone-proposed
| -rw-r--r-- | nova/api/ec2/__init__.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py index 17759015f2..964f549950 100644 --- a/nova/api/ec2/__init__.py +++ b/nova/api/ec2/__init__.py @@ -634,11 +634,9 @@ class Executor(wsgi.Application): context=context) return ec2_error(req, request_id, type(ex).__name__, unicode(ex)) except exception.InvalidInstanceIDMalformed as ex: - LOG.debug(_('ValidatorError raised: %s'), unicode(ex), - context=context) - #EC2 Compatibility - return self._error(req, context, "InvalidInstanceID.Malformed", - unicode(ex)) + LOG.debug(_('Invalid id: bogus (expecting "i-..."): %s'), + unicode(ex), context=context) + return ec2_error(req, request_id, type(ex).__name__, unicode(ex)) except Exception as ex: env = req.environ.copy() for k in env.keys(): |