Fix and enable gating on F401

Do not allow unused imports in modules, and remove those
that are currently unused.

Change-Id: I7600b1cce22eaef87633f98a89db2086a3ec2b55

diff --git a/bin/cinder-all b/bin/cinder-all
index 3e972223164bb907126fd50b354a70a5ba491133..a4785950e8c7a6b6eeb332a32b27f23f50089789 100755 (executable)
--- a/bin/cinder-all
+++ b/bin/cinder-all
@@ -46,7 +46,8 @@ if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")):
 from cinder.openstack.common import gettextutils
 gettextutils.install('cinder', lazy=False)
 
-from cinder.common import config  # Need to register global_opts
+# Need to register global_opts
+from cinder.common import config   # noqa
 from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils

diff --git a/bin/cinder-api b/bin/cinder-api
index fda3e6a0042e9804eda5fd475ce46f268ed77cc9..fe8611154853f27b66b8b84cad15075f85930690 100755 (executable)
--- a/bin/cinder-api
+++ b/bin/cinder-api
@@ -40,7 +40,8 @@ if os.path.exists(os.path.join(possible_topdir, "cinder", "__init__.py")):
 from cinder.openstack.common import gettextutils
 gettextutils.install('cinder', lazy=False)
 
-from cinder.common import config  # Need to register global_opts
+# Need to register global_opts
+from cinder.common import config  # noqa
 from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils

diff --git a/bin/cinder-backup b/bin/cinder-backup
index 5f2a47587cd698d70bbe914d23612da84338a0af..c1555987c06c767b4add36b518e99fd823a48c6a 100755 (executable)
--- a/bin/cinder-backup
+++ b/bin/cinder-backup
@@ -38,7 +38,8 @@ if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')):
 from cinder.openstack.common import gettextutils
 gettextutils.install('cinder')
 
-from cinder.common import config  # Need to register global_opts
+# Need to register global_opts
+from cinder.common import config  # noqa
 from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils

diff --git a/bin/cinder-clear-rabbit-queues b/bin/cinder-clear-rabbit-queues
index 541b289807b8252684546f982c464a0ab63efad0..f2e9f33eb3f5f7880595e1cf23553ddddb7181f1 100755 (executable)
--- a/bin/cinder-clear-rabbit-queues
+++ b/bin/cinder-clear-rabbit-queues
@@ -23,10 +23,8 @@
 
 """
 
-import datetime
 import os
 import sys
-import time
 
 from oslo.config import cfg
 
@@ -41,9 +39,8 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
 from cinder.openstack.common import gettextutils
 gettextutils.install('cinder')
 
-from cinder.common import config  # Need to register global_opts
-from cinder import context
-from cinder import exception
+# Need to register global_opts
+from cinder.common import config  # noqa
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import rpc
 from cinder import version

diff --git a/bin/cinder-manage b/bin/cinder-manage
index 76afaf6b589e30038ef0e51d50de7b2abafae60f..8926b4527267b5cbd9814f52aff872763835c471 100755 (executable)
--- a/bin/cinder-manage
+++ b/bin/cinder-manage
@@ -74,7 +74,8 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
 from cinder.openstack.common import gettextutils
 gettextutils.install('cinder')
 
-from cinder.common import config  # Need to register global_opts
+# Need to register global_opts
+from cinder.common import config  # noqa
 from cinder import context
 from cinder import db
 from cinder.db import migration
@@ -168,7 +169,7 @@ class ShellCommands(object):
             else:
                 # We don't have to wrap the following import in a 'try',
                 # because we already know 'readline' was imported successfully.
-                import rlcompleter
+                import rlcompleter    # noqa
                 readline.parse_and_bind("tab:complete")
             code.interact()
 

diff --git a/bin/cinder-scheduler b/bin/cinder-scheduler
index 0a4c7a0d0c57a977056a1d3fad3abb299ce4a8b3..752b0cfefeadc6b3e9b27fdbf5b016805475bf48 100755 (executable)
--- a/bin/cinder-scheduler
+++ b/bin/cinder-scheduler
@@ -40,7 +40,8 @@ if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')):
 from cinder.openstack.common import gettextutils
 gettextutils.install('cinder')
 
-from cinder.common import config  # Need to register global_opts
+# Need to register global_opts
+from cinder.common import config  # noqa
 from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils

diff --git a/bin/cinder-volume b/bin/cinder-volume
index 08199f0a2d71e61b4aea09513a8bcf64c9d5d3c3..53f31edcf66c68421df9c9435c98ede05a7d12a4 100755 (executable)
--- a/bin/cinder-volume
+++ b/bin/cinder-volume
@@ -44,7 +44,8 @@ if os.path.exists(os.path.join(possible_topdir, 'cinder', '__init__.py')):
 from cinder.openstack.common import gettextutils
 gettextutils.install('cinder')
 
-from cinder.common import config  # Need to register global_opts
+# Need to register global_opts
+from cinder.common import config  # noqa
 from cinder.openstack.common import log as logging
 from cinder import service
 from cinder import utils

diff --git a/bin/cinder-volume-usage-audit b/bin/cinder-volume-usage-audit
index 620fde3c95663502dd2c48426e8968dff2a524cf..40e31f1c5dc515ca8cd9540f0d2c611e4bac6823 100755 (executable)
--- a/bin/cinder-volume-usage-audit
+++ b/bin/cinder-volume-usage-audit
@@ -53,11 +53,11 @@ if os.path.exists(os.path.join(POSSIBLE_TOPDIR, 'cinder', '__init__.py')):
 from cinder.openstack.common import gettextutils
 gettextutils.install('cinder')
 
-from cinder.common import config  # Need to register global_opts
+# Need to register global_opts
+from cinder.common import config  # noqa
 from cinder import context
 from cinder import db
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import rpc
 from cinder import utils
 from cinder import version
 import cinder.volume.utils

diff --git a/cinder/api/contrib/snapshot_actions.py b/cinder/api/contrib/snapshot_actions.py
index 527891b5eb220a86cecbe6d94509eb9d8d6ec955..eec07f8231dcb16521e9db1d4b4978399fd666cf 100644 (file)
--- a/cinder/api/contrib/snapshot_actions.py
+++ b/cinder/api/contrib/snapshot_actions.py
@@ -12,7 +12,6 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-from oslo.config import cfg
 import webob
 
 from cinder.api import extensions

diff --git a/cinder/api/contrib/volume_encryption_metadata.py b/cinder/api/contrib/volume_encryption_metadata.py
index e1a6a05354fa0cc6bfab2aa6aacecee5cff7c4c1..af309f1141563130a04859071965a01a35d5bb0e 100644 (file)
--- a/cinder/api/contrib/volume_encryption_metadata.py
+++ b/cinder/api/contrib/volume_encryption_metadata.py
@@ -17,14 +17,10 @@
 
 """The volume encryption metadata extension."""
 
-import webob
-
 from cinder.api import extensions
 from cinder.api.openstack import wsgi
 from cinder.api import xmlutil
 from cinder import db
-from cinder import exception
-from cinder.openstack.common.notifier import api as notifier_api
 from cinder.volume import volume_types
 
 authorize = extensions.extension_authorizer('volume',

diff --git a/cinder/api/openstack/__init__.py b/cinder/api/openstack/__init__.py
index 9eb2bdee3fbb0d079f35df6aa878e661482d8b93..008ff031f15c7fb37f719670722cb8c36e76b241 100644 (file)
--- a/cinder/api/openstack/__init__.py
+++ b/cinder/api/openstack/__init__.py
@@ -22,7 +22,6 @@ import routes
 
 from cinder.api.openstack import wsgi
 from cinder.openstack.common import log as logging
-from cinder import utils
 from cinder import wsgi as base_wsgi
 
 

diff --git a/cinder/compute/nova.py b/cinder/compute/nova.py
index 15eaabf20383315bb7bc5010e37a74114e5b7efd..a994b096120c7a7b0cd4a9a1ff563c0440651044 100644 (file)
--- a/cinder/compute/nova.py
+++ b/cinder/compute/nova.py
@@ -17,7 +17,6 @@ Handles all requests to Nova.
 """
 
 
-from novaclient import extension
 from novaclient import service_catalog
 from novaclient.v1_1 import client as nova_client
 from novaclient.v1_1.contrib import assisted_volume_snapshots

diff --git a/cinder/db/sqlalchemy/migrate_repo/manage.py b/cinder/db/sqlalchemy/migrate_repo/manage.py
index 826d56f30a6719de6414598e8934d9bdedeaaf39..ed526c6d066c4d7e84cc0359f994b00949c0366f 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/manage.py
+++ b/cinder/db/sqlalchemy/migrate_repo/manage.py
@@ -23,7 +23,6 @@ from cinder.openstack.common import gettextutils
 gettextutils.install('cinder', lazy=False)
 
 from cinder.db.sqlalchemy import migrate_repo
-import cinder.openstack.common.db.sqlalchemy.session
 from cinder import version
 
 from migrate.versioning.shell import main

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py b/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
index df434710100664b8203f3f573b45ad3258aa6a20..1b9368cc9f75488645e9d8e374a53438bce9d075 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/017_add_encryption_information.py
@@ -19,8 +19,6 @@ from sqlalchemy import Column, ForeignKey, MetaData, Table
 from sqlalchemy import Boolean, DateTime, Integer, String
 
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import timeutils
-from cinder.openstack.common import uuidutils
 
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py b/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
index c5fbe73bef6c5abf00ef601c3714c6b1bb60f8d9..76868bf6ca8530bb92e60e4bd34a0f7e0d725bdb 100644 (file)
--- a/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
+++ b/cinder/db/sqlalchemy/migrate_repo/versions/018_add_qos_specs.py
@@ -17,7 +17,7 @@
 #    under the License.
 
 from sqlalchemy import Boolean, Column, DateTime
-from sqlalchemy import ForeignKey, MetaData, Integer, String, Table
+from sqlalchemy import ForeignKey, MetaData, String, Table
 
 from cinder.openstack.common import log as logging
 

diff --git a/cinder/exception.py b/cinder/exception.py
index 5517aff0522228c33e967779b96786516fb34742..f8f23ee54cb2e0240e36e063dca4481769b7d733 100644 (file)
--- a/cinder/exception.py
+++ b/cinder/exception.py
@@ -31,7 +31,6 @@ import webob.exc
 
 from cinder.openstack.common.gettextutils import _
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import processutils
 
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/test.py b/cinder/test.py
index 8eb25333791e0ec1cd24b0a0264699270e0d82df..b572b369f082cb2754dfb2f75ebd17a8cf9eb6ba 100644 (file)
--- a/cinder/test.py
+++ b/cinder/test.py
@@ -24,7 +24,6 @@ inline callbacks.
 """
 
 
-import functools
 import os
 import shutil
 import tempfile
@@ -37,7 +36,7 @@ import stubout
 import testtools
 from testtools import matchers
 
-from cinder.common import config  # Need to register global_opts
+from cinder.common import config  # noqa Need to register global_opts
 from cinder.db import migration
 from cinder.openstack.common.db.sqlalchemy import session
 from cinder.openstack.common import log as logging

diff --git a/cinder/tests/api/contrib/test_snapshot_actions.py b/cinder/tests/api/contrib/test_snapshot_actions.py
index f8be77f8b7901ddcb74a2d002b4a04135459a6f2..37b4d1971c2befda833946b28c4a9275d5a77016 100644 (file)
--- a/cinder/tests/api/contrib/test_snapshot_actions.py
+++ b/cinder/tests/api/contrib/test_snapshot_actions.py
@@ -12,19 +12,13 @@
 #   License for the specific language governing permissions and limitations
 #   under the License.
 
-import datetime
-import uuid
 import webob
 
 from cinder import db
-from cinder import exception
 from cinder.openstack.common import jsonutils
-from cinder.openstack.common.rpc import common as rpc_common
 from cinder import test
 from cinder.tests.api import fakes
 from cinder.tests.api.v2 import stubs
-from cinder import volume
-from cinder.volume import api as volume_api
 
 
 class SnapshotActionsTest(test.TestCase):

diff --git a/cinder/tests/api/contrib/test_volume_type_encryption.py b/cinder/tests/api/contrib/test_volume_type_encryption.py
index 058f87b82b439670d217207a7c6a2c4192774286..cb4cb0937b8164f555ea722262e1c25681330926 100644 (file)
--- a/cinder/tests/api/contrib/test_volume_type_encryption.py
+++ b/cinder/tests/api/contrib/test_volume_type_encryption.py
@@ -19,17 +19,13 @@
 
 import json
 import webob
-from xml.dom import minidom
 
-from cinder.api.contrib import volume_type_encryption
 from cinder import context
 from cinder import db
-from cinder import exception
 from cinder.openstack.common.notifier import api as notifier_api
 from cinder.openstack.common.notifier import test_notifier
 from cinder import test
 from cinder.tests.api import fakes
-from cinder.volume import volume_types
 
 
 def return_volume_type_encryption_db(context, volume_type_id, session):

diff --git a/cinder/tests/backup/fake_service.py b/cinder/tests/backup/fake_service.py
index a78d516e61566b8cf35a152e146b74edcd4d7b39..fa8fac4daed3b7f182ecb7ef74bd21b75d32d235 100644 (file)
--- a/cinder/tests/backup/fake_service.py
+++ b/cinder/tests/backup/fake_service.py
@@ -14,7 +14,6 @@
 #    under the License.
 
 from cinder.backup.driver import BackupDriver
-from cinder.db import base
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/tests/brick/test_brick_connector.py b/cinder/tests/brick/test_brick_connector.py
index ebb12e64e2c6e4698aa06f0558eea01a97b33302..a7b9b9c37a82eddeaa50ef8853d2042721f49a72 100644 (file)
--- a/cinder/tests/brick/test_brick_connector.py
+++ b/cinder/tests/brick/test_brick_connector.py
@@ -23,9 +23,6 @@ import mox
 from cinder.brick import exception
 from cinder.brick.initiator import connector
 from cinder.brick.initiator import host_driver
-from cinder.brick.initiator import linuxfc
-from cinder.brick.initiator import linuxscsi
-from cinder.brick.remotefs import remotefs
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import loopingcall
 from cinder.openstack.common import processutils as putils

diff --git a/cinder/tests/brick/test_brick_linuxscsi.py b/cinder/tests/brick/test_brick_linuxscsi.py
index a2be40d47bb976dbf0dcc4a28e2143ef9f73312f..5fa80dff00b482c4f12eefac73184ce87fc8bde4 100644 (file)
--- a/cinder/tests/brick/test_brick_linuxscsi.py
+++ b/cinder/tests/brick/test_brick_linuxscsi.py
@@ -20,7 +20,6 @@ import string
 from cinder.brick.initiator import linuxscsi
 from cinder.openstack.common import log as logging
 from cinder import test
-from cinder import utils
 
 LOG = logging.getLogger(__name__)
 

diff --git a/cinder/tests/brick/test_brick_remotefs.py b/cinder/tests/brick/test_brick_remotefs.py
index 32ae8c447447824f182fd291d9fcd920c82df3a3..7f2e954168eb651650f908134b8ad9a263da6ac6 100644 (file)
--- a/cinder/tests/brick/test_brick_remotefs.py
+++ b/cinder/tests/brick/test_brick_remotefs.py
@@ -19,7 +19,6 @@ import mox
 
 from cinder.brick.remotefs import remotefs
 from cinder.openstack.common import log as logging
-from cinder.openstack.common import processutils as putils
 from cinder import test
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/tests/compute/test_nova.py b/cinder/tests/compute/test_nova.py
index 45ee334f4c07d3eb973fa07dfe7883f4320e22cb..9f8239a750a54f6d000b6b8009fed7d5c4976222 100644 (file)
--- a/cinder/tests/compute/test_nova.py
+++ b/cinder/tests/compute/test_nova.py
@@ -14,7 +14,6 @@
 
 from cinder.compute import nova
 from cinder import context
-from cinder import exception
 from cinder import test
 
 

diff --git a/cinder/tests/db/test_finish_migration.py b/cinder/tests/db/test_finish_migration.py
index 0cb03ac4c9c74aa75c6cfce295c6642fdc65242b..f0b04ac5892452a4eb81e875a637ad732267d1ef 100644 (file)
--- a/cinder/tests/db/test_finish_migration.py
+++ b/cinder/tests/db/test_finish_migration.py
@@ -17,7 +17,6 @@
 
 from cinder import context
 from cinder import db
-from cinder import exception
 from cinder import test
 from cinder.tests import utils as testutils
 

diff --git a/cinder/tests/fake_utils.py b/cinder/tests/fake_utils.py
index fd44d67714a1565801de158db0d09e419479e838..af586b882dae1eae3404073344cacebcdd227620 100644 (file)
--- a/cinder/tests/fake_utils.py
+++ b/cinder/tests/fake_utils.py
@@ -20,7 +20,6 @@ import re
 
 from eventlet import greenthread
 
-from cinder import exception
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder import utils

diff --git a/cinder/tests/integrated/test_volumes.py b/cinder/tests/integrated/test_volumes.py
index 3de238ec0143022d4b9a56a24d2451e3072f82b0..92c02196bf161c62aaf7aa365bcb451fb8e38c95 100644 (file)
--- a/cinder/tests/integrated/test_volumes.py
+++ b/cinder/tests/integrated/test_volumes.py
@@ -23,7 +23,6 @@ from cinder import service
 from cinder.tests import fake_driver
 from cinder.tests.integrated.api import client
 from cinder.tests.integrated import integrated_helpers
-from cinder.volume import driver
 
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/tests/scheduler/fakes.py b/cinder/tests/scheduler/fakes.py
index ae1da874d22976c8d9361018ac35fd15ff8120bd..4abc6f269d2657c9a1fe553dc0dc5a9dab89c090 100644 (file)
--- a/cinder/tests/scheduler/fakes.py
+++ b/cinder/tests/scheduler/fakes.py
@@ -16,9 +16,6 @@
 Fakes For Scheduler tests.
 """
 
-import mock
-
-from cinder import db
 from cinder.openstack.common import timeutils
 from cinder.scheduler import filter_scheduler
 from cinder.scheduler import host_manager

diff --git a/cinder/tests/scheduler/test_chance_weigher.py b/cinder/tests/scheduler/test_chance_weigher.py
index a115bcf7bbc1ae5beb3f23629c968bc6bd39bad2..5f7f2a93d8fe290dfff0f848003f15352850f5f2 100644 (file)
--- a/cinder/tests/scheduler/test_chance_weigher.py
+++ b/cinder/tests/scheduler/test_chance_weigher.py
@@ -16,7 +16,6 @@ Tests For Chance Weigher.
 """
 
 import mock
-import random
 
 from cinder.scheduler import host_manager
 from cinder.scheduler.weights.chance import ChanceWeigher

diff --git a/cinder/tests/scheduler/test_scheduler.py b/cinder/tests/scheduler/test_scheduler.py
index fb216295cd2b6af4450a8966ef17fae04c7419aa..0b3ade1fb538005309888f369de0fdb79d2d0111 100644 (file)
--- a/cinder/tests/scheduler/test_scheduler.py
+++ b/cinder/tests/scheduler/test_scheduler.py
@@ -22,13 +22,10 @@ Tests For Scheduler
 import mock
 
 from cinder import context
-from cinder import db
 from cinder import exception
-from cinder.openstack.common import timeutils
 from cinder.scheduler import driver
 from cinder.scheduler import manager
 from cinder import test
-from cinder import utils
 
 
 class SchedulerManagerTestCase(test.TestCase):

diff --git a/cinder/tests/test_conf.py b/cinder/tests/test_conf.py
index cf1906df9f0c87796b77ae7f546886e5ccbb2504..bacef2a8d1b98b76a5822ffb44621c4c3d6c80cf 100644 (file)
--- a/cinder/tests/test_conf.py
+++ b/cinder/tests/test_conf.py
@@ -48,7 +48,7 @@ class ConfigTestCase(test.TestCase):
 
     def test_runtime_and_unknown_conf(self):
         self.assertNotIn('runtime_answer', CONF)
-        import cinder.tests.runtime_conf
+        import cinder.tests.runtime_conf    # noqa
         self.assertIn('runtime_answer', CONF)
         self.assertEqual(CONF.runtime_answer, 54)
 

diff --git a/cinder/tests/test_create_volume_flow.py b/cinder/tests/test_create_volume_flow.py
index c2344a5927612f7a33744865ce476a6a04904361..50cf7224c8b4530ef5a21a0407a2962d90d9e6de 100644 (file)
--- a/cinder/tests/test_create_volume_flow.py
+++ b/cinder/tests/test_create_volume_flow.py
@@ -16,8 +16,6 @@
 
 import time
 
-import mock
-
 from cinder import context
 from cinder import test
 from cinder.volume.flows import create_volume

diff --git a/cinder/tests/test_exception.py b/cinder/tests/test_exception.py
index b5617d5d32df5f459739f0de88ebdbe77aefa919..2a22a7a834a807b8818ba2841ece67d57fecfb8b 100644 (file)
--- a/cinder/tests/test_exception.py
+++ b/cinder/tests/test_exception.py
@@ -18,7 +18,6 @@
 
 from cinder import exception
 from cinder import test
-from cinder import utils
 
 
 class FakeNotifier(object):

diff --git a/cinder/tests/test_glusterfs.py b/cinder/tests/test_glusterfs.py
index e082a82202a61b5ed40a0529c044314d9bdd6d8f..565d3363d002f9bfe807ec039107640c452ed7e3 100644 (file)
--- a/cinder/tests/test_glusterfs.py
+++ b/cinder/tests/test_glusterfs.py
@@ -17,7 +17,6 @@
 """Unit tests for the GlusterFS driver module."""
 
 import errno
-import json
 import os
 import tempfile
 
@@ -26,7 +25,6 @@ from mox import IgnoreArg
 from mox import IsA
 from mox import stubout
 
-from cinder import compute
 from cinder import context
 from cinder import db
 from cinder import exception
@@ -34,7 +32,6 @@ from cinder.image import image_utils
 from cinder.openstack.common import imageutils
 from cinder.openstack.common import processutils as putils
 from cinder import test
-from cinder.tests.compute import test_nova
 from cinder import units
 from cinder import utils
 from cinder.volume import configuration as conf

diff --git a/cinder/tests/test_iscsi.py b/cinder/tests/test_iscsi.py
index f190bd525a6a897937009fb43aeef04a4ec1cc81..6d42ac037c82d5034ea6d6300a8b55acd49d9294 100644 (file)
--- a/cinder/tests/test_iscsi.py
+++ b/cinder/tests/test_iscsi.py
@@ -22,7 +22,6 @@ import tempfile
 from cinder.brick.iscsi import iscsi
 from cinder import test
 from cinder.volume import driver
-from cinder.volume import utils as volume_utils
 
 
 class TargetAdminTestCase(object):

diff --git a/cinder/tests/test_netapp.py b/cinder/tests/test_netapp.py
index 37040b90d0fbf21bd180a76e1e8ac75e20575eb8..6534325f022fbfeb86fa6cc299776b7909ef075d 100644 (file)
--- a/cinder/tests/test_netapp.py
+++ b/cinder/tests/test_netapp.py
@@ -36,7 +36,6 @@ from cinder.volume.drivers.netapp.options import netapp_connection_opts
 from cinder.volume.drivers.netapp.options import netapp_provisioning_opts
 from cinder.volume.drivers.netapp.options import netapp_transport_opts
 from cinder.volume.drivers.netapp import ssc_utils
-from cinder.volume.drivers.netapp import utils
 
 
 LOG = logging.getLogger("cinder.volume.driver")

diff --git a/cinder/tests/test_netapp_nfs.py b/cinder/tests/test_netapp_nfs.py
index a7f3b6841e7644f617e2621d0b6e464d71b6f16d..7105a8fa955f7c207e0222ff7eb44321453f1c98 100644 (file)
--- a/cinder/tests/test_netapp_nfs.py
+++ b/cinder/tests/test_netapp_nfs.py
@@ -31,7 +31,6 @@ from cinder import test
 from cinder.volume import configuration as conf
 from cinder.volume.drivers.netapp import api
 from cinder.volume.drivers.netapp import nfs as netapp_nfs
-from cinder.volume.drivers.netapp import ssc_utils
 
 
 from oslo.config import cfg

diff --git a/cinder/tests/test_netapp_ssc.py b/cinder/tests/test_netapp_ssc.py
index 9d5f0b8536dc541752ff837d90cbaa9c263697dd..b7de142f90cde5d24fde083c6e677b49164a62c2 100644 (file)
--- a/cinder/tests/test_netapp_ssc.py
+++ b/cinder/tests/test_netapp_ssc.py
@@ -20,16 +20,11 @@ import BaseHTTPServer
 import copy
 import httplib
 from lxml import etree
-import mox
 from mox import IgnoreArg
-from mox import IsA
-from mox import MockObject
 import StringIO
 
-from cinder import context
 from cinder import exception
 from cinder import test
-from cinder.volume import configuration as conf
 from cinder.volume.drivers.netapp import api
 from cinder.volume.drivers.netapp import ssc_utils
 

diff --git a/cinder/tests/test_nfs.py b/cinder/tests/test_nfs.py
index e4c84d7de6e8d9c1fe6558e0903302d61e9df3b9..353d6d09bd7a5e53917dac95a3f52048164f6e96 100644 (file)
--- a/cinder/tests/test_nfs.py
+++ b/cinder/tests/test_nfs.py
@@ -16,7 +16,6 @@
 #    under the License.
 """Unit tests for the NFS driver module."""
 
-import __builtin__
 import errno
 import os
 
@@ -29,7 +28,6 @@ from oslo.config import cfg
 from cinder import context
 from cinder import exception
 from cinder.image import image_utils
-from cinder.openstack.common import processutils as putils
 from cinder import test
 from cinder import units
 from cinder.volume import configuration as conf

diff --git a/cinder/tests/test_sheepdog.py b/cinder/tests/test_sheepdog.py
index 793579884adfb1ccd52c97b7576e0657ed3642d9..052b7fe95ad6ea750cdc9c8af6861e166fa7970e 100644 (file)
--- a/cinder/tests/test_sheepdog.py
+++ b/cinder/tests/test_sheepdog.py
@@ -20,7 +20,6 @@ import contextlib
 import os
 import tempfile
 
-from cinder import exception
 from cinder.image import image_utils
 from cinder.openstack.common import processutils
 from cinder import test

diff --git a/cinder/tests/test_storwize_svc.py b/cinder/tests/test_storwize_svc.py
index 5ed244d86c4f1a1cf7cabe16c3186d8648d2a8b6..07d6b576817cc54554b9c9b520d95ea019205345 100644 (file)
--- a/cinder/tests/test_storwize_svc.py
+++ b/cinder/tests/test_storwize_svc.py
@@ -25,7 +25,6 @@ Tests for the IBM Storwize family and SVC volume driver.
 
 import random
 import re
-import socket
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/tests/test_wsgi.py b/cinder/tests/test_wsgi.py
index ba7f15d16b969171f5f98a3507dee455d3d91fa8..8b7545c5432c428eddd22fb059d87efd2f4ce4ab 100644 (file)
--- a/cinder/tests/test_wsgi.py
+++ b/cinder/tests/test_wsgi.py
@@ -20,7 +20,6 @@
 
 import mock
 import os.path
-import ssl
 import tempfile
 import urllib2
 
@@ -32,7 +31,6 @@ import webob.dec
 from cinder import exception
 from cinder.openstack.common import gettextutils
 from cinder import test
-from cinder import utils
 import cinder.wsgi
 
 CONF = cfg.CONF

diff --git a/cinder/tests/test_zadara.py b/cinder/tests/test_zadara.py
index f604d5c29ddd06b624d19cc30fe97f9e1ba3d7b1..379342a70e5df10e2a4833dcc365aa139a2f7a52 100644 (file)
--- a/cinder/tests/test_zadara.py
+++ b/cinder/tests/test_zadara.py
@@ -21,7 +21,6 @@ Tests for Zadara VPSA volume driver
 
 import copy
 import httplib
-import mox
 
 from cinder import exception
 from cinder.openstack.common import log as logging

diff --git a/cinder/tests/utils.py b/cinder/tests/utils.py
index 7a2dcf4c0e875cf5b078719e6ccb9129a2479397..b6fdf69f084f5f13947f725455c656ea08c4538d 100644 (file)
--- a/cinder/tests/utils.py
+++ b/cinder/tests/utils.py
@@ -16,8 +16,6 @@
 #
 
 
-import os
-
 from cinder import context
 from cinder import db
 

diff --git a/cinder/utils.py b/cinder/utils.py
index 2652358433cb12b1744be317faca5c0ad2072e45..c9ee4d427af0019fb03c15e404bd9d95743018ae 100644 (file)
--- a/cinder/utils.py
+++ b/cinder/utils.py
@@ -33,7 +33,6 @@ import shutil
 import stat
 import sys
 import tempfile
-import time
 
 from eventlet import event
 from eventlet import greenthread
@@ -48,8 +47,6 @@ from xml.sax import saxutils
 
 from cinder.brick.initiator import connector
 from cinder import exception
-from cinder.openstack.common import excutils
-from cinder.openstack.common import gettextutils
 from cinder.openstack.common import importutils
 from cinder.openstack.common import lockutils
 from cinder.openstack.common import log as logging

diff --git a/cinder/volume/driver.py b/cinder/volume/driver.py
index 65aab9666d038ab53b3fa617b92b2d8beff0673a..b430aac06834ed08e7c1daf2d99d89a98180d8a8 100644 (file)
--- a/cinder/volume/driver.py
+++ b/cinder/volume/driver.py
@@ -20,7 +20,6 @@ Drivers for volumes.
 
 """
 
-import os
 import time
 
 from oslo.config import cfg

diff --git a/cinder/volume/drivers/gpfs.py b/cinder/volume/drivers/gpfs.py
index 97cdafd911e7cf66325336c3f0702f1057ef8ab1..0ec6df0a519158a65001626eb93e584e0718d78d 100644 (file)
--- a/cinder/volume/drivers/gpfs.py
+++ b/cinder/volume/drivers/gpfs.py
@@ -27,7 +27,6 @@ from oslo.config import cfg
 
 from cinder import exception
 from cinder.image import image_utils
-from cinder.openstack.common import fileutils
 from cinder.openstack.common import log as logging
 from cinder.openstack.common import processutils
 from cinder import units

diff --git a/cinder/volume/drivers/huawei/__init__.py b/cinder/volume/drivers/huawei/__init__.py
index f4d1b8a982756e8d192468fd4fbc722e84103fb3..2d923ceba5f0a2d4394dda63f765eaaa1fe5df64 100644 (file)
--- a/cinder/volume/drivers/huawei/__init__.py
+++ b/cinder/volume/drivers/huawei/__init__.py
@@ -25,8 +25,6 @@ from oslo.config import cfg
 
 from cinder import exception
 from cinder.openstack.common import log as logging
-from cinder.volume.configuration import Configuration
-from cinder.volume import driver
 from cinder.volume.drivers.huawei import huawei_dorado
 from cinder.volume.drivers.huawei import huawei_hvs
 from cinder.volume.drivers.huawei import huawei_t

