openstack/ceilometer
Code Issues Proposed changes

Merge "Remove the wrap for skip inspect rbd disk info"

Browse Source
This commit is contained in:
Zuul 2017-10-24 09:29:47 +00:00 committed by Gerrit Code Review
commit 90b6ecd9db
2 changed files with 14 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ceilometer/compute/virt/libvirt/inspector.py
View File

@ -135,27 +135,19 @@ class LibvirtInspector(virt_inspector.Inspector):
domain = self._get_domain_not_shut_off_or_raise(instance)
tree = etree.fromstring(domain.XMLDesc(0))
for disk in tree.findall('devices/disk'):
disk_type = disk.get('type')
if disk_type:
if disk_type == 'network':
LOG.warning(
'Inspection disk usage of network disk '
'%(instance_uuid)s unsupported by libvirt' % {
'instance_uuid': instance.id})
continue
# NOTE(lhx): "cdrom" device associated to the configdrive
# no longer has a "source" element. Releated bug:
# https://bugs.launchpad.net/ceilometer/+bug/1622718
if disk.find('source') is None:
continue
target = disk.find('target')
device = target.get('dev')
if device:
block_info = domain.blockInfo(device)
yield virt_inspector.DiskInfo(device=device,
capacity=block_info[0],
allocation=block_info[1],
physical=block_info[2])
# NOTE(lhx): "cdrom" device associated to the configdrive
# no longer has a "source" element. Releated bug:
# https://bugs.launchpad.net/ceilometer/+bug/1622718
if disk.find('source') is None:
continue
target = disk.find('target')
device = target.get('dev')
if device:
block_info = domain.blockInfo(device)
yield virt_inspector.DiskInfo(device=device,
capacity=block_info[0],
allocation=block_info[1],
physical=block_info[2])
@libvirt_utils.raise_nodata_if_unsupported
@libvirt_utils.retry_on_disconnect

2
ceilometer/tests/unit/compute/virt/libvirt/test_inspector.py
View File

@ -378,7 +378,7 @@ class TestLibvirtInspection(base.BaseTestCase):
with mock.patch('ceilometer.compute.virt.libvirt.utils.'
'refresh_libvirt_connection', return_value=conn):
disks = list(self.inspector.inspect_disk_info(self.instance, None))
self.assertEqual(0, len(disks))
self.assertEqual(1, len(disks))
def test_inspect_disk_info_without_source_element(self):
dom_xml = """