...
 
Commits (3)
...@@ -91,7 +91,22 @@ class BaseTestClass(): ...@@ -91,7 +91,22 @@ class BaseTestClass():
This fixture should be used in the setup of every test manipulating This fixture should be used in the setup of every test manipulating
with node devices. with node devices.
""" """
path = self.connect.NodeDeviceCreateXML(xmldata.minimal_node_device_xml, 0) # We need a usable parent nodedev: possible candidates are
# scsi_host2 (available since libvirt 3.1.0) and
# test-scsi-host-vport (available until libvirt 3.0.0).
#
# Looking up a non-existing nodedev raises an exception, so
# we need to ignore them here: that's okay, because if we
# can't find any then NodeDeviceCreateXML() itself will fail
xml = xmldata.minimal_node_device_xml
for parent in ['scsi_host2', 'test-scsi-host-vport']:
try:
if self.connect.NodeDeviceLookupByName(parent):
xml = xml.replace('@parent@', parent)
break
except dbus.exceptions.DBusException:
pass
path = self.connect.NodeDeviceCreateXML(xml, 0)
return path return path
@pytest.fixture @pytest.fixture
......
...@@ -195,7 +195,7 @@ class TestConnect(libvirttest.BaseTestClass): ...@@ -195,7 +195,7 @@ class TestConnect(libvirttest.BaseTestClass):
self.connect.connect_to_signal('NodeDeviceEvent', node_device_created) self.connect.connect_to_signal('NodeDeviceEvent', node_device_created)
path = self.connect.NodeDeviceCreateXML(xmldata.minimal_node_device_xml, 0) path = self.node_device_create()
assert isinstance(path, dbus.ObjectPath) assert isinstance(path, dbus.ObjectPath)
self.main_loop() self.main_loop()
......
...@@ -5,7 +5,6 @@ import libvirttest ...@@ -5,7 +5,6 @@ import libvirttest
import pytest import pytest
@pytest.mark.usefixtures("node_device_create")
class TestNodeDevice(libvirttest.BaseTestClass): class TestNodeDevice(libvirttest.BaseTestClass):
""" Tests for methods and properties of the NodeDevice interface """ Tests for methods and properties of the NodeDevice interface
""" """
......
...@@ -41,7 +41,7 @@ minimal_network_xml = ''' ...@@ -41,7 +41,7 @@ minimal_network_xml = '''
minimal_node_device_xml = ''' minimal_node_device_xml = '''
<device> <device>
<name>scsi_host22</name> <name>scsi_host22</name>
<parent>scsi_host2</parent> <parent>@parent@</parent>
<capability type='scsi_host'> <capability type='scsi_host'>
<host>22</host> <host>22</host>
<unique_id>22</unique_id> <unique_id>22</unique_id>
......