← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/objectstore/swift.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2014-06-13 13:20:35 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20140613132035-42ibzh8j7ww2q31i
Tags: 2014.2~b1-0ubuntu1
* New upstream release.
* debian/control: Open up juno release
* debian/patches/fix-requirements.patch: Refreshed.
* debian/rules: Patch the ceilometer.conf.sample directly since
  the configuration files are generated by a tool.
* debian/ceilometer-common.install: Drop sources.json.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer/objectstore/swift.py
1
 
# -*- encoding: utf-8 -*-
2
1
#
3
 
# Copyright © 2012 eNovance
 
2
# Copyright 2012 eNovance
4
3
#
5
4
# Author: Guillaume Pernot <gpernot@praksys.org>
6
5
#
25
24
from oslo.config import cfg
26
25
from swiftclient import client as swift
27
26
 
28
 
from ceilometer.openstack.common.gettextutils import _  # noqa
 
27
from ceilometer.central import plugin
 
28
from ceilometer.openstack.common.gettextutils import _
29
29
from ceilometer.openstack.common import log
30
30
from ceilometer.openstack.common import timeutils
31
 
from ceilometer import plugin
32
31
from ceilometer import sample
33
32
 
34
33
 
44
43
cfg.CONF.register_opts(OPTS)
45
44
 
46
45
 
47
 
class _Base(plugin.PollsterBase):
 
46
class _Base(plugin.CentralPollster):
48
47
 
49
48
    CACHE_KEY_TENANT = 'tenants'
50
49
    METHOD = 'head'
87
86
class ObjectsPollster(_Base):
88
87
    """Iterate over all accounts, using keystone.
89
88
    """
90
 
 
91
 
    def get_samples(self, manager, cache, resources=[]):
 
89
    @plugin.check_keystone
 
90
    def get_samples(self, manager, cache, resources=None):
92
91
        for tenant, account in self._iter_accounts(manager.keystone, cache):
93
92
            yield sample.Sample(
94
93
                name='storage.objects',
106
105
class ObjectsSizePollster(_Base):
107
106
    """Iterate over all accounts, using keystone.
108
107
    """
109
 
 
110
 
    def get_samples(self, manager, cache, resources=[]):
 
108
    @plugin.check_keystone
 
109
    def get_samples(self, manager, cache, resources=None):
111
110
        for tenant, account in self._iter_accounts(manager.keystone, cache):
112
111
            yield sample.Sample(
113
112
                name='storage.objects.size',
125
124
class ObjectsContainersPollster(_Base):
126
125
    """Iterate over all accounts, using keystone.
127
126
    """
128
 
 
129
 
    def get_samples(self, manager, cache, resources=[]):
 
127
    @plugin.check_keystone
 
128
    def get_samples(self, manager, cache, resources=None):
130
129
        for tenant, account in self._iter_accounts(manager.keystone, cache):
131
130
            yield sample.Sample(
132
131
                name='storage.objects.containers',
147
146
 
148
147
    METHOD = 'get'
149
148
 
150
 
    def get_samples(self, manager, cache, resources=[]):
 
149
    @plugin.check_keystone
 
150
    def get_samples(self, manager, cache, resources=None):
151
151
        for project, account in self._iter_accounts(manager.keystone, cache):
152
152
            containers_info = account[1]
153
153
            for container in containers_info:
170
170
 
171
171
    METHOD = 'get'
172
172
 
173
 
    def get_samples(self, manager, cache, resources=[]):
 
173
    @plugin.check_keystone
 
174
    def get_samples(self, manager, cache, resources=None):
174
175
        for project, account in self._iter_accounts(manager.keystone, cache):
175
176
            containers_info = account[1]
176
177
            for container in containers_info: