← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/tests/api/v1/test_max_resource_volume_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/v1/test_max_resource_volume_scenarios.py
21
21
import datetime
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
 
27
27
from ceilometer.tests import api as tests_api
50
50
                                   },
51
51
                source='source1',
52
52
            )
53
 
            msg = rpc.meter_message_from_counter(
 
53
            msg = utils.meter_message_from_counter(
54
54
                s,
55
 
                self.CONF.publisher_rpc.metering_secret,
 
55
                self.CONF.publisher.metering_secret,
56
56
            )
57
57
            self.conn.record_metering_data(msg)
58
58