adapt check pertaining to scs-0103-standard-flavors

Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>

Author: mbuechse

Tests/iaas/openstack_test.py

@@ -15,7 +15,8 @@
 import openstack
 
 from scs_0100_flavor_naming.flavor_names_check import \
-    compute_scs_flavors, compute_scs_0100_syntax_check, compute_scs_0100_semantics_check
+    compute_scs_flavors, compute_scs_0100_syntax_check, compute_scs_0100_semantics_check, \
+    compute_flavor_spec
 from scs_0101_entropy.entropy_check import \
     compute_scs_0101_image_property, compute_scs_0101_flavor_property, compute_canonical_image, \
     compute_collected_vm_output, compute_scs_0101_entropy_avail, compute_scs_0101_rngd, \
@@ -29,6 +30,8 @@
     compute_scs_0102_prop_replace_frequency, compute_scs_0102_prop_provided_until, \
     compute_scs_0102_prop_uuid_validity, compute_scs_0102_prop_hotfix_hours, \
     compute_scs_0102_image_recency
+from scs_0103_standard_flavors.standard_flavors import \
+    SCS_0103_CANONICAL_NAMES, compute_flavor_lookup, compute_scs_0103_flavor
 
 
 logger = logging.getLogger(__name__)
@@ -93,6 +96,22 @@ def make_container(cloud):
         c.scs_0102_prop_replace_frequency, c.scs_0102_prop_provided_until, c.scs_0102_prop_uuid_validity,
         c.scs_0102_image_recency,
     )))
+    # scs_0103_standard_flavors
+    c.add_function('flavor_lookup', lambda c: compute_flavor_lookup(c.flavors))
+    for canonical_name in SCS_0103_CANONICAL_NAMES:
+        nm = canonical_name.removeprefix('SCS-').lower().replace('-', '_')
+        # NOTE we need cn=canonical_name below because anon function only catches a variable's CELL, not its value
+        # i.e., if we use canonical_name inside it, we will only get its final value after the loop is done
+        c.add_function(
+            f'scs_0103_flavor_{nm}',
+            lambda c, cn=canonical_name: compute_scs_0103_flavor(c.flavor_lookup, compute_flavor_spec(cn))
+        )
+    c.add_function('standard_flavors_check', lambda c: all((
+        c.scs_0103_flavor_1v_4, c.scs_0103_flavor_2v_8, c.scs_0103_flavor_4v_16, c.scs_0103_flavor_8v_32,
+        c.scs_0103_flavor_1v_2, c.scs_0103_flavor_2v_4, c.scs_0103_flavor_4v_8, c.scs_0103_flavor_8v_16,
+        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,
+    )))
     return c
 
 

Tests/iaas/scs_0100_flavor_naming/flavor_names_check.py

@@ -35,6 +35,11 @@ def compute_scs_flavors(flavors: typing.List[openstack.compute.v2.flavor.Flavor]
     return result
 
 
+def compute_flavor_spec(canonical_name: str) -> dict:
+    # this is a helper for tying together scs_0100 and scs_0103
+    return flavor_names.flavorname_to_dict(flavor_names.parser_v3(canonical_name))
+
+
 def compute_scs_0100_syntax_check(scs_flavors: list) -> bool:
     problems = [flv.name for flv, flavorname in scs_flavors if not flavorname]
     if problems:

…standard-flavors/flavor-manager-input.py …standard_flavors/flavor-manager-input.pyTests/iaas/standard-flavors/flavor-manager-input.py renamed to Tests/iaas/scs_0103_standard_flavors/flavor-manager-input.py Tests/iaas/standard-flavors/flavor-manager-input.py renamed to Tests/iaas/scs_0103_standard_flavors/flavor-manager-input.py

@@ -0,0 +1,80 @@
+import logging
+
+
+logger = logging.getLogger(__name__)
+
+
+NAME_KEY = "scs:name-v2"
+SCS_0103_CANONICAL_NAMES = (
+    "SCS-1V-4",
+    "SCS-2V-8",
+    "SCS-4V-16",
+    "SCS-8V-32",
+    "SCS-1V-2",
+    "SCS-2V-4",
+    "SCS-4V-8",
+    "SCS-8V-16",
+    "SCS-16V-32",
+    "SCS-1V-8",
+    "SCS-2V-16",
+    "SCS-4V-32",
+    "SCS-1L-1",
+    "SCS-2V-4-20s",
+    "SCS-4V-16-100s",
+    "SCS-1V-4-10",
+    "SCS-2V-8-20",
+    "SCS-4V-16-50",
+    "SCS-8V-32-100",
+    "SCS-1V-2-5",
+    "SCS-2V-4-10",
+    "SCS-4V-8-20",
+    "SCS-8V-16-50",
+    "SCS-16V-32-100",
+    "SCS-1V-8-20",
+    "SCS-2V-16-50",
+    "SCS-4V-32-100",
+    "SCS-1L-1-5",
+)
+
+
+def compute_flavor_lookup(flavors, name_key=NAME_KEY):
+    # look up via extra_spec given by name_key
+    by_name = {
+        flavor.extra_specs[name_key]: flavor
+        for flavor in flavors
+        if name_key in flavor.extra_specs
+    }
+    # as a fallback, also allow flavor to be found by its actual name
+    for flavor in flavors:
+        if not flavor.name.startswith('SCS-'):
+            continue
+        by_name.setdefault(flavor.name, flavor)
+    return by_name
+
+
+def compute_scs_0103_flavor(flavor_lookup, flavor_spec):
+    canonical_name = flavor_spec[NAME_KEY]
+    flavor = flavor_lookup.get(canonical_name)
+    if flavor is None:
+        logger.error(f'standard flavor missing: {canonical_name}')
+        return False
+    # check that flavor matches flavor_spec
+    # cpu, ram, and disk should match, and they should match precisely for discoverability
+    # also check extra_specs (ours are prefixed with 'scs:')
+    comparison = [
+        ('vcpus', flavor.vcpus, flavor_spec['cpus']),
+        ('ram', flavor.ram, 1024 * flavor_spec['ram']),
+        ('disk', flavor.disk, flavor_spec.get('disk', 0)),
+    ] + [
+        (key, value, flavor.extra_specs.get(key))
+        for key, value in flavor_spec.items()
+        if key.startswith("scs:")
+    ]
+    report = [
+        f'{key}: {a_val!r} should be {b_val!r}'
+        for key, a_val, b_val in comparison
+        if a_val != b_val
+    ]
+    if report:
+        logger.error(f"Flavor '{flavor.name}' violating constraints: {'; '.join(report)}")
+    return not report

…as/standard-flavors/flavors-openstack.py …03_standard_flavors/flavors-openstack.pyTests/iaas/standard-flavors/flavors-openstack.py renamed to Tests/iaas/scs_0103_standard_flavors/flavors-openstack.py Tests/iaas/standard-flavors/flavors-openstack.py renamed to Tests/iaas/scs_0103_standard_flavors/flavors-openstack.py

@@ -84,8 +84,8 @@ modules:
     name: Standard flavors
     url: https://docs.scs.community/standards/scs-0103-v1-standard-flavors
     run:
-      - executable: ./iaas/standard-flavors/flavors-openstack.py
-        args: -c {os_cloud} -d ./iaas/scs-0103-v1-flavors.yaml
+      - executable: ./iaas/openstack_test.py
+        args: -c {os_cloud} standard-flavors-check
     testcases:
       - id: standard-flavors-check
         tags: [mandatory]