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 2015/01/26 17:00:15 UTC
git commit: updated refs/heads/4.4 to 1f209ff
Repository: cloudstack
Updated Branches:
refs/heads/4.4 84a14f681 -> 1f209ff22
CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1f209ff2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1f209ff2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1f209ff2
Branch: refs/heads/4.4
Commit: 1f209ff226a24979cf3a43ce0c02e05c84dd4dc2
Parents: 84a14f6
Author: Daan Hoogland <da...@onecht.net>
Authored: Mon Jan 26 16:54:53 2015 +0100
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jan 26 16:59:40 2015 +0100
----------------------------------------------------------------------
engine/schema/src/com/cloud/network/dao/NetworkVO.java | 2 +-
server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f209ff2/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 8c0466f..5b1c07d 100644
--- a/engine/schema/src/com/cloud/network/dao/NetworkVO.java
+++ b/engine/schema/src/com/cloud/network/dao/NetworkVO.java
@@ -606,7 +606,7 @@ public class NetworkVO implements Network {
this.strechedL2Network = strechedL2Network;
}
- public void setVpcId(long vpcId) {
+ public void setVpcId(Long vpcId) {
this.vpcId = vpcId;
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1f209ff2/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 62c6da1..c8ebfed 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1632,7 +1632,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
// A more permanent solution would be to define a type of 'gatewaynetwork'
// so that handling code is not mixed between the two
NetworkVO gatewaynet = _ntwkDao.findById(privateNtwk.getId());
- gatewaynet.setVpcId(vpcId);
+ gatewaynet.setVpcId(null);
_ntwkDao.persist(gatewaynet);
}