You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/06/03 20:15:35 UTC
git commit: updated refs/heads/4.4-forward to 5e80e5d
Repository: cloudstack
Updated Branches:
refs/heads/4.4-forward 0329bebac -> 5e80e5d33
CLOUDSTACK-5505: if vpc public network with snat enabled, then will triger this issue
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5e80e5d3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5e80e5d3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5e80e5d3
Branch: refs/heads/4.4-forward
Commit: 5e80e5d33d9a295b91cdba9377f52d9d963d802a
Parents: 0329beb
Author: Edison Su <su...@gmail.com>
Authored: Tue Jun 3 11:11:10 2014 -0700
Committer: Edison Su <su...@gmail.com>
Committed: Tue Jun 3 11:11:10 2014 -0700
----------------------------------------------------------------------
.../network/router/VpcVirtualNetworkApplianceManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e80e5d3/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 c06843c..c7d4d4c 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());