Adapt check pertaining to scs-0104-standard-images

Signed-off-by: Matthias Büchse <[email protected]>

Author: mbuechse

Tests/iaas/openstack_test.py

@@ -32,6 +32,8 @@
     compute_scs_0102_image_recency
 from scs_0103_standard_flavors.standard_flavors import \
     SCS_0103_CANONICAL_NAMES, compute_flavor_lookup, compute_scs_0103_flavor
+from scs_0104_standard_images.standard_images import \
+    SCS_0104_IMAGE_SPECS, compute_scs_0104_source, compute_scs_0104_image
 
 
 logger = logging.getLogger(__name__)
@@ -51,7 +53,8 @@ def make_container(cloud):
     # basic support attributes shared by multiple testcases
     c.add_function('conn', lambda _: openstack.connect(cloud=cloud, timeout=32))
     c.add_function('flavors', lambda c: list(c.conn.list_flavors(get_extra=True)))
-    c.add_function('images', lambda c: [img for img in c.conn.list_images() if img.visibility in ('public', 'community')])
+    c.add_function('images', lambda c: [img for img in c.conn.list_images(show_all=True) if img.visibility in ('public', 'community')])
+    c.add_function('image_lookup', lambda c: {img.name: img for img in c.images})
     # scs_0100_flavor_naming
     c.add_function('scs_flavors', lambda c: compute_scs_flavors(c.flavors))
     c.add_function('scs_0100_syntax_check', lambda c: compute_scs_0100_syntax_check(c.scs_flavors))
@@ -112,6 +115,39 @@ def make_container(cloud):
         c.scs_0103_flavor_16v_32, c.scs_0103_flavor_1v_8, c.scs_0103_flavor_2v_16, c.scs_0103_flavor_4v_32,
         c.scs_0103_flavor_1l_1, c.scs_0103_flavor_2v_4_20s, c.scs_0103_flavor_4v_16_100s,
     )))
+    # scs_0104_standard_images
+    c.add_function('scs_0104_source_capi_1', lambda c: compute_scs_0104_source(c.image_lookup, SCS_0104_IMAGE_SPECS['ubuntu-capi-image-1']))
+    c.add_function('scs_0104_source_capi_2', lambda c: compute_scs_0104_source(c.image_lookup, SCS_0104_IMAGE_SPECS['ubuntu-capi-image-2']))
+    c.add_function('scs_0104_source_ubuntu_2404', lambda c: compute_scs_0104_source(c.image_lookup, SCS_0104_IMAGE_SPECS['Ubuntu 24.04']))
+    c.add_function('scs_0104_source_ubuntu_2204', lambda c: compute_scs_0104_source(c.image_lookup, SCS_0104_IMAGE_SPECS['Ubuntu 22.04']))
+    c.add_function('scs_0104_source_ubuntu_2004', lambda c: compute_scs_0104_source(c.image_lookup, SCS_0104_IMAGE_SPECS['Ubuntu 20.04']))
+    c.add_function('scs_0104_source_debian_13', lambda c: compute_scs_0104_source(c.image_lookup, SCS_0104_IMAGE_SPECS['Debian 13']))
+    c.add_function('scs_0104_source_debian_12', lambda c: compute_scs_0104_source(c.image_lookup, SCS_0104_IMAGE_SPECS['Debian 12']))
+    c.add_function('scs_0104_source_debian_11', lambda c: compute_scs_0104_source(c.image_lookup, SCS_0104_IMAGE_SPECS['Debian 11']))
+    c.add_function('scs_0104_source_debian_10', lambda c: compute_scs_0104_source(c.image_lookup, SCS_0104_IMAGE_SPECS['Debian 10']))
+    c.add_function('scs_0104_image_capi_1', lambda c: compute_scs_0104_image(c.image_lookup, SCS_0104_IMAGE_SPECS['ubuntu-capi-image-1']))
+    c.add_function('scs_0104_image_capi_2', lambda c: compute_scs_0104_image(c.image_lookup, SCS_0104_IMAGE_SPECS['ubuntu-capi-image-2']))
+    c.add_function('scs_0104_image_ubuntu_2404', lambda c: compute_scs_0104_image(c.image_lookup, SCS_0104_IMAGE_SPECS['Ubuntu 24.04']))
+    c.add_function('scs_0104_image_ubuntu_2204', lambda c: compute_scs_0104_image(c.image_lookup, SCS_0104_IMAGE_SPECS['Ubuntu 22.04']))
+    c.add_function('scs_0104_image_ubuntu_2004', lambda c: compute_scs_0104_image(c.image_lookup, SCS_0104_IMAGE_SPECS['Ubuntu 20.04']))
+    c.add_function('scs_0104_image_debian_13', lambda c: compute_scs_0104_image(c.image_lookup, SCS_0104_IMAGE_SPECS['Debian 13']))
+    c.add_function('scs_0104_image_debian_12', lambda c: compute_scs_0104_image(c.image_lookup, SCS_0104_IMAGE_SPECS['Debian 12']))
+    c.add_function('scs_0104_image_debian_11', lambda c: compute_scs_0104_image(c.image_lookup, SCS_0104_IMAGE_SPECS['Debian 11']))
+    c.add_function('scs_0104_image_debian_10', lambda c: compute_scs_0104_image(c.image_lookup, SCS_0104_IMAGE_SPECS['Debian 10']))
+    # NOTE the following variant is correct for SCS-compatible IaaS v4 only
+    c.add_function('standard_images_check_1', lambda c: all((
+        c.scs_0104_image_ubuntu_2204,
+        c.scs_0104_source_capi_1, c.scs_0104_source_capi_2,
+        c.scs_0104_source_ubuntu_2404, c.scs_0104_source_ubuntu_2204, c.scs_0104_source_ubuntu_2004,
+        c.scs_0104_source_debian_13, c.scs_0104_source_debian_12, c.scs_0104_source_debian_11, c.scs_0104_source_debian_10,
+    )))
+    # NOTE the following variant is correct for SCS-compatible IaaS v5.1 only
+    c.add_function('standard_images_check_2', lambda c: all((
+        c.scs_0104_image_ubuntu_2404,
+        c.scs_0104_source_capi_1, c.scs_0104_source_capi_2,
+        c.scs_0104_source_ubuntu_2404, c.scs_0104_source_ubuntu_2204, c.scs_0104_source_ubuntu_2004,
+        c.scs_0104_source_debian_13, c.scs_0104_source_debian_12, c.scs_0104_source_debian_11, c.scs_0104_source_debian_10,
+    )))
     return c
 
 
@@ -213,7 +249,14 @@ def main(argv):
         else:
             usage(2)
 
-    testcases = [t for t in args if t.endswith('-check') or t.startswith('scs-')]
+    # NOTE For historic reasons, there is precisely one testcase id, namely standard-images-check,
+    # whose meaning depends on the version of the certificate scope in question. We are in the process
+    # of transitioning away from this anti-feature. For the time being, however, we use the following
+    # hack to support it: One testcase may be implemented in multiple variants, denoted by suffixing
+    # a number, as in standard-images-check/1, standard-images-check/2.
+    # NOTE Also, the historic testcases have terrible naming. We will transition towards names
+    # that encode the corresponding standard, such as scs-0104-image-ubuntu-2404.
+    testcases = [t for t in args if t.rsplit('/', 1)[0].endswith('-check') or t.startswith('scs-')]
     if len(testcases) != len(args):
         unknown = [a for a in args if a not in testcases]
         logger.warning(f"ignoring unknown testcases: {','.join(unknown)}")
@@ -224,7 +267,8 @@ def main(argv):
 
     c = make_container(cloud)
     for testcase in testcases:
-        harness(testcase, lambda: getattr(c, testcase.replace('-', '_')))
+        testcase_name = testcase.rsplit('/', 1)[0]  # see the note above
+        harness(testcase_name, lambda: getattr(c, testcase.replace('-', '_').replace('/', '_')))
     return 0
 
 

…iaas/standard-images/images-openstack.py …0104_standard_images/images-openstack.pyTests/iaas/standard-images/images-openstack.py renamed to Tests/iaas/scs_0104_standard_images/images-openstack.py Tests/iaas/standard-images/images-openstack.py renamed to Tests/iaas/scs_0104_standard_images/images-openstack.py

