From d990ad1b8032656eab064e454bcacbf0bc7dccc0 Mon Sep 17 00:00:00 2001
From: Bernhard Ehlers <49040325+b-ehlers@users.noreply.github.com>
Date: Sun, 7 Jul 2024 16:40:32 +0200
Subject: [PATCH] Fix appliance schema v8, adapt check.py for schema v8

---
 check.py                  |   7 +-
 schemas/appliance_v8.json | 330 +++++++++++++++++++-------------------
 2 files changed, 169 insertions(+), 168 deletions(-)

diff --git a/check.py b/check.py
index 220fa07..b68fcfa 100644
--- a/check.py
+++ b/check.py
@@ -96,8 +96,9 @@ def check_appliance(appliance):
             if image['filename'] in images:
                 print('Duplicate image filename ' + image['filename'])
                 warnings += 1
-            if image['md5sum'] in md5sums:
-                print('Duplicate image md5sum ' + image['md5sum'])
+            md5sum = image.get('checksum') or image.get('md5sum')
+            if md5sum in md5sums:
+                print('Duplicate image md5sum ' + md5sum)
                 sys.exit(1)
             versions_found = False
             for version in appliance_json['versions']:
@@ -107,7 +108,7 @@ def check_appliance(appliance):
                 print('Unused image ' + image['filename'] + ' in ' + appliance)
                 warnings += 1
             images[image['filename']] = image['version']
-            md5sums.add(image['md5sum'])
+            md5sums.add(md5sum)
 
         for version in appliance_json['versions']:
             version_match = False
diff --git a/schemas/appliance_v8.json b/schemas/appliance_v8.json
index 043ef26..4b0e23e 100644
--- a/schemas/appliance_v8.json
+++ b/schemas/appliance_v8.json
@@ -720,174 +720,174 @@
           "template_properties"
         ]
       }
