Move CloudFormation API to heat.api.cfn package
Change-Id: Ib0adf6f38da298b0b87d80272904767066b41087 Signed-off-by: Zane Bitter <zbitter@redhat.com>
This commit is contained in:
parent
e890e7d422
commit
715a62d2b4
|
@ -39,7 +39,7 @@ from heat.common import wsgi
|
||||||
from heat.openstack.common import cfg
|
from heat.openstack.common import cfg
|
||||||
from heat.openstack.common import log as logging
|
from heat.openstack.common import log as logging
|
||||||
|
|
||||||
LOG = logging.getLogger('heat.api')
|
LOG = logging.getLogger('heat.api.cfn')
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
try:
|
try:
|
||||||
|
|
|
@ -45,7 +45,7 @@ pipeline = versionnegotiation ec2authtoken authtoken auth-context cache cacheman
|
||||||
|
|
||||||
[app:apicfnv1app]
|
[app:apicfnv1app]
|
||||||
paste.app_factory = heat.common.wsgi:app_factory
|
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]
|
[filter:versionnegotiation]
|
||||||
paste.filter_factory = heat.common.wsgi:filter_factory
|
paste.filter_factory = heat.common.wsgi:filter_factory
|
||||||
|
|
|
@ -21,14 +21,13 @@ import gettext
|
||||||
|
|
||||||
gettext.install('heat', unicode=1)
|
gettext.install('heat', unicode=1)
|
||||||
|
|
||||||
from heat.api.v1 import stacks
|
|
||||||
from heat.common import wsgi
|
from heat.common import wsgi
|
||||||
|
|
||||||
from webob import Request
|
from webob import Request
|
||||||
import webob
|
import webob
|
||||||
from heat import utils
|
from heat import utils
|
||||||
from heat.common import context
|
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
|
from heat.openstack.common import log as logging
|
||||||
|
|
||||||
|
|
|
@ -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.
|
|
@ -21,7 +21,7 @@ import gettext
|
||||||
|
|
||||||
gettext.install('heat', unicode=1)
|
gettext.install('heat', unicode=1)
|
||||||
|
|
||||||
from heat.api.v1 import stacks
|
from heat.api.cfn.v1 import stacks
|
||||||
from heat.common import wsgi
|
from heat.common import wsgi
|
||||||
|
|
||||||
from webob import Request
|
from webob import Request
|
||||||
|
@ -38,7 +38,7 @@ logger = logging.getLogger(__name__)
|
||||||
class API(wsgi.Router):
|
class API(wsgi.Router):
|
||||||
|
|
||||||
"""
|
"""
|
||||||
WSGI router for Heat v1 API requests.
|
WSGI router for Heat CloudFormation v1 API requests.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
_actions = {
|
_actions = {
|
|
@ -14,8 +14,9 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
/stack endpoint for heat v1 API
|
Stack endpoint for Heat CloudFormation v1 API.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import httplib
|
import httplib
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
@ -37,13 +38,13 @@ from heat.openstack.common import rpc
|
||||||
import heat.openstack.common.rpc.common as rpc_common
|
import heat.openstack.common.rpc.common as rpc_common
|
||||||
from heat.openstack.common import log as logging
|
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):
|
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
|
Implements the API actions
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -666,7 +666,7 @@ class AppFactory(BasePasteFactory):
|
||||||
|
|
||||||
[app:apiv1app]
|
[app:apiv1app]
|
||||||
paste.app_factory = heat.common.wsgi:app_factory
|
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
|
The WSGI app constructor must accept a ConfigOpts object and a local config
|
||||||
dict as its two arguments.
|
dict as its two arguments.
|
||||||
|
|
|
@ -34,7 +34,7 @@ from heat.openstack.common import rpc
|
||||||
import heat.openstack.common.rpc.common as rpc_common
|
import heat.openstack.common.rpc.common as rpc_common
|
||||||
from heat.common.wsgi import Request
|
from heat.common.wsgi import Request
|
||||||
from heat.api.aws import exception
|
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'])
|
@attr(tag=['unit', 'api-cfn-v1-stacks', 'StackController'])
|
||||||
|
|
Loading…
Reference in New Issue