← Back to branch summary

~ubuntu-branches/ubuntu/utopic/python-ceilometerclient/utopic

« back to all changes in this revision

Viewing changes to ceilometerclient/tests/v2/test_alarms.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Chuck Short
  • Date: 2014-01-21 09:53:01 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20140121095301-cwxsrtdgddkzprjx
Tags: 1.0.8-0ubuntu1
[ James Page ]
* d/control: Add missing BD on python-babel. 

[ Chuck Short ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometerclient/tests/v2/test_alarms.py
17
17
#    under the License.
18
18
 
19
19
import copy
 
20
 
 
21
import six
 
22
from six.moves import xrange  # noqa
20
23
import testtools
21
24
 
22
25
from ceilometerclient.tests import utils
185
188
        ),
186
189
 
187
190
    },
188
 
    '/v2/alarms?q.op=&q.op=&q.value=project-id&q.value=SwiftObjectAlarm'
189
 
    '&q.field=project_id&q.field=name':
 
191
    '/v2/alarms?q.field=project_id&q.field=name&q.op=&q.op='
 
192
    '&q.value=project-id&q.value=SwiftObjectAlarm':
190
193
    {
191
194
        'GET': (
192
195
            {},
207
210
            ALARM_HISTORY,
208
211
        ),
209
212
    },
210
 
    '/v2/alarms/alarm-id/history?q.op=&q.value=NOW&q.field=timestamp':
 
213
    '/v2/alarms/alarm-id/history?q.field=timestamp&q.op=&q.value=NOW':
211
214
    {
212
215
        'GET': (
213
216
            {},
234
237
        self.assertEqual(alarms[0].alarm_id, 'alarm-id')
235
238
 
236
239
    def test_list_with_query(self):
237
 
        alarms = list(self.mgr.list(q=[
238
 
                                      {"field": "project_id",
239
 
                                       "value": "project-id"},
240
 
                                      {"field": "name",
241
 
                                       "value": "SwiftObjectAlarm"},
242
 
                                     ]))
 
240
        alarms = list(self.mgr.list(q=[{"field": "project_id",
 
241
                                        "value": "project-id"},
 
242
                                       {"field": "name",
 
243
                                        "value": "SwiftObjectAlarm"}]))
243
244
        expect = [
244
245
            ('GET',
245
 
             '/v2/alarms?q.op=&q.op=&q.value=project-id&q.value='
246
 
             'SwiftObjectAlarm&q.field=project_id&q.field=name',
 
246
             '/v2/alarms?q.field=project_id&q.field=name&q.op=&q.op='
 
247
             '&q.value=project-id&q.value=SwiftObjectAlarm',
247
248
             {}, None),
248
249
        ]
249
250
        self.assertEqual(self.api.calls, expect)
277
278
        self.assertEqual(self.api.calls, expect)
278
279
        self.assertTrue(alarm)
279
280
        self.assertEqual(alarm.alarm_id, 'alarm-id')
280
 
        for (key, value) in UPDATED_ALARM.iteritems():
 
281
        for (key, value) in six.iteritems(UPDATED_ALARM):
281
282
            self.assertEqual(getattr(alarm, key), value)
282
283
 
283
284
    def test_update_delta(self):
289
290
        self.assertEqual(self.api.calls, expect)
290
291
        self.assertTrue(alarm)
291
292
        self.assertEqual(alarm.alarm_id, 'alarm-id')
292
 
        for (key, value) in UPDATED_ALARM.iteritems():
 
293
        for (key, value) in six.iteritems(UPDATED_ALARM):
293
294
            self.assertEqual(getattr(alarm, key), value)
294
295
 
295
296
    def test_set_state(self):
323
324
        for i in xrange(len(history)):
324
325
            change = history[i]
325
326
            self.assertTrue(isinstance(change, alarms.AlarmChange))
326
 
            for k, v in ALARM_HISTORY[i].iteritems():
 
327
            for k, v in six.iteritems(ALARM_HISTORY[i]):
327
328
                self.assertEqual(getattr(change, k), v)
328
329
 
329
330
    def test_get_all_history(self):
332
333
 
333
334
    def test_get_constrained_history(self):
334
335
        q = [dict(field='timestamp', value='NOW')]
335
 
        url = ('/v2/alarms/alarm-id/history'
336
 
               '?q.op=&q.value=NOW&q.field=timestamp')
 
336
        url = ('/v2/alarms/alarm-id/history?q.field=timestamp'
 
337
               '&q.op=&q.value=NOW')
337
338
        self._do_test_get_history(q, url)
338
339
 
339
340
 
373
374
        self.assertEqual(self.api.calls, expect)
374
375
        self.assertTrue(alarm)
375
376
        self.assertEqual(alarm.alarm_id, 'alarm-id')
376
 
        for (key, value) in UPDATED_ALARM.iteritems():
 
377
        for (key, value) in six.iteritems(UPDATED_ALARM):
377
378
            self.assertEqual(getattr(alarm, key), value)
378
379
 
379
380
    def test_update_counter_name(self):
389
390
        self.assertEqual(self.api.calls, expect)
390
391
        self.assertTrue(alarm)
391
392
        self.assertEqual(alarm.alarm_id, 'alarm-id')
392
 
        for (key, value) in UPDATED_ALARM.iteritems():
 
393
        for (key, value) in six.iteritems(UPDATED_ALARM):
393
394
            self.assertEqual(getattr(alarm, key), value)