Merge "Provide CPU number as additional metadata."

ceilometer/compute/pollsters/cpu.py

@@ -69,12 +69,14 @@ class CPUPollster(_Base):
     def _get_counter(instance, instance_name, cpu_info):
         LOG.info("CPUTIME USAGE: %s %d",
                  instance.__dict__, cpu_info.time)
+        cpu_num = {'cpu_number': cpu_info.number}
         return util.make_counter_from_instance(
             instance,
             name='cpu',
             type=counter.TYPE_CUMULATIVE,
             unit='ns',
             volume=cpu_info.time,
+            additional_metadata=cpu_num,
         )
 
 

ceilometer/compute/pollsters/util.py

@@ -96,7 +96,10 @@ def _get_metadata_from_object(instance):
     return _add_reserved_user_metadata(instance, metadata)
 
 
-def make_counter_from_instance(instance, name, type, unit, volume):
+def make_counter_from_instance(instance, name, type, unit, volume,
+                               additional_metadata={}):
+    resource_metadata = _get_metadata_from_object(instance)
+    resource_metadata.update(additional_metadata)
     return counter.Counter(
         name=name,
         type=type,
@@ -106,7 +109,7 @@ def make_counter_from_instance(instance, name, type, unit, volume):
         project_id=instance.tenant_id,
         resource_id=instance.id,
         timestamp=timeutils.isotime(),
-        resource_metadata=_get_metadata_from_object(instance),
+        resource_metadata=resource_metadata,
     )
 
 

tests/compute/pollsters/test_cpu.py

@@ -57,6 +57,8 @@ class TestCPUPollster(base.TestPollsterBase):
             assert counters[0].volume == expected_time
             assert pollster.CACHE_KEY_CPU in cache
             assert self.instance.name in cache[pollster.CACHE_KEY_CPU]
+            self.assertEquals(counters[0].resource_metadata.get('cpu_number'),
+                              2)
             # ensure elapsed time between polling cycles is non-zero
             time.sleep(0.001)