case update: add new disk to check domblkthreshold

   xxxx-294599: Do domblkthreshold for device with backing chain element
Signed-off-by: nanli <[email protected]>

libvirt/tests/cfg/backingchain/virsh_domblk/domblkthreshold_with_backingchain_element.cfg

@@ -1,8 +1,14 @@
 - backingchain.virsh_domblk:
     type = domblkthreshold_with_backingchain_element
     start_vm = 'yes'
-    target_disk = 'vda'
+    target_disk = 'vdb'
     domblk_threshold = '1'
+    actual_domblk = "1"
+    disk_type = "file"
+    disk_image_format = "raw"
+    disk_dict = {"type_name":"${disk_type}", "target":{"dev": "${target_disk}", "bus": "virtio"}, "driver": {"name": "qemu", "type":"raw"}}
+    disk_size = "3G"
+    snap_extra = " -diskspec vda,snapshot=no"
     variants case_name:
         - backing_target:
             domblk_index = 3

libvirt/tests/src/backingchain/virsh_domblk/domblkthreshold_with_backingchain_element.py

@@ -7,6 +7,7 @@
 from virttest.libvirt_xml import vm_xml
 
 from provider.backingchain import blockcommand_base
+from provider.virtual_disk import disk_base
 
 
 def run(test, params, env):
@@ -18,27 +19,34 @@ def setup():
         Prepare active domain and backingchain
         """
         test.log.info("Setup env.")
+        test_obj.new_image_path = disk_obj.add_vm_disk(disk_type, disk_dict,
+                                                       size=disk_size)
         test_obj.backingchain_common_setup(create_snap=True,
-                                           snap_num=4)
+                                           snap_num=4, extra=snap_extra)
+        test.log.debug(vm_xml.VMXML.new_from_dumpxml(vm.name))
 
     def test_backing_target():
         """
         Do domblkthreshold for the backing file device target
         """
-        test.log.info("TEST_STEP1:Set domblkthreshold for backing file device")
+        test.log.info("TEST_STEP1-2:Set domblkthreshold for backing file device")
+        time.sleep(5)
         virsh.domblkthreshold(vm_name, '%s[%s]' % (target_disk, domblk_index),
                               domblk_threshold, debug=True,
                               ignore_status=False)
-        check_domstats_threshold(domstats_option, domblk_threshold)
+        check_domstats_threshold(domstats_option, actual_domblk)
 
-        test.log.info("TEST_STEP2:Do blockcommit and check event")
+        test.log.info("TEST_STEP3-4:Write file and check event")
+        expected_event = event % (vm_name, target_disk, domblk_index,
+                                  actual_domblk)
         event_session = virsh.EventTracker.start_get_event(vm_name)
         write_file()
+        check_event(event_session, expected_event, existed=False)
+
+        test.log.info("TEST_STEP5-7:Do blockcommit and check event")
         virsh.blockcommit(vm.name, target_disk,
-                          commit_options % test_obj.snap_path_list[1],
+                          commit_options % test_obj.snap_path_list[0],
                           ignore_status=False, debug=True)
-        expected_event = event % (vm_name, target_disk, domblk_index,
-                                  domblk_threshold)
         check_event(event_session, expected_event)
         check_domstats_threshold(domstats_option)
 
@@ -51,14 +59,13 @@ def test_entire_disk():
         virsh.domblkthreshold(vm_name, '%s' % target_disk,
                               domblk_threshold, debug=True,
                               ignore_status=False)
-        check_domstats_threshold(domstats_option, domblk_threshold)
+        check_domstats_threshold(domstats_option, actual_domblk)
 
         test.log.info("TEST_STEP2:Write file in guest and check event")
         event_session = virsh.EventTracker.start_get_event(vm_name)
         write_file()
-        expected_event = event % (vm_name, target_disk, domblk_threshold)
+        expected_event = event % (vm_name, target_disk, actual_domblk)
         check_event(event_session, expected_event)
-        check_domstats_threshold(domstats_option)
 
     def teardown():
         """
