← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/network/floatingip.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/network/floatingip.py
4
4
# Copyright 2013 IBM Corp
5
5
# All Rights Reserved.
6
6
#
7
 
# Author: Julien Danjou <julien@danjou.info>
8
 
#
9
7
# Licensed under the Apache License, Version 2.0 (the "License"); you may
10
8
# not use this file except in compliance with the License. You may obtain
11
9
# a copy of the License at
18
16
# License for the specific language governing permissions and limitations
19
17
# under the License.
20
18
 
21
 
from oslo.config import cfg
22
 
from oslo.utils import timeutils
 
19
from oslo_config import cfg
 
20
from oslo_utils import timeutils
23
21
 
24
22
from ceilometer.agent import plugin_base
25
23
from ceilometer.i18n import _
30
28
 
31
29
LOG = log.getLogger(__name__)
32
30
 
33
 
cfg.CONF.import_group('service_types', 'ceilometer.nova_client')
34
 
 
35
31
 
36
32
class FloatingIPPollster(plugin_base.PollsterBase):
37
33
 
38
 
    def _get_floating_ips(self, ksclient, endpoint):
 
34
    @staticmethod
 
35
    def _get_floating_ips(ksclient, endpoint):
39
36
        nv = nova_client.Client(
40
37
            auth_token=ksclient.auth_token, bypass_url=endpoint)
41
38
        return nv.floating_ip_get_all()