openstack/aodh
Code Issues Proposed changes

Merge "Fixed resource api in v2-api."

Browse Source
This commit is contained in:
Jenkins 2013-02-12 12:34:11 +00:00 committed by Gerrit Code Review
commit 85d086def3
2 changed files with 43 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/api/controllers/v2.py
View File

@ -486,7 +486,7 @@ class ResourcesController(RestController):
:param resource_id: The UUID of the resource.
"""
r = request.storage_conn.get_resources(resource=resource_id)[0]
r = list(request.storage_conn.get_resources(resource=resource_id))[0]
return Resource(**r)
@wsme_pecan.wsexpose([Resource], [Query])

42
tests/api/v2/test_list_resources.py
View File

@ -80,6 +80,48 @@ class TestListResources(FunctionalTest):
data = self.get_json('/resources')
self.assertEquals(2, len(data))
def test_instances_one(self):
counter1 = 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',
}
)
msg = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret,
'test',
)
self.conn.record_metering_data(msg)
counter2 = 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',
}
)
msg2 = meter.meter_message_from_counter(counter2,
cfg.CONF.metering_secret,
'test',
)
self.conn.record_metering_data(msg2)
data = self.get_json('/resources/resource-id')
self.assertEquals('resource-id', data['resource_id'])
def test_with_source(self):
counter1 = counter.Counter(
'instance',