Merge "Cleaning up imports in compute and virt"

16 files changed, 19 insertions, 43 deletions

diff --git a/nova/compute/api.py b/nova/compute/api.py
index 5a8756fd7..6935a5ece 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -20,13 +20,18 @@
 """Handles all requests relating to instances (guest vms)."""
 
 import functools
-import novaclient
 import re
 import time
 
+import novaclient
 import webob.exc
 
 from nova import block_device
+from nova.compute import instance_types
+from nova.compute import power_state
+from nova.compute import task_states
+from nova.compute import vm_states
+from nova.db import base
 from nova import exception
 from nova import flags
 import nova.image
@@ -34,14 +39,9 @@ from nova import log as logging
 from nova import network
 from nova import quota
 from nova import rpc
+from nova.scheduler import api as scheduler_api
 from nova import utils
 from nova import volume
-from nova.compute import instance_types
-from nova.compute import power_state
-from nova.compute import task_states
-from nova.compute import vm_states
-from nova.scheduler import api as scheduler_api
-from nova.db import base
 
 
 LOG = logging.getLogger('nova.compute.api')
diff --git a/nova/compute/utils.py b/nova/compute/utils.py
index 885ba9360..922a9c761 100644
--- a/nova/compute/utils.py
+++ b/nova/compute/utils.py
@@ -19,9 +19,8 @@
 from nova import context
 from nova import db
 from nova import flags
-from nova import utils
-
 from nova.notifier import api as notifier_api
+from nova import utils
 
 
 FLAGS = flags.FLAGS
diff --git a/nova/virt/connection.py b/nova/virt/connection.py
index aeec17c98..17e5730ba 100644
--- a/nova/virt/connection.py
+++ b/nova/virt/connection.py
@@ -27,9 +27,9 @@ from nova import utils
 from nova.virt import driver
 from nova.virt import fake
 from nova.virt import hyperv
+from nova.virt.libvirt import connection as libvirt_conn
 from nova.virt import vmwareapi_conn
 from nova.virt import xenapi_conn
-from nova.virt.libvirt import connection as libvirt_conn
 
 
 LOG = logging.getLogger("nova.virt.connection")
diff --git a/nova/virt/disk.py b/nova/virt/disk.py
index a5d6b24b7..f9d10484f 100644
--- a/nova/virt/disk.py
+++ b/nova/virt/disk.py
@@ -30,8 +30,6 @@ import os
 import tempfile
 import time
 
