Pass in new DiskStats parameters

Ceilometer added two new parameters to DiskStats [1], wr_total_times
and rd_total_times. We do not currently have those metrics, so 0 will
be passed in for both.

[1] https://github.com/openstack/ceilometer/commit/ed67c2bd3

Change-Id: I7c60ad99df736fa878b97177035d1565dac4beab
This commit is contained in:
esberglu 2017-09-14 09:36:54 -05:00
parent 4983b04c40
commit 7542a8f126
2 changed files with 9 additions and 2 deletions

View File

@ -398,7 +398,8 @@ class PowerVMInspector(virt_inspector.Inspector):
yield virt_inspector.DiskStats(
device=adpt.name, read_requests=adpt.num_reads,
read_bytes=adpt.read_bytes, write_requests=adpt.num_writes,
write_bytes=adpt.write_bytes, errors=0)
write_bytes=adpt.write_bytes, errors=0, wr_total_times=0,
rd_total_times=0)
def inspect_disk_iops(self, instance):
"""Inspect the Disk Input/Output operations per second for an instance.

View File

@ -410,6 +410,8 @@ class TestPowerVMInspector(base.BaseTestCase):
self.assertEqual(1000, stats1.write_requests)
self.assertEqual(100000, stats1.write_bytes)
self.assertEqual(0, stats1.errors)
self.assertEqual(0, stats1.wr_total_times)
self.assertEqual(0, stats1.rd_total_times)
stats2 = resp[1]
self.assertEqual('vscsi2', stats2.device)
@ -417,7 +419,9 @@ class TestPowerVMInspector(base.BaseTestCase):
self.assertEqual(200000, stats2.read_bytes)
self.assertEqual(2000, stats2.write_requests)
self.assertEqual(200000, stats2.write_bytes)
self.assertEqual(0, stats1.errors)
self.assertEqual(0, stats2.errors)
self.assertEqual(0, stats2.wr_total_times)
self.assertEqual(0, stats2.rd_total_times)
# Next is the vFC metric
stats3 = resp[2]
@ -427,3 +431,5 @@ class TestPowerVMInspector(base.BaseTestCase):
self.assertEqual(3000, stats3.write_requests)
self.assertEqual(300000, stats3.write_bytes)
self.assertEqual(0, stats3.errors)
self.assertEqual(0, stats3.wr_total_times)
self.assertEqual(0, stats3.rd_total_times)