tests: qemumonitor: Prepare for more test data in testBlockNodeNameDetect

Rename 'json' and related variables to 'nodeNameJson'. Also rename the
test files along. This is a preparation for modifying how we detect node
names which will also require data from 'query-blockstats'.

Reviewed-by: Eric Blake <eblake@redhat.com>

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json
new file mode 100644 (file)
index 0000000..fe2f321
--- /dev/null
+++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json
@@ -0,0 +1,268 @@
+[
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 9663676416,
+        "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 9665384448,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": true,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block567",
+      "backing_file_depth": 0,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/rhel7.3.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 9665380352,
+        "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
+        "format": "file",
+        "actual-size": 9665384448,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block424",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/rhel7.3.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "backing-image": {
+          "virtual-size": 9663676416,
+          "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
+          "cluster-size": 65536,
+          "format": "qcow2",
+          "actual-size": 9665384448,
+          "format-specific": {
+            "type": "qcow2",
+            "data": {
+              "compat": "1.1",
+              "lazy-refcounts": true,
+              "refcount-bits": 16,
+              "corrupt": false
+            }
+          },
+          "dirty-flag": false
+        },
+        "backing-filename-format": "qcow2",
+        "virtual-size": 9663676416,
+        "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
+        "backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block331",
+      "backing_file_depth": 1,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "backing_file": "/var/lib/libvirt/images/rhel7.3.qcow2",
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/rhel7.3.1483536402",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block281",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/rhel7.3.1483536402",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "backing-image": {
+          "backing-image": {
+            "virtual-size": 9663676416,
+            "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
+            "cluster-size": 65536,
+            "format": "qcow2",
+            "actual-size": 9665384448,
+            "format-specific": {
+              "type": "qcow2",
+              "data": {
+                "compat": "1.1",
+                "lazy-refcounts": true,
+                "refcount-bits": 16,
+                "corrupt": false
+              }
+            },
+            "dirty-flag": false
+          },
+          "backing-filename-format": "qcow2",
+          "virtual-size": 9663676416,
+          "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
+          "cluster-size": 65536,
+          "format": "qcow2",
+          "actual-size": 200704,
+          "format-specific": {
+            "type": "qcow2",
+            "data": {
+              "compat": "1.1",
+              "lazy-refcounts": false,
+              "refcount-bits": 16,
+              "corrupt": false
+            }
+          },
+          "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
+          "backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
+          "dirty-flag": false
+        },
+        "backing-filename-format": "qcow2",
+        "virtual-size": 9663676416,
+        "filename": "/var/lib/libvirt/images/rhel7.3.1483545313",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 32968704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
+        "backing-filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block118",
+      "backing_file_depth": 2,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "backing_file": "/var/lib/libvirt/images/rhel7.3.1483536402",
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/rhel7.3.1483545313",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 33030144,
+        "filename": "/var/lib/libvirt/images/rhel7.3.1483545313",
+        "format": "file",
+        "actual-size": 32968704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block078",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/rhel7.3.1483545313",
+      "encryption_key_missing": false
+    }
+]

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.json
deleted file mode 100644 (file)
index fe2f321..0000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.json
+++ /dev/null
@@ -1,268 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 9663676416,
-        "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 9665384448,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": true,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block567",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 9665380352,
-        "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "format": "file",
-        "actual-size": 9665384448,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block424",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 9663676416,
-          "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 9665384448,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": true,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 9663676416,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block331",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/rhel7.3.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.1483536402",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block281",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.1483536402",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "virtual-size": 9663676416,
-            "filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 9665384448,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": true,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 9663676416,
-          "filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-          "backing-filename": "/var/lib/libvirt/images/rhel7.3.qcow2",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 9663676416,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483545313",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 32968704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "backing-filename": "/var/lib/libvirt/images/rhel7.3.1483536402",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block118",
-      "backing_file_depth": 2,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/rhel7.3.1483536402",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.1483545313",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 33030144,
-        "filename": "/var/lib/libvirt/images/rhel7.3.1483545313",
-        "format": "file",
-        "actual-size": 32968704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block078",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/rhel7.3.1483545313",
-      "encryption_key_missing": false
-    }
-]

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json
new file mode 100644 (file)
index 0000000..7ea5c5d
--- /dev/null
+++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json
@@ -0,0 +1,135 @@
+[
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "backing-image": {
+          "virtual-size": 197120,
+          "filename": "gluster://gluster-host/vol0/img0",
+          "format": "raw",
+          "actual-size": 197120
+        },
+        "backing-filename-format": "raw",
+        "virtual-size": 197120,
+        "filename": "gluster://gluster-host/vol0/img1",
+        "cluster-size": 65536,
+        "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,
+      "ro": false,
+      "node-name": "#block1008",
+      "backing_file_depth": 1,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "backing_file": "gluster://gluster-host/vol0/img0",
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": true,
+        "writeback": true
+      },
+      "file": "gluster://gluster-host/vol0/img1",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "gluster://gluster-host/vol0/img1",
+        "format": "gluster",
+        "actual-size": 197120
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block981",
+      "backing_file_depth": 0,
+      "drv": "gluster",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": true,
+        "writeback": true
+      },
+      "file": "gluster://gluster-host/vol0/img1",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "gluster://gluster-host/vol0/img0",
+        "format": "raw",
+        "actual-size": 197120
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block349",
+      "backing_file_depth": 0,
+      "drv": "raw",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": true,
+        "writeback": true
+      },
+      "file": "gluster://gluster-host/vol0/img0",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "gluster://gluster-host/vol0/img0",
+        "format": "gluster",
+        "actual-size": 197120
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block269",
+      "backing_file_depth": 0,
+      "drv": "gluster",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": true,
+        "writeback": true
+      },
+      "file": "gluster://gluster-host/vol0/img0",
+      "encryption_key_missing": false
+    }
+  ]

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.json
deleted file mode 100644 (file)
index 7ea5c5d..0000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.json
+++ /dev/null
@@ -1,135 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 197120,
-          "filename": "gluster://gluster-host/vol0/img0",
-          "format": "raw",
-          "actual-size": 197120
-        },
-        "backing-filename-format": "raw",
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host/vol0/img1",
-        "cluster-size": 65536,
-        "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,
-      "ro": false,
-      "node-name": "#block1008",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "gluster://gluster-host/vol0/img0",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host/vol0/img1",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host/vol0/img1",
-        "format": "gluster",
-        "actual-size": 197120
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block981",
-      "backing_file_depth": 0,
-      "drv": "gluster",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host/vol0/img1",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host/vol0/img0",
-        "format": "raw",
-        "actual-size": 197120
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block349",
-      "backing_file_depth": 0,
-      "drv": "raw",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host/vol0/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "gluster://gluster-host/vol0/img0",
-        "format": "gluster",
-        "actual-size": 197120
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block269",
-      "backing_file_depth": 0,
-      "drv": "gluster",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": true,
-        "writeback": true
-      },
-      "file": "gluster://gluster-host/vol0/img0",
-      "encryption_key_missing": false
-    }
-  ]

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json
new file mode 100644 (file)
index 0000000..1fee149
--- /dev/null
+++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json
@@ -0,0 +1,554 @@
+[
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "backing-image": {
+          "virtual-size": 10485760,
+          "filename": "/var/lib/libvirt/images/base.qcow2",
+          "cluster-size": 65536,
+          "format": "qcow2",
+          "actual-size": 200704,
+          "format-specific": {
+            "type": "qcow2",
+            "data": {
+              "compat": "1.1",
+              "lazy-refcounts": false,
+              "refcount-bits": 16,
+              "corrupt": false
+            }
+          },
+          "dirty-flag": false
+        },
+        "backing-filename-format": "qcow2",
+        "virtual-size": 10485760,
+        "filename": "/var/lib/libvirt/images/relsnap.qcow2",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
+        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block1177",
+      "backing_file_depth": 1,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "backing_file": "/var/lib/libvirt/images/base.qcow2",
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/relsnap.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/relsnap.qcow2",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block1027",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/relsnap.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 10485760,
+        "filename": "/var/lib/libvirt/images/base.qcow2",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block957",
+      "backing_file_depth": 0,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/base.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/base.qcow2",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block840",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/base.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 10485760,
+        "filename": "/var/lib/libvirt/images/img0",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block709",
+      "backing_file_depth": 0,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/img0",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/img0",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block665",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/img0",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "backing-image": {
+          "virtual-size": 10485760,
+          "filename": "/var/lib/libvirt/images/img0",
+          "cluster-size": 65536,
+          "format": "qcow2",
+          "actual-size": 200704,
+          "format-specific": {
+            "type": "qcow2",
+            "data": {
+              "compat": "1.1",
+              "lazy-refcounts": false,
+              "refcount-bits": 16,
+              "corrupt": false
+            }
+          },
+          "dirty-flag": false
+        },
+        "backing-filename-format": "qcow2",
+        "virtual-size": 10485760,
+        "filename": "/var/lib/libvirt/images/img1",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "full-backing-filename": "/var/lib/libvirt/images/img0",
+        "backing-filename": "/var/lib/libvirt/images/img0",
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block514",
+      "backing_file_depth": 1,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "backing_file": "/var/lib/libvirt/images/img0",
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/img1",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/img1",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block481",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/img1",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "backing-image": {
+          "backing-image": {
+            "virtual-size": 10485760,
+            "filename": "/var/lib/libvirt/images/img0",
+            "cluster-size": 65536,
+            "format": "qcow2",
+            "actual-size": 200704,
+            "format-specific": {
+              "type": "qcow2",
+              "data": {
+                "compat": "1.1",
+                "lazy-refcounts": false,
+                "refcount-bits": 16,
+                "corrupt": false
+              }
+            },
+            "dirty-flag": false
+          },
+          "backing-filename-format": "qcow2",
+          "virtual-size": 10485760,
+          "filename": "/var/lib/libvirt/images/img1",
+          "cluster-size": 65536,
+          "format": "qcow2",
+          "actual-size": 200704,
+          "format-specific": {
+            "type": "qcow2",
+            "data": {
+              "compat": "1.1",
+              "lazy-refcounts": false,
+              "refcount-bits": 16,
+              "corrupt": false
+            }
+          },
+          "full-backing-filename": "/var/lib/libvirt/images/img0",
+          "backing-filename": "/var/lib/libvirt/images/img0",
+          "dirty-flag": false
+        },
+        "backing-filename-format": "qcow2",
+        "virtual-size": 10485760,
+        "filename": "/var/lib/libvirt/images/img2",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "full-backing-filename": "/var/lib/libvirt/images/img1",
+        "backing-filename": "/var/lib/libvirt/images/img1",
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block357",
+      "backing_file_depth": 2,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "backing_file": "/var/lib/libvirt/images/img1",
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/img2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/img2",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block290",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/img2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "backing-image": {
+          "backing-image": {
+            "backing-image": {
+              "virtual-size": 10485760,
+              "filename": "/var/lib/libvirt/images/img0",
+              "cluster-size": 65536,
+              "format": "qcow2",
+              "actual-size": 200704,
+              "format-specific": {
+                "type": "qcow2",
+                "data": {
+                  "compat": "1.1",
+                  "lazy-refcounts": false,
+                  "refcount-bits": 16,
+                  "corrupt": false
+                }
+              },
+              "dirty-flag": false
+            },
+            "backing-filename-format": "qcow2",
+            "virtual-size": 10485760,
+            "filename": "/var/lib/libvirt/images/img1",
+            "cluster-size": 65536,
+            "format": "qcow2",
+            "actual-size": 200704,
+            "format-specific": {
+              "type": "qcow2",
+              "data": {
+                "compat": "1.1",
+                "lazy-refcounts": false,
+                "refcount-bits": 16,
+                "corrupt": false
+              }
+            },
+            "full-backing-filename": "/var/lib/libvirt/images/img0",
+            "backing-filename": "/var/lib/libvirt/images/img0",
+            "dirty-flag": false
+          },
+          "backing-filename-format": "qcow2",
+          "virtual-size": 10485760,
+          "filename": "/var/lib/libvirt/images/img2",
+          "cluster-size": 65536,
+          "format": "qcow2",
+          "actual-size": 200704,
+          "format-specific": {
+            "type": "qcow2",
+            "data": {
+              "compat": "1.1",
+              "lazy-refcounts": false,
+              "refcount-bits": 16,
+              "corrupt": false
+            }
+          },
+          "full-backing-filename": "/var/lib/libvirt/images/img1",
+          "backing-filename": "/var/lib/libvirt/images/img1",
+          "dirty-flag": false
+        },
+        "backing-filename-format": "qcow2",
+        "virtual-size": 10485760,
+        "filename": "/var/lib/libvirt/images/img3",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "full-backing-filename": "/var/lib/libvirt/images/img2",
+        "backing-filename": "/var/lib/libvirt/images/img2",
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block153",
+      "backing_file_depth": 3,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "backing_file": "/var/lib/libvirt/images/img2",
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/img3",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/img3",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block076",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/img3",
+      "encryption_key_missing": false
+    }
+  ]

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.json
deleted file mode 100644 (file)
index 1fee149..0000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.json
+++ /dev/null
@@ -1,554 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/base.qcow2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/relsnap.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block1177",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/base.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/relsnap.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/relsnap.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block1027",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/relsnap.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block957",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block840",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img0",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block709",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img0",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block665",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img0",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/img0",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img1",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/img0",
-        "backing-filename": "/var/lib/libvirt/images/img0",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block514",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/img0",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img1",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img1",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block481",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img1",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/img0",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/img1",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/img0",
-          "backing-filename": "/var/lib/libvirt/images/img0",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/img1",
-        "backing-filename": "/var/lib/libvirt/images/img1",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block357",
-      "backing_file_depth": 2,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/img1",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block290",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "backing-image": {
-            "backing-image": {
-              "virtual-size": 10485760,
-              "filename": "/var/lib/libvirt/images/img0",
-              "cluster-size": 65536,
-              "format": "qcow2",
-              "actual-size": 200704,
-              "format-specific": {
-                "type": "qcow2",
-                "data": {
-                  "compat": "1.1",
-                  "lazy-refcounts": false,
-                  "refcount-bits": 16,
-                  "corrupt": false
-                }
-              },
-              "dirty-flag": false
-            },
-            "backing-filename-format": "qcow2",
-            "virtual-size": 10485760,
-            "filename": "/var/lib/libvirt/images/img1",
-            "cluster-size": 65536,
-            "format": "qcow2",
-            "actual-size": 200704,
-            "format-specific": {
-              "type": "qcow2",
-              "data": {
-                "compat": "1.1",
-                "lazy-refcounts": false,
-                "refcount-bits": 16,
-                "corrupt": false
-              }
-            },
-            "full-backing-filename": "/var/lib/libvirt/images/img0",
-            "backing-filename": "/var/lib/libvirt/images/img0",
-            "dirty-flag": false
-          },
-          "backing-filename-format": "qcow2",
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/img2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "full-backing-filename": "/var/lib/libvirt/images/img1",
-          "backing-filename": "/var/lib/libvirt/images/img1",
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/img3",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/img2",
-        "backing-filename": "/var/lib/libvirt/images/img2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block153",
-      "backing_file_depth": 3,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/img2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img3",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/img3",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block076",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/img3",
-      "encryption_key_missing": false
-    }
-  ]

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json
new file mode 100644 (file)
index 0000000..78954bb
--- /dev/null
+++ b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json
@@ -0,0 +1,316 @@
+[
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 10485760,
+        "filename": "/var/lib/libvirt/images/base.qcow2",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block729",
+      "backing_file_depth": 0,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/base.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/base.qcow2",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block628",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/base.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "backing-image": {
+          "virtual-size": 10485760,
+          "filename": "/var/lib/libvirt/images/base.qcow2",
+          "cluster-size": 65536,
+          "format": "qcow2",
+          "actual-size": 200704,
+          "format-specific": {
+            "type": "qcow2",
+            "data": {
+              "compat": "1.1",
+              "lazy-refcounts": false,
+              "refcount-bits": 16,
+              "corrupt": false
+            }
+          },
+          "dirty-flag": false
+        },
+        "backing-filename-format": "qcow2",
+        "virtual-size": 10485760,
+        "filename": "/var/lib/libvirt/images/b.qcow2",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
+        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block574",
+      "backing_file_depth": 1,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "backing_file": "/var/lib/libvirt/images/base.qcow2",
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/b.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/b.qcow2",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block405",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/b.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 10485760,
+        "filename": "/var/lib/libvirt/images/base.qcow2",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block399",
+      "backing_file_depth": 0,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/base.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/base.qcow2",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": true,
+      "node-name": "#block257",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/base.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "backing-image": {
+          "virtual-size": 10485760,
+          "filename": "/var/lib/libvirt/images/base.qcow2",
+          "cluster-size": 65536,
+          "format": "qcow2",
+          "actual-size": 200704,
+          "format-specific": {
+            "type": "qcow2",
+            "data": {
+              "compat": "1.1",
+              "lazy-refcounts": false,
+              "refcount-bits": 16,
+              "corrupt": false
+            }
+          },
+          "dirty-flag": false
+        },
+        "backing-filename-format": "qcow2",
+        "virtual-size": 10485760,
+        "filename": "/var/lib/libvirt/images/a.qcow2",
+        "cluster-size": 65536,
+        "format": "qcow2",
+        "actual-size": 200704,
+        "format-specific": {
+          "type": "qcow2",
+          "data": {
+            "compat": "1.1",
+            "lazy-refcounts": false,
+            "refcount-bits": 16,
+            "corrupt": false
+          }
+        },
+        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
+        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block170",
+      "backing_file_depth": 1,
+      "drv": "qcow2",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "backing_file": "/var/lib/libvirt/images/base.qcow2",
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/a.qcow2",
+      "encryption_key_missing": false
+    },
+    {
+      "iops_rd": 0,
+      "detect_zeroes": "off",
+      "image": {
+        "virtual-size": 197120,
+        "filename": "/var/lib/libvirt/images/a.qcow2",
+        "format": "file",
+        "actual-size": 200704,
+        "dirty-flag": false
+      },
+      "iops_wr": 0,
+      "ro": false,
+      "node-name": "#block057",
+      "backing_file_depth": 0,
+      "drv": "file",
+      "iops": 0,
+      "bps_wr": 0,
+      "write_threshold": 0,
+      "encrypted": false,
+      "bps": 0,
+      "bps_rd": 0,
+      "cache": {
+        "no-flush": false,
+        "direct": false,
+        "writeback": true
+      },
+      "file": "/var/lib/libvirt/images/a.qcow2",
+      "encryption_key_missing": false
+    }
+  ]