-from nova import context
-from nova import db
 from nova import exception
 from nova import flags
 from nova import log as logging
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index d25fe112e..aeb5d6916 100644
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -25,11 +25,11 @@ semantics of real hypervisor connections.
 
 """
 
+from nova.compute import power_state
 from nova import db
 from nova import exception
 from nova import log as logging
 from nova import utils
-from nova.compute import power_state
 from nova.virt import driver
 
 
diff --git a/nova/virt/hyperv.py b/nova/virt/hyperv.py
index 294841992..2207499b2 100644
--- a/nova/virt/hyperv.py
+++ b/nova/virt/hyperv.py
@@ -63,10 +63,10 @@ Using the Python WMI library:
 import os
 import time
 
+from nova.compute import power_state
 from nova import exception
 from nova import flags
 from nova import log as logging
-from nova.compute import power_state
 from nova.virt import driver
 from nova.virt import images
 
diff --git a/nova/virt/images.py b/nova/virt/images.py
index 968fe1692..e088a92b3 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -25,7 +25,6 @@ import os
 
 from nova import exception
 from nova import flags
-from nova.image import glance as glance_image_service
 import nova.image
 from nova import log as logging
 from nova import utils
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 864707f20..1b0a55f0c 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -42,22 +42,20 @@ Supports KVM, LXC, QEMU, UML, and XEN.
 import hashlib
 import functools
 import multiprocessing
-import netaddr
 import os
-import random
-import re
 import shutil
 import sys
 import tempfile
-import time
 import uuid
-from xml.dom import minidom
-from xml.etree import ElementTree
 
 from eventlet import greenthread
-from eventlet import tpool
+from xml.dom import minidom
+from xml.etree import ElementTree
 
+from nova.auth import manager
 from nova import block_device
+from nova.compute import instance_types
+from nova.compute import power_state
 from nova import context as nova_context
 from nova import db
 from nova import exception
@@ -65,10 +63,6 @@ from nova import flags
 import nova.image
 from nova import log as logging
 from nova import utils
-from nova import vnc
-from nova.auth import manager
-from nova.compute import instance_types
-from nova.compute import power_state
 from nova.virt import disk
 from nova.virt import driver
 from nova.virt import images
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index 96cf2e77d..9b452f2a7 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -19,13 +19,13 @@
 
 """VIF drivers for libvirt."""
 
+from nova import exception
 from nova import flags
 from nova import log as logging
 from nova.network import linux_net
-from nova.virt.libvirt import netutils
 from nova import utils
+from nova.virt.libvirt import netutils
 from nova.virt.vif import VIFDriver
-from nova import exception
 
 LOG = logging.getLogger('nova.virt.libvirt.vif')
 
diff --git a/nova/virt/vmwareapi/fake.py b/nova/virt/vmwareapi/fake.py
index ae00bca0f..fec644770 100644
--- a/nova/virt/vmwareapi/fake.py
+++ b/nova/virt/vmwareapi/fake.py
@@ -24,7 +24,6 @@ import uuid
 

 from nova import exception

 from nova import log as logging

-from nova.virt.vmwareapi import vim

 from nova.virt.vmwareapi import error_util

 

 _CLASSES = ['Datacenter', 'Datastore', 'ResourcePool', 'VirtualMachine',

diff --git a/nova/virt/vmwareapi/io_util.py b/nova/virt/vmwareapi/io_util.py
index 409242800..cb9587afc 100644
--- a/nova/virt/vmwareapi/io_util.py
+++ b/nova/virt/vmwareapi/io_util.py
@@ -24,8 +24,6 @@ from eventlet import event
 from eventlet import greenthread

 from eventlet.queue import LightQueue

 

-from glance import client

-

 from nova import exception

 from nova import log as logging

 

diff --git a/nova/virt/vmwareapi/read_write_util.py b/nova/virt/vmwareapi/read_write_util.py
index 84f4942eb..33bef6d18 100644
--- a/nova/virt/vmwareapi/read_write_util.py
+++ b/nova/virt/vmwareapi/read_write_util.py
@@ -27,9 +27,6 @@ import urllib
 import urllib2

 import urlparse

 

-from eventlet import event

-from eventlet import greenthread

-

 from glance import client

 

 from nova import flags

diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index f6409c789..1a2d1dc19 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -26,12 +26,11 @@ import urllib
 import urllib2

 import uuid

 

-from nova import context as nova_context

+from nova.compute import power_state

 from nova import exception

 from nova import flags

 from nova import log as logging

 from nova import utils

-from nova.compute import power_state

 from nova.virt.vmwareapi import vim_util

 from nova.virt.vmwareapi import vm_util

 from nova.virt.vmwareapi import vmware_images

diff --git a/nova/virt/vmwareapi/vmware_images.py b/nova/virt/vmwareapi/vmware_images.py
index 53f2d372e..b03ccae25 100644
--- a/nova/virt/vmwareapi/vmware_images.py
+++ b/nova/virt/vmwareapi/vmware_images.py
@@ -19,7 +19,6 @@ Utility functions for Image transfer.
 """

 

 from nova import exception

-from nova import flags

 from nova.image import glance

 from nova import log as logging

 from nova.virt.vmwareapi import io_util

diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index b39589d89..c41f5af3c 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -22,7 +22,6 @@ their attributes like VDIs, VIFs, as well as their lookup functions.
 
 import contextlib
 import json
-import math
 import os
 import pickle
 import re
@@ -34,7 +33,6 @@ import uuid
 from decimal import Decimal
 from xml.dom import minidom
 
-from nova import db
 from nova import exception
 from nova import flags
 from nova.image import glance
@@ -43,7 +41,6 @@ from nova import utils
 from nova.compute import instance_types
 from nova.compute import power_state
 from nova.virt import disk
-from nova.virt import images
 from nova.virt.xenapi import HelperBase
 from nova.virt.xenapi import volume_utils
 
diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py
index 764f7e800..6525b64de 100644
--- a/nova/virt/xenapi/vmops.py
+++ b/nova/virt/xenapi/vmops.py
@@ -21,10 +21,8 @@ Management class for VM-related functions (spawn, reboot, etc).
 
 import base64
 import json
-import os
 import pickle
 import random
-import subprocess
 import sys
 import time
 import uuid
@@ -38,7 +36,6 @@ from nova import context as nova_context
 from nova import db
 from nova import exception
 from nova import flags
-from nova import ipv6
 from nova import log as logging
 from nova import utils
 from nova.virt import driver