diff options
| author | Jason Koelker <jason@koelker.net> | 2011-08-15 16:30:51 -0500 |
|---|---|---|
| committer | Jason Koelker <jason@koelker.net> | 2011-08-15 16:30:51 -0500 |
| commit | a20e18c5ae2c77ed005e5dc9cec7b92d67e50a0b (patch) | |
| tree | fd3746eb4bf955e01aa519ee0d8c245b3b4d14c0 | |
| parent | 945a874a77c63710f57fa31988ba7f9ba65a5ad0 (diff) | |
| download | nova-a20e18c5ae2c77ed005e5dc9cec7b92d67e50a0b.tar.gz nova-a20e18c5ae2c77ed005e5dc9cec7b92d67e50a0b.tar.xz nova-a20e18c5ae2c77ed005e5dc9cec7b92d67e50a0b.zip | |
allow for finding a network that fits the size, also format string correctly
| -rw-r--r-- | nova/network/manager.py | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index 7748479e9..7e9a0ecf6 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -662,18 +662,26 @@ class NetworkManager(manager.SchedulerDependentManager): nets = [] used_subnets = [netaddr.IPNetwork(net['cidr']) for net in nets] - for subnet in subnets_v4: + for subnet in list(subnets_v4): if subnet in used_subnets: - raise ValueError(_('cidr already in use')) + next_subnet = subnet.next() + while next_subnet in subnets_v4: + next_subnet = next_subnet.next() + if next_subnet in fixed_net_v4: + subnets_v4.remove(subnet) + subnets_v4.append(next_subnet) + subnet = next_subnet + else: + raise ValueError(_('cidr already in use')) for used_subnet in used_subnets: if subnet in used_subnet: - msg = _('requested cidr (%{cidr}) conflicts with ' - 'existing supernet (%{super})') + msg = _('requested cidr (%(cidr)s) conflicts with ' + 'existing supernet (%(super)s)') raise ValueError(msg % {'cidr': subnet, 'super': used_subnet}) if used_subnet in subnet: - msg = _('requested cidr (%{cidr}) conflicts with ' - 'existing smaller cidr (%{smaller})') + msg = _('requested cidr (%(cidr)s) conflicts with ' + 'existing smaller cidr (%(smaller)s)') raise ValueError(msg % {'cidr': subnet, 'smaller': used_subnet}) |