support_model_filter_vmdevices

Signed-off-by: Dan Zheng <dzheng@redhat.com>

Author: dzhengfy

virttest/libvirt_xml/vm_xml.py

@@ -48,6 +48,11 @@ def extend(self, iterable):
             self.append(item)
         return self
 
+    def remove(self, value):
+        self.__type_check__(value)
+        super(VMXMLDevices, self).remove(value)
+        return self
+
     def by_device_tag(self, tag):
         result = VMXMLDevices()
         for device in self:

virttest/utils_libvirt/libvirt_vmxml.py

@@ -162,7 +162,7 @@ def create_vm_device_by_type(dev_type, dev_dict):
 
 
 def modify_vm_device(
-    vmxml, dev_type, dev_dict=None, index=0, virsh_instance=virsh, sync_vm=True
+    vmxml, dev_type, dev_dict=None, index=0, virsh_instance=virsh, sync_vm=True, dev_model=None
 ):
     """
      Get specified device , update it with given dev_dict if the device exists,
@@ -174,11 +174,12 @@ def modify_vm_device(
     :param index: device index
     :param virsh_instance: virsh instance
     :param sync_vm: boolean, True to execute sync, otherwise not
+    :param dev_model: str, the model for the device, like controller model 'pcie-root'
     :return: device object
     """
     dev_obj = None
     try:
-        dev_obj, xml_devices = libvirt.get_vm_device(vmxml, dev_type, index=index)
+        dev_obj, xml_devices = libvirt.get_vm_device(vmxml, dev_type, index=index, model=dev_model)
         dev_obj.setup_attrs(**dev_dict)
 
         vmxml.devices = xml_devices

virttest/utils_test/libvirt.py

@@ -2507,7 +2507,7 @@ def create_tpm_dev(params):
     return tpm_dev
 
 
-def get_vm_device(vmxml, dev_tag, index=0):
+def get_vm_device(vmxml, dev_tag, index=0, model=None):
     """
     Get current vm device according to device tag
 
@@ -2517,7 +2517,13 @@ def get_vm_device(vmxml, dev_tag, index=0):
     :return: device object
     """
     xml_devices = vmxml.devices
-    dev_index = xml_devices.index(xml_devices.by_device_tag(dev_tag)[index])
+    devices_by_tag = xml_devices.by_device_tag(dev_tag)
+    if model:
+        for the_device in devices_by_tag:
+            if the_device.get("model") and the_device.model != model:
+                devices_by_tag.remove(the_device)
+
+    dev_index = xml_devices.index(devices_by_tag[index])
     dev_obj = xml_devices[dev_index]
     return (dev_obj, xml_devices)