← 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_list_events_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_list_events_scenarios.py
24
24
import testscenarios
25
25
import webtest.app
26
26
 
27
 
from ceilometer.publisher import rpc
 
27
from ceilometer.publisher import utils
28
28
from ceilometer import sample
29
29
from ceilometer.tests.api.v2 import FunctionalTest
30
30
from ceilometer.tests import db as tests_db
56
56
                               },
57
57
            source='test_source',
58
58
        )
59
 
        msg = rpc.meter_message_from_counter(
 
59
        msg = utils.meter_message_from_counter(
60
60
            self.sample1,
61
 
            self.CONF.publisher_rpc.metering_secret,
 
61
            self.CONF.publisher.metering_secret,
62
62
        )
63
63
        self.conn.record_metering_data(msg)
64
64
 
76
76
                               },
77
77
            source='source2',
78
78
        )
79
 
        msg2 = rpc.meter_message_from_counter(
 
79
        msg2 = utils.meter_message_from_counter(
80
80
            self.sample2,
81
 
            self.CONF.publisher_rpc.metering_secret,
 
81
            self.CONF.publisher.metering_secret,
82
82
        )
83
83
        self.conn.record_metering_data(msg2)
84
84