Updated Branches: refs/heads/master 21d2e89dc -> ea5f318c9
pass isSourceNat to second ip on the same network Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ea5f318c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ea5f318c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ea5f318c Branch: refs/heads/master Commit: ea5f318c9da421aeb7908fa75b9548caf476f208 Parents: 21d2e89 Author: Daan Hoogland <d...@onecht.net> Authored: Tue Feb 11 14:12:00 2014 +0100 Committer: Daan Hoogland <d...@onecht.net> Committed: Tue Feb 11 14:12:00 2014 +0100 ---------------------------------------------------------------------- server/src/com/cloud/network/vpc/VpcManagerImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ea5f318c/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 e5d9ed2..b95f689 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1410,7 +1410,8 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis Long nextMac = mac + 1; dc.setMacAddress(nextMac); - privateIp = new PrivateIpVO(ipAddress, privateNtwk.getId(), nextMac, vpcId, true); + s_logger.info("creating private ip adress for vpc (" + ipAddress + ", " + privateNtwk.getId() + ", " + nextMac + ", " + vpcId + ", " + isSourceNat + ")"); + privateIp = new PrivateIpVO(ipAddress, privateNtwk.getId(), nextMac, vpcId, isSourceNat); _privateIpDao.persist(privateIp); _dcDao.update(dc.getId(), dc);
