Merge "Fix import-outside-toplevel warnings"

neutron/tests/functional/agent/linux/bin/ipt_binname.py

@@ -25,6 +25,7 @@ def print_binary_name():
     # NOTE(yamamoto): Don't move this import to module-level.
     # The aim is to test importing from eventlet non-main thread.
     # See Bug #1367075 for details.
+    # pylint: disable=import-outside-toplevel
     from neutron.agent.linux import iptables_manager
 
     print(iptables_manager.binary_name)

neutron/tests/functional/db/test_models.py

@@ -15,6 +15,7 @@
 
 import sqlalchemy
 
+from neutron.db.migration.models import head
 from neutron.tests.functional import base
 
 
@@ -34,5 +35,4 @@ class TestDBCreation(base.BaseLoggingTestCase):
         metadata.create_all(self.engine)
 
     def test_head_creation(self):
-        from neutron.db.migration.models import head
         self._test_creation(head)