From 1e675f45ba8e9c9e0468a0e8a7d979a442736d9c Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Wed, 18 Jan 2012 10:50:49 -0800
Subject: [PATCH] Bug 11593 - CIDR conflicts with zone when extending pod but
 not when creating it

Changes:
- Now we validate Pod's CIDR only against other Pod's CIDR. No need to validate against guest CIDR and
public vlan CIDR.
---
 .../com/cloud/configuration/ConfigurationManagerImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index ed55d59d753..30374335fd8 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -702,7 +702,10 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
         String checkPodCIDRs = _configDao.getValue("check.pod.cidrs");
         if (checkPodCIDRs == null || checkPodCIDRs.trim().isEmpty() || Boolean.parseBoolean(checkPodCIDRs)) {
             checkPodCidrSubnets(zoneId, podId, cidr);
-            checkCidrVlanOverlap(zoneId, cidr);
+            /* Commenting out due to Bug 11593 - CIDR conflicts with zone when extending pod but not when creating it
+             * 
+             * checkCidrVlanOverlap(zoneId, cidr);
+             */
         }
 
         Grouping.AllocationState allocationState = null;