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/06/04 09:26:43 UTC
git commit: updated refs/heads/4.4 to 3f0dcc7
Repository: cloudstack
Updated Branches:
refs/heads/4.4 16afdc031 -> 3f0dcc76a
CLOUDSTACK-5505: if vpc public network with snat enabled, then will triger this issue
(cherry picked from commit 5e80e5d33d9a295b91cdba9377f52d9d963d802a)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3f0dcc76
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3f0dcc76
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3f0dcc76
Branch: refs/heads/4.4
Commit: 3f0dcc76ae145c9ad4ac3112f25e970fcabe2297
Parents: 16afdc0
Author: Edison Su <su...@gmail.com>
Authored: Tue Jun 3 11:11:10 2014 -0700
Committer: Daan Hoogland <da...@onecht.net>
Committed: Wed Jun 4 09:26:25 2014 +0200
----------------------------------------------------------------------
.../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3f0dcc76/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index 8296460..5c92172 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -442,7 +442,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
String macAddress = vlanMacAddress.get(BroadcastDomainType.getValue(BroadcastDomainType.fromString(ipAddr.getVlanTag())));
IpAddressTO ip =
- new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, false, ipAddr.isSourceNat(), ipAddr.getVlanTag(), ipAddr.getGateway(),
+ new IpAddressTO(ipAddr.getAccountId(), ipAddr.getAddress().addr(), add, false, ipAddr.isSourceNat(), BroadcastDomainType.fromString(ipAddr.getVlanTag()).toString(), ipAddr.getGateway(),
ipAddr.getNetmask(), macAddress, networkRate, ipAddr.isOneToOneNat());
ip.setTrafficType(network.getTrafficType());