Add os_purpose field and output info.

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

Author: garloff

Tests/iaas/openstack_test.py

@@ -24,6 +24,7 @@
 from scs_0102_image_metadata.image_metadata import \
     compute_scs_0102_prop_architecture, compute_scs_0102_prop_hash_algo, compute_scs_0102_prop_min_disk, \
     compute_scs_0102_prop_min_ram, compute_scs_0102_prop_os_version, compute_scs_0102_prop_os_distro, \
+    compute_scs_0102_prop_os_purpose, \
     compute_scs_0102_prop_hw_disk_bus, compute_scs_0102_prop_hypervisor_type, compute_scs_0102_prop_hw_rng_model, \
     compute_scs_0102_prop_image_build_date, compute_scs_0102_prop_image_original_user, \
     compute_scs_0102_prop_image_source, compute_scs_0102_prop_image_description, \
@@ -90,6 +91,7 @@ def make_container(cloud):
     c.add_function('scs_0102_prop_min_ram', lambda c: compute_scs_0102_prop_min_ram(c.images))
     c.add_function('scs_0102_prop_os_version', lambda c: compute_scs_0102_prop_os_version(c.images))
     c.add_function('scs_0102_prop_os_distro', lambda c: compute_scs_0102_prop_os_distro(c.images))
+    c.add_function('scs_0102_prop_os_purpose', lambda c: compute_scs_0102_prop_os_purpose(c.images))
     c.add_function('scs_0102_prop_hw_disk_bus', lambda c: compute_scs_0102_prop_hw_disk_bus(c.images))
     c.add_function('scs_0102_prop_hypervisor_type', lambda c: compute_scs_0102_prop_hypervisor_type(c.images))
     c.add_function('scs_0102_prop_hw_rng_model', lambda c: compute_scs_0102_prop_hw_rng_model(c.images))

Tests/iaas/scs_0102_image_metadata/image_metadata.py

@@ -12,8 +12,7 @@
 HW_DISK_BUSES = ("virtio", "scsi", None)  # FIXME why None?
 HYPERVISOR_TYPES = ("qemu", "kvm", "xen", "hyper-v", "esxi", None)
 HW_RNG_MODELS = ("virtio", None)
-# Just for nice formatting of image naming hints -- otherwise we capitalize the 1st letter
-OS_LIST = ("CentOS", "AlmaLinux", "Windows Server", "RHEL", "SLES", "openSUSE")
+OS_PURPOSES = ("generic", "minimal", "k8snode", "gpu", "network", "custom")
 # Auxiliary mapping for `freq2secs` (note that values are rounded up a bit on purpose)
 FREQ_TO_SEC = {
     "never": 0,
@@ -31,15 +30,6 @@
 KIB, MIB, GIB = (1024 ** n for n in (1, 2, 3))
 
 
-def recommended_name(nm, os_list=OS_LIST):
-    """Return capitalized name"""
-    for osnm in os_list:
-        osln = len(osnm)
-        if nm[:osln].casefold() == osnm.casefold():
-            return osnm + nm[osln:]
-    return nm[0].upper() + nm[1:]
-
-
 def is_url(stg):
     """Is string stg a URL?"""
     idx = stg.find("://")
@@ -156,6 +146,7 @@ def compute_scs_0102_prop_os_version(images):
     # NOTE currently we are content when the property is not empty, but we could be more strict,
     # because the standard was recently edited to refer to the OpenStack docs, which prescribe
     # certain values for common operating systems.
+    # - os_version not matching regexp r'[0-9\.]*' (should be a numeric version no)
     offenders = [img for img in images if not img.os_version]
     _log_error('property os_version not set', offenders)
     return not offenders
@@ -164,11 +155,20 @@ def compute_scs_0102_prop_os_version(images):
 def compute_scs_0102_prop_os_distro(images):
     """This test ensures that each image has a proper value for the property `os_distro`."""
     # NOTE see note in `compute_scs_0102_prop_os_version`
+    # - os_distro not being all-lowercase (they all should be acc. to
+    #   https://docs.openstack.org/glance/2025.1/admin/useful-image-properties.html
     offenders = [img for img in images if not img.os_distro]
     _log_error('property os_distro not set', offenders)
     return not offenders
 
 
+def compute_scs_0102_prop_os_purpose(images, os_purposes=OS_PURPOSES):
+    """This test ensures that each image has a proper value for the property `os_distro`."""
+    offenders = [img for img in images if img.properties.get('os_purpose') not in os_purposes]
+    _log_error('property os_purpose not set or not correct', offenders)
+    return not offenders
+
+
 def compute_scs_0102_prop_hw_disk_bus(images, hw_disk_buses=HW_DISK_BUSES):
     """This test ensures that each image has a proper value for the property `hw_disk_bus`."""
     offenders = [img for img in images if img.hw_disk_bus not in hw_disk_buses]