
This changeset reimplements the API using Pecan and WSME instead of Flask. Pecan uses "object dispatch" instead of declared routes. The controller classes are chained together to implement the API. Most of what we have are simple REST lookups, but a few cases required custom methods. WSME is used to define types of inputs and outputs for each controller method. The WSME layer handles serizlization and deserialization in several formats. In our case, only JSON and XML are configured. There are a few small changes to the return types in the API, as well as to error handling. Now all errors are returned as JSON messages made up of a mapping containing the key 'error_message' and the text of the error. This will later be enhanced to include XML support for XML requests. This change also moves the script for starting the V1 API to a new name and replaces it with a script that starts the V2 API. There is an open bug/blueprint to fix that so both versions of the API are loaded. blueprint api-server-pecan-wsme Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com> Change-Id: I1b99a16de68f902370a8999eca073c56f9f14865
166 lines
5.3 KiB
Python
166 lines
5.3 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Doug Hellmann <doug.hellmann@dreamhost.com>
|
|
#
|
|
# 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.
|
|
"""Base classes for API tests.
|
|
"""
|
|
|
|
import json
|
|
import os
|
|
import urllib
|
|
import unittest
|
|
|
|
import flask
|
|
from pecan import set_config
|
|
from pecan.testing import load_test_app
|
|
|
|
import mox
|
|
import stubout
|
|
|
|
from ceilometer import storage
|
|
from ceilometer.api.v1 import app as v1_app
|
|
from ceilometer.api.v1 import blueprint as v1_blueprint
|
|
from ceilometer.api.controllers import v2
|
|
from ceilometer.openstack.common import cfg
|
|
from ceilometer.tests import db as db_test_base
|
|
|
|
|
|
class TestBase(db_test_base.TestBase):
|
|
"""Use only for v1 API tests.
|
|
"""
|
|
|
|
def setUp(self):
|
|
super(TestBase, self).setUp()
|
|
self.app = v1_app.make_app(enable_acl=False, attach_storage=False)
|
|
self.app.register_blueprint(v1_blueprint.blueprint)
|
|
self.test_app = self.app.test_client()
|
|
|
|
@self.app.before_request
|
|
def attach_storage_connection():
|
|
flask.request.storage_conn = self.conn
|
|
|
|
def get(self, path, **kwds):
|
|
if kwds:
|
|
query = path + '?' + urllib.urlencode(kwds)
|
|
else:
|
|
query = path
|
|
rv = self.test_app.get(query)
|
|
try:
|
|
data = json.loads(rv.data)
|
|
except ValueError:
|
|
print 'RAW DATA:', rv
|
|
raise
|
|
return data
|
|
|
|
|
|
class FunctionalTest(unittest.TestCase):
|
|
"""
|
|
Used for functional tests of Pecan controllers where you need to
|
|
test your literal application and its integration with the
|
|
framework.
|
|
"""
|
|
|
|
DBNAME = 'testdb'
|
|
|
|
PATH_PREFIX = ''
|
|
|
|
SOURCE_DATA = {'test_source': {'somekey': '666'}}
|
|
|
|
def setUp(self):
|
|
|
|
cfg.CONF.database_connection = 'test://localhost/%s' % self.DBNAME
|
|
self.conn = storage.get_connection(cfg.CONF)
|
|
# Don't want to use drop_database() because we
|
|
# may end up running out of spidermonkey instances.
|
|
# http://davisp.lighthouseapp.com/projects/26898/tickets/22
|
|
self.conn.conn[self.DBNAME].clear()
|
|
|
|
# Determine where we are so we can set up paths in the config
|
|
root_dir = os.path.abspath(os.path.join(os.path.dirname(__file__),
|
|
'..',
|
|
'..',
|
|
)
|
|
)
|
|
self.config = {
|
|
|
|
'app': {
|
|
'root': 'ceilometer.api.controllers.root.RootController',
|
|
'modules': ['ceilometer.api'],
|
|
'static_root': '%s/public' % root_dir,
|
|
'template_path': '%s/ceilometer/api/templates' % root_dir,
|
|
},
|
|
|
|
'logging': {
|
|
'loggers': {
|
|
'root': {'level': 'INFO', 'handlers': ['console']},
|
|
'ceilometer': {'level': 'DEBUG',
|
|
'handlers': ['console'],
|
|
},
|
|
},
|
|
'handlers': {
|
|
'console': {
|
|
'level': 'DEBUG',
|
|
'class': 'logging.StreamHandler',
|
|
'formatter': 'simple'
|
|
}
|
|
},
|
|
'formatters': {
|
|
'simple': {
|
|
'format': ('%(asctime)s %(levelname)-5.5s [%(name)s]'
|
|
'[%(threadName)s] %(message)s')
|
|
}
|
|
},
|
|
},
|
|
}
|
|
|
|
self.mox = mox.Mox()
|
|
self.stubs = stubout.StubOutForTesting()
|
|
|
|
self.app = self._make_app()
|
|
self._stubout_sources()
|
|
|
|
def _make_app(self):
|
|
return load_test_app(self.config)
|
|
|
|
def _stubout_sources(self):
|
|
"""Source data is usually read from a file, but
|
|
we want to let tests define their own. The class
|
|
attribute SOURCE_DATA is injected into the controller
|
|
as though it was read from the usual configuration
|
|
file.
|
|
"""
|
|
self.stubs.SmartSet(v2.SourcesController, 'sources',
|
|
self.SOURCE_DATA)
|
|
|
|
def tearDown(self):
|
|
self.mox.UnsetStubs()
|
|
self.stubs.UnsetAll()
|
|
self.stubs.SmartUnsetAll()
|
|
self.mox.VerifyAll()
|
|
set_config({}, overwrite=True)
|
|
|
|
def get_json(self, path, expect_errors=False, headers=None, **params):
|
|
full_path = self.PATH_PREFIX + path
|
|
print 'GET: %s %r' % (full_path, params)
|
|
response = self.app.get(full_path,
|
|
params=params,
|
|
headers=headers,
|
|
expect_errors=expect_errors)
|
|
if not expect_errors:
|
|
response = response.json
|
|
print 'GOT:', response
|
|
return response
|