openstack/neutron-lbaas
Code Issues Proposed changes

Merge "Remove useless check in _rpc_update_firewall"

Browse Source
This commit is contained in:
Jenkins 2014-09-12 17:41:35 +00:00 committed by Gerrit Code Review
commit 36816dfeae
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/services/firewall/fwaas_plugin.py
View File

@ -182,13 +182,11 @@ class FirewallPlugin(firewall_db.Firewall_db_mixin):
def _rpc_update_firewall(self, context, firewall_id):
status_update = {"firewall": {"status": const.PENDING_UPDATE}}
fw = super(FirewallPlugin, self).update_firewall(context, firewall_id,
status_update)
if fw:
fw_with_rules = (
self._make_firewall_dict_with_rules(context,
firewall_id))
self.agent_rpc.update_firewall(context, fw_with_rules)
super(FirewallPlugin, self).update_firewall(context, firewall_id,
status_update)
fw_with_rules = self._make_firewall_dict_with_rules(context,
firewall_id)
self.agent_rpc.update_firewall(context, fw_with_rules)
def _rpc_update_firewall_policy(self, context, firewall_policy_id):
firewall_policy = self.get_firewall_policy(context, firewall_policy_id)