etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 12556: Check guest network cidr when add pod

This commit is contained in:
Sheng Yang 2012-01-09 16:42:01 -08:00
parent 08a1d9ece1
commit 5886109fb9
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -704,6 +704,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
if (checkPodCIDRs == null || checkPodCIDRs.trim().isEmpty() || Boolean.parseBoolean(checkPodCIDRs)) {
checkPodCidrSubnets(zoneId, podId, cidr);
checkCidrVlanOverlap(zoneId, cidr);
_networkMgr.checkVirtualNetworkCidrOverlap(zoneId, cidr);
}
Grouping.AllocationState allocationState = null;
@ -2703,7 +2704,7 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
HashMap<Long, List<Object>> currentPodCidrSubnets = _podDao.getCurrentPodCidrSubnets(dcId, skipPod);
List<Object> newCidrPair = new ArrayList<Object>();
newCidrPair.add(0, getCidrAddress(cidr));
newCidrPair.add(1, getCidrSize(cidr));
newCidrPair.add(1, (long)getCidrSize(cidr));
currentPodCidrSubnets.put(new Long(-1), newCidrPair);
String zoneName = getZoneName(dcId);

2
server/src/com/cloud/network/NetworkManager.java
View File

@ -271,4 +271,6 @@ public interface NetworkManager extends NetworkService {
public Map<Provider, ArrayList<PublicIp>> getProviderToIpList(Network network, Map<PublicIp, Set<Service>> ipToServices);
public boolean checkIpForService(IPAddressVO ip, Service service);
void checkVirtualNetworkCidrOverlap(Long zoneId, String cidr);
}

1
server/src/com/cloud/network/NetworkManagerImpl.java
View File

@ -2017,6 +2017,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
return Integer.parseInt(cidrPair[1]);
}
@Override
public void checkVirtualNetworkCidrOverlap(Long zoneId, String cidr) {
if (zoneId == null) {
return;