From d14797400d350cc93301bfaa690f185ed2da0814 Mon Sep 17 00:00:00 2001 From: Cedric Brandily Date: Wed, 27 Aug 2014 11:35:41 +0200 Subject: [PATCH] Remove useless check in _rpc_update_firewall Firewall_db_mixin.update_firewall returns an updated firewall or raises an error (if the firewall is not found), that's why checking if its result is evaluated to False is not required Change-Id: Ib4e2fa0920783728b8e1cc8597b3edf78e098b52 --- neutron/services/firewall/fwaas_plugin.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/neutron/services/firewall/fwaas_plugin.py b/neutron/services/firewall/fwaas_plugin.py index 6a9fd1c5439..b44e8fb6b2d 100644 --- a/neutron/services/firewall/fwaas_plugin.py +++ b/neutron/services/firewall/fwaas_plugin.py @@ -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)