cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anim...@apache.org
Subject [3/7] git commit: updated refs/heads/4.3 to adf4dd5
Date Fri, 14 Feb 2014 00:12:05 GMT
pass isSourceNat to second ip on the same network(cherry picked from commit 5af163ff7f658c30c6d93b50ac17c9cc0c5eb8c1)

Signed-off-by: Animesh Chaturvedi <animesh@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a10a0832
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a10a0832
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a10a0832

Branch: refs/heads/4.3
Commit: a10a0832b6f2ef4f5db31bc7e5a1d2cd4f4067c9
Parents: 7016e6a
Author: Daan Hoogland <daan@onecht.net>
Authored: Tue Feb 11 14:12:00 2014 +0100
Committer: Animesh Chaturvedi <animesh@apache.org>
Committed: Thu Feb 13 15:54:57 2014 -0800

----------------------------------------------------------------------
 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/a10a0832/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);


Mime
View raw message