~ubuntu-branches/ubuntu/vivid/ceilometer/vivid

« back to all changes in this revision

Viewing changes to ceilometer/tests/api/v2/test_list_resources_scenarios.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2015-02-19 14:59:07 UTC
  • mfrom: (1.2.3)
  • Revision ID: package-import@ubuntu.com-20150219145907-9jojybdsl64zcn14
Tags: 2015.1~b2-0ubuntu1
[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/p/skip-test.patch: Rebased.

[ James Page ]
* d/rules,d/p/skip-gabbi.patch: Skip tests that rely on python-gabbi until
  packaging and MIR is complete.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#
2
2
# Copyright 2012 New Dream Network, LLC (DreamHost)
3
3
#
4
 
# Author: Doug Hellmann <doug.hellmann@dreamhost.com>
5
 
#
6
4
# Licensed under the Apache License, Version 2.0 (the "License"); you may
7
5
# not use this file except in compliance with the License. You may obtain
8
6
# a copy of the License at
20
18
import datetime
21
19
import json
22
20
 
23
 
from oslo.utils import timeutils
 
21
from oslo_utils import timeutils
24
22
import six
25
23
 
26
24
from ceilometer.publisher import utils
63
61
            source='test',
64
62
        )
65
63
        msg = utils.meter_message_from_counter(
66
 
            sample1,
67
 
            self.CONF.publisher.metering_secret,
 
64
            sample1, self.CONF.publisher.telemetry_secret,
68
65
        )
69
66
        self.conn.record_metering_data(msg)
70
67
 
92
89
            source='test',
93
90
        )
94
91
        msg = utils.meter_message_from_counter(
95
 
            sample1,
96
 
            self.CONF.publisher.metering_secret,
 
92
            sample1, self.CONF.publisher.telemetry_secret,
97
93
        )
98
94
        self.conn.record_metering_data(msg)
99
95
 
112
108
            source='test',
113
109
        )
114
110
        msg2 = utils.meter_message_from_counter(
115
 
            sample2,
116
 
            self.CONF.publisher.metering_secret,
 
111
            sample2, self.CONF.publisher.telemetry_secret,
117
112
        )
118
113
        self.conn.record_metering_data(msg2)
119
114
 
146
141
            )
147
142
            msg = utils.meter_message_from_counter(
148
143
                datapoint,
149
 
                self.CONF.publisher.metering_secret,
 
144
                self.CONF.publisher.telemetry_secret,
150
145
            )
151
146
            self.conn.record_metering_data(msg)
152
147
 
171
166
            source='test',
172
167
        )
173
168
        msg = utils.meter_message_from_counter(
174
 
            sample1,
175
 
            self.CONF.publisher.metering_secret,
 
169
            sample1, self.CONF.publisher.telemetry_secret,
176
170
        )
177
171
        self.conn.record_metering_data(msg)
178
172
 
191
185
            source='test',
192
186
        )
193
187
        msg2 = utils.meter_message_from_counter(
194
 
            sample2,
195
 
            self.CONF.publisher.metering_secret,
 
188
            sample2, self.CONF.publisher.telemetry_secret,
196
189
        )
197
190
        self.conn.record_metering_data(msg2)
198
191
 
215
208
            source='test_list_resources',
216
209
        )
217
210
        msg = utils.meter_message_from_counter(
218
 
            sample1,
219
 
            self.CONF.publisher.metering_secret,
 
211
            sample1, self.CONF.publisher.telemetry_secret,
220
212
        )
221
213
        self.conn.record_metering_data(msg)
222
214
 
235
227
            source='not-test',
236
228
        )
237
229
        msg2 = utils.meter_message_from_counter(
238
 
            sample2,
239
 
            self.CONF.publisher.metering_secret,
 
230
            sample2, self.CONF.publisher.telemetry_secret,
240
231
        )
241
232
        self.conn.record_metering_data(msg2)
242
233
 
264
255
            source='test_list_resources',
265
256
        )
266
257
        msg = utils.meter_message_from_counter(
267
 
            sample1,
268
 
            self.CONF.publisher.metering_secret,
 
258
            sample1, self.CONF.publisher.telemetry_secret,
269
259
        )
270
260
        self.conn.record_metering_data(msg)
271
261
 
284
274
            source='test_list_resources',
285
275
        )
286
276
        msg2 = utils.meter_message_from_counter(
287
 
            sample2,
288
 
            self.CONF.publisher.metering_secret,
 
277
            sample2, self.CONF.publisher.telemetry_secret,
289
278
        )
290
279
        self.conn.record_metering_data(msg2)
291
280
 
317
306
            source='test_list_resources',
318
307
        )
319
308
        msg = utils.meter_message_from_counter(
320
 
            sample1,
321
 
            self.CONF.publisher.metering_secret,
 
309
            sample1, self.CONF.publisher.telemetry_secret,
322
310
        )
323
311
        self.conn.record_metering_data(msg)
324
312
 
337
325
            source='not-test',
338
326
        )
339
327
        msg2 = utils.meter_message_from_counter(
340
 
            sample2,
341
 
            self.CONF.publisher.metering_secret,
 
328
            sample2, self.CONF.publisher.telemetry_secret,
342
329
        )
343
330
        self.conn.record_metering_data(msg2)
344
331
 
364
351
            source='test_list_resources',
365
352
        )
366
353
        msg = utils.meter_message_from_counter(
367
 
            sample1,
368
 
            self.CONF.publisher.metering_secret,
 
354
            sample1, self.CONF.publisher.telemetry_secret,
369
355
        )
370
356
        self.conn.record_metering_data(msg)
371
357
 
384
370
            source='not-test',
385
371
        )
386
372
        msg2 = utils.meter_message_from_counter(
387
 
            sample2,
388
 
            self.CONF.publisher.metering_secret,
 
373
            sample2, self.CONF.publisher.telemetry_secret,
389
374
        )
390
375
        self.conn.record_metering_data(msg2)
391
376
 
411
396
            source='not-test',
412
397
        )
413
398
        msg2 = utils.meter_message_from_counter(
414
 
            sample1,
415
 
            self.CONF.publisher.metering_secret,
 
399
            sample1, self.CONF.publisher.telemetry_secret,
416
400
        )
417
401
        self.conn.record_metering_data(msg2)
418
402
 
438
422
            source='not-test',
439
423
        )
440
424
        msg2 = utils.meter_message_from_counter(
441
 
            sample1,
442
 
            self.CONF.publisher.metering_secret,
 
425
            sample1, self.CONF.publisher.telemetry_secret,
443
426
        )
444
427
        self.conn.record_metering_data(msg2)
445
428
 
467
450
            source='test',
468
451
        )
469
452
        msg = utils.meter_message_from_counter(
470
 
            sample1,
471
 
            self.CONF.publisher.metering_secret,
 
453
            sample1, self.CONF.publisher.telemetry_secret,
472
454
        )
473
455
        self.conn.record_metering_data(msg)
474
456
 
496
478
            source='test_list_resources',
497
479
        )
498
480
        msg = utils.meter_message_from_counter(
499
 
            sample1,
500
 
            self.CONF.publisher.metering_secret,
 
481
            sample1, self.CONF.publisher.telemetry_secret,
501
482
        )
502
483
        self.conn.record_metering_data(msg)
503
484
 
528
509
            source='test_list_resources',
529
510
        )
530
511
        msg = utils.meter_message_from_counter(
531
 
            sample1,
532
 
            self.CONF.publisher.metering_secret,
 
512
            sample1, self.CONF.publisher.telemetry_secret,
533
513
        )
534
514
        self.conn.record_metering_data(msg)
535
515