diff options
| author | Claudiu Belu <cbelu@cloudbasesolutions.com> | 2014-11-24 19:57:51 +0200 |
|---|---|---|
| committer | Alessandro Pilotti <apilotti@cloudbasesolutions.com> | 2014-11-25 15:40:15 +0000 |
| commit | 1324ab751b8d350f9460006581d84f5beda86285 (patch) | |
| tree | 559b361a827405f8b2aade0bc6fb03ab1da03ba5 | |
| parent | b1fca33e5f4c5443389d131a212a058d2306ac23 (diff) | |
| download | ceilometer-1324ab751b8d350f9460006581d84f5beda86285.tar.gz | |
Fixes Hyper-V Inspector disk metrics cache issue
Hyper-V Inspector yields a Disk with the property
'device' containing a dictionary. This causes an
exception when the values are cached in a dictionary
using the said 'device' as a key.
Closes-Bug: #1395807
Change-Id: I09b4ec2a37a6f7e6580a059517ab6e606bfc346f
(cherry picked from commit a2e11a37aca6d4c0f76376938a147a37b1950ec6)
| -rw-r--r-- | ceilometer/compute/virt/hyperv/inspector.py | 6 | ||||
| -rw-r--r-- | ceilometer/tests/compute/virt/hyperv/test_inspector.py | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/ceilometer/compute/virt/hyperv/inspector.py b/ceilometer/compute/virt/hyperv/inspector.py index 183b0ca2..0bdb1d20 100644 --- a/ceilometer/compute/virt/hyperv/inspector.py +++ b/ceilometer/compute/virt/hyperv/inspector.py @@ -69,11 +69,7 @@ class HyperVInspector(virt_inspector.Inspector): def inspect_disks(self, instance_name): for disk_metrics in self._utils.get_disk_metrics(instance_name): - device = dict([(i, disk_metrics[i]) - for i in ['instance_id', 'host_resource'] - if i in disk_metrics]) - - disk = virt_inspector.Disk(device=device) + disk = virt_inspector.Disk(device=disk_metrics['instance_id']) stats = virt_inspector.DiskStats( read_requests=0, # Return bytes diff --git a/ceilometer/tests/compute/virt/hyperv/test_inspector.py b/ceilometer/tests/compute/virt/hyperv/test_inspector.py index 0f2424c6..89071f27 100644 --- a/ceilometer/tests/compute/virt/hyperv/test_inspector.py +++ b/ceilometer/tests/compute/virt/hyperv/test_inspector.py @@ -102,9 +102,6 @@ class TestHyperVInspection(base.BaseTestCase): fake_instance_id = "fake_fake_instance_id" fake_host_resource = "fake_host_resource" - fake_device = {"instance_id": fake_instance_id, - "host_resource": fake_host_resource} - self._inspector._utils.get_disk_metrics.return_value = [{ 'read_mb': fake_read_mb, 'write_mb': fake_write_mb, @@ -119,7 +116,7 @@ class TestHyperVInspection(base.BaseTestCase): inspected_disk, inspected_stats = inspected_disks[0] - self.assertEqual(fake_device, inspected_disk.device) + self.assertEqual(fake_instance_id, inspected_disk.device) self.assertEqual(fake_read_mb * units.Mi, inspected_stats.read_bytes) self.assertEqual(fake_write_mb * units.Mi, inspected_stats.write_bytes) |