Repository: cloudstack Updated Branches: refs/heads/4.3 e8047e11d -> c0cf817f1
Revert "CLOUDSTACK-6485: private gateway network should not be associated with vpc" This reverts commit c37df38c834a7cfc075228c697fc6d358a70f574. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c0cf817f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c0cf817f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c0cf817f Branch: refs/heads/4.3 Commit: c0cf817f1b2a53a23253679aa785f0db3219619a Parents: e8047e1 Author: Daan Hoogland <d...@onecht.net> Authored: Thu May 8 11:21:27 2014 +0200 Committer: Daan Hoogland <d...@onecht.net> Committed: Thu May 8 11:21:27 2014 +0200 ---------------------------------------------------------------------- server/src/com/cloud/network/NetworkServiceImpl.java | 2 +- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0cf817f/server/src/com/cloud/network/NetworkServiceImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 7f3f2ff..df58e11 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -3934,7 +3934,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } else { s_logger.debug("Private network already exists: " + privateNetwork); //Do not allow multiple private gateways with same Vlan within a VPC - if (vpcId != null && vpcId.equals(privateNetwork.getVpcId())) { + if (vpcId.equals(privateNetwork.getVpcId())) { throw new InvalidParameterValueException("Private network for the vlan: " + uriString + " and cidr " + cidr + " already exists " + "for Vpc " + vpcId + " in zone " + _entityMgr.findById(DataCenter.class, pNtwk.getDataCenterId()).getName()); } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0cf817f/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 6400220..40e910d 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1428,9 +1428,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis if (privateNtwk == null) { s_logger.info("creating new network for vpc " + vpc + " using broadcast uri: " + broadcastUri); String networkName = "vpc-" + vpc.getName() + "-privateNetwork"; - /* vpcid should not be set on the new network as it is not part of the vpc but an outside net */ privateNtwk = _ntwkSvc.createPrivateNetwork(networkName, networkName, physicalNetworkIdFinal, - broadcastUri, ipAddress, null, gateway, netmask, gatewayOwnerId, null, isSourceNat, networkOfferingId); + broadcastUri, ipAddress, null, gateway, netmask, gatewayOwnerId, vpcId, isSourceNat, networkOfferingId); } else { // create the nic/ip as createPrivateNetwork doesn''t do that work for us now DataCenterVO dc = _dcDao.lockRow(physNetFinal.getDataCenterId(), true);
