openstack/heat
Code Issues Proposed changes

Move CloudFormation API to heat.api.cfn package

Browse Source 
Change-Id: Ib0adf6f38da298b0b87d80272904767066b41087
Signed-off-by: Zane Bitter <zbitter@redhat.com>
This commit is contained in:
Zane Bitter 2012-09-27 14:57:50 +02:00
parent e890e7d422
commit 715a62d2b4
8 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/heat-api-cfn
View File

@ -39,7 +39,7 @@ from heat.common import wsgi
from heat.openstack.common import cfg
from heat.openstack.common import log as logging
LOG = logging.getLogger('heat.api')
LOG = logging.getLogger('heat.api.cfn')
if __name__ == '__main__':
try:

2
etc/heat/heat-api-cfn-paste.ini
View File

@ -45,7 +45,7 @@ pipeline = versionnegotiation ec2authtoken authtoken auth-context cache cacheman
[app:apicfnv1app]
paste.app_factory = heat.common.wsgi:app_factory
heat.app_factory = heat.api.v1:API
heat.app_factory = heat.api.cfn.v1:API
[filter:versionnegotiation]
paste.filter_factory = heat.common.wsgi:filter_factory

3
heat/api/aws/ec2token.py
View File

@ -21,14 +21,13 @@ import gettext
gettext.install('heat', unicode=1)
from heat.api.v1 import stacks
from heat.common import wsgi
from webob import Request
import webob
from heat import utils
from heat.common import context
from heat.api.v1 import exception
from heat.api.aws import exception
from heat.openstack.common import log as logging

14
heat/api/cfn/__init__.py Normal file
View File

@ -0,0 +1,14 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.

4
heat/api/v1/__init__.py → heat/api/cfn/v1/__init__.py
View File

@ -21,7 +21,7 @@ import gettext
gettext.install('heat', unicode=1)
from heat.api.v1 import stacks
from heat.api.cfn.v1 import stacks
from heat.common import wsgi
from webob import Request
@ -38,7 +38,7 @@ logger = logging.getLogger(__name__)
class API(wsgi.Router):
"""
WSGI router for Heat v1 API requests.
WSGI router for Heat CloudFormation v1 API requests.
"""
_actions = {

7
heat/api/v1/stacks.py → heat/api/cfn/v1/stacks.py
View File

@ -14,8 +14,9 @@
# under the License.
"""
/stack endpoint for heat v1 API
Stack endpoint for Heat CloudFormation v1 API.
"""
import httplib
import json
import os
@ -37,13 +38,13 @@ from heat.openstack.common import rpc
import heat.openstack.common.rpc.common as rpc_common
from heat.openstack.common import log as logging
logger = logging.getLogger('heat.api.v1.stacks')
logger = logging.getLogger('heat.api.cfn.v1.stacks')
class StackController(object):
"""
WSGI controller for stacks resource in heat v1 API
WSGI controller for stacks resource in Heat CloudFormation v1 API
Implements the API actions
"""

2
heat/common/wsgi.py
View File

@ -666,7 +666,7 @@ class AppFactory(BasePasteFactory):
[app:apiv1app]
paste.app_factory = heat.common.wsgi:app_factory
heat.app_factory = heat.api.v1:API
heat.app_factory = heat.api.cfn.v1:API
The WSGI app constructor must accept a ConfigOpts object and a local config
dict as its two arguments.

2
heat/tests/test_api_cfn_v1.py
View File

@ -34,7 +34,7 @@ from heat.openstack.common import rpc
import heat.openstack.common.rpc.common as rpc_common
from heat.common.wsgi import Request
from heat.api.aws import exception
import heat.api.v1.stacks as stacks
import heat.api.cfn.v1.stacks as stacks
@attr(tag=['unit', 'api-cfn-v1-stacks', 'StackController'])