Updated Branches: refs/heads/master bc06fc07b -> a8efbcda5
CS-14253: Apply IP when firewall rule is in place Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ea6f3eb6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ea6f3eb6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ea6f3eb6 Branch: refs/heads/master Commit: ea6f3eb6f9ffaa9a0140895bff9660fa8e46cf22 Parents: 4cb7a10 Author: Sheng Yang <[email protected]> Authored: Fri Aug 17 10:30:15 2012 -0700 Committer: Sheng Yang <[email protected]> Committed: Fri Aug 17 16:52:06 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 2 +- .../router/VirtualNetworkApplianceManagerImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ea6f3eb6/server/src/com/cloud/network/NetworkManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 867dedf..baf44df 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -925,7 +925,7 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag List<PublicIp> publicIps) throws ResourceUnavailableException { boolean success = true; - Map<PublicIp, Set<Service>> ipToServices = getIpToServices(publicIps, rulesRevoked, false); + Map<PublicIp, Set<Service>> ipToServices = getIpToServices(publicIps, rulesRevoked, true); Map<Provider, ArrayList<PublicIp>> providerToIpList = getProviderToIpList(network, ipToServices); for (Provider provider : providerToIpList.keySet()) { http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ea6f3eb6/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index e76588b..f143eb7 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -2158,7 +2158,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian //Get public Ips that should be handled by router Network network = _networkDao.findById(guestNetworkId); - Map<PublicIp, Set<Service>> ipToServices = _networkMgr.getIpToServices(allPublicIps, false, false); + Map<PublicIp, Set<Service>> ipToServices = _networkMgr.getIpToServices(allPublicIps, false, true); Map<Provider, ArrayList<PublicIp>> providerToIpList = _networkMgr.getProviderToIpList(network, ipToServices); // Only cover virtual router for now, if ELB use it this need to be modified
