diff options
| author | Jason Koelker <jason@koelker.net> | 2011-07-29 16:58:42 -0500 |
|---|---|---|
| committer | Jason Koelker <jason@koelker.net> | 2011-07-29 16:58:42 -0500 |
| commit | c1f530c606a84de05becd412fe396acca385e342 (patch) | |
| tree | ce71bb8bc3a680681565d3d0abd3a457f67ffd68 | |
| parent | 36846b40016a27b5f9e0762273de532f4e0e10cd (diff) | |
| download | nova-c1f530c606a84de05becd412fe396acca385e342.tar.gz nova-c1f530c606a84de05becd412fe396acca385e342.tar.xz nova-c1f530c606a84de05becd412fe396acca385e342.zip | |
only create fixed_ips if we have an ipv4 range
| -rw-r--r-- | nova/network/manager.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/network/manager.py b/nova/network/manager.py index bdb57d634..4db2213b8 100644 --- a/nova/network/manager.py +++ b/nova/network/manager.py @@ -678,11 +678,11 @@ class NetworkManager(manager.SchedulerDependentManager): # None if network with cidr or cidr_v6 already exists network = self.db.network_create_safe(context, net) - if network: + if not network: + raise ValueError(_('Network already exists!')) + + if network and cidr: self._create_fixed_ips(context, network['id']) - else: - raise ValueError(_('Network with cidr %s already exists') % - cidr) @property def _bottom_reserved_ips(self): # pylint: disable=R0201 |