Merge "Remove unused imports"
This commit is contained in:
commit
740ebdce96
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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__)
|
||||
|
||||
|
@ -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):
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
@ -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__)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -16,7 +16,6 @@
|
||||
Tests For HostManager
|
||||
"""
|
||||
|
||||
import datetime
|
||||
|
||||
from nova import db
|
||||
from nova import exception
|
||||
|
@ -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
|
||||
|
@ -18,7 +18,6 @@
|
||||
|
||||
import mox
|
||||
import os
|
||||
import subprocess
|
||||
import tempfile
|
||||
|
||||
from nova import test
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -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
|
||||
|
@ -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__)
|
||||
|
@ -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
|
||||
|
@ -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__)
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
||||
|
@ -22,7 +22,6 @@
|
||||
import errno
|
||||
import hashlib
|
||||
import os
|
||||
import random
|
||||
import re
|
||||
|
||||
from nova import exception
|
||||
|
@ -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
|
||||
|
@ -23,7 +23,6 @@ ONTAP 7-mode storage systems with installed iSCSI licenses.
|
||||
|
||||
"""
|
||||
|
||||
import string
|
||||
import time
|
||||
|
||||
import suds
|
||||
|
@ -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__)
|
||||
|
Loading…
Reference in New Issue
Block a user