Merge pull request #2180 from aliang123/1820429

Support query_named_block_nodes during live commit

qemu/tests/blockdev_commit_query_named_block_nodes.py

+from provider import backup_utils
+from provider import job_utils
+
+from provider.blockdev_commit_base import BlockDevCommitTest
+
+
+class BlockdevCommitQueryNamedBlockNodes(BlockDevCommitTest):
+
+    def commit_snapshots(self):
+        device = self.params.get("device_tag")
+        device_params = self.params.object_params(device)
+        snapshot_tags = device_params["snapshot_tags"].split()
+        self.device_node = self.get_node_name(device)
+        options = ["base-node", "top-node", "speed"]
+        arguments = self.params.copy_from_keys(options)
+        arguments["base-node"] = self.get_node_name(device)
+        arguments["top-node"] = self.get_node_name(snapshot_tags[-2])
+        device = self.get_node_name(snapshot_tags[-1])
+        commit_cmd = backup_utils.block_commit_qmp_cmd
+        cmd, args = commit_cmd(device, **arguments)
+        self.main_vm.monitor.cmd(cmd, args)
+        job_id = args.get("job-id", device)
+        self.main_vm.monitor.cmd("query-named-block-nodes")
+        job_utils.wait_until_block_job_completed(self.main_vm, job_id)
+
+
+def run(test, params, env):
+    """
+    Block commit base Test
+
+    1. boot guest with data disk
+    2. create 4 snapshots and save file in each snapshot
+    3. commit snapshot 4 to snapshot 3
+    4. during commit, query named block nodes
+    5. verify files's md5 after commit
+    """
+
+    block_test = BlockdevCommitQueryNamedBlockNodes(test, params, env)
+    block_test.run_test()

qemu/tests/cfg/blockdev_commit_query_named_block_nodes.cfg

+- blockdev_commit_query_named_block_nodes:
+    type = blockdev_commit_query_named_block_nodes
+    virt_test_type = qemu
+    only Linux
+    images += " data"
+    force_create_image_data = yes
+    force_remove_image_data = yes
+    start_vm = yes
+    kill_vm = yes
+    storage_pools = default
+    storage_type_default = "directory"
+    storage_pool = default
+    image_size_data = 500M
+    image_name_data = data
+    snapshot_tags_data = sn1 sn2 sn3 sn4
+
+    image_size_sn1 = 500M
+    image_name_sn1 = sn1
+    image_format_sn1 = qcow2
+
+    image_name_sn2 = sn2
+    image_size_sn2 = 500M
+    image_format_sn2 = qcow2
+
+    image_name_sn3 = sn3
+    image_size_sn3 = 500M
+    image_format_sn3 = qcow2
+
+    image_name_sn4 = sn4
+    image_size_sn4 = 500M
+    image_format_sn4 = qcow2
+
+    device_tag = "data"
+    rebase_mode = unsafe
+    qemu_force_use_drive_expression = no