CLOUDSTACK-6485 prevent ip asignment of private gw iface Prevent ipaddress asignment of gateway to gateway-interface on vpc router by setting vpcid to null in network
Was fixed in 4.4 by 1f209ff226a24979cf3a43ce0c02e05c84dd4dc2 Reimplemented for 4.7 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2c07ce59 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2c07ce59 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2c07ce59 Branch: refs/heads/master Commit: 2c07ce590d9763033aff2ee895915eefe8a16030 Parents: 9be76b3 Author: Remi Bergsma <[email protected]> Authored: Thu Dec 31 14:20:52 2015 +0100 Committer: Remi Bergsma <[email protected]> Committed: Thu Dec 31 14:22:52 2015 +0100 ---------------------------------------------------------------------- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2c07ce59/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 fe9a86f..e9a2202 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1668,7 +1668,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 final NetworkVO gatewaynet = _ntwkDao.findById(privateNtwk.getId()); - gatewaynet.setVpcId(vpcId); + gatewaynet.setVpcId(null); _ntwkDao.persist(gatewaynet); }
