Removed unused imports.
Removed a bunch of unused imports based on pyflakes. Change-Id: I00952371200cb4531ddf163447433da756582a21 Signed-off-by: Chuck Short <chuck.short@canonical.com>
This commit is contained in:
		@@ -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__)
 | 
			
		||||
 
 | 
			
		||||
@@ -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__)
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,6 @@
 | 
			
		||||
 | 
			
		||||
import itertools
 | 
			
		||||
import os
 | 
			
		||||
import time
 | 
			
		||||
 | 
			
		||||
from webob import exc
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -1,5 +1,3 @@
 | 
			
		||||
import netaddr
 | 
			
		||||
import webob
 | 
			
		||||
from webob import exc
 | 
			
		||||
 | 
			
		||||
from nova.api.openstack import extensions
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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__)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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__)
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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 = [
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -18,7 +18,6 @@ Classes for dynamic generation of mock objects.
 | 
			
		||||
"""
 | 
			
		||||
 | 
			
		||||
import inspect
 | 
			
		||||
import pickle
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
def serialize_obj(obj):
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -16,7 +16,6 @@ import datetime
 | 
			
		||||
 | 
			
		||||
import eventlet
 | 
			
		||||
import fixtures
 | 
			
		||||
import mox
 | 
			
		||||
 | 
			
		||||
from nova import context
 | 
			
		||||
from nova import db
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,6 @@
 | 
			
		||||
#    under the License.
 | 
			
		||||
 | 
			
		||||
from lxml import etree
 | 
			
		||||
from lxml import objectify
 | 
			
		||||
 | 
			
		||||
from nova import test
 | 
			
		||||
from nova.tests import matchers
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -22,8 +22,6 @@ import os.path
 | 
			
		||||
import StringIO
 | 
			
		||||
import tempfile
 | 
			
		||||
 | 
			
		||||
import eventlet
 | 
			
		||||
from eventlet import greenpool
 | 
			
		||||
import mox
 | 
			
		||||
 | 
			
		||||
import nova
 | 
			
		||||
 
 | 
			
		||||
@@ -15,7 +15,6 @@
 | 
			
		||||
#    under the License.
 | 
			
		||||
 | 
			
		||||
import __builtin__
 | 
			
		||||
import os
 | 
			
		||||
import StringIO
 | 
			
		||||
 | 
			
		||||
from nova.openstack.common import cfg
 | 
			
		||||
 
 | 
			
		||||
@@ -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):
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -20,7 +20,6 @@
 | 
			
		||||
#    under the License.
 | 
			
		||||
 | 
			
		||||
import os
 | 
			
		||||
import time
 | 
			
		||||
 | 
			
		||||
from lxml import etree
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -39,7 +39,6 @@ A driver for XenServer or Xen Cloud Platform.
 | 
			
		||||
 | 
			
		||||
import contextlib
 | 
			
		||||
import cPickle as pickle
 | 
			
		||||
import time
 | 
			
		||||
import urlparse
 | 
			
		||||
import xmlrpclib
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user