Updated Branches: refs/heads/master a70bbdb13 -> fb8c58a3c
retrieving network might fail if it exists in a different datacentre Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fb8c58a3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fb8c58a3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fb8c58a3 Branch: refs/heads/master Commit: fb8c58a3cf09919b89544a774463d694ffd9e9fd Parents: a70bbdb Author: Daan Hoogland <[email protected]> Authored: Mon Nov 11 10:32:06 2013 +0100 Committer: Daan Hoogland <[email protected]> Committed: Mon Nov 11 10:32:06 2013 +0100 ---------------------------------------------------------------------- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fb8c58a3/server/src/com/cloud/network/vpc/VpcManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 017d38d..2e0737d 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1420,10 +1420,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis Network privateNtwk = null; if (BroadcastDomainType.getSchemeValue(BroadcastDomainType.fromString(broadcastUri)) == BroadcastDomainType.Lswitch) { String cidr = NetUtils.ipAndNetMaskToCidr(gateway, netmask); - privateNtwk = _ntwkDao.getPrivateNetwork(broadcastUri, cidr, gatewayOwnerId, dcId, networkOfferingId); - s_logger.info("found and using existing network for vpc " + vpc + ": " + broadcastUri); + // if the dcid is different we get no network so next we try to create it } if (privateNtwk == null) { s_logger.info("creating new network for vpc " + vpc + " using broadcast uri: " + broadcastUri); @@ -1431,6 +1430,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis privateNtwk = _ntwkSvc.createPrivateNetwork(networkName, networkName, physicalNetworkIdFinal, broadcastUri, ipAddress, null, gateway, netmask, gatewayOwnerId, vpcId, isSourceNat, networkOfferingId); } else { // create the nic/ip as createPrivateNetwork doesn''t do that work for us now + s_logger.info("found and using existing network for vpc " + vpc + ": " + broadcastUri); DataCenterVO dc = _dcDao.lockRow(physNetFinal.getDataCenterId(), true); //add entry to private_ip_address table
