[libvirt] [PATCHv2 12/14] virjsondata: json_reformat input data

Ján Tomko posted 14 patches 6 years, 10 months ago
[libvirt] [PATCHv2 12/14] virjsondata: json_reformat input data
Posted by Ján Tomko 6 years, 10 months ago
Remove trailing slashes and run json_reformat.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
 tests/virjsondata/parse-Harder-in.json      |  17 +-
 tests/virjsondata/parse-NotSoSimple-in.json |  18 ++-
 tests/virjsondata/parse-Simple-in.json      |   7 +-
 tests/virjsondata/parse-VeryHard-in.json    | 167 +++++++++++++++++---
 4 files changed, 177 insertions(+), 32 deletions(-)

diff --git a/tests/virjsondata/parse-Harder-in.json b/tests/virjsondata/parse-Harder-in.json
index 739d780fb9..1cdac1f0c9 100644
--- a/tests/virjsondata/parse-Harder-in.json
+++ b/tests/virjsondata/parse-Harder-in.json
@@ -1,4 +1,13 @@
-{"return": [{"filename": \
-"unix:/home/berrange/.libvirt/qemu/lib/tck.monitor,server",\
-"label": "charmonitor"}, {"filename": "pty:/dev/pts/158",\
-"label": "charserial0"}], "id": "libvirt-3"}
+{
+    "return": [
+        {
+            "filename": "unix:/home/berrange/.libvirt/qemu/lib/tck.monitor,server",
+            "label": "charmonitor"
+        },
+        {
+            "filename": "pty:/dev/pts/158",
+            "label": "charserial0"
+        }
+    ],
+    "id": "libvirt-3"
+}
diff --git a/tests/virjsondata/parse-NotSoSimple-in.json b/tests/virjsondata/parse-NotSoSimple-in.json
index bda5fd1c3f..c6553b74af 100644
--- a/tests/virjsondata/parse-NotSoSimple-in.json
+++ b/tests/virjsondata/parse-NotSoSimple-in.json
@@ -1,3 +1,15 @@
-{"QMP": {"version": {"qemu":\
-{"micro": 91, "minor": 13, "major": 0},\
-"package": " (qemu-kvm-devel)"}, "capabilities": []}}
+{
+    "QMP": {
+        "version": {
+            "qemu": {
+                "micro": 91,
+                "minor": 13,
+                "major": 0
+            },
+            "package": " (qemu-kvm-devel)"
+        },
+        "capabilities": [
+
+        ]
+    }
+}
diff --git a/tests/virjsondata/parse-Simple-in.json b/tests/virjsondata/parse-Simple-in.json
index a40724b322..167bdccdf8 100644
--- a/tests/virjsondata/parse-Simple-in.json
+++ b/tests/virjsondata/parse-Simple-in.json
@@ -1 +1,6 @@
-{"return": {}, "id": "libvirt-1"}
+{
+    "return": {
+
+    },
+    "id": "libvirt-1"
+}
diff --git a/tests/virjsondata/parse-VeryHard-in.json b/tests/virjsondata/parse-VeryHard-in.json
index e10d605950..dc64fc1661 100644
--- a/tests/virjsondata/parse-VeryHard-in.json
+++ b/tests/virjsondata/parse-VeryHard-in.json
@@ -1,24 +1,143 @@
-{"return":[{"name":"quit"},{"name":\
-"eject"},{"name":"change"},{"name":"screendump"},\
-{"name":"stop"},{"name":"cont"},{"name":\
-"system_reset"},{"name":"system_powerdown"},\
-{"name":"device_add"},{"name":"device_del"},\
-{"name":"cpu"},{"name":"memsave"},{"name":\
-"pmemsave"},{"name":"migrate"},{"name":\
-"migrate_cancel"},{"name":"migrate_set_speed"},\
-{"name":"client_migrate_info"},{"name":\
-"migrate_set_downtime"},{"name":"netdev_add"},\
-{"name":"netdev_del"},{"name":"block_resize"},\
-{"name":"balloon"},{"name":"set_link"},{"name":\
-"getfd"},{"name":"closefd"},{"name":"block_passwd"},\
-{"name":"set_password"},{"name":"expire_password"},\
-{"name":"qmp_capabilities"},{"name":\
-"human-monitor-command"},{"name":"query-version"},\
-{"name":"query-commands"},{"name":"query-chardev"},\
-{"name":"query-block"},{"name":"query-blockstats"},\
-{"name":"query-cpus"},{"name":"query-pci"},{"name":\
-"query-kvm"},{"name":"query-status"},{"name":\
-"query-mice"},{"name":"query-vnc"},{"name":\
-"query-spice"},{"name":"query-name"},{"name":\
-"query-uuid"},{"name":"query-migrate"},{"name":\
-"query-balloon"}],"id":"libvirt-2"}
+{
+    "return": [
+        {
+            "name": "quit"
+        },
+        {
+            "name": "eject"
+        },
+        {
+            "name": "change"
+        },
+        {
+            "name": "screendump"
+        },
+        {
+            "name": "stop"
+        },
+        {
+            "name": "cont"
+        },
+        {
+            "name": "system_reset"
+        },
+        {
+            "name": "system_powerdown"
+        },
+        {
+            "name": "device_add"
+        },
+        {
+            "name": "device_del"
+        },
+        {
+            "name": "cpu"
+        },
+        {
+            "name": "memsave"
+        },
+        {
+            "name": "pmemsave"
+        },
+        {
+            "name": "migrate"
+        },
+        {
+            "name": "migrate_cancel"
+        },
+        {
+            "name": "migrate_set_speed"
+        },
+        {
+            "name": "client_migrate_info"
+        },
+        {
+            "name": "migrate_set_downtime"
+        },
+        {
+            "name": "netdev_add"
+        },
+        {
+            "name": "netdev_del"
+        },
+        {
+            "name": "block_resize"
+        },
+        {
+            "name": "balloon"
+        },
+        {
+            "name": "set_link"
+        },
+        {
+            "name": "getfd"
+        },
+        {
+            "name": "closefd"
+        },
+        {
+            "name": "block_passwd"
+        },
+        {
+            "name": "set_password"
+        },
+        {
+            "name": "expire_password"
+        },
+        {
+            "name": "qmp_capabilities"
+        },
+        {
+            "name": "human-monitor-command"
+        },
+        {
+            "name": "query-version"
+        },
+        {
+            "name": "query-commands"
+        },
+        {
+            "name": "query-chardev"
+        },
+        {
+            "name": "query-block"
+        },
+        {
+            "name": "query-blockstats"
+        },
+        {
+            "name": "query-cpus"
+        },
+        {
+            "name": "query-pci"
+        },
+        {
+            "name": "query-kvm"
+        },
+        {
+            "name": "query-status"
+        },
+        {
+            "name": "query-mice"
+        },
+        {
+            "name": "query-vnc"
+        },
+        {
+            "name": "query-spice"
+        },
+        {
+            "name": "query-name"
+        },
+        {
+            "name": "query-uuid"
+        },
+        {
+            "name": "query-migrate"
+        },
+        {
+            "name": "query-balloon"
+        }
+    ],
+    "id": "libvirt-2"
+}
-- 
2.19.2

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCHv2 12/14] virjsondata: json_reformat input data
Posted by Peter Krempa 6 years, 10 months ago
On Tue, Apr 02, 2019 at 17:41:51 +0200, Ján Tomko wrote:
> Remove trailing slashes and run json_reformat.
> 
> Signed-off-by: Ján Tomko <jtomko@redhat.com>
> ---
>  tests/virjsondata/parse-Harder-in.json      |  17 +-
>  tests/virjsondata/parse-NotSoSimple-in.json |  18 ++-
>  tests/virjsondata/parse-Simple-in.json      |   7 +-
>  tests/virjsondata/parse-VeryHard-in.json    | 167 +++++++++++++++++---
>  4 files changed, 177 insertions(+), 32 deletions(-)

I don't think we should do this for the input files and even for some
output files. The non-prettified input/output is used in QMP monitor
interactions and I think we should keep at least some in the "native"
format.

This is to complement most other test files like the caps replies where
we use the prettified output so that the files can be updated
reasonably. This static data does not have to change.
--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list