From 7390d6ebeca4d91c093fc02570224b379afcb5b2 Mon Sep 17 00:00:00 2001 From: Xuhan Peng Date: Thu, 14 Aug 2014 11:21:53 +0800 Subject: [PATCH] Remove INACTIVE status from FWaaS DOWN status is introduced to replace INACTIVE status. There is one place in FWaaS code which still checks INACTIVE status. This commit removes INACTIVE status from FWaaS. Change-Id: I896c81a6229978a46f8a88a31936920a1036f142 Partial-Bug: #1286048 --- neutron/services/firewall/fwaas_plugin.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neutron/services/firewall/fwaas_plugin.py b/neutron/services/firewall/fwaas_plugin.py index 27a5439306..051ba1f608 100644 --- a/neutron/services/firewall/fwaas_plugin.py +++ b/neutron/services/firewall/fwaas_plugin.py @@ -52,9 +52,7 @@ class FirewallCallbacks(n_rpc.RpcCallback): "not changing to %(status)s"), {'fw_id': firewall_id, 'status': status}) return False - #TODO(xuhanp): Remove INACTIVE status and use DOWN to - # be consistent with other network resources - if status in (const.ACTIVE, const.INACTIVE, const.DOWN): + if status in (const.ACTIVE, const.DOWN): fw_db.status = status return True else: