openstack
/
fuel-devops
Code Issues Proposed changes

Check that suitable emulator is found for libvirt 

Fixes the unclear error:
'NoneType' object has no attribute 'text'

Change-Id: I56919a72afb706d86e4d35298a808e78b1c4f422
This commit is contained in:
Dennis Dmitriev 2017-04-19 17:23:36 +03:00
parent 6847377d9a
commit cc2828c56c
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devops/driver/libvirt/libvirt_driver.py
View File

@ -1134,6 +1134,17 @@ class LibvirtNode(node.Node):
:rtype : None
"""
emulator_field = self.driver.get_capabilities().find(
'guest/arch[@name="{0:>s}"]/'
'domain[@type="{1:>s}"]/emulator'.format(
self.architecture, self.hypervisor))
if not emulator_field:
raise error.DevopsError(
"No suitable emulator found in libvirt for arch = '{0}'"
" and domain type = '{1}', please check 'virsh capabilities'"
.format(self.architecture, self.hypervisor))
emulator = emulator_field.text
name = helpers.underscored(
helpers.deepgetattr(self, 'group.environment.name'),
self.name,
@ -1178,10 +1189,6 @@ class LibvirtNode(node.Node):
interface_filter=filter_name,
))
emulator = self.driver.get_capabilities().find(
'guest/arch[@name="{0:>s}"]/'
'domain[@type="{1:>s}"]/emulator'.format(
self.architecture, self.hypervisor)).text
node_xml = builder.LibvirtXMLBuilder.build_node_xml(
name=name,
hypervisor=self.hypervisor,