diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index d0897522388..867dedf93f8 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 firewallRules = new ArrayList(); - boolean applyFirewallRules = false; - if (element instanceof FirewallServiceProvider && - isProviderSupportServiceInNetwork(network.getId(), Service.Firewall, provider)) { - applyFirewallRules = true; - } Set services = new HashSet(); 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) {