← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/alarm/notifier/trust.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/alarm/notifier/trust.py
15
15
"""Rest alarm notifier with trusted authentication."""
16
16
 
17
17
from keystoneclient.v3 import client as keystone_client
18
 
from oslo.config import cfg
 
18
from oslo_config import cfg
19
19
from six.moves.urllib import parse
20
20
 
21
21
from ceilometer.alarm.notifier import rest
36
36
    """
37
37
 
38
38
    @staticmethod
39
 
    def notify(action, alarm_id, alarm_name, previous, current,
 
39
    def notify(action, alarm_id, alarm_name, severity, previous, current,
40
40
               reason, reason_data):
41
41
        trust_id = action.username
42
42
 
62
62
 
63
63
        headers = {'X-Auth-Token': client.auth_token}
64
64
        rest.RestAlarmNotifier.notify(
65
 
            action, alarm_id, alarm_name, previous, current, reason,
 
65
            action, alarm_id, alarm_name, severity, previous, current, reason,
66
66
            reason_data, headers)