You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/02/12 09:50:20 UTC

git commit: updated refs/heads/4.3-forward to 5af163f

Updated Branches:
  refs/heads/4.3-forward 3f1bed64e -> 5af163ff7


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/5af163ff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5af163ff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5af163ff

Branch: refs/heads/4.3-forward
Commit: 5af163ff7f658c30c6d93b50ac17c9cc0c5eb8c1
Parents: 3f1bed6
Author: Daan Hoogland <da...@onecht.net>
Authored: Tue Feb 11 14:12:00 2014 +0100
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Wed Feb 12 09:46:32 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/5af163ff/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 f7c38d4..40e910d 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1444,7 +1444,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);