Move utils.py to a more appropriate location

It's only used by the database code.

Change-Id: Icd81fdb950b84bcbd365dd80f701a4992f695ea7
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/db/api.py b/heat/db/api.py
index b2f8765d389fd0953b9bf295bddcfc79708f589f..abac96ca068cb6030c75d09ccb18d7d496e2cbea 100644 (file)
--- a/heat/db/api.py
+++ b/heat/db/api.py
@@ -25,7 +25,7 @@ Usage:
 The underlying driver is loaded . SQLAlchemy is currently the only
 supported backend.
 '''
-import heat.utils
+from heat.db import utils
 from heat.openstack.common import cfg
 
 
@@ -37,7 +37,7 @@ db_opts = [
                help='The backend to use for db'),
     ]
 
-IMPL = heat.utils.LazyPluggable('db_backend',
+IMPL = utils.LazyPluggable('db_backend',
                            sqlalchemy='heat.db.sqlalchemy.api')
 
 

diff --git a/heat/db/migration.py b/heat/db/migration.py
index 610ef25560f44386ffc813b425b4c7acaad5e818..deaa2d4424f07dbb190dec6854b31bd12f804696 100644 (file)
--- a/heat/db/migration.py
+++ b/heat/db/migration.py
@@ -14,7 +14,7 @@
 
 """Database setup and migration commands."""
 
-from heat import utils
+from heat.db import utils
 
 
 IMPL = utils.LazyPluggable('db_backend',

diff --git a/heat/utils.py b/heat/db/utils.py
similarity index 100%
rename from heat/utils.py
rename to heat/db/utils.py

diff --git a/heat/tests/functional/util.py b/heat/tests/functional/util.py
index 3a12d0513f9135f8570fc2a894d6623b8ba6a594..f5655222d1bc43d46ee799ec1b62a6db95ef2e6a 100644 (file)
--- a/heat/tests/functional/util.py
+++ b/heat/tests/functional/util.py
@@ -40,7 +40,6 @@ except ImportError:
     from glance import client as glance_client
 from novaclient.v1_1 import client as nova_client
 import heat
-from heat import utils
 from heat.common import template_format
 from heat.engine import parser
 from heat import client as heat_client