Merge "Removed unused imports."

32 files changed, 0 insertions, 62 deletions

diff --git a/nova/tests/api/openstack/compute/contrib/test_cloudpipe_update.py b/nova/tests/api/openstack/compute/contrib/test_cloudpipe_update.py
index ed2c0869e..8068776de 100644
--- a/nova/tests/api/openstack/compute/contrib/test_cloudpipe_update.py
+++ b/nova/tests/api/openstack/compute/contrib/test_cloudpipe_update.py
@@ -16,7 +16,6 @@
 import webob
 
 from nova.api.openstack.compute.contrib import cloudpipe_update
-from nova.api.openstack import wsgi
 from nova import db
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_coverage_ext.py b/nova/tests/api/openstack/compute/contrib/test_coverage_ext.py
index e7d00e68a..b8df3a118 100644
--- a/nova/tests/api/openstack/compute/contrib/test_coverage_ext.py
+++ b/nova/tests/api/openstack/compute/contrib/test_coverage_ext.py
@@ -14,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License
 
-import os.path
 import telnetlib
 
 from coverage import coverage
@@ -22,7 +21,6 @@ import webob
 
 from nova.api.openstack.compute.contrib import coverage_ext
 from nova import context
-from nova import exception
 from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_fixed_ips.py b/nova/tests/api/openstack/compute/contrib/test_fixed_ips.py
index 4d5ca5e5c..6b6fb8286 100644
--- a/nova/tests/api/openstack/compute/contrib/test_fixed_ips.py
+++ b/nova/tests/api/openstack/compute/contrib/test_fixed_ips.py
@@ -19,7 +19,6 @@ from nova.api.openstack.compute.contrib import fixed_ips
 from nova import context
 from nova import db
 from nova import exception
-from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py b/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py
index 2dd3cc217..408b17d48 100644
--- a/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py
+++ b/nova/tests/api/openstack/compute/contrib/test_floating_ip_bulk.py
@@ -18,8 +18,6 @@ import webob
 
 from nova.api.openstack.compute.contrib import floating_ips_bulk
 from nova import context
-from nova import db
-from nova import exception
 from nova.openstack.common import cfg
 from nova import test
 from nova.tests.api.openstack import fakes
diff --git a/nova/tests/api/openstack/compute/contrib/test_networks.py b/nova/tests/api/openstack/compute/contrib/test_networks.py
index 367e61910..bab6cef68 100644
--- a/nova/tests/api/openstack/compute/contrib/test_networks.py
+++ b/nova/tests/api/openstack/compute/contrib/test_networks.py
@@ -15,7 +15,6 @@
 #    under the License.
 
 import copy
-import itertools
 import math
 import netaddr
 import uuid
@@ -24,8 +23,6 @@ import webob
 
 from nova.api.openstack.compute.contrib import networks
 from nova.api.openstack.compute.contrib import networks_associate
-from nova import config
-from nova import db
 from nova import exception
 from nova.openstack.common import cfg
 from nova import test
diff --git a/nova/tests/api/openstack/compute/contrib/test_volumes.py b/nova/tests/api/openstack/compute/contrib/test_volumes.py
index 21befe5e6..e8a315edd 100644
--- a/nova/tests/api/openstack/compute/contrib/test_volumes.py
+++ b/nova/tests/api/openstack/compute/contrib/test_volumes.py
@@ -22,7 +22,6 @@ from nova.api.openstack.compute.contrib import volumes
 from nova.compute import api as compute_api
 from nova.compute import instance_types
 from nova import context
-from nova import db
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.openstack.common import timeutils
diff --git a/nova/tests/baremetal/db/base.py b/nova/tests/baremetal/db/base.py
index 6e6fae945..f2b905895 100644
--- a/nova/tests/baremetal/db/base.py
+++ b/nova/tests/baremetal/db/base.py
@@ -15,8 +15,6 @@
 
 """Bare-metal DB test base class."""
 
