openstack/aodh
Code Issues Proposed changes

Merge "Update floating-ip pollster to use cache"

Browse Source
This commit is contained in:
Jenkins 2013-07-04 23:55:32 +00:00 committed by Gerrit Code Review
commit 8122de74c8
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ceilometer/network/floatingip.py
View File

@ -35,9 +35,17 @@ class FloatingIPPollster(plugin.CentralPollster):
def get_counter_names(): def get_counter_names():
return ['ip.floating'] return ['ip.floating']
def get_counters(self, manager, cache): def _get_floating_ips(self):
nv = nova_client.Client() nv = nova_client.Client()
for ip in nv.floating_ip_get_all(): return nv.floating_ip_get_all()
def _iter_floating_ips(self, cache):
if 'floating_ips' not in cache:
cache['floating_ips'] = list(self._get_floating_ips())
return iter(cache['floating_ips'])
def get_counters(self, manager, cache):
for ip in self._iter_floating_ips(cache):
self.LOG.info("FLOATING IP USAGE: %s" % ip.ip) self.LOG.info("FLOATING IP USAGE: %s" % ip.ip)
# FIXME (flwang) Now Nova API /os-floating-ips can't provide those # FIXME (flwang) Now Nova API /os-floating-ips can't provide those
# attributes were used by Ceilometer, such as project id, host. # attributes were used by Ceilometer, such as project id, host.

6
tests/network/test_floatingip.py
View File

@ -85,3 +85,9 @@ class TestFloatingIPPollster(base.TestCase):
counters = list(self.pollster.get_counters(self.manager, {})) counters = list(self.pollster.get_counters(self.manager, {}))
self.assertEqual(set([c.name for c in counters]), self.assertEqual(set([c.name for c in counters]),
set(self.pollster.get_counter_names())) set(self.pollster.get_counter_names()))
def test_get_counters_cached(self):
cache = {}
cache['floating_ips'] = self.faux_get_ips(None)[:2]
counters = list(self.pollster.get_counters(self.manager, cache))
self.assertEqual(len(counters), 2)