← 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_list_meters_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_list_meters_scenarios.py
23
23
import logging
24
24
import testscenarios
25
25
 
26
 
from ceilometer.publisher import rpc
 
26
from ceilometer.publisher import utils
27
27
from ceilometer import sample
28
28
 
29
29
from ceilometer.tests import api as tests_api
108
108
                    resource_metadata={'display_name': 'test-server',
109
109
                                       'tag': 'four.sample'},
110
110
                    source='test_list_resources')]:
111
 
            msg = rpc.meter_message_from_counter(
 
111
            msg = utils.meter_message_from_counter(
112
112
                cnt,
113
 
                self.CONF.publisher_rpc.metering_secret)
 
113
                self.CONF.publisher.metering_secret)
114
114
            self.conn.record_metering_data(msg)
115
115
 
116
116
    def test_list_meters(self):