From 0ad145cc94dbc8a0ad06223ac7d4d634b3cc05cc Mon Sep 17 00:00:00 2001 From: frank Date: Thu, 3 Nov 2011 15:10:42 -0700 Subject: [PATCH] Bug 11808 - Allow additional non-default virtual networks when isDefault is null, for virtual network set defaut to true, false for direct network --- server/src/com/cloud/network/NetworkManagerImpl.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index fdd28303645..28b54fce727 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1687,10 +1687,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag throw new InvalidParameterValueException("Network creation is not allowed in zone with network type " + NetworkType.Basic); } - if (isDefault == null) { - isDefault = false; - } - + if (isDefault == null) { + if (networkOffering.getGuestType() == GuestIpType.Virtual) { + isDefault = true; + } else { + isDefault = false; + } + } + // allow isDefault/isShared to be set only for Direct network if (networkOffering.getGuestType() == GuestIpType.Virtual && isShared != null && isShared) { throw new InvalidParameterValueException("Can specify isShared parameter for Direct networks only");