Revert "bug 14484: Apply existed firewall rules when associating IP"
This reverts commit b409615a328c059ab8daf841529fcbf8abcb8863. In order to fix CS-15503. Fix of bug 14484(CS-14253) would be applied later. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/4cb7a100 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/4cb7a100 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/4cb7a100 Branch: refs/heads/master Commit: 4cb7a100c658c9fe1a4325a78ac1ec7dc8c13f65 Parents: bc06fc0 Author: Sheng Yang <[email protected]> Authored: Fri Aug 17 09:35:27 2012 -0700 Committer: Sheng Yang <[email protected]> Committed: Fri Aug 17 16:52:06 2012 -0700 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkManagerImpl.java | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/4cb7a100/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 d089752..867dedf 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -262,8 +262,6 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag @Inject NicDao _nicDao = null; @Inject - FirewallRulesDao _fwRulesDao = null; - @Inject RulesManager _rulesMgr; @Inject LoadBalancingRulesManager _lbMgr; @@ -955,27 +953,14 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag } else { throw new CloudRuntimeException("Fail to get ip deployer for element: " + element); } - //We would apply all the existed firewall rules for this IP, since the rule maybe discard by revoke PF/LB rules - List<FirewallRule> firewallRules = new ArrayList<FirewallRule>(); - boolean applyFirewallRules = false; - if (element instanceof FirewallServiceProvider && - isProviderSupportServiceInNetwork(network.getId(), Service.Firewall, provider)) { - applyFirewallRules = true; - } Set<Service> services = new HashSet<Service>(); for (PublicIp ip : ips) { if (!ipToServices.containsKey(ip)) { continue; } services.addAll(ipToServices.get(ip)); - if (applyFirewallRules) { - firewallRules.addAll(_fwRulesDao.listByIpAndPurpose(ip.getId(), Purpose.Firewall)); - } } deployer.applyIps(network, ips, services); - if (applyFirewallRules && !firewallRules.isEmpty()) { - ((FirewallServiceProvider) element).applyFWRules(network, firewallRules); - } } catch (ResourceUnavailableException e) { success = false; if (!continueOnError) {
