Remove a whole bunch of unused imports

Change-Id: I6759e5b6250c48cc0deb4b198b44c948c64c47d1

41 files changed, 2 insertions, 95 deletions

diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
index 7c8a8b09f..64b206aef 100644
--- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
+++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe.py
@@ -23,10 +23,7 @@ from nova.api import auth
 from nova.api.openstack import compute
 from nova.api.openstack.compute import wsgi
 from nova.api.openstack.compute.contrib import cloudpipe
-from nova.auth import manager
-from nova.cloudpipe import pipelib
 from nova import context
-from nova import crypto
 from nova import db
 from nova import flags
 from nova import test
diff --git a/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py b/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py
index 4addcf5c8..d81ae8ef9 100644
--- a/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py
+++ b/nova/tests/api/openstack/compute/contrib/test_deferred_delete.py
@@ -15,7 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import mox
 import webob
 
 from nova.api.openstack.compute.contrib import deferred_delete
diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py b/nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py
index 3107e50c4..9bc6aa6c5 100644
--- a/nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py
+++ b/nova/tests/api/openstack/compute/contrib/test_floating_ip_dns.py
@@ -13,21 +13,15 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import sys
-
 from lxml import etree
-import webob
 import urllib
 
-from nova.api.openstack.compute.contrib import floating_ips
 from nova.api.openstack.compute.contrib import floating_ip_dns
 from nova import context
 from nova import db
 from nova import network
-from nova import rpc
 from nova import test
 from nova.tests.api.openstack import fakes
-from nova import utils
 
 
 name = "arbitraryname"
diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
index e4ea99f40..76e9cab3f 100644
--- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py
+++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
@@ -24,7 +24,6 @@ from nova.api.openstack.compute.contrib import security_groups
 from nova.api.openstack import wsgi
 import nova.db
 from nova import exception
-from nova import utils
 from nova import test
 from nova.tests.api.openstack import fakes
 
diff --git a/nova/tests/api/openstack/compute/test_api.py b/nova/tests/api/openstack/compute/test_api.py
index 15768ff33..da23ee711 100644
--- a/nova/tests/api/openstack/compute/test_api.py
+++ b/nova/tests/api/openstack/compute/test_api.py
@@ -24,7 +24,6 @@ from webob import Request
 
 from nova import test
 from nova.api import openstack as openstack_api
-from nova.api.openstack import compute
 from nova.api.openstack.compute import wsgi
 from nova.tests.api.openstack import fakes
 
diff --git a/nova/tests/api/openstack/compute/test_consoles.py b/nova/tests/api/openstack/compute/test_consoles.py
index f58e76a3f..00239d99c 100644
--- a/nova/tests/api/openstack/compute/test_consoles.py
+++ b/nova/tests/api/openstack/compute/test_consoles.py
@@ -17,7 +17,6 @@
 #    under the License.
 
 import datetime
-import json
 
 from lxml import etree
 import webob
@@ -29,7 +28,6 @@ from nova.compute import vm_states
 from nova import exception
 from nova import flags
 from nova import test
-from nova.tests.api.openstack import common
 from nova.tests.api.openstack import fakes
 from nova import utils
 
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index 8d810c4a0..77c89d47d 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -33,7 +33,6 @@ from nova.compute import instance_types
 from nova.compute import task_states
 from nova.compute import vm_states
 import nova.db
-from nova.db.sqlalchemy.models import InstanceActions
 from nova.db.sqlalchemy.models import InstanceMetadata
 from nova import flags
 import nova.image.fake
diff --git a/nova/tests/api/openstack/volume/test_volumes.py b/nova/tests/api/openstack/volume/test_volumes.py
index 2f17c4b22..d2738b531 100644
--- a/nova/tests/api/openstack/volume/test_volumes.py
+++ b/nova/tests/api/openstack/volume/test_volumes.py
@@ -14,17 +14,12 @@
 #    under the License.
 
 import datetime
-import json
 
 from lxml import etree
-import webob
 
-import nova
 from nova.api.openstack.volume import volumes
-from nova.compute import instance_types
 from nova import flags
 from nova import test