diff --git a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.json b/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.json
deleted file mode 100644 (file)
index 78954bb..0000000
--- a/tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.json
+++ /dev/null
@@ -1,316 +0,0 @@
-[
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block729",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block628",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/base.qcow2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/b.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block574",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/base.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/b.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/b.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block405",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/b.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block399",
-      "backing_file_depth": 0,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/base.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": true,
-      "node-name": "#block257",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/base.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "backing-image": {
-          "virtual-size": 10485760,
-          "filename": "/var/lib/libvirt/images/base.qcow2",
-          "cluster-size": 65536,
-          "format": "qcow2",
-          "actual-size": 200704,
-          "format-specific": {
-            "type": "qcow2",
-            "data": {
-              "compat": "1.1",
-              "lazy-refcounts": false,
-              "refcount-bits": 16,
-              "corrupt": false
-            }
-          },
-          "dirty-flag": false
-        },
-        "backing-filename-format": "qcow2",
-        "virtual-size": 10485760,
-        "filename": "/var/lib/libvirt/images/a.qcow2",
-        "cluster-size": 65536,
-        "format": "qcow2",
-        "actual-size": 200704,
-        "format-specific": {
-          "type": "qcow2",
-          "data": {
-            "compat": "1.1",
-            "lazy-refcounts": false,
-            "refcount-bits": 16,
-            "corrupt": false
-          }
-        },
-        "full-backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "backing-filename": "/var/lib/libvirt/images/base.qcow2",
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block170",
-      "backing_file_depth": 1,
-      "drv": "qcow2",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "backing_file": "/var/lib/libvirt/images/base.qcow2",
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/a.qcow2",
-      "encryption_key_missing": false
-    },
-    {
-      "iops_rd": 0,
-      "detect_zeroes": "off",
-      "image": {
-        "virtual-size": 197120,
-        "filename": "/var/lib/libvirt/images/a.qcow2",
-        "format": "file",
-        "actual-size": 200704,
-        "dirty-flag": false
-      },
-      "iops_wr": 0,
-      "ro": false,
-      "node-name": "#block057",
-      "backing_file_depth": 0,
-      "drv": "file",
-      "iops": 0,
-      "bps_wr": 0,
-      "write_threshold": 0,
-      "encrypted": false,
-      "bps": 0,
-      "bps_rd": 0,
-      "cache": {
-        "no-flush": false,
-        "direct": false,
-        "writeback": true
-      },
-      "file": "/var/lib/libvirt/images/a.qcow2",
-      "encryption_key_missing": false
-    }
-  ]

diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
index c343c0d3820f1198ee130f7a6c91c7a086624a49..5bab9f5077b1bce6d59a719396dab4396eda6fab 100644 (file)
--- a/tests/qemumonitorjsontest.c
+++ b/tests/qemumonitorjsontest.c
@@ -2740,19 +2740,19 @@ static int
 testBlockNodeNameDetect(const void *opaque)
 {
     const struct testBlockNodeNameDetectData *data = opaque;
-    char *jsonFile = NULL;
-    char *jsonStr = NULL;
+    char *namedNodesFile = NULL;
+    char *namedNodesStr = NULL;
     char *resultFile = NULL;
     char *actual = NULL;
     char **nodenames = NULL;
     char **next;
-    virJSONValuePtr json = NULL;
+    virJSONValuePtr namedNodesJson = NULL;
     virHashTablePtr nodedata = NULL;
     virBuffer buf = VIR_BUFFER_INITIALIZER;
     int ret = -1;
 
-    if (virAsprintf(&jsonFile,
-                    "%s/qemumonitorjsondata/qemumonitorjson-nodename-%s.json",
+    if (virAsprintf(&namedNodesFile,
+                    "%s/qemumonitorjsondata/qemumonitorjson-nodename-%s-named-nodes.json",
                     abs_srcdir, data->name) < 0 ||
         virAsprintf(&resultFile,
                     "%s/qemumonitorjsondata/qemumonitorjson-nodename-%s.result",
@@ -2762,13 +2762,13 @@ testBlockNodeNameDetect(const void *opaque)
     if (!(nodenames = virStringSplit(data->nodenames, ",", 0)))
         goto cleanup;
 
-    if (virTestLoadFile(jsonFile, &jsonStr) < 0)
+    if (virTestLoadFile(namedNodesFile, &namedNodesStr) < 0)
         goto cleanup;
 
-    if (!(json = virJSONValueFromString(jsonStr)))
+    if (!(namedNodesJson = virJSONValueFromString(namedNodesStr)))
         goto cleanup;
 
-    if (!(nodedata = qemuBlockNodeNameGetBackingChain(json)))
+    if (!(nodedata = qemuBlockNodeNameGetBackingChain(namedNodesJson)))
         goto cleanup;
 
     for (next = nodenames; *next; next++)
@@ -2787,13 +2787,13 @@ testBlockNodeNameDetect(const void *opaque)
     ret = 0;
 
  cleanup:
-    VIR_FREE(jsonFile);
+    VIR_FREE(namedNodesFile);
     VIR_FREE(resultFile);
-    VIR_FREE(jsonStr);
+    VIR_FREE(namedNodesStr);
     VIR_FREE(actual);
     virHashFree(nodedata);
     virStringListFree(nodenames);
-    virJSONValueFree(json);
+    virJSONValueFree(namedNodesJson);
 
     return ret;
 }