diff --git a/ceilometer_zvm/compute/virt/zvm/inspector.py b/ceilometer_zvm/compute/virt/zvm/inspector.py index d10755c..ca43450 100644 --- a/ceilometer_zvm/compute/virt/zvm/inspector.py +++ b/ceilometer_zvm/compute/virt/zvm/inspector.py @@ -134,7 +134,8 @@ class ZVMInspector(virt_inspector.Inspector): time=inst_stat['used_cpu_time']) def inspect_memory_usage(self, instance, duration=None): - pass + inst_stat = self._get_inst_stat('memory.usage', instance) + return virt_inspector.MemoryUsageStats(usage=inst_stat['used_memory']) def inspect_vnics(self, instance): pass diff --git a/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py b/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py index 03eb002..9e0fe76 100644 --- a/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py +++ b/ceilometer_zvm/tests/unit/compute/virt/zvm/test_inspector.py @@ -155,3 +155,11 @@ class TestZVMInspector(base.BaseTestCase): self.assertEqual(2, cpu_stat.number) self.assertEqual(99999999, cpu_stat.time) get_stat.assert_called_once_with('cpus', None) + + @mock.patch("ceilometer_zvm.compute.virt.zvm.inspector.ZVMInspector." + "_get_inst_stat") + def test_inspect_memory_usage(self, get_stat): + get_stat.return_value = {'used_memory': 1998} + mem_usage = self.inspector.inspect_memory_usage(None) + self.assertEqual(1998, mem_usage.usage) + get_stat.assert_called_once_with('memory.usage', None)