-import fixtures
-
 from nova import context as nova_context
 from nova.openstack.common import cfg
 from nova import test
diff --git a/nova/tests/baremetal/test_driver.py b/nova/tests/baremetal/test_driver.py
index 51019c439..c62c01aac 100644
--- a/nova/tests/baremetal/test_driver.py
+++ b/nova/tests/baremetal/test_driver.py
@@ -18,11 +18,8 @@
 Tests for baremetal driver.
 """
 
-import mox
-
 from nova import exception
 from nova.openstack.common import cfg
-from nova import test
 from nova.tests.baremetal.db import base
 from nova.tests.baremetal.db import utils
 from nova.tests.image import fake as fake_image
diff --git a/nova/tests/compute/test_multiple_nodes.py b/nova/tests/compute/test_multiple_nodes.py
index 4855af12e..f24f18ac6 100644
--- a/nova/tests/compute/test_multiple_nodes.py
+++ b/nova/tests/compute/test_multiple_nodes.py
@@ -16,8 +16,6 @@
 #    under the License.
 """Tests for compute service with multiple compute nodes"""
 
-import mox
-
 from nova import context
 from nova import exception
 from nova.openstack.common import cfg
diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py
index 9cc235579..3f3962c8f 100644
--- a/nova/tests/compute/test_resource_tracker.py
+++ b/nova/tests/compute/test_resource_tracker.py
@@ -19,14 +19,11 @@
 
 import uuid
 
-from nova.compute import claims
-from nova.compute import instance_types
 from nova.compute import resource_tracker
 from nova.compute import task_states
 from nova.compute import vm_states
 from nova import context
 from nova import db
-from nova import exception
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 from nova import test
diff --git a/nova/tests/compute/test_stats.py b/nova/tests/compute/test_stats.py
index 9b063b8a0..a086f0d30 100644
--- a/nova/tests/compute/test_stats.py
+++ b/nova/tests/compute/test_stats.py
@@ -20,8 +20,6 @@
 from nova.compute import stats
 from nova.compute import task_states
 from nova.compute import vm_states
-from nova import db
-from nova import exception
 from nova import test
 
 
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index 3f7787e9a..46ad730e6 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -26,7 +26,6 @@ from nova import context
 from nova import db
 from nova.db.sqlalchemy import models
 from nova import exception as exc
-from nova import notifications
 from nova.openstack.common import jsonutils
 from nova.openstack.common.rpc import common as rpc_common
 from nova.openstack.common import timeutils
diff --git a/nova/tests/consoleauth/test_consoleauth.py b/nova/tests/consoleauth/test_consoleauth.py
index 8db72221e..202e4c7b7 100644
--- a/nova/tests/consoleauth/test_consoleauth.py
+++ b/nova/tests/consoleauth/test_consoleauth.py
@@ -20,8 +20,6 @@ Tests for Consoleauth Code.
 
 """
 
-import time
-
 from nova.consoleauth import manager
 from nova import context
 from nova.openstack.common import log as logging
diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py
index 4a04986ec..f9cd459b1 100644
--- a/nova/tests/fake_network.py
+++ b/nova/tests/fake_network.py
@@ -26,7 +26,6 @@ from nova.network import model as network_model
 from nova.network import nova_ipam_lib
 from nova.network import rpcapi as network_rpcapi
 from nova.openstack.common import cfg
-from nova import utils
 from nova.virt.libvirt import config as libvirt_config
 
 
