openstack/aodh
Code Issues Proposed changes

Merge "Remove unnecessary escape character in string format"

Browse Source
This commit is contained in:
Jenkins
2014-04-11 14:10:16 +00:00
committed by Gerrit Code Review
parent a404a2b151 0991612e8d
commit eeab9ced74
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1107,20 +1107,20 @@ class ComplexQuery(_Base):
@classmethod @classmethod
def sample(cls): def sample(cls):
return cls(filter='{\"and\": [{\"and\": [{\"=\": ' + return cls(filter='{"and": [{"and": [{"=": ' +
'{\"counter_name\": \"cpu_util\"}}, ' + '{"counter_name": "cpu_util"}}, ' +
'{\">\": {\"counter_volume\": 0.23}}, ' + '{">": {"counter_volume": 0.23}}, ' +
'{\"<\": {\"counter_volume\": 0.26}}]}, ' + '{"<": {"counter_volume": 0.26}}]}, ' +
'{\"or\": [{\"and\": [{\">\": ' + '{"or": [{"and": [{">": ' +
'{\"timestamp\": \"2013-12-01T18:00:00\"}}, ' + '{"timestamp": "2013-12-01T18:00:00"}}, ' +
'{\"<\": ' + '{"<": ' +
'{\"timestamp\": \"2013-12-01T18:15:00\"}}]}, ' + '{"timestamp": "2013-12-01T18:15:00"}}]}, ' +
'{\"and\": [{\">\": ' + '{"and": [{">": ' +
'{\"timestamp\": \"2013-12-01T18:30:00\"}}, ' + '{"timestamp": "2013-12-01T18:30:00"}}, ' +
'{\"<\": ' + '{"<": ' +
'{\"timestamp\": \"2013-12-01T18:45:00\"}}]}]}]}', '{"timestamp": "2013-12-01T18:45:00"}}]}]}]}',
orderby='[{\"counter_volume\": \"ASC\"}, ' + orderby='[{"counter_volume": "ASC"}, ' +
'{\"timestamp\": \"DESC\"}]', '{"timestamp": "DESC"}]',
limit=42 limit=42
) )