if vpc public network with snat enabled, then will triger this issue;

(cherry picked from commit 6b8e0baa21e6cffc62eb2d35eecc7aeb2087d1c1)


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

Branch: refs/heads/4.5
Commit: c10189f79aa1d9be1d01bb2ff1b6d7406e2ea7e1
Parents: 6e9d3b6
Author: Edison Su <[email protected]>
Authored: Thu Oct 9 16:48:09 2014 -0700
Committer: David Nalley <[email protected]>
Committed: Mon Oct 13 00:39:10 2014 -0400

----------------------------------------------------------------------
 .../network/router/VpcVirtualNetworkApplianceManagerImpl.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c10189f7/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 ef2ab3d..cc673d9 100644
--- 
a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -445,7 +445,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());

Reply via email to