From c96620525ca4d9d7d458ea2fbbde9028f8b2e4f2 Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Mon, 6 Aug 2012 16:44:47 -0400 Subject: [PATCH] Add list projects API Change-Id: I7d7c62c540f0a57dbd192c08d4d1fe8aa2ea3312 Signed-off-by: Doug Hellmann --- ceilometer/api/v1.py | 10 +++ tests/api/v1/test_list_projects.py | 112 +++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 tests/api/v1/test_list_projects.py diff --git a/ceilometer/api/v1.py b/ceilometer/api/v1.py index bd0ddd48..6ee1f81f 100644 --- a/ceilometer/api/v1.py +++ b/ceilometer/api/v1.py @@ -58,6 +58,16 @@ def list_users(source): return flask.jsonify(users=list(users)) +## APIs for working with projects. + + +@blueprint.route('/projects', defaults={'source': None}) +@blueprint.route('/sources//projects') +def list_projects(source): + projects = flask.request.storage_conn.get_projects(source=source) + return flask.jsonify(projects=list(projects)) + + ## APIs for working with events. diff --git a/tests/api/v1/test_list_projects.py b/tests/api/v1/test_list_projects.py new file mode 100644 index 00000000..fe6c1506 --- /dev/null +++ b/tests/api/v1/test_list_projects.py @@ -0,0 +1,112 @@ +# -*- encoding: utf-8 -*- +# +# Copyright © 2012 New Dream Network, LLC (DreamHost) +# +# Author: Doug Hellmann +# +# 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 users. +""" + +import datetime +import logging + +from ceilometer import counter +from ceilometer import meter + +from ceilometer.tests import api as tests_api + +LOG = logging.getLogger(__name__) + + +class TestListProjects(tests_api.TestBase): + + def test_empty(self): + data = self.get('/projects') + self.assertEquals({'projects': []}, data) + + def test_projects(self): + counter1 = counter.Counter( + 'test_list_projects', + 'instance', + 'cumulative', + 1, + 'user-id', + 'project-id', + 'resource-id', + timestamp=datetime.datetime(2012, 7, 2, 10, 40), + duration=0, + resource_metadata={'display_name': 'test-server', + 'tag': 'self.counter', + } + ) + msg = meter.meter_message_from_counter(counter1) + self.conn.record_metering_data(msg) + + counter2 = counter.Counter( + 'test_list_users', + 'instance', + 'cumulative', + 1, + 'user-id2', + 'project-id2', + 'resource-id-alternate', + timestamp=datetime.datetime(2012, 7, 2, 10, 41), + duration=0, + resource_metadata={'display_name': 'test-server', + 'tag': 'self.counter2', + } + ) + msg2 = meter.meter_message_from_counter(counter2) + self.conn.record_metering_data(msg2) + + data = self.get('/projects') + self.assertEquals(['project-id', 'project-id2'], data['projects']) + + def test_with_source(self): + counter1 = counter.Counter( + 'test_list_users', + 'instance', + 'cumulative', + 1, + 'user-id', + 'project-id', + 'resource-id', + timestamp=datetime.datetime(2012, 7, 2, 10, 40), + duration=0, + resource_metadata={'display_name': 'test-server', + 'tag': 'self.counter', + } + ) + msg = meter.meter_message_from_counter(counter1) + self.conn.record_metering_data(msg) + + counter2 = counter.Counter( + 'not-test', + 'instance', + 'cumulative', + 1, + 'user-id2', + 'project-id2', + 'resource-id-alternate', + timestamp=datetime.datetime(2012, 7, 2, 10, 41), + duration=0, + resource_metadata={'display_name': 'test-server', + 'tag': 'self.counter2', + } + ) + msg2 = meter.meter_message_from_counter(counter2) + self.conn.record_metering_data(msg2) + + data = self.get('/sources/test_list_users/projects') + self.assertEquals(['project-id'], data['projects'])