From b0026981a5855ec0a9427f7787570d4de903512d Mon Sep 17 00:00:00 2001 From: Zane Bitter Date: Wed, 28 Nov 2012 14:43:40 +0100 Subject: [PATCH] Move the resource module out of the resources package Leave only the actual resource implementations in the heat.engine.resources package. This is the first step to implementing a plugin-style architecture for resources. Change-Id: I8a63da4f54b087ee792969678f92da8e31787a3e Signed-off-by: Zane Bitter --- heat/engine/{resources => }/event.py | 2 +- heat/engine/parser.py | 4 ++-- heat/engine/{resources => }/properties.py | 0 heat/engine/{resources => }/resource.py | 6 +++--- heat/engine/resources/__init__.py | 2 -- heat/engine/resources/autoscaling.py | 2 +- heat/engine/resources/cloud_watch.py | 2 +- heat/engine/resources/eip.py | 2 +- heat/engine/resources/instance.py | 2 +- heat/engine/resources/quantum/quantum.py | 2 +- heat/engine/resources/s3.py | 2 +- heat/engine/resources/security_group.py | 2 +- heat/engine/resources/stack.py | 2 +- heat/engine/resources/user.py | 2 +- heat/engine/resources/volume.py | 2 +- heat/engine/resources/wait_condition.py | 2 +- heat/engine/service.py | 2 +- heat/tests/test_event.py | 4 ++-- heat/tests/test_loadbalancer.py | 2 +- heat/tests/test_parser.py | 2 +- heat/tests/test_properties.py | 2 +- heat/tests/test_quantum.py | 2 +- heat/tests/test_resource.py | 2 +- 23 files changed, 25 insertions(+), 27 deletions(-) rename heat/engine/{resources => }/event.py (98%) rename heat/engine/{resources => }/properties.py (100%) rename heat/engine/{resources => }/resource.py (98%) diff --git a/heat/engine/resources/event.py b/heat/engine/event.py similarity index 98% rename from heat/engine/resources/event.py rename to heat/engine/event.py index d7a76cd36a..2c54352275 100644 --- a/heat/engine/resources/event.py +++ b/heat/engine/event.py @@ -18,7 +18,7 @@ from heat.common import exception from heat.engine import identifier from heat.openstack.common import log as logging -logger = logging.getLogger('heat.engine.resources.event') +logger = logging.getLogger(__name__) class Event(object): diff --git a/heat/engine/parser.py b/heat/engine/parser.py index bd01015df1..5fcf2b5a79 100644 --- a/heat/engine/parser.py +++ b/heat/engine/parser.py @@ -19,7 +19,7 @@ import functools from heat.common import exception from heat.engine import dependencies from heat.engine import identifier -from heat.engine import resources +from heat.engine import resource from heat.engine import template from heat.engine import timestamp from heat.engine.parameters import Parameters @@ -78,7 +78,7 @@ class Stack(object): template_resources = self.t[template.RESOURCES] self.resources = dict((name, - resources.Resource(name, data, self)) + resource.Resource(name, data, self)) for (name, data) in template_resources.items()) self.dependencies = self._get_dependencies(self.resources.itervalues()) diff --git a/heat/engine/resources/properties.py b/heat/engine/properties.py similarity index 100% rename from heat/engine/resources/properties.py rename to heat/engine/properties.py diff --git a/heat/engine/resources/resource.py b/heat/engine/resource.py similarity index 98% rename from heat/engine/resources/resource.py rename to heat/engine/resource.py index a8a35c9af0..8d0cff129c 100644 --- a/heat/engine/resources/resource.py +++ b/heat/engine/resource.py @@ -16,16 +16,16 @@ import base64 from datetime import datetime -from heat.engine.resources import event +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.engine import timestamp -from heat.engine.resources.properties import Properties +from heat.engine.properties import Properties from heat.openstack.common import log as logging -logger = logging.getLogger('heat.engine.resources') +logger = logging.getLogger(__name__) class Metadata(object): diff --git a/heat/engine/resources/__init__.py b/heat/engine/resources/__init__.py index 4ff07839ce..e8e4035941 100644 --- a/heat/engine/resources/__init__.py +++ b/heat/engine/resources/__init__.py @@ -12,5 +12,3 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -from resource import Resource diff --git a/heat/engine/resources/autoscaling.py b/heat/engine/resources/autoscaling.py index a784de877d..8976219874 100644 --- a/heat/engine/resources/autoscaling.py +++ b/heat/engine/resources/autoscaling.py @@ -14,7 +14,7 @@ # under the License. from heat.engine.resources import instance -from heat.engine.resources import resource +from heat.engine import resource from heat.openstack.common import log as logging diff --git a/heat/engine/resources/cloud_watch.py b/heat/engine/resources/cloud_watch.py index f8a54e6458..6fdb809ceb 100644 --- a/heat/engine/resources/cloud_watch.py +++ b/heat/engine/resources/cloud_watch.py @@ -15,7 +15,7 @@ from heat.common import exception from heat.engine import watchrule -from heat.engine.resources import resource +from heat.engine import resource from heat.db import api as db_api from heat.openstack.common import log as logging diff --git a/heat/engine/resources/eip.py b/heat/engine/resources/eip.py index b151452743..b1ddffc11f 100644 --- a/heat/engine/resources/eip.py +++ b/heat/engine/resources/eip.py @@ -14,7 +14,7 @@ # under the License. from heat.common import exception -from heat.engine.resources import resource +from heat.engine import resource from novaclient.exceptions import NotFound from heat.openstack.common import log as logging diff --git a/heat/engine/resources/instance.py b/heat/engine/resources/instance.py index 0d2f15f704..d4e42b49af 100644 --- a/heat/engine/resources/instance.py +++ b/heat/engine/resources/instance.py @@ -22,7 +22,7 @@ from novaclient.exceptions import NotFound from urlparse import urlparse import heat -from heat.engine.resources import resource +from heat.engine import resource from heat.common import exception from heat.openstack.common import cfg diff --git a/heat/engine/resources/quantum/quantum.py b/heat/engine/resources/quantum/quantum.py index 6c3cf926c5..defc3ec412 100644 --- a/heat/engine/resources/quantum/quantum.py +++ b/heat/engine/resources/quantum/quantum.py @@ -14,7 +14,7 @@ # under the License. from heat.common import exception -from heat.engine.resources import resource +from heat.engine import resource from heat.openstack.common import log as logging diff --git a/heat/engine/resources/s3.py b/heat/engine/resources/s3.py index dcf6b82a5a..d69e2abf3a 100644 --- a/heat/engine/resources/s3.py +++ b/heat/engine/resources/s3.py @@ -18,7 +18,7 @@ import os from urlparse import urlparse from heat.common import exception -from heat.engine.resources import resource +from heat.engine import resource from heat.openstack.common import log as logging try: from swiftclient.client import ClientException diff --git a/heat/engine/resources/security_group.py b/heat/engine/resources/security_group.py index 2b146a20cf..d60860d138 100644 --- a/heat/engine/resources/security_group.py +++ b/heat/engine/resources/security_group.py @@ -15,7 +15,7 @@ from novaclient.exceptions import BadRequest from novaclient.exceptions import NotFound -from heat.engine.resources import resource +from heat.engine import resource from heat.openstack.common import log as logging diff --git a/heat/engine/resources/stack.py b/heat/engine/resources/stack.py index 726a2de186..fb5737826d 100644 --- a/heat/engine/resources/stack.py +++ b/heat/engine/resources/stack.py @@ -18,7 +18,7 @@ import json from heat.common import exception from heat.engine import format -from heat.engine.resources import resource +from heat.engine import resource from heat.engine import parser from heat.openstack.common import log as logging diff --git a/heat/engine/resources/user.py b/heat/engine/resources/user.py index 43014ac102..cd02f11f34 100644 --- a/heat/engine/resources/user.py +++ b/heat/engine/resources/user.py @@ -16,7 +16,7 @@ import eventlet from heat.common import exception from heat.openstack.common import cfg -from heat.engine.resources import resource +from heat.engine import resource from heat.openstack.common import log as logging diff --git a/heat/engine/resources/volume.py b/heat/engine/resources/volume.py index d4f9c98a24..8ef0304a67 100644 --- a/heat/engine/resources/volume.py +++ b/heat/engine/resources/volume.py @@ -17,7 +17,7 @@ import eventlet from heat.openstack.common import log as logging from heat.common import exception -from heat.engine.resources import resource +from heat.engine import resource from novaclient.exceptions import NotFound logger = logging.getLogger('heat.engine.volume') diff --git a/heat/engine/resources/wait_condition.py b/heat/engine/resources/wait_condition.py index d00dac995b..33f4e69eed 100644 --- a/heat/engine/resources/wait_condition.py +++ b/heat/engine/resources/wait_condition.py @@ -16,7 +16,7 @@ import eventlet from heat.common import exception -from heat.engine.resources import resource +from heat.engine import resource from heat.openstack.common import log as logging diff --git a/heat/engine/service.py b/heat/engine/service.py index 6c172e32b4..8c844af97d 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -19,7 +19,7 @@ import webob from heat.common import context from heat.db import api as db_api from heat.engine import api -from heat.engine.resources.event import Event +from heat.engine.event import Event from heat.engine import identifier from heat.engine import parser from heat.engine import watchrule diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py index 50853dd553..90d9e7cc37 100644 --- a/heat/tests/test_event.py +++ b/heat/tests/test_event.py @@ -21,8 +21,8 @@ from heat.common import context import heat.db as db_api from heat.engine import parser from heat.engine import template -from heat.engine.resources import event -from heat.engine.resources import resource +from heat.engine import event +from heat.engine import resource tmpl = { diff --git a/heat/tests/test_loadbalancer.py b/heat/tests/test_loadbalancer.py index f68aa85386..ec179df5f3 100644 --- a/heat/tests/test_loadbalancer.py +++ b/heat/tests/test_loadbalancer.py @@ -31,7 +31,7 @@ from heat.engine import format from heat.engine import parser from heat.engine.resources import instance from heat.engine.resources import loadbalancer as lb -from heat.engine.resources.resource import Metadata +from heat.engine.resource import Metadata from heat.engine.resources import stack from heat.tests.v1_1 import fakes diff --git a/heat/tests/test_parser.py b/heat/tests/test_parser.py index e3c31a2417..a0a95fbea8 100644 --- a/heat/tests/test_parser.py +++ b/heat/tests/test_parser.py @@ -26,7 +26,7 @@ from heat.engine import format from heat.engine import parser from heat.engine import parameters from heat.engine import template -from heat.engine.resources import Resource +from heat.engine.resource import Resource def join(raw): diff --git a/heat/tests/test_properties.py b/heat/tests/test_properties.py index a20a7e3e7a..99bde479ea 100644 --- a/heat/tests/test_properties.py +++ b/heat/tests/test_properties.py @@ -17,7 +17,7 @@ import unittest from nose.plugins.attrib import attr import mox -from heat.engine.resources import properties +from heat.engine import properties @attr(tag=['unit', 'properties']) diff --git a/heat/tests/test_quantum.py b/heat/tests/test_quantum.py index 42adef77c6..7c20fb189b 100644 --- a/heat/tests/test_quantum.py +++ b/heat/tests/test_quantum.py @@ -26,7 +26,7 @@ from nose.plugins.attrib import attr from heat.common import context from heat.common import exception from heat.engine import format -from heat.engine.resources import properties +from heat.engine import properties from heat.engine.resources.quantum import net from heat.engine.resources.quantum.quantum import QuantumResource as qr from heat.engine import parser diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py index c1f94b7928..cf0f4ae97b 100644 --- a/heat/tests/test_resource.py +++ b/heat/tests/test_resource.py @@ -21,7 +21,7 @@ import mox import json from heat.common import context from heat.engine import parser -from heat.engine.resources import resource +from heat.engine import resource @attr(tag=['unit', 'resource'])