-from nova.tests.api.openstack import fakes
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/api/test_wsgi.py b/nova/tests/api/test_wsgi.py
index d33268296..6504e664d 100644
--- a/nova/tests/api/test_wsgi.py
+++ b/nova/tests/api/test_wsgi.py
@@ -21,13 +21,11 @@
 Test WSGI basics and provide some helper functions for other WSGI tests.
 """
 
-import json
 from nova import test
 
 import routes
 import webob
 
-from nova import exception
 from nova import wsgi
 
 
diff --git a/nova/tests/db/fakes.py b/nova/tests/db/fakes.py
index ef3162eb4..45045989c 100644
--- a/nova/tests/db/fakes.py
+++ b/nova/tests/db/fakes.py
@@ -18,12 +18,8 @@
 
 """Stubouts, mocks and fixtures for the test suite"""
 
-import time
-
 from nova import db
 from nova import exception
-from nova import test
-from nova import utils
 
 
 class FakeModel(object):
diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py
index 70c998ef0..e30419ed9 100644
--- a/nova/tests/integrated/test_extensions.py
+++ b/nova/tests/integrated/test_extensions.py
@@ -15,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
-
 from nova.api.openstack.compute import extensions
 from nova import flags
 from nova.log import logging
diff --git a/nova/tests/notifier/test_list_notifier.py b/nova/tests/notifier/test_list_notifier.py
index b77720759..d71bb279f 100644
--- a/nova/tests/notifier/test_list_notifier.py
+++ b/nova/tests/notifier/test_list_notifier.py
@@ -13,15 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import stubout
-import sys
-
 import nova
 from nova import log as logging
 import nova.notifier.api
 from nova.notifier.api import notify
-from nova.notifier import log_notifier
-from nova.notifier import no_op_notifier
+import nova.notifier.log_notifier
+import nova.notifier.no_op_notifier
 from nova.notifier import list_notifier
 from nova import test
 
@@ -32,7 +29,6 @@ class NotifierListTestCase(test.TestCase):
     def setUp(self):
         super(NotifierListTestCase, self).setUp()
         list_notifier._reset_drivers()
-        self.stubs = stubout.StubOutForTesting()
         # Mock log to add one to exception_count when log.exception is called
 
         def mock_exception(cls, *args):
diff --git a/nova/tests/rpc/test_carrot.py b/nova/tests/rpc/test_carrot.py
index fa9f73961..2523810d8 100644
--- a/nova/tests/rpc/test_carrot.py
+++ b/nova/tests/rpc/test_carrot.py
@@ -19,7 +19,6 @@
 Unit Tests for remote procedure calls using carrot
 """
 
-from nova import context
 from nova import log as logging
 from nova.rpc import impl_carrot
 from nova.tests.rpc import common
diff --git a/nova/tests/rpc/test_kombu.py b/nova/tests/rpc/test_kombu.py
index dc100cf12..255de275e 100644
--- a/nova/tests/rpc/test_kombu.py
+++ b/nova/tests/rpc/test_kombu.py
@@ -19,7 +19,6 @@
 Unit Tests for remote procedure calls using kombu
 """
 
-from nova import context
 from nova import log as logging
 from nova import test
 from nova.rpc import impl_kombu
diff --git a/nova/tests/scheduler/test_distributed_scheduler.py b/nova/tests/scheduler/test_distributed_scheduler.py
index 36d2ddc5b..412c981c5 100644
--- a/nova/tests/scheduler/test_distributed_scheduler.py
+++ b/nova/tests/scheduler/test_distributed_scheduler.py
@@ -22,9 +22,7 @@ import nova.db
 
 from nova import context
 from nova import exception
-from nova import rpc
 from nova import test
-from nova.compute import api as compute_api
 from nova.scheduler import distributed_scheduler
 from nova.scheduler import least_cost
 from nova.scheduler import zone_manager
diff --git a/nova/tests/scheduler/test_host_filter.py b/nova/tests/scheduler/test_host_filter.py
index 62131a625..797ec3fe9 100644
--- a/nova/tests/scheduler/test_host_filter.py
+++ b/nova/tests/scheduler/test_host_filter.py
@@ -22,7 +22,6 @@ import nova
 from nova import exception
 from nova import test
 from nova.scheduler import distributed_scheduler as dist
-from nova.scheduler import zone_manager
 from nova.tests.scheduler import fake_zone_manager as ds_fakes
 
 
diff --git a/nova/tests/scheduler/test_least_cost.py b/nova/tests/scheduler/test_least_cost.py
index 4a3af2eac..65a4268d3 100644
--- a/nova/tests/scheduler/test_least_cost.py
+++ b/nova/tests/scheduler/test_least_cost.py
@@ -16,7 +16,6 @@
 Tests For Least Cost functions.
 """
 from nova.scheduler import least_cost
