openstack/aodh
Code Issues Proposed changes

message_id is not allowed to be submitted via api

Browse Source 
The message_id of sample is not a modifiable value.
So, forbidden it in API.

Change-Id: Ieeb5330d36732fd9ea829b879226c5e5bb8fd083
This commit is contained in:
Mehdi Abaakouk 2013-07-26 16:42:11 +02:00
parent 82c3574100
commit 2d42de9e8a
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -507,6 +507,10 @@ class MeterController(rest.RestController):
raise wsme.exc.InvalidInput('counter_name', s.counter_name,
'should be %s' % self._id)
if s.message_id:
raise wsme.exc.InvalidInput('message_id', s.message_id,
'The message_id must not be set')
s.user_id = (s.user_id or def_user_id)
s.project_id = (s.project_id or def_project_id)
s.source = '%s:%s' % (s.project_id, (s.source or def_source))

20
tests/api/v2/test_post_samples_scenarios.py
View File

@ -72,6 +72,26 @@ class TestPostSamples(FunctionalTest,
self.assertEqual(s1, data.json)
self.assertEqual(s1[0], self.published[0][1]['args']['data'][0])
def test_messsage_id_provided(self):
"""Do not accept sample with message_id."""
s1 = [{'counter_name': 'my_counter_name',
'counter_type': 'gauge',
'counter_unit': 'instance',
'counter_volume': 1,
'message_id': 'evil',
'source': 'closedstack',
'resource_id': 'bd9431c1-8d69-4ad3-803a-8d4a6b89fd36',
'project_id': '35b17138-b364-4e6a-a131-8f3099c5be68',
'user_id': 'efd87807-12d2-4b38-9c70-5f5c2ac427ff',
'resource_metadata': {'name1': 'value1',
'name2': 'value2'}}]
data = self.post_json('/meters/my_counter_name/', s1,
expect_errors=True)
self.assertEqual(data.status_int, 400)
self.assertEqual(len(self.published), 0)
def test_wrong_project_id(self):
"""Do not accept cross posting samples to different projects."""
s1 = [{'counter_name': 'my_counter_name',