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>
changes/82/17082/1
Zane Bitter 10 years ago
parent 965618ac42
commit b0026981a5

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

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

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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

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

@ -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

@ -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

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

@ -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

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

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

@ -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

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

Loading…
Cancel
Save