Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 b04a3474 编写于 作者: P Peter Krempa
浏览文件
操作

tests: qemumonitorjson: Fix 'gluster' node name detection test case 

Add the blockstats data and fix the expected output.
Reviewed-by: NEric Blake <eblake@redhat.com>
上级 18c5c93d
隐藏空白更改
内联 并排
Showing with 167 addition and 51 deletion
tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json 0 → 100644
浏览文件 @ b04a3474
[
{
"device": "drive-virtio-disk0",
"parent": {
"stats": {
"flush_total_time_ns": 0,
"wr_highest_offset": 0,
"wr_total_time_ns": 0,
"failed_wr_operations": 0,
"failed_rd_operations": 0,
"wr_merged": 0,
"wr_bytes": 0,
"timed_stats": [
],
"failed_flush_operations": 0,
"account_invalid": false,
"rd_total_time_ns": 0,
"flush_operations": 0,
"wr_operations": 0,
"rd_merged": 0,
"rd_bytes": 0,
"invalid_flush_operations": 0,
"account_failed": false,
"rd_operations": 0,
"invalid_wr_operations": 0,
"invalid_rd_operations": 0
},
"node-name": "#block282"
},
"stats": {
"flush_total_time_ns": 0,
"wr_highest_offset": 0,
"wr_total_time_ns": 0,
"failed_wr_operations": 0,
"failed_rd_operations": 0,
"wr_merged": 0,
"wr_bytes": 0,
"timed_stats": [
],
"failed_flush_operations": 0,
"account_invalid": true,
"rd_total_time_ns": 0,
"flush_operations": 0,
"wr_operations": 0,
"rd_merged": 0,
"rd_bytes": 0,
"invalid_flush_operations": 0,
"account_failed": true,
"rd_operations": 0,
"invalid_wr_operations": 0,
"invalid_rd_operations": 0
},
"backing": {
"parent": {
"stats": {
"flush_total_time_ns": 0,
"wr_highest_offset": 0,
"wr_total_time_ns": 0,
"failed_wr_operations": 0,
"failed_rd_operations": 0,
"wr_merged": 0,
"wr_bytes": 0,
"timed_stats": [
],
"failed_flush_operations": 0,
"account_invalid": false,
"rd_total_time_ns": 0,
"flush_operations": 0,
"wr_operations": 0,
"rd_merged": 0,
"rd_bytes": 0,
"invalid_flush_operations": 0,
"account_failed": false,
"rd_operations": 0,
"invalid_wr_operations": 0,
"invalid_rd_operations": 0
},
"node-name": "#block477"
},
"stats": {
"flush_total_time_ns": 0,
"wr_highest_offset": 0,
"wr_total_time_ns": 0,
"failed_wr_operations": 0,
"failed_rd_operations": 0,
"wr_merged": 0,
"wr_bytes": 0,
"timed_stats": [
],
"failed_flush_operations": 0,
"account_invalid": false,
"rd_total_time_ns": 0,
"flush_operations": 0,
"wr_operations": 0,
"rd_merged": 0,
"rd_bytes": 0,
"invalid_flush_operations": 0,
"account_failed": false,
"rd_operations": 0,
"invalid_wr_operations": 0,
"invalid_rd_operations": 0
},
"node-name": "#block596"
},
"node-name": "#block338"
}
]
tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json
浏览文件 @ b04a3474
...@@ -3,40 +3,19 @@ ...@@ -3,40 +3,19 @@
"iops_rd": 0, "iops_rd": 0,
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"backing-image": {
"virtual-size": 197120,
"filename": "gluster://gluster-host/vol0/img0",
"format": "raw",
"actual-size": 197120
},
"backing-filename-format": "raw",
"virtual-size": 197120, "virtual-size": 197120,
"filename": "gluster://gluster-host/vol0/img1", "filename": "gluster://gluster-host/vol0/img0",
"cluster-size": 65536, "format": "raw",
"format": "qcow2", "actual-size": 197120
"actual-size": 197120,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"full-backing-filename": "gluster://gluster-host/vol0/img0",
"backing-filename": "gluster://gluster-host/vol0/img0",
"dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": false, "ro": true,
"node-name": "#block1008", "node-name": "#block596",
"backing_file_depth": 1, "backing_file_depth": 0,
"drv": "qcow2", "drv": "raw",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
"backing_file": "gluster://gluster-host/vol0/img0",
"encrypted": false, "encrypted": false,
"bps": 0, "bps": 0,
"bps_rd": 0, "bps_rd": 0,
...@@ -45,7 +24,7 @@ ...@@ -45,7 +24,7 @@
"direct": true, "direct": true,
"writeback": true "writeback": true
}, },
"file": "gluster://gluster-host/vol0/img1", "file": "gluster://gluster-host/vol0/img0",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
...@@ -53,13 +32,13 @@ ...@@ -53,13 +32,13 @@
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 197120, "virtual-size": 197120,
"filename": "gluster://gluster-host/vol0/img1", "filename": "gluster://gluster-host/vol0/img0",
"format": "gluster", "format": "gluster",
"actual-size": 197120 "actual-size": 197120
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": false, "ro": true,
"node-name": "#block981", "node-name": "#block477",
"backing_file_depth": 0, "backing_file_depth": 0,
"drv": "gluster", "drv": "gluster",
"iops": 0, "iops": 0,
...@@ -73,26 +52,47 @@ ...@@ -73,26 +52,47 @@
"direct": true, "direct": true,
"writeback": true "writeback": true
}, },
"file": "gluster://gluster-host/vol0/img1", "file": "gluster://gluster-host/vol0/img0",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
"iops_rd": 0, "iops_rd": 0,
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"backing-image": {
"virtual-size": 197120,
"filename": "gluster://gluster-host/vol0/img0",
"format": "raw",
"actual-size": 197120
},
"backing-filename-format": "raw",
"virtual-size": 197120, "virtual-size": 197120,
"filename": "gluster://gluster-host/vol0/img0", "filename": "gluster://gluster-host:24007/vol0/img1",
"format": "raw", "cluster-size": 65536,
"actual-size": 197120 "format": "qcow2",
"actual-size": 197120,
"format-specific": {
"type": "qcow2",
"data": {
"compat": "1.1",
"lazy-refcounts": false,
"refcount-bits": 16,
"corrupt": false
}
},
"full-backing-filename": "gluster://gluster-host/vol0/img0",
"backing-filename": "gluster://gluster-host/vol0/img0",
"dirty-flag": false
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": true, "ro": false,
"node-name": "#block349", "node-name": "#block338",
"backing_file_depth": 0, "backing_file_depth": 1,
"drv": "raw", "drv": "qcow2",
"iops": 0, "iops": 0,
"bps_wr": 0, "bps_wr": 0,
"write_threshold": 0, "write_threshold": 0,
"backing_file": "gluster://gluster-host/vol0/img0",
"encrypted": false, "encrypted": false,
"bps": 0, "bps": 0,
"bps_rd": 0, "bps_rd": 0,
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
"direct": true, "direct": true,
"writeback": true "writeback": true
}, },
"file": "gluster://gluster-host/vol0/img0", "file": "gluster://gluster-host:24007/vol0/img1",
"encryption_key_missing": false "encryption_key_missing": false
}, },
{ {
...@@ -109,13 +109,13 @@ ...@@ -109,13 +109,13 @@
"detect_zeroes": "off", "detect_zeroes": "off",
"image": { "image": {
"virtual-size": 197120, "virtual-size": 197120,
"filename": "gluster://gluster-host/vol0/img0", "filename": "gluster://gluster-host:24007/vol0/img1",
"format": "gluster", "format": "gluster",
"actual-size": 197120 "actual-size": 197120
}, },
"iops_wr": 0, "iops_wr": 0,
"ro": true, "ro": false,
"node-name": "#block269", "node-name": "#block282",
"backing_file_depth": 0, "backing_file_depth": 0,
"drv": "gluster", "drv": "gluster",
"iops": 0, "iops": 0,
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
"direct": true, "direct": true,
"writeback": true "writeback": true
}, },
"file": "gluster://gluster-host/vol0/img0", "file": "gluster://gluster-host:24007/vol0/img1",
"encryption_key_missing": false "encryption_key_missing": false
} }
] ]
tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result
浏览文件 @ b04a3474
filename : 'gluster://gluster-host/vol0/img1' drive-virtio-disk0
format node : '#block1008' filename : 'gluster://gluster-host:24007/vol0/img1'
storage node: '#block981' format node : '#block338'
format drv : 'qcow2'
storage node: '#block282'
storage drv : 'gluster'
filename : 'gluster://gluster-host/vol0/img0' filename : 'gluster://gluster-host/vol0/img0'
format node : '#block349' format node : '#block596'
storage node: '#block269' format drv : 'raw'
storage node: '#block477'
storage drv : 'gluster'
tests/qemumonitorjsontest.c
浏览文件 @ b04a3474
...@@ -2929,7 +2929,7 @@ mymain(void) ...@@ -2929,7 +2929,7 @@ mymain(void)
DO_TEST_BLOCK_NODE_DETECT("basic"); DO_TEST_BLOCK_NODE_DETECT("basic");
DO_TEST_BLOCK_NODE_DETECT("same-backing"); DO_TEST_BLOCK_NODE_DETECT("same-backing");
DO_TEST_BLOCK_NODE_DETECT("relative"); DO_TEST_BLOCK_NODE_DETECT("relative");
/* DO_TEST_BLOCK_NODE_DETECT("gluster"); */ DO_TEST_BLOCK_NODE_DETECT("gluster");
#undef DO_TEST_BLOCK_NODE_DETECT #undef DO_TEST_BLOCK_NODE_DETECT
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或