Merge "Remove cpu_util meter"

ceilometer/compute/pollsters/instance_stats.py

@@ -38,12 +38,6 @@ class CPUPollster(InstanceStatsPollster):
         return {'cpu_number': c_data.cpu_number}
 
 
-class CPUUtilPollster(InstanceStatsPollster):
-    sample_name = 'cpu_util'
-    sample_unit = '%'
-    sample_stats_key = 'cpu_util'
-
-
 class MemoryUsagePollster(InstanceStatsPollster):
     sample_name = 'memory.usage'
     sample_unit = 'MB'

ceilometer/compute/virt/inspector.py

@@ -43,7 +43,6 @@ class InstanceStats(object):
         'power_state',             # the power state of the domain
         'cpu_number',              # number: number of CPUs
         'cpu_time',                # time: cumulative CPU time
-        'cpu_util',                # util: CPU utilization in percentage
         'cpu_l3_cache_usage',      # cachesize: Amount of CPU L3 cache used
         'memory_usage',            # usage: Amount of memory used
         'memory_resident',         #

ceilometer/tests/unit/compute/pollsters/test_cpu.py

@@ -98,29 +98,6 @@ class TestCPUPollster(base.TestPollsterBase):
                          samples[0].resource_metadata['instance_type'])
 
 
-class TestCPUUtilPollster(base.TestPollsterBase):
-
-    def test_get_samples(self):
-        self._mock_inspect_instance(
-            virt_inspector.InstanceStats(cpu_util=40),
-            virt_inspector.InstanceStats(cpu_util=60),
-        )
-
-        mgr = manager.AgentManager(0, self.CONF)
-        pollster = instance_stats.CPUUtilPollster(self.CONF)
-
-        def _verify_cpu_util_metering(expected_util):
-            cache = {}
-            samples = list(pollster.get_samples(mgr, cache, [self.instance]))
-            self.assertEqual(1, len(samples))
-            self.assertEqual(set(['cpu_util']),
-                             set([s.name for s in samples]))
-            self.assertEqual(expected_util, samples[0].volume)
-
-        _verify_cpu_util_metering(40)
-        _verify_cpu_util_metering(60)
-
-
 class TestCPUL3CachePollster(base.TestPollsterBase):
 
     def test_get_samples(self):

setup.cfg

@@ -75,7 +75,6 @@ ceilometer.poll.compute =
     disk.device.write.latency = ceilometer.compute.pollsters.disk:PerDeviceDiskWriteLatencyPollster
     power.state = ceilometer.compute.pollsters.instance_stats:PowerStatePollster
     cpu = ceilometer.compute.pollsters.instance_stats:CPUPollster
-    cpu_util = ceilometer.compute.pollsters.instance_stats:CPUUtilPollster
     cpu_l3_cache = ceilometer.compute.pollsters.instance_stats:CPUL3CachePollster
     network.incoming.bytes = ceilometer.compute.pollsters.net:IncomingBytesPollster
     network.incoming.packets = ceilometer.compute.pollsters.net:IncomingPacketsPollster