apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 7901: Prevent using the same cidr for POD and zone's virtual network

Browse Source 
status 7901: resolved fixed
This commit is contained in:
alena 2011-02-16 11:01:57 -08:00
parent 1c97126f8c
commit b0e4ecb3af
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -468,7 +468,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
if (NetUtils.ipRangesOverlap(startIp, endIp, gateway, gateway)) { if (NetUtils.ipRangesOverlap(startIp, endIp, gateway, gateway)) {
throw new InvalidParameterValueException("The gateway shouldn't overlap start/end ip addresses"); throw new InvalidParameterValueException("The gateway shouldn't overlap start/end ip addresses");
} }
String checkPodCIDRs = _configDao.getValue("check.pod.cidrs"); String checkPodCIDRs = _configDao.getValue("check.pod.cidrs");
if (checkPodCIDRs == null || checkPodCIDRs.trim().isEmpty() || Boolean.parseBoolean(checkPodCIDRs)) { if (checkPodCIDRs == null || checkPodCIDRs.trim().isEmpty() || Boolean.parseBoolean(checkPodCIDRs)) {
// Check if the CIDR conflicts with the Guest Network or other pods // Check if the CIDR conflicts with the Guest Network or other pods
@ -478,6 +478,21 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
newCidrPair.add(1, new Long(cidrSize)); newCidrPair.add(1, new Long(cidrSize));
currentPodCidrSubnets.put(new Long(-1), newCidrPair); currentPodCidrSubnets.put(new Long(-1), newCidrPair);
checkPodCidrSubnets(zoneId, currentPodCidrSubnets); checkPodCidrSubnets(zoneId, currentPodCidrSubnets);
//Prevent using the same CIDR for POD and virtual networking
List<VlanVO> vlans = _vlanDao.listByZoneAndType(zoneId, VlanType.VirtualNetwork);
for (VlanVO vlan : vlans) {
String vlanCidr = NetUtils.ipAndNetMaskToCidr(vlan.getVlanGateway(), vlan.getVlanNetmask());
String[] cidrPairVlan = vlanCidr.split("\\/");
String[] vlanIpRange = NetUtils.getIpRangeFromCidr(cidrPairVlan[0], Long.valueOf(cidrPairVlan[1]));
String[] cidrPairPod = cidr.split("\\/");
String[] podIpRange = NetUtils.getIpRangeFromCidr(cidrPairPod[0], Long.valueOf(cidrPairPod[1]));
if (NetUtils.ipRangesOverlap(vlanIpRange[0], vlanIpRange[1], podIpRange[0], podIpRange[1])) {
throw new InvalidParameterValueException("Pod's cidr conflicts with cidr of virtual network in zone id=" + zoneId);
}
}
} }
} }