From e474454c912af666eb062c821b6976dbf2e01cb6 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 26 Jan 2015 16:54:53 +0100 Subject: [PATCH] CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network --- 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(-) diff --git a/engine/schema/src/com/cloud/network/dao/NetworkVO.java b/engine/schema/src/com/cloud/network/dao/NetworkVO.java index 6d4add7c708..b0332106aec 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; } } diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index c49da15d024..796b590cd05 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1654,7 +1654,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); }