Log firewall status on delete in case of status inconsistency

This should help to troubleshoot related gate failres.

Change-Id: I92d4d886cafed5faeb2a6d0b224f4b5dc8522100
Related-Bug: #1314313

diff --git a/neutron/services/firewall/fwaas_plugin.py b/neutron/services/firewall/fwaas_plugin.py
index 793eb870bf620d1046e4865ddf3c8b3e73e00a81..a1573fdc7126859dd2cc3cd2a450c6021a0fe04a 100644 (file)
--- a/neutron/services/firewall/fwaas_plugin.py
+++ b/neutron/services/firewall/fwaas_plugin.py
@@ -67,9 +67,10 @@ class FirewallCallbacks(object):
                 self.plugin.delete_db_firewall_object(context, firewall_id)
                 return True
             else:
+                LOG.warn(_('Firewall %(fw)s unexpectedly deleted by agent, '
+                           'status was %(status)s'),
+                         {'fw': firewall_id, 'status': fw_db.status})
                 fw_db.status = const.ERROR
-                LOG.warn(_('Firewall %s unexpectedly deleted by agent.'),
-                         firewall_id)
                 return False
 
     def get_firewalls_for_tenant(self, context, **kwargs):