Repository: cloudstack
Updated Branches:
refs/heads/master 38e8a20af -> 3515c39ca
Revert "CLOUDSTACK-6485: private gateway network should not be associated with
vpc"
This reverts commit 3bd594c584f34dff2ea69a942202f79b87d44698.
Conflicts:
server/src/com/cloud/network/NetworkServiceImpl.java
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3515c39c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3515c39c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3515c39c
Branch: refs/heads/master
Commit: 3515c39cac36c6acf93065bf8323a24c7d0a6ee7
Parents: 38e8a20
Author: Daan Hoogland <d...@onecht.net>
Authored: Thu May 8 11:45:35 2014 +0200
Committer: Daan Hoogland <d...@onecht.net>
Committed: Thu May 8 11:45:35 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3515c39c/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 2e627ce..aa3415c 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1587,9 +1587,9 @@ 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);
+ 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);
