From 6c22d2a5ecd5fdb6e87c282d280145008cd7c52b Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck.short@canonical.com>
Date: Fri, 17 Feb 2012 14:32:19 -0500
Subject: Display error for invalid CIDR.

Display an error to the user when giving an
invalid CIDR. Fixes bug 917982.

Change-Id: I5def054f5cc8e14bc8ebd981744d7d7af7f5710b
---
 nova/api/ec2/cloud.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'nova/api')

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:
-- 
cgit