Repository: cloudstack Updated Branches: refs/heads/master 8204a4489 -> 29aeed71f
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/29aeed71 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/29aeed71 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/29aeed71 Branch: refs/heads/master Commit: 29aeed71fc1cd30c0781e6ab90c65aacdce9de4b Parents: 8204a44 Author: Daan Hoogland <d...@onecht.net> Authored: Mon Jan 26 16:54:53 2015 +0100 Committer: Daan Hoogland <d...@onecht.net> Committed: Mon Jan 26 16:54:53 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/29aeed71/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 6d4add7..b033210 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/29aeed71/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 6bc75e4..e5d3630 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1666,7 +1666,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); }
