← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/openstack/common/context.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/openstack/common/context.py
36
36
    accesses the system, as well as additional request information.
37
37
    """
38
38
 
39
 
    def __init__(self, auth_token=None, user=None, tenant=None, is_admin=False,
 
39
    user_idt_format = '{user} {tenant} {domain} {user_domain} {p_domain}'
 
40
 
 
41
    def __init__(self, auth_token=None, user=None, tenant=None, domain=None,
 
42
                 user_domain=None, project_domain=None, is_admin=False,
40
43
                 read_only=False, show_deleted=False, request_id=None,
41
44
                 instance_uuid=None):
42
45
        self.auth_token = auth_token
43
46
        self.user = user
44
47
        self.tenant = tenant
 
48
        self.domain = domain
 
49
        self.user_domain = user_domain
 
50
        self.project_domain = project_domain
45
51
        self.is_admin = is_admin
46
52
        self.read_only = read_only
47
53
        self.show_deleted = show_deleted
51
57
        self.request_id = request_id
52
58
 
53
59
    def to_dict(self):
 
60
        user_idt = (
 
61
            self.user_idt_format.format(user=self.user or '-',
 
62
                                        tenant=self.tenant or '-',
 
63
                                        domain=self.domain or '-',
 
64
                                        user_domain=self.user_domain or '-',
 
65
                                        p_domain=self.project_domain or '-'))
 
66
 
54
67
        return {'user': self.user,
55
68
                'tenant': self.tenant,
 
69
                'domain': self.domain,
 
70
                'user_domain': self.user_domain,
 
71
                'project_domain': self.project_domain,
56
72
                'is_admin': self.is_admin,
57
73
                'read_only': self.read_only,
58
74
                'show_deleted': self.show_deleted,
59
75
                'auth_token': self.auth_token,
60
76
                'request_id': self.request_id,
61
 
                'instance_uuid': self.instance_uuid}
 
77
                'instance_uuid': self.instance_uuid,
 
78
                'user_identity': user_idt}
62
79
 
63
80
 
64
81
def get_admin_context(show_deleted=False):