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.
This commit is contained in:
prachi 2012-01-18 10:50:49 -08:00
parent 3769a2f9ec
commit 1e675f45ba
1 changed files with 4 additions and 1 deletions

View File

@ -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;