From c1f530c606a84de05becd412fe396acca385e342 Mon Sep 17 00:00:00 2001 From: Jason Koelker Date: Fri, 29 Jul 2011 16:58:42 -0500 Subject: only create fixed_ips if we have an ipv4 range --- nova/network/manager.py | 8 ++++---- 1 file 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 -- cgit