You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/05/08 11:32:38 UTC
git commit: updated refs/heads/4.4 to 9450205
Repository: cloudstack
Updated Branches:
refs/heads/4.4 882bf079f -> 9450205f7
Revert "CLOUDSTACK-6485: private gateway network should not be associated with vpc"
This reverts commit 90600f1bdff34fcdac1adefe076d72766dc1c556.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9450205f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9450205f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9450205f
Branch: refs/heads/4.4
Commit: 9450205f77f12b4e0690a259a6791eca6d9b6ea7
Parents: 882bf07
Author: Daan Hoogland <da...@onecht.net>
Authored: Thu May 8 11:32:20 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Thu May 8 11:32:20 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 6 +++---
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9450205f/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 05c2725..d8ce98e 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3977,9 +3977,9 @@ 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())) {
- 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());
+ 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/9450205f/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 da9cc9b..29e621a 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1588,9 +1588,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);