summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/api/ec2/cloud.py2
-rw-r--r--nova/api/metadata/base.py4
-rw-r--r--nova/api/openstack/compute/contrib/config_drive.py7
-rw-r--r--nova/api/openstack/compute/contrib/instance_usage_audit_log.py3
-rw-r--r--nova/api/openstack/compute/contrib/security_groups.py2
-rw-r--r--nova/compute/manager.py2
-rw-r--r--nova/compute/rpcapi.py1
-rw-r--r--nova/scheduler/driver.py1
-rw-r--r--nova/scheduler/host_manager.py1
-rw-r--r--nova/test.py1
-rw-r--r--nova/tests/test_metadata.py2
-rw-r--r--nova/tests/test_misc.py1
-rw-r--r--nova/tests/test_pipelib.py1
-rw-r--r--nova/utils.py1
14 files changed, 0 insertions, 29 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index e723176f2..5e85cd88a 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -23,7 +23,6 @@ datastore.
"""
import base64
-import re
import time
from nova.api.ec2 import ec2utils
@@ -38,7 +37,6 @@ from nova import exception
from nova import flags
from nova.image import s3
from nova import network
-from nova.openstack.common import excutils
from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
from nova import quota
diff --git a/nova/api/metadata/base.py b/nova/api/metadata/base.py
index 2964d57f1..61bc9cad0 100644
--- a/nova/api/metadata/base.py
+++ b/nova/api/metadata/base.py
@@ -23,14 +23,10 @@ import os
from nova.api.ec2 import ec2utils
from nova import block_device
-from nova import compute
from nova import context
from nova import db
-from nova import exception
from nova import flags
from nova import network
-from nova.openstack.common import log as logging
-from nova import volume
FLAGS = flags.FLAGS
flags.DECLARE('dhcp_domain', 'nova.network.manager')
diff --git a/nova/api/openstack/compute/contrib/config_drive.py b/nova/api/openstack/compute/contrib/config_drive.py
index 49f0aef78..a2b354365 100644
--- a/nova/api/openstack/compute/contrib/config_drive.py
+++ b/nova/api/openstack/compute/contrib/config_drive.py
@@ -17,18 +17,11 @@
"""Config Drive extension"""
-import webob
-import webob.exc
-
from nova.api.openstack.compute import servers
-from nova.api.openstack.compute import views
from nova.api.openstack import extensions
from nova.api.openstack import wsgi
from nova.api.openstack import xmlutil
-from nova.compute import api as compute_api
-from nova import exception
from nova import flags
-from nova.openstack.common import log as logging
FLAGS = flags.FLAGS
diff --git a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
index 3c3588860..87dfee13c 100644
--- a/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
+++ b/nova/api/openstack/compute/contrib/instance_usage_audit_log.py
@@ -17,12 +17,9 @@
import datetime
-from webob import exc
from nova.api.openstack import extensions
-from nova import context as nova_context
from nova import db
-from nova import exception
from nova import flags
from nova import utils
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py
index 1705bdd26..a45aac442 100644
--- a/nova/api/openstack/compute/contrib/security_groups.py
+++ b/nova/api/openstack/compute/contrib/security_groups.py
@@ -29,9 +29,7 @@ from nova import compute
from nova import db
from nova import exception
from nova import flags
-from nova.openstack.common import excutils
from nova.openstack.common import log as logging
-from nova import utils
LOG = logging.getLogger(__name__)
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 2a664160f..e85062623 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -37,10 +37,8 @@ terminating it.
import contextlib
import functools
import inspect
-import os
import socket
import sys
-import tempfile
import time
import traceback
diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py
index 526654d9f..aa3d32e34 100644
--- a/nova/compute/rpcapi.py
+++ b/nova/compute/rpcapi.py
@@ -22,7 +22,6 @@ from nova import exception
from nova import flags
from nova.openstack.common import jsonutils
from nova.openstack.common import rpc
-from nova.openstack.common.rpc import common as rpc_common
import nova.openstack.common.rpc.proxy
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index 324b89edb..94fc6f5fe 100644
--- a/nova/scheduler/driver.py
+++ b/nova/scheduler/driver.py
@@ -31,7 +31,6 @@ from nova import flags
from nova import notifications
from nova.openstack.common import cfg
from nova.openstack.common import importutils
-from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging
from nova.openstack.common import rpc
from nova.openstack.common import timeutils
diff --git a/nova/scheduler/host_manager.py b/nova/scheduler/host_manager.py
index 91593b67b..0403dffdf 100644
--- a/nova/scheduler/host_manager.py
+++ b/nova/scheduler/host_manager.py
@@ -17,7 +17,6 @@
Manage hosts in the current zone.
"""
-import datetime
import UserDict
from nova import db
diff --git a/nova/test.py b/nova/test.py
index a8a2464ce..da1f17387 100644
--- a/nova/test.py
+++ b/nova/test.py
@@ -38,7 +38,6 @@ from nova.openstack.common import timeutils
from nova import service
from nova import tests
from nova.tests import fake_flags
-from nova.virt import fake
test_opts = [
diff --git a/nova/tests/test_metadata.py b/nova/tests/test_metadata.py
index 62822f721..7b415f740 100644
--- a/nova/tests/test_metadata.py
+++ b/nova/tests/test_metadata.py
@@ -22,7 +22,6 @@ import base64
from copy import copy
import re
-import stubout
import webob
from nova.api.metadata import base
@@ -33,7 +32,6 @@ from nova import exception
from nova import flags
from nova import network
from nova import test
-from nova.tests import fake_network
FLAGS = flags.FLAGS
diff --git a/nova/tests/test_misc.py b/nova/tests/test_misc.py
index ee77dca3b..87971a6a9 100644
--- a/nova/tests/test_misc.py
+++ b/nova/tests/test_misc.py
@@ -14,7 +14,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-import commands
import errno
import glob
import os
diff --git a/nova/tests/test_pipelib.py b/nova/tests/test_pipelib.py
index 26ab82ffd..96e6b08a9 100644
--- a/nova/tests/test_pipelib.py
+++ b/nova/tests/test_pipelib.py
@@ -16,7 +16,6 @@
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
from nova import utils
diff --git a/nova/utils.py b/nova/utils.py
index b05e0956d..9b71e07c5 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -37,7 +37,6 @@ import sys
import tempfile
import threading
import time
-import types
import uuid
from xml.sax import saxutils