← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/tests/storage/test_storage_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:
ceilometer/tests/storage/test_storage_scenarios.py
1
1
#
2
2
# Copyright 2013 Intel Corp.
3
3
#
4
 
# Author: Lianhao Lu <lianhao.lu@intel.com>
5
 
#         Shane Wang <shane.wang@intel.com>
6
 
#         Julien Danjou <julien@danjou.info>
7
 
#
8
4
# Licensed under the Apache License, Version 2.0 (the "License"); you may
9
5
# not use this file except in compliance with the License. You may obtain
10
6
# a copy of the License at
23
19
import operator
24
20
 
25
21
import mock
26
 
from oslo.config import cfg
27
 
from oslo.utils import timeutils
 
22
from oslo_config import cfg
 
23
from oslo_utils import timeutils
28
24
import pymongo
29
25
 
30
26
import ceilometer
55
51
            resource_metadata=metadata, source=source
56
52
        )
57
53
        msg = utils.meter_message_from_counter(
58
 
            s, self.CONF.publisher.metering_secret
 
54
            s, self.CONF.publisher.telemetry_secret
59
55
        )
60
56
        self.conn.record_metering_data(msg)
61
57
        return msg
1182
1178
        self.assertEqual(10, results.max)
1183
1179
        self.assertEqual(27, results.sum)
1184
1180
        self.assertEqual(9, results.avg)
 
1181
        self.assertEqual(datetime.datetime(2012, 9, 25, 10, 30),
 
1182
                         results.period_start)
 
1183
        self.assertEqual(datetime.datetime(2012, 9, 25, 12, 32),
 
1184
                         results.period_end)
1185
1185
 
1186
1186
    def test_by_user(self):
1187
1187
        f = storage.SampleFilter(
1409
1409
                source=test_sample['source'],
1410
1410
            )
1411
1411
            msg = utils.meter_message_from_counter(
1412
 
                c,
1413
 
                self.CONF.publisher.metering_secret,
 
1412
                c, self.CONF.publisher.telemetry_secret,
1414
1413
            )
1415
1414
            self.conn.record_metering_data(msg)
1416
1415
 
2608
2607
            source='test-1',
2609
2608
        )
2610
2609
        msg = utils.meter_message_from_counter(
2611
 
            c,
2612
 
            self.CONF.publisher.metering_secret,
 
2610
            c, self.CONF.publisher.telemetry_secret,
2613
2611
        )
2614
2612
 
2615
2613
        self.conn.record_metering_data(msg)
2627
2625
            source='test-1',
2628
2626
        )
2629
2627
        msg = utils.meter_message_from_counter(
2630
 
            c,
2631
 
            self.CONF.publisher.metering_secret,
 
2628
            c, self.CONF.publisher.telemetry_secret,
2632
2629
        )
2633
2630
        self.conn.record_metering_data(msg)
2634
2631
 
2645
2642
            source='test-1',
2646
2643
        )
2647
2644
        msg = utils.meter_message_from_counter(
2648
 
            c,
2649
 
            self.CONF.publisher.metering_secret,
 
2645
            c, self.CONF.publisher.telemetry_secret,
2650
2646
        )
2651
2647
        self.conn.record_metering_data(msg)
2652
2648
 
3492
3488
                          timestamp=datetime.datetime.utcnow(),
3493
3489
                          resource_metadata=metadata)
3494
3490
        msg = utils.meter_message_from_counter(
3495
 
            s, self.CONF.publisher.metering_secret)
 
3491
            s, self.CONF.publisher.telemetry_secret)
3496
3492
        self.conn.record_metering_data(msg)
3497
3493
 
3498
3494