3173ab4c4b
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
144 lines
5.4 KiB
Python
144 lines
5.4 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.
|
|
"""Test listing raw events.
|
|
"""
|
|
|
|
import datetime
|
|
import logging
|
|
|
|
from ceilometer.openstack.common import timeutils
|
|
from ceilometer.storage import impl_test
|
|
from .base import FunctionalTest
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class TestComputeDurationByResource(FunctionalTest):
|
|
|
|
def setUp(self):
|
|
super(TestComputeDurationByResource, self).setUp()
|
|
|
|
# Create events relative to the range and pretend
|
|
# that the intervening events exist.
|
|
|
|
self.early1 = datetime.datetime(2012, 8, 27, 7, 0)
|
|
self.early2 = datetime.datetime(2012, 8, 27, 17, 0)
|
|
|
|
self.start = datetime.datetime(2012, 8, 28, 0, 0)
|
|
|
|
self.middle1 = datetime.datetime(2012, 8, 28, 8, 0)
|
|
self.middle2 = datetime.datetime(2012, 8, 28, 18, 0)
|
|
|
|
self.end = datetime.datetime(2012, 8, 28, 23, 59)
|
|
|
|
self.late1 = datetime.datetime(2012, 8, 29, 9, 0)
|
|
self.late2 = datetime.datetime(2012, 8, 29, 19, 0)
|
|
|
|
def _stub_interval_func(self, func):
|
|
self.stubs.Set(impl_test.TestConnection,
|
|
'get_event_interval',
|
|
func)
|
|
|
|
def _set_interval(self, start, end):
|
|
def get_interval(ignore_self, event_filter):
|
|
assert event_filter.start
|
|
assert event_filter.end
|
|
return (start, end)
|
|
self._stub_interval_func(get_interval)
|
|
|
|
def _invoke_api(self):
|
|
return self.get_json(
|
|
'/resources/resource-id/meters/instance:m1.tiny/duration',
|
|
start_timestamp=self.start.isoformat(),
|
|
end_timestamp=self.end.isoformat(),
|
|
search_offset=10, # this value doesn't matter, db call is mocked
|
|
)
|
|
|
|
def test_before_range(self):
|
|
self._set_interval(self.early1, self.early2)
|
|
data = self._invoke_api()
|
|
assert data['start_timestamp'] is None
|
|
assert data['end_timestamp'] is None
|
|
assert data['duration'] is None
|
|
|
|
def _assert_times_match(self, actual, expected):
|
|
#import pdb; pdb.set_trace()
|
|
if actual:
|
|
actual = timeutils.parse_isotime(actual)
|
|
actual = actual.replace(tzinfo=None)
|
|
assert actual == expected
|
|
|
|
def test_overlap_range_start(self):
|
|
self._set_interval(self.early1, self.middle1)
|
|
data = self._invoke_api()
|
|
self._assert_times_match(data['start_timestamp'], self.start)
|
|
self._assert_times_match(data['end_timestamp'], self.middle1)
|
|
assert data['duration'] == 8 * 60
|
|
|
|
def test_within_range(self):
|
|
self._set_interval(self.middle1, self.middle2)
|
|
data = self._invoke_api()
|
|
self._assert_times_match(data['start_timestamp'], self.middle1)
|
|
self._assert_times_match(data['end_timestamp'], self.middle2)
|
|
assert data['duration'] == 10 * 60
|
|
|
|
def test_within_range_zero_duration(self):
|
|
self._set_interval(self.middle1, self.middle1)
|
|
data = self._invoke_api()
|
|
self._assert_times_match(data['start_timestamp'], self.middle1)
|
|
self._assert_times_match(data['end_timestamp'], self.middle1)
|
|
assert data['duration'] == 0
|
|
|
|
def test_overlap_range_end(self):
|
|
self._set_interval(self.middle2, self.late1)
|
|
data = self._invoke_api()
|
|
self._assert_times_match(data['start_timestamp'], self.middle2)
|
|
self._assert_times_match(data['end_timestamp'], self.end)
|
|
assert data['duration'] == (6 * 60) - 1
|
|
|
|
def test_after_range(self):
|
|
self._set_interval(self.late1, self.late2)
|
|
data = self._invoke_api()
|
|
assert data['start_timestamp'] is None
|
|
assert data['end_timestamp'] is None
|
|
assert data['duration'] is None
|
|
|
|
def test_without_end_timestamp(self):
|
|
def get_interval(ignore_self, event_filter):
|
|
return (self.late1, self.late2)
|
|
self._stub_interval_func(get_interval)
|
|
data = self.get_json(
|
|
'/resources/resource-id/meters/instance:m1.tiny/duration',
|
|
start_timestamp=self.late1.isoformat(),
|
|
search_offset=10, # this value doesn't matter, db call is mocked
|
|
)
|
|
self._assert_times_match(data['start_timestamp'], self.late1)
|
|
self._assert_times_match(data['end_timestamp'], self.late2)
|
|
|
|
def test_without_start_timestamp(self):
|
|
def get_interval(ignore_self, event_filter):
|
|
return (self.early1, self.early2)
|
|
self._stub_interval_func(get_interval)
|
|
data = self.get_json(
|
|
'/resources/resource-id/meters/instance:m1.tiny/duration',
|
|
end_timestamp=self.early2.isoformat(),
|
|
search_offset=10, # this value doesn't matter, db call is mocked
|
|
)
|
|
self._assert_times_match(data['start_timestamp'], self.early1)
|
|
self._assert_times_match(data['end_timestamp'], self.early2)
|