From 6f2ee6daacc8b282477f89651dc81c33beb3befd Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Sat, 24 May 2014 19:44:00 +0200 Subject: [PATCH] CLOUDSTACK-6485 prevent ipaddress asignment of gateway to gateway-interface on vpc router --- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 0d24544338d..62c6da1148d 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1624,6 +1624,18 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis networkAclId = aclId; } + { // experimental block, this is a hack + // set vpc id in network to null + // might be needed for all types of broadcast domains + // the ugly hack is that vpc gateway nets are created as guest network + // while they are not. + // 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); + _ntwkDao.persist(gatewaynet); + } + //2) create gateway entry VpcGatewayVO gatewayVO = new VpcGatewayVO(ipAddress, VpcGateway.Type.Private, vpcId, privateNtwk.getDataCenterId(), privateNtwk.getId(), broadcastUri, gateway, netmask,