-    }
-  },
-  "images": {
-    "type": "array",
-    "title": "Images for this appliance",
-    "items": {
-      "type": "object",
-      "title": "An image file",
-      "properties": {
-        "filename": {
-          "type": "string",
-          "title": "Filename"
+    },
+    "images": {
+      "type": "array",
+      "title": "Images for this appliance",
+      "items": {
+        "type": "object",
+        "title": "An image file",
+        "properties": {
+          "filename": {
+            "type": "string",
+            "title": "Filename"
+          },
+          "version": {
+            "type": "string",
+            "title": "Version of the image file"
+          },
+          "md5sum": {
+            "type": "string",
+            "title": "MD5 cheksum of the image file",
+            "pattern": "^[a-f0-9]{32}$"
+          },
+          "checksum": {
+            "type": "string",
+            "title": "checksum of the image file"
+          },
+          "checksum_type": {
+            "title": "checksum type of the image file",
+            "enum": [
+              "md5"
+            ]
+          },
+          "filesize": {
+            "type": "integer",
+            "title": "File size in bytes of the image file"
+          },
+          "download_url": {
+            "type": "string",
+            "format": "uri",
+            "title": "Download URL where you can download the image file from a browser"
+          },
+          "direct_download_url": {
+            "type": "string",
+            "format": "uri",
+            "title": "Optional. Non authenticated URL to the image file where you can download the image directly"
+          },
+          "compression": {
+            "enum": [
+              "bzip2",
+              "gzip",
+              "lzma",
+              "xz",
+              "rar",
+              "zip",
+              "7z"
+            ],
+            "title": "Optional, compression type of direct download URL image."
+          },
+          "compression_target": {
+            "type": "string",
+            "title": "Optional, file name of the image file inside the compressed file."
+          }
         },
-        "version": {
-          "type": "string",
-          "title": "Version of the image file"
-        },
-        "md5sum": {
-          "type": "string",
-          "title": "MD5 cheksum of the image file",
-          "pattern": "^[a-f0-9]{32}$"
-        },
-        "checksum": {
-          "type": "string",
-          "title": "checksum of the image file"
-        },
-        "checksum_type": {
-          "title": "checksum type of the image file",
-          "enum": [
-            "md5"
-          ]
-        },
-        "filesize": {
-          "type": "integer",
-          "title": "File size in bytes of the image file"
-        },
-        "download_url": {
-          "type": "string",
-          "format": "uri",
-          "title": "Download URL where you can download the image file from a browser"
-        },
-        "direct_download_url": {
-          "type": "string",
-          "format": "uri",
-          "title": "Optional. Non authenticated URL to the image file where you can download the image directly"
-        },
-        "compression": {
-          "enum": [
-            "bzip2",
-            "gzip",
-            "lzma",
-            "xz",
-            "rar",
-            "zip",
-            "7z"
-          ],
-          "title": "Optional, compression type of direct download URL image."
-        },
-        "compression_target": {
-          "type": "string",
-          "title": "Optional, file name of the image file inside the compressed file."
-        }
-      },
-      "anyOf": [
-        {
-          "required": [
-            "filename",
-            "version",
-            "md5sum",
-            "filesize"
-          ]
-        },
-        {
-          "required": [
-            "filename",
-            "version",
-            "checksum",
-            "filesize"
-          ]
-        }
-      ]
-    }
-  },
-  "versions": {
-    "type": "array",
-    "title": "Versions of the appliance",
-    "items": {
-      "type": "object",
-      "title": "A version of the appliance",
-      "properties": {
-        "name": {
-          "type": "string",
-          "title": "Name of the version"
-        },
-        "settings": {
-          "type": "string",
-          "title": "Template settings to use to run the version"
-        },
-        "category": {
-          "$ref": "#/definitions/categories",
-          "title": "Category of the version"
-        },
-        "installation_instructions": {
-          "type": "string",
-          "title": "Optional installation instructions for the version"
-        },
-        "usage": {
-          "type": "string",
-          "title": "Optional instructions about using the version"
-        },
-        "default_username": {
-          "type": "string",
-          "title": "Default username for the version"
-        },
-        "default_password": {
-          "type": "string",
-          "title": "Default password for the version"
-        },
-        "symbol": {
-          "type": "string",
-          "title": "An optional symbol for the version"
-        },
-        "images": {
-          "type": "object",
-          "title": "Images used for this version",
-          "properties": {
-            "kernel_image": {
-              "type": "string",
-              "title": "Kernel image (Qemu only)"
-            },
-            "initrd": {
-              "type": "string",
-              "title": "Initrd disk image (Qemu only)"
-            },
-            "image": {
-              "type": "string",
-              "title": "OS image (IOU and Dynamips only)"
-            },
-            "bios_image": {
-              "type": "string",
-              "title": "Bios image (Qemu only)"
-            },
-            "hda_disk_image": {
-              "type": "string",
-              "title": "Hda disk image (Qemu only)"
-            },
-            "hdb_disk_image": {
-              "type": "string",
-              "title": "Hdc disk image (Qemu only)"
-            },
-            "hdc_disk_image": {
-              "type": "string",
-              "title": "Hdd disk image (Qemu only)"
-            },
-            "hdd_disk_image": {
-              "type": "string",
-              "title": "Hdd disk image (Qemu only)"
-            },
-            "cdrom_image": {
-              "type": "string",
-              "title": "cdrom image (Qemu only)"
+        "anyOf": [
+          {
+            "required": [
+              "filename",
+              "version",
+              "md5sum",
+              "filesize"
+            ]
+          },
+          {
+            "required": [
+              "filename",
+              "version",
+              "checksum",
+              "filesize"
+            ]
+          }
+        ]
+      }
+    },
+    "versions": {
+      "type": "array",
+      "title": "Versions of the appliance",
+      "items": {
+        "type": "object",
+        "title": "A version of the appliance",
+        "properties": {
+          "name": {
+            "type": "string",
+            "title": "Name of the version"
+          },
+          "settings": {
+            "type": "string",
+            "title": "Template settings to use to run the version"
+          },
+          "category": {
+            "$ref": "#/definitions/categories",
+            "title": "Category of the version"
+          },
+          "installation_instructions": {
+            "type": "string",
+            "title": "Optional installation instructions for the version"
+          },
+          "usage": {
+            "type": "string",
+            "title": "Optional instructions about using the version"
+          },
+          "default_username": {
+            "type": "string",
+            "title": "Default username for the version"
+          },
+          "default_password": {
+            "type": "string",
+            "title": "Default password for the version"
+          },
+          "symbol": {
+            "type": "string",
+            "title": "An optional symbol for the version"
+          },
+          "images": {
+            "type": "object",
+            "title": "Images used for this version",
+            "properties": {
+              "kernel_image": {
+                "type": "string",
+                "title": "Kernel image (Qemu only)"
+              },
+              "initrd": {
+                "type": "string",
+                "title": "Initrd disk image (Qemu only)"
+              },
+              "image": {
+                "type": "string",
+                "title": "OS image (IOU and Dynamips only)"
+              },
+              "bios_image": {
+                "type": "string",
+                "title": "Bios image (Qemu only)"
+              },
+              "hda_disk_image": {
+                "type": "string",
+                "title": "Hda disk image (Qemu only)"
+              },
+              "hdb_disk_image": {
+                "type": "string",
+                "title": "Hdc disk image (Qemu only)"
+              },
+              "hdc_disk_image": {
+                "type": "string",
+                "title": "Hdd disk image (Qemu only)"
+              },
+              "hdd_disk_image": {
+                "type": "string",
+                "title": "Hdd disk image (Qemu only)"
+              },
+              "cdrom_image": {
+                "type": "string",
+                "title": "cdrom image (Qemu only)"
+              }
             }
           }
-        }
-      },
-      "required": [
-        "name"
-      ]
+        },
+        "required": [
+          "name"
+        ]
+      }
     }
   },
   "required": [