-from nova.scheduler import zone_manager
 from nova import test
 from nova.tests.scheduler import fake_zone_manager
 
diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py
index 550964844..b612b86ac 100644
--- a/nova/tests/scheduler/test_scheduler.py
+++ b/nova/tests/scheduler/test_scheduler.py
@@ -21,7 +21,6 @@ Tests For Scheduler
 
 import datetime
 import mox
-import stubout
 
 from novaclient import v1_1 as novaclient
 from novaclient import exceptions as novaclient_exceptions
@@ -36,7 +35,6 @@ from nova import rpc
 from nova import utils
 from nova.scheduler import api
 from nova.scheduler import driver
-from nova.scheduler import zone_manager
 from nova.scheduler import manager
 from nova.scheduler.simple import SimpleScheduler
 from nova.compute import power_state
diff --git a/nova/tests/scheduler/test_vsa_scheduler.py b/nova/tests/scheduler/test_vsa_scheduler.py
index 9a74c9948..cc141897e 100644
--- a/nova/tests/scheduler/test_vsa_scheduler.py
+++ b/nova/tests/scheduler/test_vsa_scheduler.py
@@ -13,12 +13,9 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import stubout
-
 import nova
 
 from nova import context
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
diff --git a/nova/tests/test_adminapi.py b/nova/tests/test_adminapi.py
index 41dbc3e92..dba2a2780 100644
--- a/nova/tests/test_adminapi.py
+++ b/nova/tests/test_adminapi.py
@@ -16,8 +16,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from eventlet import greenthread
-
 from nova import context
 from nova import db
 from nova import flags
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
index cb33df2bb..f7548ceb4 100644
--- a/nova/tests/test_api.py
+++ b/nova/tests/test_api.py
@@ -31,7 +31,6 @@ from nova import block_device
 from nova import context
 from nova import exception
 from nova import test
-from nova import wsgi
 from nova.api import auth
 from nova.api import ec2
 from nova.api.ec2 import apirequest
diff --git a/nova/tests/test_cfg.py b/nova/tests/test_cfg.py
index 440b7acc7..f150df319 100644
--- a/nova/tests/test_cfg.py
+++ b/nova/tests/test_cfg.py
@@ -18,7 +18,6 @@ import os
 import sys
 import StringIO
 import tempfile
-import unittest
 
 import stubout
 
diff --git a/nova/tests/test_flags.py b/nova/tests/test_flags.py
index ae0c19ada..b5fe11983 100644
--- a/nova/tests/test_flags.py
+++ b/nova/tests/test_flags.py
@@ -21,7 +21,6 @@ import exceptions
 import os
 import tempfile
 
-from nova import exception
 from nova import flags
 from nova import test
 
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index aa277206f..2def43731 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -23,7 +23,6 @@ from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import test
-from nova import utils
 from nova.compute import instance_types
 from nova.db.sqlalchemy.session import get_session
 from nova.db.sqlalchemy import models
diff --git a/nova/tests/test_instance_types_extra_specs.py b/nova/tests/test_instance_types_extra_specs.py
index fd49c276b..999e5a126 100644
--- a/nova/tests/test_instance_types_extra_specs.py
+++ b/nova/tests/test_instance_types_extra_specs.py
@@ -19,8 +19,6 @@ Unit Tests for instance types extra specs code
 from nova import context
 from nova import db
 from nova import test
