diff options
| author | Ricardo Carrillo Cruz <emaildericky@gmail.com> | 2011-02-17 20:20:11 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-17 20:20:11 +0000 |
| commit | 2f48d2ab1cccfc68516e89f58cf5033032da70f5 (patch) | |
| tree | 461c1ebb678719f269a97752516c1aa946a61e33 | |
| parent | 38d0641f484d03c7a39b34830181abb1dc1dca1c (diff) | |
| parent | 7070ee5a668b1673f806835b3ca6635272d34f62 (diff) | |
| download | nova-2f48d2ab1cccfc68516e89f58cf5033032da70f5.tar.gz nova-2f48d2ab1cccfc68516e89f58cf5033032da70f5.tar.xz nova-2f48d2ab1cccfc68516e89f58cf5033032da70f5.zip | |
Hi guys
Taking Jay suggestion, i completely got rid of BadParameter and just used ValueError, no point of using a new exception class when there's already something available in Python for that purpose.
Regards
| -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 981f5ec80..b906a83ed 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -511,6 +511,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 |