@@ -0,0 +1,81 @@
+import logging
+import re
+
+import yaml
+
+
+logger = logging.getLogger(__name__)
+
+
+_specs = yaml.safe_load(r"""
+"ubuntu-capi-image-1":
+  name_scheme: "ubuntu-capi-image v[0-9]\\.[0-9]+(\\.[0-9]+)?"
+  source: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube
+"ubuntu-capi-image-2":
+  # this name_scheme uses `-` to separate base name "ubuntu-capi-image" from version
+  # latest openstack-image-manager can be told to use `-` by setting `separator: "-"` on the image
+  name_scheme: "ubuntu-capi-image-v[0-9]\\.[0-9]+(\\.[0-9]+)?"
+  source: https://swift.services.a.regiocloud.tech/swift/v1/AUTH_b182637428444b9aa302bb8d5a5a418c/openstack-k8s-capi-images/ubuntu-2204-kube
+"Ubuntu 24.04":
+  source:
+  - https://cloud-images.ubuntu.com/releases/noble/
+  - https://cloud-images.ubuntu.com/noble/
+"Ubuntu 22.04":
+  source:
+  - https://cloud-images.ubuntu.com/releases/jammy/
+  - https://cloud-images.ubuntu.com/jammy/
+"Ubuntu 20.04":
+  source:
+  - https://cloud-images.ubuntu.com/releases/focal/
+  - https://cloud-images.ubuntu.com/focal/
+"Debian 13":
+  source:
+  - https://cloud.debian.org/images/cloud/trixie/
+  - https://cdimage.debian.org/cdimage/cloud/trixie/
+"Debian 12":
+  source:
+  - https://cloud.debian.org/images/cloud/bookworm/
+  - https://cdimage.debian.org/cdimage/cloud/bookworm/
+"Debian 11":
+  source:
+  - https://cloud.debian.org/images/cloud/bullseye/
+  - https://cdimage.debian.org/cdimage/cloud/bullseye/
+"Debian 10":
+  source:
+  - https://cloud.debian.org/images/cloud/buster/
+  - https://cdimage.debian.org/cdimage/cloud/buster/
+""")
+SCS_0104_IMAGE_SPECS = {key: {'name': key, **val} for key, val in _specs.items()}
+
+
+def _lookup_images(image_lookup, image_spec):
+    name_scheme = image_spec.get('name_scheme')
+    if name_scheme:
+        rex = re.compile(name_scheme)
+        return [img for name, img in image_lookup.items() if rex.match(name)]
+    img = image_lookup.get(image_spec['name'])
+    if img is None:
+        return []
+    return [img]
+
+
+def compute_scs_0104_source(image_lookup, image_spec):
+    matches = _lookup_images(image_lookup, image_spec)
+    errors = 0
+    for image in matches:
+        img_source = image.properties['image_source']
+        sources = image_spec['source']
+        if not isinstance(sources, (tuple, list)):
+            sources = [sources]
+        if not any(img_source.startswith(src) for src in sources):
+            errors += 1
+            logger.error(f"Image '{image.name}' source mismatch: {img_source} matches none of these prefixes: {', '.join(sources)}")
+    return not errors
+
+
+def compute_scs_0104_image(image_lookup, image_spec):
+    matches = _lookup_images(image_lookup, image_spec)
+    if not matches:
+        logger.error(f"Missing image '{image_spec['name']}'")
+        return False
+    return True

Tests/iaas/scs_0104_standard_images/standard_images.py

@@ -91,14 +91,27 @@ modules:
         tags: [mandatory]
         description: >
           Must fulfill all requirements of <https://docs.scs.community/standards/scs-0103-v1-standard-flavors>
-  - id: scs-0104-v1
+  - id: scs-0104-v1-1
     name: Standard images
     url: https://docs.scs.community/standards/scs-0104-v1-standard-images
     parameters:
       image_spec: address (URL) of an image-spec (YAML) file
     run:
-      - executable: ./iaas/standard-images/images-openstack.py
-        args: -c {os_cloud} -d {image_spec}
+      - executable: ./iaas/openstack_test.py
+        args: -c {os_cloud} standard-images-check/1
+    testcases:
+      - id: standard-images-check
+        tags: [mandatory]
+        description: >
+          Must fulfill all requirements of <https://docs.scs.community/standards/scs-0104-v1-standard-images>
+  - id: scs-0104-v1-2
+    name: Standard images
+    url: https://docs.scs.community/standards/scs-0104-v1-standard-images
+    parameters:
+      image_spec: address (URL) of an image-spec (YAML) file
+    run:
+      - executable: ./iaas/openstack_test.py
+        args: -c {os_cloud} standard-images-check/2
     testcases:
       - id: standard-images-check
         tags: [mandatory]
@@ -207,7 +220,7 @@ versions:
       - scs-0101-v1
       - scs-0102-v1
       - scs-0103-v1
-      - ref: scs-0104-v1
+      - ref: scs-0104-v1-2
         parameters:
           image_spec: https://raw.githubusercontent.com/SovereignCloudStack/standards/main/Tests/iaas/scs-0104-v1-images-v5.yaml
       - scs-0114-v1
@@ -228,7 +241,7 @@ versions:
       - scs-0101-v1
       - scs-0102-v1
       - scs-0103-v1
-      - ref: scs-0104-v1
+      - ref: scs-0104-v1-1
         parameters:
           image_spec: https://raw.githubusercontent.com/SovereignCloudStack/standards/main/Tests/iaas/scs-0104-v1-images.yaml
     targets: