Bugfix: image-md-check.py too lenient, scs-0102-v1 too strict (#914)

Signed-off-by: Matthias Büchse <[email protected]>
Co-authored-by: Kurt Garloff <[email protected]>

Author: mbuechse

Standards/scs-0102-v1-image-metadata.md

@@ -52,15 +52,22 @@ in the [OpenStack Image documentation](https://docs.openstack.org/glance/latest/
 
 The following properties are considered mandatory:
 
-- `architecture`, `hypervisor_type`
+- `architecture`
 - `min_disk` (in GiB), `min_ram` (in MiB)
 - `os_version`, `os_distro`
-- `hw_rng_model`, `hw_disk_bus` (`scsi` recommended, and then setting `hw_scsi_model` is also recommended)
+- `hw_disk_bus` (`scsi` recommended, and then setting `hw_scsi_model` is also recommended)
 
 **Note**: Disk sizes tend to be measured in GB = 10^9 and not GiB = 2^30 in the disk industry, but OpenStack uses GiB.
 
-The following properties are recommended (if the features are supported):
+The value given vor `min_ram` MUST be sufficient for the VM to boot and survive (for at least 10 s).
 
+The following property is recommended:
+
+- `hypervisor_type`
+
+The following further properties are recommended (if the features are supported):
+
+- `hw_rng_model`
 - `os_secure_boot`, `hw_firmware_type`
 - `hw_watchdog_action`, `hw_mem_encryption`, `hw_pmu`, `hw_video_ram`, `hw_vif_multiqueue_enabled`
 

Tests/iaas/image-metadata/image-md-check.py

@@ -282,12 +282,16 @@ def validate_imageMD(img, outd_list):
     if img.min_ram < 64:
         print(f'WARNING: Image "{imgnm}": min_ram == {img.min_ram} MiB < 64 MiB', file=sys.stderr)
         warnings += 1
-        # errors += 1
-    if img.min_disk * GIB < img.size:
-        print(f'WARNING: Image "{imgnm}": img size == {img.size / MIB:.0f} MiB, but min_disk == {img.min_disk * GIB / MIB:.0f} MiB',
+    if not img.min_ram:
+        print(f'ERROR: Image "{imgnm}": min_ram == 0', file=sys.stderr)
+        errors += 1
+    if not img.min_disk:
+        print(f'ERROR: Image "{imgnm}": min_disk == 0', file=sys.stderr)
+        errors += 1
+    elif img.min_disk * GIB < img.size:
+        print(f'ERROR: Image "{imgnm}": img size == {img.size / MIB:.0f} MiB, but min_disk == {img.min_disk * GIB / MIB:.0f} MiB',
               file=sys.stderr)
-        warnings += 1
-        # errors += 1
+        errors += 1
     # (6) tags os:*, managed_by_*
     # Nothing to do here ... we could do a warning if those are missing ...