summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/__init__.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index 17759015f..964f54995 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():