← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ceilometer/trusty-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Chuck Short
  • Date: 2014-01-23 15:08:11 UTC
  • mfrom: (1.1.11)
  • Revision ID: package-import@ubuntu.com-20140123150811-1zaismsuyh1hcl8y
Tags: 2014.1~b2-0ubuntu1
https://launchpad.net/bugs/1261101
https://launchpad.net/bugs/1250002
https://launchpad.net/bugs/1224223
[ James Page ]
* d/control: Add python-jsonpath-rw to BD's.
* d/p/fix-setup-requirements.patch: Bump WebOb to support < 1.4.
 (LP: #1261101)

[ Chuck Short ]
* New upstream version.
* debian/control, debian/ceilometer-common.install: Split out
  ceilometer-alarm-evaluator and ceilometer-alarm-notifier into their
  own packages. (LP: #1250002)
* debian/ceilometer-agent-central.logrotate,
  debian/ceilometer-agent-compute.logrotate,
  debian/ceilometer-api.logrotate,
  debian/ceilometer-collector.logrotate: Add logrotate files, 
  thanks to Ahmed Rahal. (LP: #1224223)
* Fix typos in upstart files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer/tests/api/v2/test_statistics_scenarios.py
21
21
 
22
22
import testscenarios
23
23
 
24
 
from ceilometer.publisher import rpc
 
24
from ceilometer.publisher import utils
25
25
from ceilometer import sample
26
26
from ceilometer.tests.api.v2 import FunctionalTest
27
27
from ceilometer.tests import db as tests_db
51
51
                                   },
52
52
                source='source1',
53
53
            )
54
 
            msg = rpc.meter_message_from_counter(
 
54
            msg = utils.meter_message_from_counter(
55
55
                s,
56
 
                self.CONF.publisher_rpc.metering_secret,
 
56
                self.CONF.publisher.metering_secret,
57
57
            )
58
58
            self.conn.record_metering_data(msg)
59
59
 
149
149
                                   },
150
150
                source='source1',
151
151
            )
152
 
            msg = rpc.meter_message_from_counter(
 
152
            msg = utils.meter_message_from_counter(
153
153
                s,
154
 
                self.CONF.publisher_rpc.metering_secret,
 
154
                self.CONF.publisher.metering_secret,
155
155
            )
156
156
            self.conn.record_metering_data(msg)
157
157
 
270
270
                                   },
271
271
                source='source1',
272
272
            )
273
 
            msg = rpc.meter_message_from_counter(
 
273
            msg = utils.meter_message_from_counter(
274
274
                s,
275
 
                self.CONF.publisher_rpc.metering_secret,
 
275
                self.CONF.publisher.metering_secret,
276
276
            )
277
277
            self.conn.record_metering_data(msg)
278
278
 
370
370
                                   },
371
371
                source='source1',
372
372
            )
373
 
            msg = rpc.meter_message_from_counter(
 
373
            msg = utils.meter_message_from_counter(
374
374
                s,
375
 
                self.CONF.publisher_rpc.metering_secret,
 
375
                self.CONF.publisher.metering_secret,
376
376
            )
377
377
            self.conn.record_metering_data(msg)
378
378
 
527
527
                                   'event': test_sample['metadata_event'], },
528
528
                source=test_sample['source'],
529
529
            )
530
 
            msg = rpc.meter_message_from_counter(
 
530
            msg = utils.meter_message_from_counter(
531
531
                c,
532
 
                self.CONF.publisher_rpc.metering_secret,
 
532
                self.CONF.publisher.metering_secret,
533
533
            )
534
534
            self.conn.record_metering_data(msg)
535
535
 
1285
1285
                                   'event': test_sample['metadata_event'], },
1286
1286
                source=test_sample['source'],
1287
1287
            )
1288
 
            msg = rpc.meter_message_from_counter(
 
1288
            msg = utils.meter_message_from_counter(
1289
1289
                c,
1290
 
                self.CONF.publisher_rpc.metering_secret,
 
1290
                self.CONF.publisher.metering_secret,
1291
1291
            )
1292
1292
            self.conn.record_metering_data(msg)
1293
1293