summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorChuck Short <chuck.short@canonical.com>2012-02-17 14:32:19 -0500
committerChuck Short <chuck.short@canonical.com>2012-03-02 13:54:38 -0500
commit6c22d2a5ecd5fdb6e87c282d280145008cd7c52b (patch)
tree259ec170ab38bf0dcb6da24e5104cec779aed781 /nova/api
parent8a530832c599f8866e98947976d74a5332d877af (diff)
downloadnova-6c22d2a5ecd5fdb6e87c282d280145008cd7c52b.tar.gz
nova-6c22d2a5ecd5fdb6e87c282d280145008cd7c52b.tar.xz
nova-6c22d2a5ecd5fdb6e87c282d280145008cd7c52b.zip
Display error for invalid CIDR.
Display an error to the user when giving an invalid CIDR. Fixes bug 917982. Change-Id: I5def054f5cc8e14bc8ebd981744d7d7af7f5710b
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/cloud.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index 5240af016..4254a9873 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -538,7 +538,7 @@ class CloudController(object):
if not utils.is_valid_cidr(cidr_ip):
# Raise exception for non-valid address
- raise exception.InvalidCidr(cidr=cidr_ip)
+ raise exception.EC2APIError(_("Invalid CIDR"))
values['cidr'] = cidr_ip
else: