Merge "Remove unused imports"

29 files changed, 4 insertions, 44 deletions

diff --git a/nova/crypto.py b/nova/crypto.py
index bdb056c93..d1c9919e2 100644
--- a/nova/crypto.py
+++ b/nova/crypto.py
@@ -24,7 +24,6 @@ Includes root and intermediate CAs, SSH key_pairs and x509 certificates.
 
 from __future__ import absolute_import
 
-import base64
 import hashlib
 import os
 import string
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/105_instance_info_caches_uses_uuid.py b/nova/db/sqlalchemy/migrate_repo/versions/105_instance_info_caches_uses_uuid.py
index c1c7d7a44..c4c13e539 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/105_instance_info_caches_uses_uuid.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/105_instance_info_caches_uses_uuid.py
@@ -16,8 +16,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import select, Column, ForeignKey, Integer
-from sqlalchemy import MetaData, String, Table
+from sqlalchemy import MetaData, Table
 from migrate import ForeignKeyConstraint
 
 from nova.openstack.common import log as logging
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/106_add_foreign_keys.py b/nova/db/sqlalchemy/migrate_repo/versions/106_add_foreign_keys.py
index 2874b4042..2c483007c 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/106_add_foreign_keys.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/106_add_foreign_keys.py
@@ -16,8 +16,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from sqlalchemy import select, Column, ForeignKey, Integer
-from sqlalchemy import MetaData, String, Table
+from sqlalchemy import MetaData, Table
 from migrate import ForeignKeyConstraint
 
 from nova.openstack.common import log as logging
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/107_add_instance_id_mappings.py b/nova/db/sqlalchemy/migrate_repo/versions/107_add_instance_id_mappings.py
index 39985a1af..250906c62 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/107_add_instance_id_mappings.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/107_add_instance_id_mappings.py
@@ -16,7 +16,7 @@
 
 from nova.openstack.common import log as logging
 from sqlalchemy import Boolean, Column, DateTime, Integer
-from sqlalchemy import Index, MetaData, String, Table
+from sqlalchemy import MetaData, String, Table
 
 LOG = logging.getLogger(__name__)
 
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/108_task_log.py b/nova/db/sqlalchemy/migrate_repo/versions/108_task_log.py
index e6aedc1a6..d8593bd77 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/108_task_log.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/108_task_log.py
@@ -15,7 +15,7 @@
 #    under the License.
 
 from sqlalchemy import Boolean, Column, DateTime, Integer
-from sqlalchemy import Index, MetaData, String, Table
+from sqlalchemy import MetaData, String, Table
 
 
 def upgrade(migrate_engine):
diff --git a/nova/db/sqlalchemy/migrate_repo/versions/109_drop_dns_domains_project_id_fkey.py b/nova/db/sqlalchemy/migrate_repo/versions/109_drop_dns_domains_project_id_fkey.py
index 16489b068..a2b0792d3 100644
--- a/nova/db/sqlalchemy/migrate_repo/versions/109_drop_dns_domains_project_id_fkey.py
+++ b/nova/db/sqlalchemy/migrate_repo/versions/109_drop_dns_domains_project_id_fkey.py
@@ -17,7 +17,6 @@
 
 from migrate import ForeignKeyConstraint
 from sqlalchemy import MetaData, Table
-from sqlalchemy import Column, ForeignKey, Integer
 
 from nova.openstack.common import log as logging
 
diff --git a/nova/network/nova_ipam_lib.py b/nova/network/nova_ipam_lib.py
index be8858983..6b6897156 100644
--- a/nova/network/nova_ipam_lib.py
+++ b/nova/network/nova_ipam_lib.py
@@ -16,7 +16,6 @@
 #    under the License.
 
 from nova import db
-from nova import exception
 from nova import ipv6
 from nova.openstack.common import log as logging
 
diff --git a/nova/scheduler/filters/aggregate_instance_extra_specs.py b/nova/scheduler/filters/aggregate_instance_extra_specs.py
index 5851909be..b08adfd66 100644
--- a/nova/scheduler/filters/aggregate_instance_extra_specs.py
+++ b/nova/scheduler/filters/aggregate_instance_extra_specs.py
@@ -15,10 +15,8 @@
 #    under the License.
 
 from nova import db
-from nova import exception
 from nova.openstack.common import log as logging
 from nova.scheduler import filters
-from nova import utils
 
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/tests/api/ec2/test_ec2_validate.py b/nova/tests/api/ec2/test_ec2_validate.py
index 18f99ffbb..f193f1a3c 100644
--- a/nova/tests/api/ec2/test_ec2_validate.py
+++ b/nova/tests/api/ec2/test_ec2_validate.py
@@ -22,7 +22,6 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova.openstack.common import rpc
 from nova import test
diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py
index 686548726..ea23cd5c2 100644
--- a/nova/tests/api/openstack/compute/contrib/test_hosts.py
+++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py
@@ -21,7 +21,6 @@ from nova.compute import power_state
 from nova.compute import vm_states
 from nova import context
 from nova import db
-from nova import exception
 from nova import flags
 from nova.openstack.common import log as logging
 from nova import test
diff --git a/nova/tests/api/openstack/compute/contrib/test_instance_usage_audit_log.py b/nova/tests/api/openstack/compute/contrib/test_instance_usage_audit_log.py
index 2e06897c7..4ada22a17 100644
--- a/nova/tests/api/openstack/compute/contrib/test_instance_usage_audit_log.py
+++ b/nova/tests/api/openstack/compute/contrib/test_instance_usage_audit_log.py
@@ -14,13 +14,10 @@
 #    under the License.
 
 import datetime
-from webob import exc
 
 from nova.api.openstack.compute.contrib import instance_usage_audit_log as ial
-from nova.compute import utils as compute_utils
 from nova import context
 from nova import db
-from nova import exception
 from nova.openstack.common import timeutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/network/test_api.py b/nova/tests/network/test_api.py
index 1ad2b09f1..a29756caa 100644
--- a/nova/tests/network/test_api.py
+++ b/nova/tests/network/test_api.py
@@ -18,7 +18,6 @@
 """Tests for network API"""
 
 from nova import context
-from nova import db
 from nova import network
 from nova.openstack.common import rpc
 from nova import test
diff --git a/nova/tests/scheduler/test_host_manager.py b/nova/tests/scheduler/test_host_manager.py
index 01521c65d..45ad1021b 100644
--- a/nova/tests/scheduler/test_host_manager.py
+++ b/nova/tests/scheduler/test_host_manager.py
@@ -16,7 +16,6 @@
 Tests For HostManager
 """
 
-import datetime
 
 from nova import db
 from nova import exception
diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py
index c242bb62b..bbb63ab51 100644
--- a/nova/tests/scheduler/test_scheduler.py
+++ b/nova/tests/scheduler/test_scheduler.py
@@ -31,7 +31,6 @@ from nova import flags
 from nova import notifications
 from nova.openstack.common import jsonutils
 from nova.openstack.common import rpc
-from nova.openstack.common.rpc import common as rpc_common
 from nova.openstack.common import timeutils
 from nova.scheduler import driver
 from nova.scheduler import manager
diff --git a/nova/tests/test_configdrive2.py b/nova/tests/test_configdrive2.py
index b9467f258..77c9d12a6 100644
--- a/nova/tests/test_configdrive2.py
+++ b/nova/tests/test_configdrive2.py
@@ -18,7 +18,6 @@
 
 import mox
 import os
-import subprocess
 import tempfile
 
 from nova import test
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 469b48b01..5e5a6eb2a 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -31,8 +31,6 @@ from xml.dom import minidom
 from nova.api.ec2 import cloud
 from nova.compute import instance_types
 from nova.compute import power_state
-from nova.compute import rpcapi as compute_rpcapi
-from nova.compute import utils as compute_utils
 from nova.compute import vm_mode
 from nova.compute import vm_states
 from nova import context
diff --git a/nova/tests/test_plugin_api_extensions.py b/nova/tests/test_plugin_api_extensions.py
index d45fd096b..af30c10d1 100644
--- a/nova/tests/test_plugin_api_extensions.py
+++ b/nova/tests/test_plugin_api_extensions.py
@@ -15,11 +15,9 @@
 
 import pkg_resources
 
-import nova
 from nova.api.openstack.compute import extensions as computeextensions
 from nova.api.openstack import extensions
 from nova.openstack.common.plugin import plugin
-from nova.openstack.common.plugin import pluginmanager
 from nova import test
 
 
diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index 6aa390a11..5e357deeb 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -22,7 +22,6 @@ Unit Tests for remote procedure calls using queue
 
 import mox
 
-from eventlet import greenthread
 
 from nova import context
 from nova import db
diff --git a/nova/tests/test_storwize_svc.py b/nova/tests/test_storwize_svc.py
index 15ab96130..e735bf66c 100644
--- a/nova/tests/test_storwize_svc.py
+++ b/nova/tests/test_storwize_svc.py
@@ -31,7 +31,6 @@ from nova import exception
 from nova.openstack.common import excutils
 from nova.openstack.common import log as logging
 from nova import test
-from nova import utils
 from nova.volume import storwize_svc
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index 898d23343..b4e1ebb3d 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -19,14 +19,11 @@ import datetime
 import hashlib
 import os
 import os.path
-import shutil
-import socket
 import StringIO
 import tempfile
 
 import eventlet
 from eventlet import greenpool
-import iso8601
 import mox
 
 import nova
diff --git a/nova/tests/test_xensm.py b/nova/tests/test_xensm.py
index ae9d5de97..c1748567b 100644
--- a/nova/tests/test_xensm.py
+++ b/nova/tests/test_xensm.py
@@ -16,18 +16,14 @@
 
 """Test suite for Xen Storage Manager Volume Driver."""
 
-import os
 
 from nova import context
 from nova import db
 from nova import exception
 from nova import flags
 from nova.openstack.common import log as logging
-from nova import test
 from nova.tests.xenapi import stubs
-from nova.virt.xenapi import driver as xenapi_conn
 from nova.virt.xenapi import fake as xenapi_fake
-from nova.virt.xenapi import volume_utils
 from nova.volume import xensm
 
 LOG = logging.getLogger(__name__)
diff --git a/nova/utils.py b/nova/utils.py
index 762708bc4..180210dc8 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -35,13 +35,11 @@ import socket
 import struct
 import sys
 import tempfile
-import threading
 import time
 import uuid
 import weakref
 from xml.sax import saxutils
 
-from eventlet import corolocal
 from eventlet import event
 from eventlet.green import subprocess
 from eventlet import greenthread
diff --git a/nova/virt/configdrive.py b/nova/virt/configdrive.py
index 0c3d2978e..11b9cd1c0 100644
--- a/nova/virt/configdrive.py
+++ b/nova/virt/configdrive.py
@@ -17,13 +17,10 @@
 
 """Config Drive v2 helper."""
 
-import base64
-import json
 import os
 import shutil
 import tempfile
 
-from nova.api.metadata import base as instance_metadata
 from nova import exception
 from nova import flags
 from nova.openstack.common import cfg
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index 53b37ada6..53fc88329 100644
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -22,7 +22,6 @@ Driver base-classes:
     types that support that contract
 """
 
-from nova.compute import power_state
 from nova import flags
 from nova.openstack.common import log as logging
 
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 2d4672876..ebc81d13f 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -29,7 +29,6 @@ from nova.compute import power_state
 from nova import db
 from nova import exception
 from nova.openstack.common import log as logging
-from nova import utils
 from nova.virt import driver
 
 
diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py
index 5adfe4cae..997628405 100644
--- a/nova/virt/libvirt/utils.py
+++ b/nova/virt/libvirt/utils.py
@@ -22,7 +22,6 @@
 import errno
 import hashlib
 import os
-import random
 import re
 
 from nova import exception
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 3a0c8e4d1..41e1f6dd6 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -42,7 +42,6 @@ from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import utils
-from nova.virt import driver
 from nova.virt.xenapi import agent
 from nova.virt.xenapi import firewall
 from nova.virt.xenapi import pool_states
diff --git a/nova/volume/netapp.py b/nova/volume/netapp.py
index 380f2fbc4..6dd5c0e31 100644
--- a/nova/volume/netapp.py
+++ b/nova/volume/netapp.py
@@ -23,7 +23,6 @@ ONTAP 7-mode storage systems with installed iSCSI licenses.
 
 """
 
-import string
 import time
 
 import suds
diff --git a/nova/volume/storwize_svc.py b/nova/volume/storwize_svc.py
index f87500f9b..d1958a702 100644
--- a/nova/volume/storwize_svc.py
+++ b/nova/volume/storwize_svc.py
@@ -49,7 +49,6 @@ from nova import flags
 from nova.openstack.common import cfg
 from nova.openstack.common import excutils
 from nova.openstack.common import log as logging
-from nova import utils
 from nova.volume import san
 
 LOG = logging.getLogger(__name__)