← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/dispatcher/http.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/dispatcher/http.py
1
1
# Copyright 2013 IBM Corp
2
2
#
3
 
# Author: Tong Li <litong01@us.ibm.com>
4
 
#
5
3
# Licensed under the Apache License, Version 2.0 (the "License"); you may
6
4
# not use this file except in compliance with the License. You may obtain
7
5
# a copy of the License at
16
14
 
17
15
import json
18
16
 
19
 
from oslo.config import cfg
 
17
from oslo_config import cfg
20
18
import requests
21
19
 
22
20
from ceilometer import dispatcher
87
85
                    'timestamp': meter.get('timestamp', 'NO TIMESTAMP'),
88
86
                    'counter_volume': meter['counter_volume']}))
89
87
            if publisher_utils.verify_signature(
90
 
                    meter,
91
 
                    self.conf.publisher.metering_secret):
 
88
                    meter, self.conf.publisher.telemetry_secret):
92
89
                try:
93
90
                    if self.cadf_only:
94
91
                        # Only cadf messages are being wanted.