diff options
| author | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-02-14 17:43:39 +0100 |
|---|---|---|
| committer | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-02-14 17:43:39 +0100 |
| commit | ee26d0827b7ad3e4d7869614835fe58abe32dfc8 (patch) | |
| tree | 3b53efe372bab3633b9010aa611cdea68b31debb /nova | |
| parent | 5a35643962a8978a1ac584d64dd381a9ffbc8517 (diff) | |
| download | nova-ee26d0827b7ad3e4d7869614835fe58abe32dfc8.tar.gz nova-ee26d0827b7ad3e4d7869614835fe58abe32dfc8.tar.xz nova-ee26d0827b7ad3e4d7869614835fe58abe32dfc8.zip | |
Got rid of BadParameter, just using standard python ValueError
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/network/manager.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 8eb9f041b..d911844a1 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -505,6 +505,12 @@ class VlanManager(NetworkManager): def create_networks(self, context, cidr, num_networks, network_size, cidr_v6, vlan_start, vpn_start): """Create networks based on parameters.""" + # Check that num_networks + vlan_start is not > 4094, fixes lp708025 + if num_networks + vlan_start > 4094: + raise ValueError(_('The sum between the number of networks and' + ' the vlan start cannot be greater' + ' than 4094')) + fixed_net = IPy.IP(cidr) fixed_net_v6 = IPy.IP(cidr_v6) network_size_v6 = 1 << 64 |