From 365c7a849a4c3333e40c944ce021263280eb2149 Mon Sep 17 00:00:00 2001
From: Eoghan Glynn <eglynn@redhat.com>
Date: Thu, 25 Oct 2012 21:00:29 +0000
Subject: [PATCH] Instance pollster emits instance.<type> meter

Fixes bug 1071486

Previously the instance pollster emitted only the instance meter,
whereas the notification handler for the instance.exists event
emitted both instance and instance.<type>.

Since the pollster & handler would generally be triggered at different
frequencies (e.g. every 600s versus once an hour) this led to an
imbalance in the metering store whereby the instance counters didn't
match the sum of the per-flavor counters as expected.

Change-Id: Ic76a645f150a87bc92b4ccfc7a777dfe13502467
---
 ceilometer/compute/libvirt.py | 6 ++++++
 tests/compute/test_libvirt.py | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ceilometer/compute/libvirt.py b/ceilometer/compute/libvirt.py
index 37cb26168..37b7c0cc0 100644
--- a/ceilometer/compute/libvirt.py
+++ b/ceilometer/compute/libvirt.py
@@ -68,6 +68,12 @@ class InstancePollster(plugin.ComputePollster):
                                          type=counter.TYPE_GAUGE,
                                          volume=1,
         )
+        yield make_counter_from_instance(instance,
+                                         name='instance:%s' %
+                                         instance.instance_type.name,
+                                         type=counter.TYPE_GAUGE,
+                                         volume=1,
+        )
 
 
 class DiskIOPollster(plugin.ComputePollster):
diff --git a/tests/compute/test_libvirt.py b/tests/compute/test_libvirt.py
index d91f6705c..23a3afe75 100644
--- a/tests/compute/test_libvirt.py
+++ b/tests/compute/test_libvirt.py
@@ -51,11 +51,17 @@ class TestInstancePollster(unittest.TestCase):
         self.instance = mock.MagicMock()
         self.instance.name = 'instance-00000001'
         self.instance.id = 1
+        self.instance.instance_type = mock.MagicMock()
+        self.instance.instance_type.name = 'm1.small'
         flags.FLAGS.compute_driver = 'libvirt.LibvirtDriver'
         flags.FLAGS.connection_type = 'libvirt'
 
     def test_get_counter(self):
-        list(self.pollster.get_counters(self.manager, self.instance))
+        counters = list(self.pollster.get_counters(self.manager,
+                                                   self.instance))
+        self.assertEquals(len(counters), 2)
+        self.assertEqual(counters[0].name, 'instance')
+        self.assertEqual(counters[1].name, 'instance:m1.small')
 
 
 class TestDiskIOPollster(unittest.TestCase):