diff options
author | Chuck Short <chuck.short@canonical.com> | 2012-12-21 08:39:32 -0600 |
---|---|---|
committer | Chuck Short <chuck.short@canonical.com> | 2012-12-21 08:41:47 -0600 |
commit | 4acafc7ff3e1306f3400853ec79762f45ef0ae5c (patch) | |
tree | 08aecd7315fd9c9f635fb7ac70ef8125b3406a7e | |
parent | 3f1a70bdb1b2a7df7147f09e2b0b09dd1b49f3be (diff) | |
download | nova-4acafc7ff3e1306f3400853ec79762f45ef0ae5c.tar.gz nova-4acafc7ff3e1306f3400853ec79762f45ef0ae5c.tar.xz nova-4acafc7ff3e1306f3400853ec79762f45ef0ae5c.zip |
Removed unused imports.
Removed a bunch of unused imports based on pyflakes.
Change-Id: I00952371200cb4531ddf163447433da756582a21
Signed-off-by: Chuck Short <chuck.short@canonical.com>
55 files changed, 4 insertions, 112 deletions
diff --git a/nova/api/openstack/compute/contrib/cloudpipe_update.py b/nova/api/openstack/compute/contrib/cloudpipe_update.py index e4a200c81..b23e7b794 100644 --- a/nova/api/openstack/compute/contrib/cloudpipe_update.py +++ b/nova/api/openstack/compute/contrib/cloudpipe_update.py @@ -18,11 +18,9 @@ import webob.exc -from nova.api.openstack.compute.contrib import cloudpipe from nova.api.openstack import extensions from nova.api.openstack import wsgi from nova import db -from nova import exception from nova.openstack.common import log as logging LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/coverage_ext.py b/nova/api/openstack/compute/contrib/coverage_ext.py index 98a067fc8..e97185f82 100644 --- a/nova/api/openstack/compute/contrib/coverage_ext.py +++ b/nova/api/openstack/compute/contrib/coverage_ext.py @@ -22,19 +22,15 @@ import re import sys import telnetlib import tempfile -import time from coverage import coverage from webob import exc -from nova.api.openstack import common from nova.api.openstack import extensions -from nova.api.openstack import wsgi from nova.compute import api as compute_api from nova import db from nova.network import api as network_api from nova.openstack.common import log as logging -from nova import utils LOG = logging.getLogger(__name__) diff --git a/nova/api/openstack/compute/contrib/floating_ips_bulk.py b/nova/api/openstack/compute/contrib/floating_ips_bulk.py index 59d9d24b6..cbd95d2d6 100644 --- a/nova/api/openstack/compute/contrib/floating_ips_bulk.py +++ b/nova/api/openstack/compute/contrib/floating_ips_bulk.py @@ -16,12 +16,9 @@ # under the License. import netaddr -import urllib import webob.exc from nova.api.openstack import extensions -from nova.api.openstack import wsgi -from nova.api.openstack import xmlutil from nova import db from nova import exception from nova.openstack.common import cfg diff --git a/nova/api/openstack/compute/contrib/fping.py b/nova/api/openstack/compute/contrib/fping.py index 5afc6bc78..282be19ca 100644 --- a/nova/api/openstack/compute/contrib/fping.py +++ b/nova/api/openstack/compute/contrib/fping.py @@ -18,7 +18,6 @@ import itertools import os -import time from webob import exc diff --git a/nova/api/openstack/compute/contrib/networks.py b/nova/api/openstack/compute/contrib/networks.py index a45de72fe..9689a2451 100644 --- a/nova/api/openstack/compute/contrib/networks.py +++ b/nova/api/openstack/compute/contrib/networks.py @@ -22,7 +22,6 @@ from webob import exc from nova.api.openstack import extensions from nova.api.openstack import wsgi -from nova import db from nova import exception from nova import network from nova.openstack.common import log as logging diff --git a/nova/api/openstack/compute/contrib/networks_associate.py b/nova/api/openstack/compute/contrib/networks_associate.py index a923c769d..10f6e7d8e 100644 --- a/nova/api/openstack/compute/contrib/networks_associate.py +++ b/nova/api/openstack/compute/contrib/networks_associate.py @@ -1,5 +1,3 @@ -import netaddr -import webob from webob import exc from nova.api.openstack import extensions diff --git a/nova/compute/manager.py b/nova/compute/manager.py index ac616a376..ccd82d3f0 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -58,7 +58,6 @@ from nova.image import glance from nova import manager from nova import network from nova.network import model as network_model -from nova import notifications from nova.openstack.common import cfg from nova.openstack.common import excutils from nova.openstack.common import importutils diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index 82f8ec461..1c653b8ca 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -27,7 +27,6 @@ from nova import conductor from nova import context from nova import db from nova import exception -from nova import notifications from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py index 94d6df0e1..a382d8d55 100644 --- a/nova/db/sqlalchemy/models.py +++ b/nova/db/sqlalchemy/models.py @@ -27,7 +27,6 @@ from sqlalchemy import ForeignKey, DateTime, Boolean, Text, Float from sqlalchemy.orm import relationship, backref, object_mapper from nova.db.sqlalchemy.session import get_session -from nova import exception from nova.openstack.common import cfg from nova.openstack.common import timeutils diff --git a/nova/network/api.py b/nova/network/api.py index b177c60ba..ecc63ba79 100644 --- a/nova/network/api.py +++ b/nova/network/api.py @@ -25,7 +25,6 @@ from nova import exception from nova.network import model as network_model from nova.network import rpcapi as network_rpcapi from nova.openstack.common import log as logging -from nova.openstack.common import rpc LOG = logging.getLogger(__name__) diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py index 99636379e..c63b5643b 100644 --- a/nova/scheduler/driver.py +++ b/nova/scheduler/driver.py @@ -35,10 +35,8 @@ from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import log as logging from nova.openstack.common.notifier import api as notifier -from nova.openstack.common import rpc from nova.openstack.common import timeutils from nova import servicegroup -from nova import utils LOG = logging.getLogger(__name__) diff --git a/nova/scheduler/filters/compute_filter.py b/nova/scheduler/filters/compute_filter.py index 3fb19687d..e35f68ab5 100644 --- a/nova/scheduler/filters/compute_filter.py +++ b/nova/scheduler/filters/compute_filter.py @@ -17,7 +17,6 @@ from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.scheduler import filters from nova import servicegroup -from nova import utils CONF = cfg.CONF diff --git a/nova/test.py b/nova/test.py index a111219cd..d9f68cc76 100644 --- a/nova/test.py +++ b/nova/test.py @@ -43,10 +43,8 @@ from nova.openstack.common import cfg from nova.openstack.common import log as logging from nova.openstack.common import timeutils from nova import service -from nova import tests from nova.tests import conf_fixture from nova.tests import policy_fixture -from nova.tests import utils test_opts = [ 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 c15259066..43052628c 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 778391dd1..b4780e466 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 diff --git a/nova/utils.py b/nova/utils.py index 32f089feb..26468868a 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -29,7 +29,6 @@ import os import pyclbr import random import re -import shlex import shutil import signal import socket @@ -37,13 +36,11 @@ import struct import sys import tempfile import time -import weakref from xml.sax import saxutils from eventlet import event from eventlet.green import subprocess from eventlet import greenthread -from eventlet import semaphore import netaddr from nova import exception diff --git a/nova/virt/baremetal/db/sqlalchemy/api.py b/nova/virt/baremetal/db/sqlalchemy/api.py index 48606ac44..abdb19fb7 100644 --- a/nova/virt/baremetal/db/sqlalchemy/api.py +++ b/nova/virt/baremetal/db/sqlalchemy/api.py @@ -20,15 +20,8 @@ """Implementation of SQLAlchemy backend.""" -from sqlalchemy import and_ -from sqlalchemy.exc import IntegrityError -from sqlalchemy import or_ -from sqlalchemy.orm import joinedload -from sqlalchemy.orm import joinedload_all from sqlalchemy.sql.expression import asc -from sqlalchemy.sql.expression import desc from sqlalchemy.sql.expression import literal_column -from sqlalchemy.sql import func from nova.db.sqlalchemy.api import is_user_context from nova.db.sqlalchemy.api import require_admin_context diff --git a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py index d945755fc..2d899406c 100644 --- a/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py +++ b/nova/virt/baremetal/db/sqlalchemy/migrate_repo/versions/001_init.py @@ -15,9 +15,8 @@ # License for the specific language governing permissions and limitations # under the License. -from migrate import ForeignKeyConstraint -from sqlalchemy import Boolean, BigInteger, Column, DateTime, Float, ForeignKey -from sqlalchemy import Index, Integer, MetaData, String, Table, Text +from sqlalchemy import Boolean, Column, DateTime +from sqlalchemy import Index, Integer, MetaData, String, Table from nova.openstack.common import log as logging diff --git a/nova/virt/baremetal/db/sqlalchemy/models.py b/nova/virt/baremetal/db/sqlalchemy/models.py index c1ab191d0..f18c68960 100644 --- a/nova/virt/baremetal/db/sqlalchemy/models.py +++ b/nova/virt/baremetal/db/sqlalchemy/models.py @@ -19,12 +19,9 @@ SQLAlchemy models for baremetal data. """ -from sqlalchemy.orm import relationship, backref, object_mapper -from sqlalchemy import Column, Integer, BigInteger, String, schema -from sqlalchemy import ForeignKey, DateTime, Boolean, Text, Float, Index -from sqlalchemy.exc import IntegrityError +from sqlalchemy import Column, Integer, String +from sqlalchemy import ForeignKey, DateTime, Text, Index from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.schema import ForeignKeyConstraint from nova.db.sqlalchemy import models diff --git a/nova/virt/libvirt/utils.py b/nova/virt/libvirt/utils.py index c01327d3d..0d56275a0 100644 --- a/nova/virt/libvirt/utils.py +++ b/nova/virt/libvirt/utils.py @@ -20,7 +20,6 @@ # under the License. import os -import time from lxml import etree diff --git a/nova/virt/powervm/blockdev.py b/nova/virt/powervm/blockdev.py index c9d26b740..b359716ff 100644 --- a/nova/virt/powervm/blockdev.py +++ b/nova/virt/powervm/blockdev.py @@ -18,7 +18,6 @@ import hashlib import os import re -from nova import exception as nova_exception from nova import utils from nova.openstack.common import cfg diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py index b43cf091c..0821d4d84 100644 --- a/nova/virt/powervm/driver.py +++ b/nova/virt/powervm/driver.py @@ -14,11 +14,6 @@ # License for the specific language governing permissions and limitations # under the License. -from nova.compute import task_states -from nova.compute import vm_states - -from nova import context as nova_context - from nova.openstack.common import cfg from nova.openstack.common import log as logging diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py index eefa25d41..7bf27b7e0 100644 --- a/nova/virt/xenapi/driver.py +++ b/nova/virt/xenapi/driver.py @@ -39,7 +39,6 @@ A driver for XenServer or Xen Cloud Platform. import contextlib import cPickle as pickle -import time import urlparse import xmlrpclib diff --git a/nova/virt/xenapi/host.py b/nova/virt/xenapi/host.py index e893abf4f..045409e4f 100644 --- a/nova/virt/xenapi/host.py +++ b/nova/virt/xenapi/host.py @@ -25,7 +25,6 @@ from nova.compute import task_states from nova.compute import vm_states from nova import context from nova import exception -from nova import notifications from nova.openstack.common import jsonutils from nova.virt.xenapi import pool_states from nova.virt.xenapi import vm_utils diff --git a/nova/virt/xenapi/pool.py b/nova/virt/xenapi/pool.py index 5e6a8195c..40b1b029f 100644 --- a/nova/virt/xenapi/pool.py +++ b/nova/virt/xenapi/pool.py @@ -26,7 +26,6 @@ from nova import exception from nova.openstack.common import cfg from nova.openstack.common import jsonutils from nova.openstack.common import log as logging -from nova.openstack.common import rpc from nova.virt.xenapi import pool_states from nova.virt.xenapi import vm_utils |