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>

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):

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())

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):

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

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
 

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

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

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

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
 

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

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
 

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

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
 

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')

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
 

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

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 = {

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
 

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):

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'])

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

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'])