-from nova.db.sqlalchemy.session import get_session
-from nova.db.sqlalchemy import models
 
 
 class InstanceTypeExtraSpecsTestCase(test.TestCase):
diff --git a/nova/tests/test_iptables_network.py b/nova/tests/test_iptables_network.py
index 478dfa70d..6a0202644 100644
--- a/nova/tests/test_iptables_network.py
+++ b/nova/tests/test_iptables_network.py
@@ -17,8 +17,6 @@
 #    under the License.
 """Unit Tests for network code."""
 
-import os
-
 from nova import test
 from nova.network import linux_net
 
diff --git a/nova/tests/test_ipv6.py b/nova/tests/test_ipv6.py
index e1ba4aafb..f4641c147 100644
--- a/nova/tests/test_ipv6.py
+++ b/nova/tests/test_ipv6.py
@@ -22,8 +22,6 @@ from nova import test
 
 LOG = logging.getLogger('nova.tests.test_ipv6')
 
-import sys
-
 
 class IPv6RFC2462TestCase(test.TestCase):
     """Unit tests for IPv6 rfc2462 backend operations."""
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 782e01563..8334e6f94 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -20,7 +20,6 @@ import mox
 import os
 import re
 import shutil
-import sys
 import tempfile
 
 from xml.etree.ElementTree import fromstring as xml_to_tree
diff --git a/nova/tests/test_localization.py b/nova/tests/test_localization.py
index a25809a79..3011b8b28 100644
--- a/nova/tests/test_localization.py
+++ b/nova/tests/test_localization.py
@@ -14,11 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import glob
 import os
 import re
-import sys
-import unittest
 
 import nova
 from nova import test
diff --git a/nova/tests/test_network_info.py b/nova/tests/test_network_info.py
index 1fd30dc9a..7627c29f6 100644
--- a/nova/tests/test_network_info.py
+++ b/nova/tests/test_network_info.py
@@ -15,8 +15,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import json
-
 from nova import exception
 from nova import log as logging
 from nova.network import model
diff --git a/nova/tests/test_notifier.py b/nova/tests/test_notifier.py
index 70a0ec5d5..00f367f49 100644
--- a/nova/tests/test_notifier.py
+++ b/nova/tests/test_notifier.py
@@ -16,15 +16,9 @@
 import stubout
 
 import nova
-from nova import context
-from nova import flags
 from nova import log
-from nova import rpc
 import nova.notifier.api
 from nova.notifier.api import notify
-from nova.notifier import no_op_notifier
-from nova.notifier import rabbit_notifier
-from nova.rpc import impl_kombu
 from nova import test
 
 
diff --git a/nova/tests/test_nova_manage.py b/nova/tests/test_nova_manage.py
index 5e124413f..354e9d98c 100644
--- a/nova/tests/test_nova_manage.py
+++ b/nova/tests/test_nova_manage.py
@@ -28,13 +28,11 @@ sys.dont_write_bytecode = True
 import imp
 nova_manage = imp.load_source('nova_manage.py', NOVA_MANAGE_PATH)
 sys.dont_write_bytecode = False
-import mox
 import stubout
 
 import StringIO
 from nova import context
 from nova import db
-from nova import exception
 from nova import test
 from nova.tests.db import fakes as db_fakes
 
diff --git a/nova/tests/test_quantum.py b/nova/tests/test_quantum.py
index 8e8a8511c..51cdda495 100644
--- a/nova/tests/test_quantum.py
+++ b/nova/tests/test_quantum.py
@@ -15,14 +15,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-import stubout
-
 from nova import context
 from nova import db
 from nova.db.sqlalchemy import models
 from nova.db.sqlalchemy.session import get_session
 from nova import exception
-from nova import ipv6
 from nova import log as logging
 from nova.network.quantum import manager as quantum_manager
 from nova.network.quantum import melange_connection
@@ -30,8 +27,6 @@ from nova import test
 from nova import utils
 from nova.network import manager
 
-import mox
-
 LOG = logging.getLogger('nova.tests.quantum_network')
 
 