@@ -80,19 +87,20 @@ def check_domstats_threshold(options, threshold_value=None):
         :param threshold_value: domstats threshold value, if it is None,
         result should be no output
         """
-        if not utils_misc.wait_for(
-                lambda:
-                bool(threshold_value) == ('threshold' in virsh.domstats(
-                    vm_name, options, debug=True).stdout_text.strip()), 30, 2):
-            test.fail('Failed to get expected threshold value in 30s')
-
-        result = virsh.domstats(vm_name, options, debug=True,
-                                ignore_status=False).stdout_text.strip()
         if not threshold_value:
+            result = virsh.domstats(vm_name, options, debug=True,
+                                    ignore_status=False).stdout_text.strip()
             pattern = "block.*.threshold"
             if re.search(pattern, result):
                 test.fail("Threshold: %s should not be in %s" % (pattern, result))
         else:
+            if not utils_misc.wait_for(
+                    lambda:
+                    bool(threshold_value) == ('threshold' in virsh.domstats(
+                        vm_name, options, debug=True).stdout_text.strip()), 30, 2):
+                test.fail('Failed to get expected threshold value in 30s')
+            result = virsh.domstats(vm_name, options, debug=True,
+                                    ignore_status=False).stdout_text.strip()
             pattern = r"block.*.threshold=%s" % threshold_value
             if not re.search(pattern, result):
                 test.fail("Not get correct threshold: %s should be in %s" % (
@@ -103,21 +111,31 @@ def write_file():
         Write file in guest
         """
         session = vm.wait_for_login()
-        utils_disk.dd_data_to_vm_disk(session, large_file, bs='4M', count='200')
+        cmd = "mkfs.ext4 /dev/%s;mount /dev/%s /mnt" % (target_disk, target_disk)
+        session.cmd_status_output(cmd)
+        utils_disk.dd_data_to_vm_disk(session, mount_file, bs='8M', count='400')
         session.close()
 
-    def check_event(event_session, expected_event):
+    def check_event(event_session, expected_event, existed=True):
         """
         Check event correct
 
         :param event_session: virsh session
         :param expected_event: expected event pattern
+        :param existed: if event existed, default True
         """
         test.log.debug('Checking event pattern is -> %s', expected_event)
-        event_output = virsh.EventTracker.finish_get_event(event_session)
-        if not re.search(expected_event, event_output):
-            test.fail('Not find: %s from event output:%s' % (
-                expected_event, event_output))
+        event_output = event_session.get_stripped_output()
+        search_res = re.search(expected_event, event_output)
+        if existed:
+            if not search_res:
+                test.fail('Not find: %s from event output:%s' % (
+                    expected_event, event_output))
+        else:
+            if search_res:
+                test.fail('Event:%s should not exist in output:%s' % (
+                    expected_event, event_output))
+        test.log.debug("Checking event successfully")
 
     # Process cartesian parameters
     vm_name = params.get("main_vm")
@@ -126,11 +144,18 @@ def check_event(event_session, expected_event):
     case_name = params.get('case_name', '')
     target_disk = params.get('target_disk')
     domblk_threshold = params.get('domblk_threshold')
+    actual_domblk = params.get('actual_domblk')
     domblk_index = params.get('domblk_index')
     domstats_option = params.get('domstats_option')
     commit_options = params.get('commit_options')
+    disk_dict = eval(params.get('disk_dict', '{}'))
+    disk_type = params.get("disk_type")
+    disk_size = params.get("disk_size")
+    mount_file = params.get("mount_file", "/mnt/file")
+    snap_extra = params.get("snap_extra")
 
     test_obj = blockcommand_base.BlockCommand(test, vm, params)
+    disk_obj = disk_base.DiskBase(test, vm, params)
 
     vmxml = vm_xml.VMXML.new_from_inactive_dumpxml(vm_name)
     bkxml = vmxml.copy()