Merge "Add list projects API"
This commit is contained in:
commit
3909b9d388
@ -58,6 +58,16 @@ def list_users(source):
|
|||||||
return flask.jsonify(users=list(users))
|
return flask.jsonify(users=list(users))
|
||||||
|
|
||||||
|
|
||||||
|
## APIs for working with projects.
|
||||||
|
|
||||||
|
|
||||||
|
@blueprint.route('/projects', defaults={'source': None})
|
||||||
|
@blueprint.route('/sources/<source>/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.
|
## APIs for working with events.
|
||||||
|
|
||||||
|
|
||||||
|
112
tests/api/v1/test_list_projects.py
Normal file
112
tests/api/v1/test_list_projects.py
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
# -*- 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 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'])
|
Loading…
Reference in New Issue
Block a user