diff --git a/cinder/volume/drivers/huawei/huawei_utils.py b/cinder/volume/drivers/huawei/huawei_utils.py
index 38a3383842c20f3c5fee462ec9612d8e919c388e..97c3aa82d5874e823981b475e91e157bb3628978 100644 (file)
--- a/cinder/volume/drivers/huawei/huawei_utils.py
+++ b/cinder/volume/drivers/huawei/huawei_utils.py
@@ -18,7 +18,6 @@
 
 from xml.etree import ElementTree as ET
 
-from cinder import exception
 from cinder.openstack.common import log as logging
 
 LOG = logging.getLogger(__name__)

diff --git a/cinder/volume/drivers/san/__init__.py b/cinder/volume/drivers/san/__init__.py
index cc1ac69f764f830dfb5d32c43214971c2266ca00..bfc9cda666f42157fd3ed14f7819bf876a55b7c5 100644 (file)
--- a/cinder/volume/drivers/san/__init__.py
+++ b/cinder/volume/drivers/san/__init__.py
@@ -22,6 +22,6 @@
 """
 
 # Adding imports for backwards compatibility in loading volume_driver.
-from hp_lefthand import HpSanISCSIDriver
-from san import SanISCSIDriver
-from solaris import SolarisISCSIDriver
+from hp_lefthand import HpSanISCSIDriver    # noqa
+from san import SanISCSIDriver      # noqa
+from solaris import SolarisISCSIDriver      # noqa

diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py
index fa7444f04640cceca38e41f43efe7f547e0ade91..8da5e5269c5edf8909b299fdb64bd9580ec19635 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_common.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_common.py
@@ -44,7 +44,6 @@ import json
 import pprint
 from random import randint
 import re
-import time
 import uuid
 
 from eventlet import greenthread
@@ -52,7 +51,6 @@ import hp3parclient
 from hp3parclient import client
 from hp3parclient import exceptions as hpexceptions
 from oslo.config import cfg
-import paramiko
 
 from cinder import context
 from cinder import exception

diff --git a/cinder/volume/drivers/san/hp/hp_3par_fc.py b/cinder/volume/drivers/san/hp/hp_3par_fc.py
index 4e11be05d570b5172556a2b57053267f5e9d45ed..e404f998dc305363225bff742840df51bf5c7caf 100644 (file)
--- a/cinder/volume/drivers/san/hp/hp_3par_fc.py
+++ b/cinder/volume/drivers/san/hp/hp_3par_fc.py
@@ -32,9 +32,7 @@ volume_driver=cinder.volume.drivers.san.hp.hp_3par_fc.HP3PARFCDriver
 """
 
 from hp3parclient import exceptions as hpexceptions
