98ac1d30f5
This led me to discover and fix bug #1144837, which makes the SQL engine returns correctly the list of resources when asked. This also fixes a bug in the /resources listing in MongoDB driver: it used to filter on the resource db, which only contains the most recent up to date version of some fields, and returns wrong results. This also fixes bug #1131349 Change-Id: I7441a8f2839c7db198c80de75f5c39f0dd219813 Signed-off-by: Julien Danjou <julien@danjou.info>
287 lines
12 KiB
Python
287 lines
12 KiB
Python
# -*- encoding: utf-8 -*-
|
|
#
|
|
# Copyright © 2012 New Dream Network, LLC (DreamHost)
|
|
#
|
|
# Author: Doug Hellmann <doug.hellmann@dreamhost.com>
|
|
# Julien Danjou <julien@danjou.info>
|
|
#
|
|
# 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 resources.
|
|
"""
|
|
|
|
import datetime
|
|
import logging
|
|
|
|
from oslo.config import cfg
|
|
|
|
from ceilometer.collector import meter
|
|
from ceilometer import counter
|
|
|
|
from ceilometer.tests import api as tests_api
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class TestListEmptyResources(tests_api.TestBase):
|
|
|
|
def test_empty(self):
|
|
data = self.get('/resources')
|
|
self.assertEquals({'resources': []}, data)
|
|
|
|
|
|
class TestListResourcesBase(tests_api.TestBase):
|
|
|
|
def setUp(self):
|
|
super(TestListResourcesBase, self).setUp()
|
|
|
|
for cnt in [
|
|
counter.Counter(
|
|
'instance',
|
|
'cumulative',
|
|
'',
|
|
1,
|
|
'user-id',
|
|
'project-id',
|
|
'resource-id',
|
|
timestamp=datetime.datetime(2012, 7, 2, 10, 40),
|
|
resource_metadata={'display_name': 'test-server',
|
|
'tag': 'self.counter'},
|
|
),
|
|
counter.Counter(
|
|
'instance',
|
|
'cumulative',
|
|
'',
|
|
1,
|
|
'user-id',
|
|
'project-id',
|
|
'resource-id-alternate',
|
|
timestamp=datetime.datetime(2012, 7, 2, 10, 41),
|
|
resource_metadata={'display_name': 'test-server',
|
|
'tag': 'self.counter2'},
|
|
),
|
|
counter.Counter(
|
|
'instance',
|
|
'cumulative',
|
|
'',
|
|
1,
|
|
'user-id2',
|
|
'project-id2',
|
|
'resource-id2',
|
|
timestamp=datetime.datetime(2012, 7, 2, 10, 42),
|
|
resource_metadata={'display_name': 'test-server',
|
|
'tag': 'self.counter3'},
|
|
),
|
|
counter.Counter(
|
|
'instance',
|
|
'cumulative',
|
|
'',
|
|
1,
|
|
'user-id',
|
|
'project-id',
|
|
'resource-id',
|
|
timestamp=datetime.datetime(2012, 7, 2, 10, 43),
|
|
resource_metadata={'display_name': 'test-server',
|
|
'tag': 'self.counter4'}
|
|
)]:
|
|
msg = meter.meter_message_from_counter(cnt,
|
|
cfg.CONF.metering_secret,
|
|
'test_list_resources')
|
|
self.conn.record_metering_data(msg)
|
|
|
|
|
|
class TestListResources(TestListResourcesBase):
|
|
|
|
def test_list_resources(self):
|
|
data = self.get('/resources')
|
|
self.assertEquals(3, len(data['resources']))
|
|
self.assertEquals(set(r['resource_id'] for r in data['resources']),
|
|
set(['resource-id',
|
|
'resource-id-alternate',
|
|
'resource-id2']))
|
|
|
|
def test_list_resources_non_admin(self):
|
|
data = self.get('/resources',
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-id"})
|
|
self.assertEquals(2, len(data['resources']))
|
|
self.assertEquals(set(r['resource_id'] for r in data['resources']),
|
|
set(['resource-id',
|
|
'resource-id-alternate']))
|
|
|
|
def test_list_resources_with_timestamps(self):
|
|
data = self.get('/resources',
|
|
start_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 41).isoformat(),
|
|
end_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 43).isoformat())
|
|
self.assertEquals(set(r['resource_id'] for r in data['resources']),
|
|
set(['resource-id-alternate',
|
|
'resource-id2']))
|
|
|
|
def test_list_resources_with_timestamps_non_admin(self):
|
|
data = self.get('/resources',
|
|
start_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 41).isoformat(),
|
|
end_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 43).isoformat(),
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-id"})
|
|
self.assertEquals(set(r['resource_id'] for r in data['resources']),
|
|
set(['resource-id-alternate']))
|
|
|
|
def test_with_source(self):
|
|
data = self.get('/sources/test_list_resources/resources')
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(['resource-id',
|
|
'resource-id2',
|
|
'resource-id-alternate']), ids)
|
|
|
|
def test_with_source_non_admin(self):
|
|
data = self.get('/sources/test_list_resources/resources',
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-id"})
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(['resource-id',
|
|
'resource-id-alternate']), ids)
|
|
|
|
def test_with_source_with_timestamps(self):
|
|
data = self.get('/sources/test_list_resources/resources',
|
|
start_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 41).isoformat(),
|
|
end_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 43).isoformat())
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(['resource-id2',
|
|
'resource-id-alternate']), ids)
|
|
|
|
def test_with_source_with_timestamps_non_admin(self):
|
|
data = self.get('/sources/test_list_resources/resources',
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-id"},
|
|
start_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 41).isoformat(),
|
|
end_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 43).isoformat())
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(['resource-id-alternate']), ids)
|
|
|
|
def test_with_source_non_existent(self):
|
|
data = self.get('/sources/test_list_resources_dont_exist/resources')
|
|
self.assertEquals(data['resources'], [])
|
|
|
|
def test_with_user(self):
|
|
data = self.get('/users/user-id/resources')
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(['resource-id', 'resource-id-alternate']), ids)
|
|
|
|
def test_with_user_non_admin(self):
|
|
data = self.get('/users/user-id/resources',
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-id"})
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(['resource-id', 'resource-id-alternate']), ids)
|
|
|
|
def test_with_user_wrong_tenant(self):
|
|
data = self.get('/users/user-id/resources',
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-jd"})
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(), ids)
|
|
|
|
def test_with_user_with_timestamps(self):
|
|
data = self.get('/users/user-id/resources',
|
|
start_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 42).isoformat(),
|
|
end_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 42).isoformat())
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(), ids)
|
|
|
|
def test_with_user_with_timestamps_non_admin(self):
|
|
data = self.get('/users/user-id/resources',
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-id"},
|
|
start_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 42).isoformat(),
|
|
end_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 42).isoformat())
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(), ids)
|
|
|
|
def test_with_user_non_existent(self):
|
|
data = self.get('/users/user-id-foobar123/resources')
|
|
self.assertEquals(data['resources'], [])
|
|
|
|
def test_with_project(self):
|
|
data = self.get('/projects/project-id/resources')
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(['resource-id', 'resource-id-alternate']), ids)
|
|
|
|
def test_with_project_non_admin(self):
|
|
data = self.get('/projects/project-id/resources',
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-id"})
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(['resource-id', 'resource-id-alternate']), ids)
|
|
|
|
def test_with_project_with_timestamp(self):
|
|
data = self.get('/projects/project-id/resources',
|
|
start_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 40).isoformat(),
|
|
end_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 41).isoformat())
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(['resource-id']), ids)
|
|
|
|
def test_with_project_with_timestamp_non_admin(self):
|
|
data = self.get('/projects/project-id/resources',
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-id"},
|
|
start_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 40).isoformat(),
|
|
end_timestamp=datetime.datetime(
|
|
2012, 7, 2, 10, 41).isoformat())
|
|
ids = set(r['resource_id'] for r in data['resources'])
|
|
self.assertEquals(set(['resource-id']), ids)
|
|
|
|
def test_with_project_non_existent(self):
|
|
data = self.get('/projects/jd-was-here/resources')
|
|
self.assertEquals(data['resources'], [])
|
|
|
|
|
|
class TestListResourcesMetaquery(TestListResourcesBase):
|
|
|
|
def test_metaquery1(self):
|
|
q = '/sources/test_list_resources/resources'
|
|
data = self.get('%s?metadata.display_name=test-server' % q)
|
|
self.assertEquals(3, len(data['resources']))
|
|
|
|
def test_metaquery1_non_admin(self):
|
|
q = '/sources/test_list_resources/resources'
|
|
data = self.get('%s?metadata.display_name=test-server' % q,
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-id"})
|
|
self.assertEquals(2, len(data['resources']))
|
|
|
|
def test_metaquery2(self):
|
|
q = '/sources/test_list_resources/resources'
|
|
data = self.get('%s?metadata.tag=self.counter4' % q)
|
|
self.assertEquals(1, len(data['resources']))
|
|
|
|
def test_metaquery2_non_admin(self):
|
|
q = '/sources/test_list_resources/resources'
|
|
data = self.get('%s?metadata.tag=self.counter4' % q,
|
|
headers={"X-Roles": "Member",
|
|
"X-Tenant-Id": "project-id"})
|
|
self.assertEquals(1, len(data['resources']))
|