Merge pull request autotest#5529 from Yingshun/igb_at_iface

virtual_network: Add a hotplug case

libvirt/tests/cfg/virtual_network/hotplug/attach_detach_interface/attach_interface_with_model.cfg

@@ -0,0 +1,26 @@
+- virtual_network.hotplug.attach_interface.model:
+    type = attach_interface_with_model
+    start_vm = no
+    timeout = 240
+    outside_ip = 'www.redhat.com'
+    host_iface =
+    vm_ping_outside = pass
+    variants model_type:
+        - virtio:
+            iface_driver = virtio_net
+            pci_model = pcie-root-port
+            s390-virtio:
+                check_pci_model = no
+        - e1000e:
+            only x86_64
+            iface_driver = e1000e
+            pci_model = pcie-root-port
+        - igb:
+            only x86_64
+            func_supported_since_libvirt_ver = (9, 3, 0)
+            iface_driver = igb
+            pci_model = pcie-root-port
+        - rtl8139:
+            only x86_64
+            iface_driver = 8139cp
+            pci_model = pcie-to-pci-bridge

libvirt/tests/src/virtual_network/hotplug/attach_detach_interface/attach_interface_with_model.py

@@ -0,0 +1,123 @@
+import uuid
+
+from virttest import libvirt_version
+from virttest import utils_net
+from virttest import virsh
+from virttest.libvirt_xml import vm_xml
+
+from virttest.utils_libvirt import libvirt_vmxml
+from virttest.libvirt_xml.devices import interface
+from virttest.utils_test import libvirt
+
+from provider.virtual_network import network_base
+from provider.interface import interface_base
+
+VIRSH_ARGS = {"ignore_status": False, "debug": True}
+
+
+def check_model_controller(vm_name, pci_model, test):
+    """
+    Checks that the controllers are the expected pci model
+
+    :param vm_name: VM name
+    :param pci_model: The expected pci model
+    :param test: Test instance
+    """
+    vmxml = vm_xml.VMXML.new_from_dumpxml(vm_name)
+    iface = vmxml.get_devices("interface")[0]
+    test.log.debug(f"Interface xml after vm started:\n{iface}")
+    ctrl_index = int(iface.fetch_attrs()["address"]["attrs"]["bus"], 16)
+    controllers = vmxml.get_devices("controller")
+    iface_controller = [c for c in controllers if c.type == "pci" and
+                        c.index == str(ctrl_index)][0]
+    test.log.debug(f"Controller xml:\n{iface_controller}")
+
+    if iface_controller.model == pci_model:
+        test.log.debug("XML controller model check: PASS")
+    else:
+        test.fail(f"Expect pci model: {pci_model}, "
+                  f"and got {iface_controller.model}")
+
+
+def run(test, params, env):
+    """
+    Attach-interface with different models and options
+    """
+    libvirt_version.is_libvirt_feature_supported(params)
+
+    vm_name = params.get("main_vm")
+    vm = env.get_vm(vm_name)
+    outside_ip = params.get("outside_ip")
+    pci_model = params.get("pci_model")
+    iface_driver = params.get("iface_driver")
+    model_type = params.get("model_type")
+    check_pci_model = params.get("check_pci_model", "yes") == "yes"
+
+    vmxml = vm_xml.VMXML.new_from_inactive_dumpxml(vm_name)
+    bkxml = vmxml.copy()
+
+    try:
+        pci_controllers = vmxml.get_controllers("pci")
+        for controller in pci_controllers:
+            if controller.get("model") == "pcie-to-pci-bridge":
+                break
+        else:
+            controller_dict = {"model": "pcie-to-pci-bridge"}
+            libvirt_vmxml.modify_vm_device(vmxml, "controller", controller_dict, 50)
+        libvirt_vmxml.remove_vm_devices_by_type(vm, "interface")
+        test.log.debug(f"VMXML of {vm_name}:\n{virsh.dumpxml(vm_name).stdout_text}")
+
+        vm.start()
+        session = vm.wait_for_serial_login()
+
+        mac = utils_net.generate_mac_address_simple()
+        alias_name = "ua-" + str(uuid.uuid1())
+        options = "network default --model {} --alias {} --mac {}".format(
+            model_type, alias_name, mac)
+        iface = interface.Interface()
+        iface.xml = virsh.attach_interface(vm_name, f"{options} --print-xml", **VIRSH_ARGS).stdout_text.strip()
+        test.log.debug(iface.fetch_attrs())
+        exp_iface = {'model': model_type, 'source': {'network': 'default'},
+                     'type_name': 'network',
+                     'alias': {'name': alias_name},
+                     'mac_address': mac}
+        iface_attrs = iface.fetch_attrs()
+
+        if exp_iface != iface_attrs:
+            test.fail("Failed to print xml! Expected: %s, Got: %s." % (exp_iface, iface_attrs))
+        virsh.attach_interface(vm_name, options, **VIRSH_ARGS)
+        iflist = libvirt.get_interface_details(vm_name)
+        test.log.debug(f"iflist of vm: {iflist}")
+        iface_info = iflist[0]
+        if iface_info["model"] == model_type:
+            test.log.debug("Model check of domiflist: PASS")
+        else:
+            test.fail(f"Expect interface model {model_type}, "
+                      f"but got {iface_info['model']}")
+
+        session = vm.wait_for_serial_login()
+        vm_iface_info = interface_base.get_vm_iface_info(session)
+        if vm_iface_info.get("driver") != iface_driver:
+            test.fail("Failed to get expected driver \"{iface_driver}\" in ethtool output")
+
+        ips = {"outside_ip": outside_ip}
+        network_base.ping_check(params, ips, session, force_ipv4=True)
+
+        if check_pci_model:
+            check_model_controller(vm_name, pci_model, test)
+
+        virsh.detach_device_alias(vm_name, alias_name,
+                                  wait_for_event=True, **VIRSH_ARGS)
+        iflist = libvirt.get_interface_details(vm_name)
+        test.log.debug(f"iflist of vm: {iflist}")
+        if iflist:
+            test.fail("Found unexpected interface in %s." % iflist)
+        vm_iface = interface_base.get_vm_iface(session, True)
+        if vm_iface:
+            test.fail("Found unexpected interface in %s." % vm_iface)
+        else:
+            test.log.debug(vm_iface)
+        session.close()
+
+    finally:
+        bkxml.sync()

provider/interface/interface_base.py

@@ -47,17 +47,22 @@ def create_hostdev(hostdev_dict):
     return hostdev_dev
 
 
-def get_vm_iface(vm_session):
+def get_vm_iface(vm_session, ignore_status=False):
     """
     Get VM's 1st interface
 
     :param vm_session: An session to VM
+    :param ignore_status: Whether to raise an exception if there is no interface
     :return: VM's first interface
     """
     p_iface, _v_ifc = utils_net.get_remote_host_net_ifs(vm_session)
     vm_iface = p_iface[:1:]
     if not vm_iface:
-        raise exceptions.TestFail("Failed to get vm's iface!")
+        if ignore_status:
+            logging.debug("There is no interface in VM!")
+            return
+        else:
+            raise exceptions.TestFail("Failed to get vm's iface!")
     return vm_iface[0]