Merge "Remove useless check in _rpc_update_firewall"

This commit is contained in:
Jenkins 2014-09-12 17:41:35 +00:00 committed by Gerrit Code Review
commit 2b7e804c40

View File

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