From 5937b9adca96ea4ffcb0865c75ca3e80c5b9b100 Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Wed, 7 Apr 2021 17:35:25 +0000 Subject: [PATCH] image-info: show format version for qcow2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the "image-format" from a string to a dict, with a "type": $value entry, where $value contains the previous plain string data. Additionally, include the qcow2 format version, if the given image is indeed a qcow2. Adapt all manifest test accordingly (partly done by Ondřej) Python 3 script used for conversion of manifest tests: import os import json for name in os.listdir(os.getcwd()): if not name.endswith(".json"): continue print(name) with open(name, "r") as old: data = json.load(old) info = data.get("image-info", {}) format = info.get("image-format") if not format: continue info["image-format"] = { "type": format } if format != "qcow2": continue info["image-format"]["compat"] = "1.1" with open(name + ".new", "w") as new: json.dump(data, new, indent=2) new.write("\n") new.flush() os.rename(name+".new", name) test: use the new image-info format in all test manifests The previous commit converted only qcow2 and openstack manifests but this change is actually needed for all manifests produced by the qemu assembler. Co-Developed-by: Ondřej Budai --- test/data/manifests/centos_8-x86_64-ami-boot.json | 4 +++- test/data/manifests/centos_8-x86_64-openstack-boot.json | 5 ++++- test/data/manifests/centos_8-x86_64-qcow2-boot.json | 5 ++++- test/data/manifests/centos_8-x86_64-qcow2-customize.json | 7 +++++-- test/data/manifests/centos_8-x86_64-vhd-boot.json | 4 +++- test/data/manifests/centos_8-x86_64-vmdk-boot.json | 4 +++- test/data/manifests/fedora_32-aarch64-ami-boot.json | 4 +++- test/data/manifests/fedora_32-aarch64-openstack-boot.json | 5 ++++- test/data/manifests/fedora_32-aarch64-qcow2-boot.json | 5 ++++- test/data/manifests/fedora_32-x86_64-ami-boot.json | 4 +++- test/data/manifests/fedora_32-x86_64-openstack-boot.json | 5 ++++- test/data/manifests/fedora_32-x86_64-qcow2-boot.json | 5 ++++- test/data/manifests/fedora_32-x86_64-qcow2-customize.json | 5 ++++- test/data/manifests/fedora_32-x86_64-vhd-boot.json | 4 +++- test/data/manifests/fedora_32-x86_64-vmdk-boot.json | 4 +++- test/data/manifests/fedora_33-aarch64-ami-boot.json | 4 +++- test/data/manifests/fedora_33-x86_64-ami-boot.json | 4 +++- test/data/manifests/fedora_33-x86_64-openstack-boot.json | 5 ++++- test/data/manifests/fedora_33-x86_64-qcow2-boot.json | 5 ++++- test/data/manifests/fedora_33-x86_64-qcow2-customize.json | 5 ++++- test/data/manifests/fedora_33-x86_64-vhd-boot.json | 4 +++- test/data/manifests/fedora_33-x86_64-vmdk-boot.json | 4 +++- test/data/manifests/rhel_8-aarch64-ami-boot.json | 4 +++- test/data/manifests/rhel_8-aarch64-openstack-boot.json | 5 ++++- test/data/manifests/rhel_8-aarch64-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_8-ppc64le-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_8-s390x-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_8-x86_64-ami-boot.json | 4 +++- test/data/manifests/rhel_8-x86_64-openstack-boot.json | 5 ++++- test/data/manifests/rhel_8-x86_64-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_8-x86_64-qcow2-customize.json | 5 ++++- test/data/manifests/rhel_8-x86_64-vhd-boot.json | 4 +++- test/data/manifests/rhel_8-x86_64-vmdk-boot.json | 4 +++- test/data/manifests/rhel_84-aarch64-ami-boot.json | 4 +++- test/data/manifests/rhel_84-aarch64-openstack-boot.json | 5 ++++- test/data/manifests/rhel_84-aarch64-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_84-ppc64le-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_84-s390x-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_84-x86_64-ami-boot.json | 4 +++- test/data/manifests/rhel_84-x86_64-openstack-boot.json | 5 ++++- test/data/manifests/rhel_84-x86_64-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_84-x86_64-qcow2-customize.json | 5 ++++- test/data/manifests/rhel_84-x86_64-vhd-boot.json | 4 +++- test/data/manifests/rhel_84-x86_64-vmdk-boot.json | 4 +++- test/data/manifests/rhel_90-aarch64-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_90-ppc64le-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_90-s390x-qcow2-boot.json | 5 ++++- test/data/manifests/rhel_90-x86_64-qcow2-boot.json | 5 ++++- tools/image-info | 6 +++++- 49 files changed, 179 insertions(+), 50 deletions(-) diff --git a/test/data/manifests/centos_8-x86_64-ami-boot.json b/test/data/manifests/centos_8-x86_64-ami-boot.json index dc64bb5dc..7df9eaaa6 100644 --- a/test/data/manifests/centos_8-x86_64-ami-boot.json +++ b/test/data/manifests/centos_8-x86_64-ami-boot.json @@ -10329,7 +10329,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/centos_8-x86_64-openstack-boot.json b/test/data/manifests/centos_8-x86_64-openstack-boot.json index 26c625d91..b08ebe8a9 100644 --- a/test/data/manifests/centos_8-x86_64-openstack-boot.json +++ b/test/data/manifests/centos_8-x86_64-openstack-boot.json @@ -11038,7 +11038,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/centos_8-x86_64-qcow2-boot.json b/test/data/manifests/centos_8-x86_64-qcow2-boot.json index 5e2f5f3ba..ca1cb87f2 100644 --- a/test/data/manifests/centos_8-x86_64-qcow2-boot.json +++ b/test/data/manifests/centos_8-x86_64-qcow2-boot.json @@ -11030,7 +11030,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/centos_8-x86_64-qcow2-customize.json b/test/data/manifests/centos_8-x86_64-qcow2-customize.json index d056d2c09..c2e690374 100644 --- a/test/data/manifests/centos_8-x86_64-qcow2-customize.json +++ b/test/data/manifests/centos_8-x86_64-qcow2-customize.json @@ -11124,7 +11124,10 @@ "wheel:x:10:" ], "hostname": "my-host", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", @@ -11770,4 +11773,4 @@ }, "timezone": "London" } -} \ No newline at end of file +} diff --git a/test/data/manifests/centos_8-x86_64-vhd-boot.json b/test/data/manifests/centos_8-x86_64-vhd-boot.json index 0e33f523b..6dc49f370 100644 --- a/test/data/manifests/centos_8-x86_64-vhd-boot.json +++ b/test/data/manifests/centos_8-x86_64-vhd-boot.json @@ -10952,7 +10952,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/centos_8-x86_64-vmdk-boot.json b/test/data/manifests/centos_8-x86_64-vmdk-boot.json index 66ad8273e..d85c242f4 100644 --- a/test/data/manifests/centos_8-x86_64-vmdk-boot.json +++ b/test/data/manifests/centos_8-x86_64-vmdk-boot.json @@ -10540,7 +10540,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "vmdk", + "image-format": { + "type": "vmdk" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_32-aarch64-ami-boot.json b/test/data/manifests/fedora_32-aarch64-ami-boot.json index 627f2b2f6..ca7bf9880 100644 --- a/test/data/manifests/fedora_32-aarch64-ami-boot.json +++ b/test/data/manifests/fedora_32-aarch64-ami-boot.json @@ -8957,7 +8957,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;34", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_32-aarch64-openstack-boot.json b/test/data/manifests/fedora_32-aarch64-openstack-boot.json index 5b4b71dc5..051938d65 100644 --- a/test/data/manifests/fedora_32-aarch64-openstack-boot.json +++ b/test/data/manifests/fedora_32-aarch64-openstack-boot.json @@ -9311,7 +9311,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;34", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_32-aarch64-qcow2-boot.json b/test/data/manifests/fedora_32-aarch64-qcow2-boot.json index 369ac2dcb..34f99e3b3 100644 --- a/test/data/manifests/fedora_32-aarch64-qcow2-boot.json +++ b/test/data/manifests/fedora_32-aarch64-qcow2-boot.json @@ -8811,7 +8811,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;34", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_32-x86_64-ami-boot.json b/test/data/manifests/fedora_32-x86_64-ami-boot.json index 00e0f2f4a..6b063e2bc 100644 --- a/test/data/manifests/fedora_32-x86_64-ami-boot.json +++ b/test/data/manifests/fedora_32-x86_64-ami-boot.json @@ -9207,7 +9207,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;34", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_32-x86_64-openstack-boot.json b/test/data/manifests/fedora_32-x86_64-openstack-boot.json index 144537a0f..5c21e8c69 100644 --- a/test/data/manifests/fedora_32-x86_64-openstack-boot.json +++ b/test/data/manifests/fedora_32-x86_64-openstack-boot.json @@ -9561,7 +9561,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;34", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_32-x86_64-qcow2-boot.json b/test/data/manifests/fedora_32-x86_64-qcow2-boot.json index b92379c11..47b630a49 100644 --- a/test/data/manifests/fedora_32-x86_64-qcow2-boot.json +++ b/test/data/manifests/fedora_32-x86_64-qcow2-boot.json @@ -9197,7 +9197,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;34", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_32-x86_64-qcow2-customize.json b/test/data/manifests/fedora_32-x86_64-qcow2-customize.json index 3fc5904de..6e1382ce7 100644 --- a/test/data/manifests/fedora_32-x86_64-qcow2-customize.json +++ b/test/data/manifests/fedora_32-x86_64-qcow2-customize.json @@ -9312,7 +9312,10 @@ "wheel:x:10:" ], "hostname": "my-host", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;34", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_32-x86_64-vhd-boot.json b/test/data/manifests/fedora_32-x86_64-vhd-boot.json index 5031da6a3..211335105 100644 --- a/test/data/manifests/fedora_32-x86_64-vhd-boot.json +++ b/test/data/manifests/fedora_32-x86_64-vhd-boot.json @@ -8809,7 +8809,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;34", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_32-x86_64-vmdk-boot.json b/test/data/manifests/fedora_32-x86_64-vmdk-boot.json index 909a28ea4..04016fe9f 100644 --- a/test/data/manifests/fedora_32-x86_64-vmdk-boot.json +++ b/test/data/manifests/fedora_32-x86_64-vmdk-boot.json @@ -8915,7 +8915,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "vmdk", + "image-format": { + "type": "vmdk" + }, "os-release": { "ANSI_COLOR": "0;34", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_33-aarch64-ami-boot.json b/test/data/manifests/fedora_33-aarch64-ami-boot.json index bfe43ea9d..3be497876 100644 --- a/test/data/manifests/fedora_33-aarch64-ami-boot.json +++ b/test/data/manifests/fedora_33-aarch64-ami-boot.json @@ -9878,7 +9878,9 @@ "wheel:x:10:" ], "hostname": "localhost.localdomain", - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;38;2;60;110;180", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_33-x86_64-ami-boot.json b/test/data/manifests/fedora_33-x86_64-ami-boot.json index 91bcc5cb9..b15255593 100644 --- a/test/data/manifests/fedora_33-x86_64-ami-boot.json +++ b/test/data/manifests/fedora_33-x86_64-ami-boot.json @@ -9449,7 +9449,9 @@ "wheel:x:10:" ], "hostname": "localhost.localdomain", - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;38;2;60;110;180", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_33-x86_64-openstack-boot.json b/test/data/manifests/fedora_33-x86_64-openstack-boot.json index 014f08e24..102cb2be1 100644 --- a/test/data/manifests/fedora_33-x86_64-openstack-boot.json +++ b/test/data/manifests/fedora_33-x86_64-openstack-boot.json @@ -9768,7 +9768,10 @@ "wheel:x:10:" ], "hostname": "localhost.localdomain", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;38;2;60;110;180", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_33-x86_64-qcow2-boot.json b/test/data/manifests/fedora_33-x86_64-qcow2-boot.json index 2970315b1..3da9c7b60 100644 --- a/test/data/manifests/fedora_33-x86_64-qcow2-boot.json +++ b/test/data/manifests/fedora_33-x86_64-qcow2-boot.json @@ -9389,7 +9389,10 @@ "wheel:x:10:" ], "hostname": "localhost.localdomain", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;38;2;60;110;180", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_33-x86_64-qcow2-customize.json b/test/data/manifests/fedora_33-x86_64-qcow2-customize.json index ea852bbbc..ef15e3076 100644 --- a/test/data/manifests/fedora_33-x86_64-qcow2-customize.json +++ b/test/data/manifests/fedora_33-x86_64-qcow2-customize.json @@ -9492,7 +9492,10 @@ "wheel:x:10:" ], "hostname": "my-host", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;38;2;60;110;180", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_33-x86_64-vhd-boot.json b/test/data/manifests/fedora_33-x86_64-vhd-boot.json index 3bdab8a8b..ea73cded5 100644 --- a/test/data/manifests/fedora_33-x86_64-vhd-boot.json +++ b/test/data/manifests/fedora_33-x86_64-vhd-boot.json @@ -9051,7 +9051,9 @@ "wheel:x:10:" ], "hostname": "localhost.localdomain", - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;38;2;60;110;180", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/fedora_33-x86_64-vmdk-boot.json b/test/data/manifests/fedora_33-x86_64-vmdk-boot.json index cc79222bf..892530cdd 100644 --- a/test/data/manifests/fedora_33-x86_64-vmdk-boot.json +++ b/test/data/manifests/fedora_33-x86_64-vmdk-boot.json @@ -9389,7 +9389,9 @@ "wheel:x:10:" ], "hostname": "localhost.localdomain", - "image-format": "vmdk", + "image-format": { + "type": "vmdk" + }, "os-release": { "ANSI_COLOR": "0;38;2;60;110;180", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-aarch64-ami-boot.json b/test/data/manifests/rhel_8-aarch64-ami-boot.json index 6aef77f12..48783a69f 100644 --- a/test/data/manifests/rhel_8-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_8-aarch64-ami-boot.json @@ -8569,7 +8569,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-aarch64-openstack-boot.json b/test/data/manifests/rhel_8-aarch64-openstack-boot.json index 342b62337..91abbe77d 100644 --- a/test/data/manifests/rhel_8-aarch64-openstack-boot.json +++ b/test/data/manifests/rhel_8-aarch64-openstack-boot.json @@ -9138,7 +9138,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-aarch64-qcow2-boot.json b/test/data/manifests/rhel_8-aarch64-qcow2-boot.json index e9d042365..232b59d8c 100644 --- a/test/data/manifests/rhel_8-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_8-aarch64-qcow2-boot.json @@ -9594,7 +9594,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json index 2329a100d..5e9b7820c 100644 --- a/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_8-ppc64le-qcow2-boot.json @@ -10324,7 +10324,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-s390x-qcow2-boot.json b/test/data/manifests/rhel_8-s390x-qcow2-boot.json index 721d4af3d..376c9ed81 100644 --- a/test/data/manifests/rhel_8-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_8-s390x-qcow2-boot.json @@ -10204,7 +10204,10 @@ "wheel:x:10:", "zkeyadm:x:996:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-x86_64-ami-boot.json b/test/data/manifests/rhel_8-x86_64-ami-boot.json index 63b0b8412..d49b7e387 100644 --- a/test/data/manifests/rhel_8-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_8-x86_64-ami-boot.json @@ -8557,7 +8557,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-x86_64-openstack-boot.json b/test/data/manifests/rhel_8-x86_64-openstack-boot.json index 55b43a0d5..ac85daf13 100644 --- a/test/data/manifests/rhel_8-x86_64-openstack-boot.json +++ b/test/data/manifests/rhel_8-x86_64-openstack-boot.json @@ -9141,7 +9141,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-x86_64-qcow2-boot.json b/test/data/manifests/rhel_8-x86_64-qcow2-boot.json index d61359a7b..c09647112 100644 --- a/test/data/manifests/rhel_8-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_8-x86_64-qcow2-boot.json @@ -9567,7 +9567,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-x86_64-qcow2-customize.json b/test/data/manifests/rhel_8-x86_64-qcow2-customize.json index 45c9ac211..99bd8bf2f 100644 --- a/test/data/manifests/rhel_8-x86_64-qcow2-customize.json +++ b/test/data/manifests/rhel_8-x86_64-qcow2-customize.json @@ -9696,7 +9696,10 @@ "wheel:x:10:" ], "hostname": "my-host", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-x86_64-vhd-boot.json b/test/data/manifests/rhel_8-x86_64-vhd-boot.json index 3d75608ce..3933cca92 100644 --- a/test/data/manifests/rhel_8-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_8-x86_64-vhd-boot.json @@ -9050,7 +9050,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_8-x86_64-vmdk-boot.json b/test/data/manifests/rhel_8-x86_64-vmdk-boot.json index f77eaeef0..f6504d800 100644 --- a/test/data/manifests/rhel_8-x86_64-vmdk-boot.json +++ b/test/data/manifests/rhel_8-x86_64-vmdk-boot.json @@ -8693,7 +8693,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "vmdk", + "image-format": { + "type": "vmdk" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-aarch64-ami-boot.json b/test/data/manifests/rhel_84-aarch64-ami-boot.json index 99addd354..9b14047e2 100644 --- a/test/data/manifests/rhel_84-aarch64-ami-boot.json +++ b/test/data/manifests/rhel_84-aarch64-ami-boot.json @@ -8981,7 +8981,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-aarch64-openstack-boot.json b/test/data/manifests/rhel_84-aarch64-openstack-boot.json index 5cddc1ec6..5f776ed26 100644 --- a/test/data/manifests/rhel_84-aarch64-openstack-boot.json +++ b/test/data/manifests/rhel_84-aarch64-openstack-boot.json @@ -9550,7 +9550,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json b/test/data/manifests/rhel_84-aarch64-qcow2-boot.json index cdf77befd..3097db387 100644 --- a/test/data/manifests/rhel_84-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_84-aarch64-qcow2-boot.json @@ -9472,7 +9472,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json index 8d5006865..f346cad43 100644 --- a/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_84-ppc64le-qcow2-boot.json @@ -10199,7 +10199,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-s390x-qcow2-boot.json b/test/data/manifests/rhel_84-s390x-qcow2-boot.json index a44520a6b..fa1ac5f88 100644 --- a/test/data/manifests/rhel_84-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_84-s390x-qcow2-boot.json @@ -10131,7 +10131,10 @@ "wheel:x:10:", "zkeyadm:x:996:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-x86_64-ami-boot.json b/test/data/manifests/rhel_84-x86_64-ami-boot.json index 277561e49..2a10b1475 100644 --- a/test/data/manifests/rhel_84-x86_64-ami-boot.json +++ b/test/data/manifests/rhel_84-x86_64-ami-boot.json @@ -9149,7 +9149,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-x86_64-openstack-boot.json b/test/data/manifests/rhel_84-x86_64-openstack-boot.json index 8ad30308b..19ba7ff70 100644 --- a/test/data/manifests/rhel_84-x86_64-openstack-boot.json +++ b/test/data/manifests/rhel_84-x86_64-openstack-boot.json @@ -9733,7 +9733,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json index fb35223a1..cd014c03e 100644 --- a/test/data/manifests/rhel_84-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_84-x86_64-qcow2-boot.json @@ -9610,7 +9610,10 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-x86_64-qcow2-customize.json b/test/data/manifests/rhel_84-x86_64-qcow2-customize.json index 3b82dc93c..ce1be9436 100644 --- a/test/data/manifests/rhel_84-x86_64-qcow2-customize.json +++ b/test/data/manifests/rhel_84-x86_64-qcow2-customize.json @@ -9706,7 +9706,10 @@ "wheel:x:10:" ], "hostname": "my-host", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-x86_64-vhd-boot.json b/test/data/manifests/rhel_84-x86_64-vhd-boot.json index 33d3b2712..5412228b5 100644 --- a/test/data/manifests/rhel_84-x86_64-vhd-boot.json +++ b/test/data/manifests/rhel_84-x86_64-vhd-boot.json @@ -9657,7 +9657,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "raw", + "image-format": { + "type": "raw" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json index 54e82d483..5b01cbf0f 100644 --- a/test/data/manifests/rhel_84-x86_64-vmdk-boot.json +++ b/test/data/manifests/rhel_84-x86_64-vmdk-boot.json @@ -9308,7 +9308,9 @@ "video:x:39:", "wheel:x:10:" ], - "image-format": "vmdk", + "image-format": { + "type": "vmdk" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json index 592037623..79549c848 100644 --- a/test/data/manifests/rhel_90-aarch64-qcow2-boot.json +++ b/test/data/manifests/rhel_90-aarch64-qcow2-boot.json @@ -9569,7 +9569,10 @@ "wheel:x:10:" ], "hostname": "localhost.localdomain", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json index 813987771..7d6f23db6 100644 --- a/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json +++ b/test/data/manifests/rhel_90-ppc64le-qcow2-boot.json @@ -10320,7 +10320,10 @@ "wheel:x:10:" ], "hostname": "localhost.localdomain", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_90-s390x-qcow2-boot.json b/test/data/manifests/rhel_90-s390x-qcow2-boot.json index 07db59ad8..9d71f1616 100644 --- a/test/data/manifests/rhel_90-s390x-qcow2-boot.json +++ b/test/data/manifests/rhel_90-s390x-qcow2-boot.json @@ -9775,7 +9775,10 @@ "zkeyadm:x:987:" ], "hostname": "localhost.localdomain", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json index 737a05a44..6f5b91b74 100644 --- a/test/data/manifests/rhel_90-x86_64-qcow2-boot.json +++ b/test/data/manifests/rhel_90-x86_64-qcow2-boot.json @@ -9706,7 +9706,10 @@ "wheel:x:10:" ], "hostname": "localhost.localdomain", - "image-format": "qcow2", + "image-format": { + "type": "qcow2", + "compat": "1.1" + }, "os-release": { "ANSI_COLOR": "0;31", "BUG_REPORT_URL": "https://bugzilla.redhat.com/", diff --git a/tools/image-info b/tools/image-info index 002323203..1b63156e0 100755 --- a/tools/image-info +++ b/tools/image-info @@ -152,7 +152,11 @@ def subprocess_check_output(argv, parse_fn=None): def read_image_format(device): qemu = subprocess_check_output(["qemu-img", "info", "--output=json", device], json.loads) - return qemu["format"] + format = qemu["format"] + result = {"type": format} + if format == "qcow2": + result["compat"] = qemu["format-specific"]["data"]["compat"] + return result def read_partition(device, partition):