summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRicardo Carrillo Cruz <emaildericky@gmail.com>2011-03-03 00:59:11 +0000
committerTarmac <>2011-03-03 00:59:11 +0000
commitcee47d411c6b55dcedf667e63eb3e42651ba1f0d (patch)
tree2c724079b65e3140233dcae571f0f1004fa9cd97
parent98e665f870c20d81db13bb9e5402a7b187dfe539 (diff)
parentf03f3ba265ca5f66b66e781c0ac23618562d0085 (diff)
downloadnova-cee47d411c6b55dcedf667e63eb3e42651ba1f0d.tar.gz
nova-cee47d411c6b55dcedf667e63eb3e42651ba1f0d.tar.xz
nova-cee47d411c6b55dcedf667e63eb3e42651ba1f0d.zip
Fixes Bug #715424: nova-manage : create network crashes when subnet range provided is not enough , if the network range cannot fit the parameters passed, a ValueError is raised
-rw-r--r--nova/network/manager.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py
index 500f2a1e8..b36dd59cf 100644
--- a/nova/network/manager.py
+++ b/nova/network/manager.py
@@ -531,6 +531,11 @@ class VlanManager(NetworkManager):
' than 4094'))
fixed_net = IPy.IP(cidr)
+ if fixed_net.len() < num_networks * network_size:
+ raise ValueError(_('The network range is not big enough to fit '
+ '%(num_networks)s. Network size is %(network_size)s' %
+ locals()))
+
fixed_net_v6 = IPy.IP(cidr_v6)
network_size_v6 = 1 << 64
significant_bits_v6 = 64