From: Zane Bitter Date: Fri, 30 Nov 2012 10:38:44 +0000 (+0100) Subject: Move the identifier module into heat.common X-Git-Tag: 2014.1~1147 X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=b35cc6d06e9d744134197591e890e3d0ec8af3e5;p=openstack-build%2Fheat-build.git 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 --- diff --git a/heat/api/cfn/v1/stacks.py b/heat/api/cfn/v1/stacks.py index 7501434b..b7b0b5bc 100644 --- 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 545d53bb..b2b0e385 100644 --- 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 3a16809e..a63e35f8 100644 --- 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 7d367d95..3b358dfd 100644 --- 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 2c543522..cb49aea3 100644 --- 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 5fcf2b5a..2244ece5 100644 --- 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 6e07f020..c3b149b4 100644 --- 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 adaa4c93..cf317fca 100644 --- 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 b2913feb..7564808a 100644 --- 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 3410d00e..23d11f91 100644 --- 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 1327ae97..af4d8f71 100644 --- 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'])