Merge "Code cleanup for Freescale FWaaS Plugin"

neutron_fwaas/services/firewall/freescale/README.rst

@@ -2,3 +2,10 @@ Freescale Firewall as a Service Plugin
 
 * For more information, refer to:
     https://wiki.openstack.org/wiki/Freescale_Firewall_as_a_Service_Plugin
+
+* For Information on Freescale CI, refer to:
+    https://wiki.openstack.org/wiki/ThirdPartySystems/Freescale_CI
+
+* Freescale CI contact:
+    - fslosci@freescale.com
+    - trinath.somanchi@freescale.com

neutron_fwaas/services/firewall/freescale/fwaas_plugin.py

@@ -14,15 +14,15 @@
 #    under the License.
 #
 
-from oslo.utils import excutils
-from sqlalchemy.orm import exc
-
 from neutron.common import rpc
 from neutron.common import topics
 from neutron.i18n import _LE
 from neutron.openstack.common import log as logging
 from neutron.plugins.common import constants as const
 from neutron.plugins.ml2.drivers.freescale import config
+from oslo.utils import excutils
+from sqlalchemy.orm import exc
+
 from neutron_fwaas.db.firewall import firewall_db
 from neutron_fwaas.services.firewall import fwaas_plugin
 
@@ -88,7 +88,7 @@ class FirewallPlugin(firewall_db.Firewall_db_mixin):
             self._client.update_firewall(firewall_id, status_update)
         except Exception:
             with excutils.save_and_reraise_exception():
-                LOG.error(_LE("Failed to update firewall status (%s)."),
+                LOG.exception(_LE("Failed to update firewall status (%s)."),
                           firewall_id)
 
     def _update_firewall_policy(self, context, firewall_policy_id):

neutron_fwaas/tests/unit/services/firewall/freescale/test_freescale_fwaas_plugin.py

@@ -16,10 +16,10 @@
 import contextlib
 
 import mock
-from webob import exc
-
 from neutron import context
 from neutron import manager
+from webob import exc
+
 from neutron.plugins.common import constants as const
 from neutron_fwaas.tests.unit.db.firewall import test_db_firewall