Added fix for CLOUDSTACK-6548

Signed-off-by: santhosh <santhosh.edukulla@gmail.com>
Signed-off-by: Daan Hoogland <daan@onecht.net>

Conflicts:
	server/src/com/cloud/network/NetworkServiceImpl.java
This commit is contained in:
santhosh 2014-05-08 20:21:09 +10:00 committed by Daan Hoogland
parent 5ba5da3696
commit 00fcd9fb20

View File

@ -3973,7 +3973,11 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
//create Guest network //create Guest network
privateNetwork = _networkMgr.createGuestNetwork(ntwkOffFinal.getId(), networkName, displayText, gateway, cidr, uriString, null, owner, null, pNtwk, privateNetwork = _networkMgr.createGuestNetwork(ntwkOffFinal.getId(), networkName, displayText, gateway, cidr, uriString, null, owner, null, pNtwk,
pNtwk.getDataCenterId(), ACLType.Account, null, vpcId, null, null, true, null); pNtwk.getDataCenterId(), ACLType.Account, null, vpcId, null, null, true, null);
s_logger.debug("Created private network " + privateNetwork); if (privateNetwork != null) {
s_logger.debug("Successfully created guest network " + privateNetwork);
} else {
throw new CloudRuntimeException("Creating guest network failed");
}
} else { } else {
s_logger.debug("Private network already exists: " + privateNetwork); s_logger.debug("Private network already exists: " + privateNetwork);
//Do not allow multiple private gateways with same Vlan within a VPC //Do not allow multiple private gateways with same Vlan within a VPC