From 590b2332de5043d162fd0d2b51f3011a33475617 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Mon, 18 Jun 2012 16:03:03 -0700 Subject: [PATCH] Don't need to check guest cidr overlap It's not external devices, so guest network with different vlan can be the same. --- server/src/com/cloud/network/NetworkManagerImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 783f9e6f089..00ceab5ab6f 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2403,9 +2403,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag throw new InvalidParameterValueException("Cannot specify CIDR when using network offering with external devices!"); } - if (cidr != null) { - checkVirtualNetworkCidrOverlap(zoneId, cidr); - } // Vlan is created in 2 cases - works in Advance zone only: // 1) GuestType is Shared // 2) GuestType is Isolated, but SourceNat service is disabled