-from oslo.config import cfg
 
-from cinder import exception
 from cinder.openstack.common import log as logging
 from cinder import utils
 import cinder.volume.driver

diff --git a/cinder/volume/utils.py b/cinder/volume/utils.py
index 0014d400953df96cf774ea1a9d9310304d7cb20e..1e06a5853cd6b6d0ce6165fd80b485018c8daf10 100644 (file)
--- a/cinder/volume/utils.py
+++ b/cinder/volume/utils.py
@@ -18,13 +18,10 @@
 
 
 import math
-import os
-import stat
 
 from oslo.config import cfg
 
 from cinder.brick.local_dev import lvm as brick_lvm
-from cinder import exception
 from cinder.openstack.common import log as logging
 from cinder.openstack.common.notifier import api as notifier_api
 from cinder.openstack.common import processutils

diff --git a/tox.ini b/tox.ini
index d69583058787a222f983d0a989f9e0437654686b..8124779c938ce9fac15666bd583ab25362a05987 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -43,6 +43,6 @@ commands =
 commands = {posargs}
 
 [flake8]
-ignore = E711,E712,F401,F403,F841,H302,H303,H304,H803
+ignore = E711,E712,F403,F841,H302,H303,H304,H803
 builtins = _
-exclude = .git,.venv,.tox,dist,doc,common,*egg,build
+exclude = .git,.venv,.tox,dist,tools,doc,common,*egg,build