From 8838e435eca0772a840dc1832f6374aa5058aefd Mon Sep 17 00:00:00 2001 From: Huang Rui Date: Thu, 17 Sep 2015 10:41:21 +0800 Subject: [PATCH] Implement inspector method - inspect_memory_usage zvm inspector method inspect_memory_usage will return memory usage to ceilometer memory pollster. Change-Id: Ibbe1030516fd960211d009d4bfa863bad99227af --- ceilometer_zvm/compute/virt/zvm/inspector.py | 3 ++- .../tests/unit/compute/virt/zvm/test_inspector.py | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) 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)