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/09 17:05:27 UTC
[1/2] git commit: updated refs/heads/4.4-forward to 4f0820b
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward cc0ed93a1 -> 4f0820b86
Added fix for CLOUDSTACK-6548
Signed-off-by: santhosh <sa...@gmail.com>
Signed-off-by: Daan Hoogland <da...@onecht.net>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/550493ce
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/550493ce
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/550493ce
Branch: refs/heads/4.4-forward
Commit: 550493cec318a7ab2c0d5376183263ef2efba58e
Parents: cc0ed93
Author: santhosh <sa...@gmail.com>
Authored: Thu May 8 20:21:09 2014 +1000
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri May 9 17:03:52 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/network/NetworkServiceImpl.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/550493ce/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 d8ce98e..ec9fa12 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3968,12 +3968,16 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
DataCenterVO dc = _dcDao.lockRow(pNtwk.getDataCenterId(), true);
//check if we need to create guest network
- Network privateNetwork = _networksDao.getPrivateNetwork(uriString, cidr, networkOwnerId, pNtwk.getDataCenterId(), networkOfferingId);
+ Network privateNetwork = _networksDao.getPrivateNetwork(uriString, cidr, networkOwnerId, pNtwk.getDataCenterId(), networkOfferingId);
if (privateNetwork == null) {
//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);
- 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 {
s_logger.debug("Private network already exists: " + privateNetwork);
//Do not allow multiple private gateways with same Vlan within a VPC
[2/2] git commit: updated refs/heads/4.4-forward to 4f0820b
Posted by da...@apache.org.
be able to remove vpc as owning entity of a network
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f0820b8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f0820b8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f0820b8
Branch: refs/heads/4.4-forward
Commit: 4f0820b86505e2b07fda62bbdaee66c2bab9d01c
Parents: 550493c
Author: Daan Hoogland <da...@onecht.net>
Authored: Fri May 9 16:51:34 2014 +0200
Committer: Daan Hoogland <da...@onecht.net>
Committed: Fri May 9 17:04:57 2014 +0200
----------------------------------------------------------------------
engine/schema/src/com/cloud/network/dao/NetworkVO.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f0820b8/engine/schema/src/com/cloud/network/dao/NetworkVO.java
----------------------------------------------------------------------
diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
index 6883a3b..8c0466f 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
@@ -605,4 +605,8 @@ public class NetworkVO implements Network {
public void setStrechedL2Network(boolean strechedL2Network) {
this.strechedL2Network = strechedL2Network;
}
+
+ public void setVpcId(long vpcId) {
+ this.vpcId = vpcId;
+ }
}