You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2012/06/19 01:06:29 UTC
git commit: Don't need to check guest cidr overlap
Updated Branches:
refs/heads/master f6d16d0ab -> 590b2332d
Don't need to check guest cidr overlap
It's not external devices, so guest network with different vlan can be the same.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/590b2332
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/590b2332
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/590b2332
Branch: refs/heads/master
Commit: 590b2332de5043d162fd0d2b51f3011a33475617
Parents: f6d16d0
Author: Sheng Yang <sh...@citrix.com>
Authored: Mon Jun 18 16:03:03 2012 -0700
Committer: Sheng Yang <sh...@citrix.com>
Committed: Mon Jun 18 16:06:14 2012 -0700
----------------------------------------------------------------------
.../src/com/cloud/network/NetworkManagerImpl.java | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/590b2332/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index 783f9e6..00ceab5 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