Move the identifier module into heat.common

It is used by both the engine and the client APIs, so it doesn't belong in
the engine.

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

diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py
index 7501434b2d76adf9c909777a6fc226022967dfc8..b7b0b5bc4f429e2a568ab019a06bf81407730772 100644 (file)
--- a/heat/api/cfn/v1/stacks.py
+++ b/heat/api/cfn/v1/stacks.py
@@ -28,7 +28,7 @@ from heat.common import wsgi
 from heat.engine import rpcapi as engine_rpcapi
 from heat.engine import format
 import heat.engine.api as engine_api
-from heat.engine import identifier
+from heat.common import identifier
 
 import heat.openstack.common.rpc.common as rpc_common
 

diff --git a/heat/api/openstack/v1/events.py b/heat/api/openstack/v1/events.py
index 545d53bb4c248c001abb28040b13d062886168af..b2b0e38579b68e0560cfd473c18ab9ca672e6f27 100644 (file)
--- a/heat/api/openstack/v1/events.py
+++ b/heat/api/openstack/v1/events.py
@@ -19,7 +19,7 @@ from webob import exc
 from heat.api.openstack.v1 import util
 from heat.common import wsgi
 from heat.engine import api as engine_api
-from heat.engine import identifier
+from heat.common import identifier
 from heat.engine import rpcapi as engine_rpcapi
 import heat.openstack.common.rpc.common as rpc_common
 from heat.openstack.common.gettextutils import _

diff --git a/heat/api/openstack/v1/resources.py b/heat/api/openstack/v1/resources.py
index 3a16809e6fe92a603b2eb91885ec8024b2e3dc42..a63e35f80922ae20fa0a1bfe9c8ae1ce6e7b334e 100644 (file)
--- a/heat/api/openstack/v1/resources.py
+++ b/heat/api/openstack/v1/resources.py
@@ -18,7 +18,7 @@ import itertools
 from heat.api.openstack.v1 import util
 from heat.common import wsgi
 from heat.engine import api as engine_api
-from heat.engine import identifier
+from heat.common import identifier
 from heat.engine import rpcapi as engine_rpcapi
 import heat.openstack.common.rpc.common as rpc_common
 

diff --git a/heat/api/openstack/v1/util.py b/heat/api/openstack/v1/util.py
index 7d367d95639d554f31142d3b8f7f690d4310fa56..3b358dfd01f0b800cb093cdfd414aeb8ffd1c39e 100644 (file)
--- a/heat/api/openstack/v1/util.py
+++ b/heat/api/openstack/v1/util.py
@@ -16,7 +16,7 @@
 from webob import exc
 from functools import wraps
 
-from heat.engine import identifier
+from heat.common import identifier
 
 
 def tenant_local(handler):

diff --git a/heat/engine/identifier.py b/heat/common/identifier.py
similarity index 100%
rename from heat/engine/identifier.py
rename to heat/common/identifier.py

diff --git a/heat/engine/event.py b/heat/engine/event.py
index 2c54352275d1ad454e8f5ddaa773ec42a6895620..cb49aea3acf5eeefe24c652638af8c47eee117c9 100644 (file)
--- a/heat/engine/event.py
+++ b/heat/engine/event.py
@@ -15,7 +15,7 @@
 
 from heat.db import api as db_api
 from heat.common import exception
-from heat.engine import identifier
+from heat.common import identifier
 from heat.openstack.common import log as logging
 
 logger = logging.getLogger(__name__)

diff --git a/heat/engine/parser.py b/heat/engine/parser.py
index 5fcf2b5a7983e5904aab2d24220f4cae5e6ccf8b..2244ece564d7be3e06bc9e764e6680bde511fd86 100644 (file)
--- a/heat/engine/parser.py
+++ b/heat/engine/parser.py
@@ -18,7 +18,7 @@ import functools
 
 from heat.common import exception
 from heat.engine import dependencies
-from heat.engine import identifier
+from heat.common import identifier
 from heat.engine import resource
 from heat.engine import template
 from heat.engine import timestamp

diff --git a/heat/engine/resource.py b/heat/engine/resource.py
index 6e07f02083f320bf7e09b5a870548efdc2aa2330..c3b149b46a8013a8d5f92a954ce6873016e0fbb1 100644 (file)
--- a/heat/engine/resource.py
+++ b/heat/engine/resource.py
@@ -19,7 +19,7 @@ from datetime import datetime
 from heat.engine import event
 from heat.common import exception
 from heat.db import api as db_api
-from heat.engine import identifier
+from heat.common import identifier
 from heat.engine import timestamp
 from heat.engine.properties import Properties
 

diff --git a/heat/engine/service.py b/heat/engine/service.py
index adaa4c93648893c589bb5c50e5e945f2623c881d..cf317fca3388dfdf1d37dbb78c15296e19aff708 100644 (file)
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -20,7 +20,7 @@ from heat.common import context
 from heat.db import api as db_api
 from heat.engine import api
 from heat.engine.event import Event
-from heat.engine import identifier
+from heat.common import identifier
 from heat.engine import parser
 from heat.engine import resources
 from heat.engine import watchrule

diff --git a/heat/tests/test_api_cfn_v1.py b/heat/tests/test_api_cfn_v1.py
index b2913feb70f16594e263c16d02a90c1480cb9397..7564808a4c66abe63bbdbd39663712a32baaa38f 100644 (file)
--- a/heat/tests/test_api_cfn_v1.py
+++ b/heat/tests/test_api_cfn_v1.py
@@ -27,7 +27,7 @@ import urlparse
 
 from heat.common import config
 from heat.common import context
-from heat.engine import identifier
+from heat.common import identifier
 from heat.openstack.common import cfg
 from heat.openstack.common import rpc
 import heat.openstack.common.rpc.common as rpc_common

diff --git a/heat/tests/test_api_openstack_v1.py b/heat/tests/test_api_openstack_v1.py
index 3410d00e126bf7301e7de0acef39a0e91bdc8723..23d11f9120b22c10dc6d096998306501b20bcffa 100644 (file)
--- a/heat/tests/test_api_openstack_v1.py
+++ b/heat/tests/test_api_openstack_v1.py
@@ -28,7 +28,7 @@ import webob.exc
 
 from heat.common import config
 from heat.common import context
-from heat.engine import identifier
+from heat.common import identifier
 from heat.openstack.common import cfg
 from heat.openstack.common import rpc
 import heat.openstack.common.rpc.common as rpc_common

diff --git a/heat/tests/test_identifier.py b/heat/tests/test_identifier.py
index 1327ae9797e830bbe1536cc11a5bea883a59d826..af4d8f719d6f6b642f77158a03deac4298af1853 100644 (file)
--- a/heat/tests/test_identifier.py
+++ b/heat/tests/test_identifier.py
@@ -19,7 +19,7 @@ from nose.plugins.attrib import attr
 import mox
 import json
 
-from heat.engine import identifier
+from heat.common import identifier
 
 
 @attr(tag=['unit', 'identifier'])