openstack/aodh
Code Issues Proposed changes

Merge "trailing slash in url causes 404 error"

Browse Source
This commit is contained in:
Jenkins 2013-07-24 06:16:28 +00:00 committed by Gerrit Code Review
commit 23f66f7e0d
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -618,6 +618,9 @@ class MetersController(rest.RestController):
@pecan.expose() @pecan.expose()
def _lookup(self, meter_id, *remainder): def _lookup(self, meter_id, *remainder):
# NOTE(gordc): drop last path if empty (Bug #1202739)
if remainder and not remainder[-1]:
remainder = remainder[:-1]
return MeterController(meter_id), remainder return MeterController(meter_id), remainder
@wsme_pecan.wsexpose([Meter], [Query]) @wsme_pecan.wsexpose([Meter], [Query])

4
tests/api/v2/list_events.py
View File

@ -82,6 +82,10 @@ class TestListEvents(FunctionalTest):
data = self.get_json('/meters/instance') data = self.get_json('/meters/instance')
self.assertEquals(2, len(data)) self.assertEquals(2, len(data))
def test_all_trailing_slash(self):
data = self.get_json('/meters/instance/')
self.assertEquals(2, len(data))
def test_all_limit(self): def test_all_limit(self):
data = self.get_json('/meters/instance?limit=1') data = self.get_json('/meters/instance?limit=1')
self.assertEquals(1, len(data)) self.assertEquals(1, len(data))