summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhongyue Luo <zhongyue.nah@intel.com>2012-11-05 15:10:45 +0800
committerZhongyue Luo <zhongyue.nah@intel.com>2012-11-05 15:10:45 +0800
commita260d5fc77f52acaae9dc8595d0f275ad00c49aa (patch)
treeba7b29725ebccc366e82ec794fa49a71b57e084f
parentd2e7bb04317f62643ab2005b601da2265c502c93 (diff)
Cleanup nova.db.sqlalchemy.api import
Change-Id: I335fcd135a077d266653dfbacf9756bb8d47da14
-rw-r--r--nova/db/sqlalchemy/api.py20
1 files changed, 11 insertions, 9 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index d4173a7f8..ea7e665cf 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -25,6 +25,16 @@ import datetime
import functools
import warnings
+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 import block_device
from nova.common.sqlalchemyutils import paginate_query
from nova.compute import vm_states
@@ -37,15 +47,7 @@ from nova.openstack.common import log as logging
from nova.openstack.common import timeutils
from nova.openstack.common import uuidutils
from nova import utils
-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
+
FLAGS = flags.FLAGS