Merge "enable H401 hacking check"

diff --cc neutron/db/l3_dvrscheduler_db.py
Simple merge

diff --cc neutron/plugins/ml2/drivers/arista/arista_l3_driver.py
Simple merge

diff --cc neutron/services/l3_router/brocade/l3_router_plugin.py
index 4d19bca4022c449c5662ab8d5964cedc6ff786c4,78c920ea0c40567c8c35e1a9727e026d851f4f4a..b7c73e770ef9ad4920ec5372dafabff644025656
--- 1/neutron/services/l3_router/brocade/l3_router_plugin.py
--- 2/neutron/services/l3_router/brocade/l3_router_plugin.py
+++ b/neutron/services/l3_router/brocade/l3_router_plugin.py
@@@ -71,10 -70,10 +71,10 @@@ class BrocadeSVIPlugin(router.L3RouterP
                          'rbridge_id': cfg.CONF.ml2_brocade.rbridge_id
                          }
          self._driver = driver.NOSdriver()
 -        LOG.info(_("rbridge id %s"), self._switch['rbridge_id'])
 +        LOG.info(_LI("rbridge id %s"), self._switch['rbridge_id'])
  
      def create_router(self, context, router):
-         """ creates a vrf on NOS device."""
+         """Creates a vrf on NOS device."""
          LOG.debug("BrocadeSVIPlugin.create_router called: ")
          with context.session.begin(subtransactions=True):
              new_router = super(BrocadeSVIPlugin, self).create_router(context,

diff --cc tox.ini
Simple merge