From 473768cd7673cb8332b30ac4d3051461cd4ab447 Mon Sep 17 00:00:00 2001 From: Brian Waldon Date: Wed, 21 Dec 2011 13:48:11 -0500 Subject: Cleaning up imports in compute and virt Change-Id: Ib3ea4014a37b852e713f8a683238a7c158272229 --- nova/compute/api.py | 14 +++++++------- nova/compute/utils.py | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'nova/compute') 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 -- cgit