diff --git a/nova/tests/hyperv/mockproxy.py b/nova/tests/hyperv/mockproxy.py
index 1aeaf44f8..d1f3b57d2 100644
--- a/nova/tests/hyperv/mockproxy.py
+++ b/nova/tests/hyperv/mockproxy.py
@@ -18,7 +18,6 @@ Classes for dynamic generation of mock objects.
 """
 
 import inspect
-import pickle
 
 
 def serialize_obj(obj):
diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py
index a94deb150..c0770902d 100644
--- a/nova/tests/network/test_linux_net.py
+++ b/nova/tests/network/test_linux_net.py
@@ -24,7 +24,6 @@ from nova import db
 from nova.network import driver
 from nova.network import linux_net
 from nova.openstack.common import fileutils
-from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
 from nova import test
 from nova import utils
diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py
index c4cb485d4..f291e8112 100644
--- a/nova/tests/scheduler/test_host_filters.py
+++ b/nova/tests/scheduler/test_host_filters.py
@@ -20,7 +20,6 @@ import stubout
 
 from nova import context
 from nova import db
-from nova import exception
 from nova.openstack.common import cfg
 from nova.openstack.common import jsonutils
 from nova.scheduler import filters
diff --git a/nova/tests/scheduler/test_host_manager.py b/nova/tests/scheduler/test_host_manager.py
index 3463b4aff..c1236a7fe 100644
--- a/nova/tests/scheduler/test_host_manager.py
+++ b/nova/tests/scheduler/test_host_manager.py
@@ -15,8 +15,6 @@
 """
 Tests For HostManager
 """
-import sys
-
 from nova.compute import task_states
 from nova.compute import vm_states
 from nova import db
diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py
index d0f0fd6ec..9b9f85925 100644
--- a/nova/tests/scheduler/test_scheduler.py
+++ b/nova/tests/scheduler/test_scheduler.py
@@ -31,7 +31,6 @@ from nova import db
 from nova import exception
 from nova.openstack.common import jsonutils
 from nova.openstack.common import rpc
-from nova.openstack.common import timeutils
 from nova.scheduler import driver
 from nova.scheduler import manager
 from nova import servicegroup
diff --git a/nova/tests/servicegroup/test_db_servicegroup.py b/nova/tests/servicegroup/test_db_servicegroup.py
index b042c65b0..d14427439 100644
--- a/nova/tests/servicegroup/test_db_servicegroup.py
+++ b/nova/tests/servicegroup/test_db_servicegroup.py
@@ -16,7 +16,6 @@ import datetime
 
 import eventlet
 import fixtures
-import mox
 
 from nova import context
 from nova import db
diff --git a/nova/tests/test_imagebackend.py b/nova/tests/test_imagebackend.py
index c077fce77..82b5eb475 100644
--- a/nova/tests/test_imagebackend.py
+++ b/nova/tests/test_imagebackend.py
@@ -19,7 +19,6 @@ import fixtures
 import os
 
 from nova.openstack.common import cfg
-from nova.openstack.common import fileutils
 from nova import test
 from nova.tests import fake_libvirt_utils
 from nova.virt.libvirt import imagebackend
diff --git a/nova/tests/test_libvirt.py b/nova/tests/test_libvirt.py
index 920b05105..6e941cb45 100644
--- a/nova/tests/test_libvirt.py
+++ b/nova/tests/test_libvirt.py
@@ -58,7 +58,6 @@ from nova.virt.libvirt import config as vconfig
 from nova.virt.libvirt import driver as libvirt_driver
 from nova.virt.libvirt import firewall
 from nova.virt.libvirt import imagebackend
-from nova.virt.libvirt import snapshots
 from nova.virt.libvirt import utils as libvirt_utils
 from nova.virt.libvirt import volume
 from nova.virt.libvirt import volume_nfs
diff --git a/nova/tests/test_libvirt_config.py b/nova/tests/test_libvirt_config.py
index 486f373cf..5eafba841 100644
--- a/nova/tests/test_libvirt_config.py
+++ b/nova/tests/test_libvirt_config.py
@@ -15,7 +15,6 @@
 #    under the License.
 
 from lxml import etree
-from lxml import objectify
 
 from nova import test
 from nova.tests import matchers
diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py
index 4e989f315..d815678f4 100644
--- a/nova/tests/test_misc.py
+++ b/nova/tests/test_misc.py
@@ -14,13 +14,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import errno
 import glob
 import os
-import select
-
-from eventlet import greenpool
-from eventlet import greenthread
 
 from nova import exception
 from nova import test
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index 146c00187..d2f3b2392 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -22,8 +22,6 @@ import os.path
 import StringIO
 import tempfile
 
-import eventlet
-from eventlet import greenpool
 import mox
 
 import nova
diff --git a/nova/tests/test_versions.py b/nova/tests/test_versions.py
index e864c00dd..b8d7a5a2a 100644
--- a/nova/tests/test_versions.py
+++ b/nova/tests/test_versions.py
@@ -15,7 +15,6 @@
 #    under the License.
 
 import __builtin__
-import os
 import StringIO
 
 from nova.openstack.common import cfg
diff --git a/nova/tests/test_virt.py b/nova/tests/test_virt.py
index 0cede2197..99d69f33f 100644
--- a/nova/tests/test_virt.py
+++ b/nova/tests/test_virt.py
@@ -17,15 +17,11 @@
 
 import os
 
-from nova import exception
 from nova import test
-from nova import tests
 from nova import utils
 from nova.virt.disk import api as disk_api
 from nova.virt import driver
 
-from nova.openstack.common import jsonutils
-
 
 class TestVirtDriver(test.TestCase):
     def test_block_device(self):
diff --git a/nova/tests/test_virt_disk.py b/nova/tests/test_virt_disk.py
index cc9b739ca..1177aef6f 100644
--- a/nova/tests/test_virt_disk.py
+++ b/nova/tests/test_virt_disk.py
@@ -19,7 +19,6 @@ import sys
 from nova import test
 from nova.tests import fakeguestfs
 from nova.virt.disk import api as diskapi
-from nova.virt.disk.vfs import api as vfsapi
 from nova.virt.disk.vfs import guestfs as vfsguestfs
 
 
diff --git a/nova/tests/test_virt_disk_vfs_localfs.py b/nova/tests/test_virt_disk_vfs_localfs.py
index 4d0ebd5ed..806ed01d8 100644
--- a/nova/tests/test_virt_disk_vfs_localfs.py
+++ b/nova/tests/test_virt_disk_vfs_localfs.py
@@ -14,8 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import sys
-
 from nova import exception
 from nova import test
 from nova.tests import utils as tests_utils
diff --git a/nova/tests/test_virt_drivers.py b/nova/tests/test_virt_drivers.py
index cd525d2a1..8e5e258ea 100644
--- a/nova/tests/test_virt_drivers.py
+++ b/nova/tests/test_virt_drivers.py
@@ -17,14 +17,11 @@
 import __builtin__
 import base64
 import fixtures
-import mox
 import netaddr
-import StringIO
 import sys
 import traceback
 
 from nova.compute.manager import ComputeManager
-from nova import db
 from nova import exception
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
diff --git a/nova/tests/virt/disk/test_loop.py b/nova/tests/virt/disk/test_loop.py
index 47f45d565..dedd1377d 100644
--- a/nova/tests/virt/disk/test_loop.py
+++ b/nova/tests/virt/disk/test_loop.py
@@ -16,14 +16,9 @@
 #    under the License.
 
 
-import os
-
 import fixtures
-from testtools.matchers import Equals
-from testtools.matchers import MatchesListwise
 
 from nova import test
-from nova import utils
 from nova.virt.disk.mount import loop
 
 
diff --git a/nova/tests/virt/disk/test_nbd.py b/nova/tests/virt/disk/test_nbd.py
index a73df8a84..16003c9ac 100644
--- a/nova/tests/virt/disk/test_nbd.py
+++ b/nova/tests/virt/disk/test_nbd.py
@@ -18,12 +18,9 @@
 
 import fixtures
 import os
-from testtools.matchers import Equals
-from testtools.matchers import MatchesListwise
 
 from nova import test
 
-from nova import utils
 from nova.virt.disk.mount import nbd
 
 ORIG_EXISTS = os.path.exists