cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: updated refs/heads/master to 6b8e0ba
Date Thu, 09 Oct 2014 23:48:20 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 5ff1ece2b -> 6b8e0baa2


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

Branch: refs/heads/master
Commit: 6b8e0baa21e6cffc62eb2d35eecc7aeb2087d1c1
Parents: 5ff1ece
Author: Edison Su <sudison@gmail.com>
Authored: Thu Oct 9 16:48:09 2014 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Thu Oct 9 16:48:09 2014 -0700

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6b8e0baa/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());


Mime
View raw message