Merge pull request #3932 from chunfuwen/fix_wwn_cases_failure

Fix wwn cases failure due to qemu output format change for json
autotest · Jan 4, 2022 · cbed38c · cbed38c
2 parents 7fc4da7 + 50f7064
commit cbed38c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/libvirt/tests/src/virtual_disks/virtual_disks_multidisks.py b/libvirt/tests/src/virtual_disks/virtual_disks_multidisks.py
@@ -1755,10 +1755,18 @@ def test_device_update_boot_order(disk_type, disk_path, error_msg):
             if len(serial) != 0 and serial[0] != "":
                 cmd += " | grep serial=%s" % serial[0]
             if len(wwn) != 0 and wwn[0] != "":
+                wwn0_value = wwn[0]
+                # After libvirt 7.9.0, qemu output becomes json format,
+                # therefore wwn in hex is changed to decimal
+                if libvirt_version.version_compare(7, 9, 0):
+                    wwn0_value = str(int(wwn[0], 16))
                 if len(wwn) > 1:
-                    cmd += " | grep -E \"wwn=(0x)?%s.*wwn=(0x)?%s\"" % (wwn[0], wwn[1])
+                    wwn1_value = wwn[1]
+                    if libvirt_version.version_compare(7, 9, 0):
+                        wwn1_value = str(int(wwn[1], 16))
+                    cmd += " | grep -E \"wwn=(0x)?%s.*wwn=(0x)?%s\"" % (wwn0_value, wwn1_value)
                 else:
-                    cmd += " | grep -E \"wwn=(0x)?%s\"" % wwn[0]
+                    cmd += " | grep -E \"wwn=(0x)?%s\"" % wwn0_value
             if vendor != "":
                 cmd += " | grep vendor=%s" % vendor
             if product != "":