diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-12-21 19:58:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-12-21 19:58:01 +0000 |
| commit | d0c77ebc0ea122030e681ba1400d0325e396cfb5 (patch) | |
| tree | 6d3b703e1b7b7506c95a8aa8ffb8e9f5cb4c650b /nova/compute | |
| parent | 30fd2e52575599af9027eb16a4e116d1f0f5d7b1 (diff) | |
| parent | 473768cd7673cb8332b30ac4d3051461cd4ab447 (diff) | |
Merge "Cleaning up imports in compute and virt"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/api.py | 14 | ||||
| -rw-r--r-- | nova/compute/utils.py | 3 |
2 files changed, 8 insertions, 9 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 |