diff --git a/nova/tests/test_service.py b/nova/tests/test_service.py
index 0e9ffda35..99f091b22 100644
--- a/nova/tests/test_service.py
+++ b/nova/tests/test_service.py
@@ -26,12 +26,10 @@ from nova import context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import rpc
 from nova import test
 from nova import service
 from nova import manager
 from nova import wsgi
-from nova.compute import manager as compute_manager
 
 flags.DEFINE_string("fake_manager", "nova.tests.test_service.FakeManager",
                     "Manager for testing")
diff --git a/nova/tests/test_versions.py b/nova/tests/test_versions.py
index 4621b042b..cec418aee 100644
--- a/nova/tests/test_versions.py
+++ b/nova/tests/test_versions.py
@@ -15,9 +15,7 @@
 #    under the License.
 
 
-from nova import exception
 from nova import test
-from nova import utils
 from nova import version
 
 
diff --git a/nova/tests/test_volume_types.py b/nova/tests/test_volume_types.py
index 1e190805c..1e4a600a7 100644
--- a/nova/tests/test_volume_types.py
+++ b/nova/tests/test_volume_types.py
@@ -19,12 +19,10 @@ Unit Tests for volume types code
 import time
 
 from nova import context
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
 from nova import test
-from nova import utils
 from nova.volume import volume_types
 from nova.db.sqlalchemy.session import get_session
 from nova.db.sqlalchemy import models
diff --git a/nova/tests/test_volume_types_extra_specs.py b/nova/tests/test_volume_types_extra_specs.py
index 0a1f1a464..9ff778bb2 100644
--- a/nova/tests/test_volume_types_extra_specs.py
+++ b/nova/tests/test_volume_types_extra_specs.py
@@ -21,8 +21,6 @@ Unit Tests for volume types extra specs code
 from nova import context
 from nova import db
 from nova import test
-from nova.db.sqlalchemy.session import get_session
-from nova.db.sqlalchemy import models
 
 
 class VolumeTypeExtraSpecsTestCase(test.TestCase):
diff --git a/nova/tests/test_vsa.py b/nova/tests/test_vsa.py
index 271747fec..d7c8f09f5 100644
--- a/nova/tests/test_vsa.py
+++ b/nova/tests/test_vsa.py
@@ -17,10 +17,8 @@ import base64
 import stubout
 
 from xml.etree import ElementTree
-from xml.etree.ElementTree import Element, SubElement
 
 from nova import context
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
diff --git a/nova/tests/test_vsa_volumes.py b/nova/tests/test_vsa_volumes.py
index b7cd4e840..ef6396ff4 100644
--- a/nova/tests/test_vsa_volumes.py
+++ b/nova/tests/test_vsa_volumes.py
@@ -13,13 +13,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import stubout
-
 from nova import exception
 from nova import flags
 from nova import vsa
 from nova import volume
-from nova import db
 from nova import context
 from nova import test
 from nova import log as logging
@@ -33,7 +30,6 @@ class VsaVolumesTestCase(test.TestCase):
 
     def setUp(self):
         super(VsaVolumesTestCase, self).setUp()
-        self.stubs = stubout.StubOutForTesting()
         self.vsa_api = vsa.API()
         self.volume_api = volume.API()
         self.context = context.get_admin_context()
diff --git a/nova/tests/test_zones.py b/nova/tests/test_zones.py
index 9b5b9b24a..703ff0bf9 100644
--- a/nova/tests/test_zones.py
+++ b/nova/tests/test_zones.py
@@ -19,14 +19,10 @@ Tests For ZoneManager
 import datetime
 import mox
 
-from nova import context
 from nova import db
 from nova import flags
-from nova import service
 from nova import test
-from nova import rpc
 from nova import utils
-from nova.auth import manager as auth_manager
 from nova.scheduler import zone_manager
 
 FLAGS = flags.FLAGS
diff --git a/nova/tests/xenapi/stubs.py b/nova/tests/xenapi/stubs.py
index 6e24bdc34..c0de0dd37 100644
--- a/nova/tests/xenapi/stubs.py
+++ b/nova/tests/xenapi/stubs.py
@@ -15,7 +15,6 @@
 
 """Stubouts, mocks and fixtures for the test suite"""
 
-import eventlet
 import json
 import random