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 <zbitter@redhat.com>

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 d7a76cd36a8af98528b09940b874b709e234ee95..2c54352275d1ad454e8f5ddaa773ec42a6895620 100644 (file)
--- 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 bd01015df165d4c4d80348aac03758ee6586ac5c..5fcf2b5a7983e5904aab2d24220f4cae5e6ccf8b 100644 (file)
--- 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 a8a35c9af0e7941d3993a9172db831cfa4f71d16..8d0cff129cdad6088bb5a8e5159eff557a10726a 100644 (file)
--- 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 4ff07839cec87722cc56abd922130b017afa5506..e8e403594152912bed8c5a341795ba08bf925d34 100644 (file)
--- 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 a784de877d29eeabb7ad6e7a54e2fdd775c63d7b..897621987484df76e518aeb5719984aad4664c45 100644 (file)
--- 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 f8a54e64580b55accc988c19eaf75d1b06f95e3d..6fdb809cebee94feb999c21aa2c24b56754f614b 100644 (file)
--- 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 b1514527434d6cbb87753f391999bfb0447253fd..b1ddffc11f670531de197e9b53b20b0e16710d0b 100644 (file)
--- 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 0d2f15f70499e4246c06161a71eeb67519e27d7c..d4e42b49af17dc4440bc26a70603813640b63c5e 100644 (file)
--- 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 6c3cf926c5959c86fb241fc760e2d4d9de0a69eb..defc3ec4124fbd92effd9aa8e036837715b171e4 100644 (file)
--- 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 dcf6b82a5a3804d5f9dd2e9b911f3989551b4f9b..d69e2abf3a8df422f986e30607fc8ba0d0f4d553 100644 (file)
--- 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 2b146a20cf7a055ddd061cbfaf89e501805ab302..d60860d1386174de709126181497758370308f93 100644 (file)
--- 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 726a2de1868134e818b07eaf545a23469bbe5861..fb5737826dec72f40641eb122157e8dda9a66298 100644 (file)
--- 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 43014ac102265696fe07c355502e75ddbd802bca..cd02f11f3429c8b1f1b69654e86ab6c609aff722 100644 (file)
--- 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 d4f9c98a2469d1e2cf43e917cdd34dad3611a735..8ef0304a67bf81e91ea9d04587bb6e55878af196 100644 (file)
--- 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 d00dac995bfe51418d9164a0b6a38905cba9fd9a..33f4e69eed6c0888b005b11bb56a850f5381c48a 100644 (file)
--- 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 6c172e32b4249678f9796a863453483a93409535..8c844af97d0fbcf7ed9ddd377b1a12d9545b3707 100644 (file)
--- 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 50853dd5539d06acc71f7d0bd460380a583929a7..90d9e7cc37971900b6355acf8b4d2d561513a740 100644 (file)
--- 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 f68aa85386dacf86c3869f9d44c34d6f562ea970..ec179df5f32fafb734c683d5e96983f84b26d219 100644 (file)
--- 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 e3c31a24178ec293640ad91bd1235346ad3977e9..a0a95fbea877a6480231bbacf33f27b83e83d424 100644 (file)
--- 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 a20a7e3e7a0c5db814c313edeb554249d92bc3c9..99bde479ea45cf7b17ff82d566fb38d21f72051a 100644 (file)
--- 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 42adef77c6d4210900518849c74e7d55e0739312..7c20fb189bbe0e3f28bbdcbda3d7191f573000fb 100644 (file)
--- 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 c1f94b79284d845dba5f26dcb4778e32dff568c9..cf0f4ae97b2f1f8817237119c93e9869f26f27a0 100644 (file)
--- 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'])