From: Xuhan Peng <xuhanp@cn.ibm.com>
Date: Thu, 14 Aug 2014 03:21:53 +0000 (+0800)
Subject: Remove INACTIVE status from FWaaS
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c3760e5600a231a6cc95e31d9dccdcd581f8ee5f;p=openstack-build%2Fneutron-build.git

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
---

diff --git a/neutron/services/firewall/fwaas_plugin.py b/neutron/services/firewall/fwaas_plugin.py
index 27a543930..051ba1f60 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: