Remove unused code for entropy check

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

Author: mbuechse

Standards/scs-0101-w1-entropy-implementation-testing.md

@@ -31,12 +31,6 @@ checked, because of two reasons: (a) we already check the file `entropy_avail`
 (see subsection on Errors), and (b) users can always choose a recent image,
 as ensured by the image metadata standard.
 
-Three further testcases are available, but currently unused:
-
-- `scs-0101-image-property` ensures that each flavor has the extra spec `hw_rng:allowed=True`,
-- `scs-0101-flavor-property` ensures that each public image has the property `hw_rng_model: virtio`,
-- `scs-0101-rngd` ensures that the service `rngd` is present on a sample VM.
-
 ## Manual tests
 
 None.

Tests/iaas/openstack_test.py

@@ -73,10 +73,7 @@ def make_container(cloud):
     # scs_0101_entropy
     c.add_function('canonical_image', lambda c: compute_canonical_image(c.images))
     c.add_function('collected_vm_output', lambda c: compute_collected_vm_output(c.conn, c.flavors, c.canonical_image))
-    c.add_function('scs_0101_image_property', lambda c: compute_scs_0101_image_property(c.images))
-    c.add_function('scs_0101_flavor_property', lambda c: compute_scs_0101_flavor_property(c.flavors))
     c.add_function('scs_0101_entropy_avail', lambda c: compute_scs_0101_entropy_avail(c.collected_vm_output, c.canonical_image.name))
-    c.add_function('scs_0101_rngd', lambda c: compute_scs_0101_rngd(c.collected_vm_output, c.canonical_image.name))
     c.add_function('scs_0101_fips_test', lambda c: compute_scs_0101_fips_test(c.collected_vm_output, c.canonical_image.name))
     # scs_0102_image_metadata
     c.add_function('scs_0102_prop_architecture', lambda c: compute_scs_0102_prop_architecture(c.images))

Tests/iaas/scs_0101_entropy/entropy_check.py

@@ -17,18 +17,6 @@
 SECURITY_GROUP_NAME = "_scs-0101-group"
 KEYPAIR_NAME = "_scs-0101-keypair"
 
-IMAGE_ATTRIBUTES = {
-    # https://docs.openstack.org/glance/2023.1/admin/useful-image-properties.html#image-property-keys-and-values
-    # type: str
-    "hw_rng_model": "virtio",
-}
-FLAVOR_ATTRIBUTES = {
-    # https://docs.openstack.org/nova/2023.1/configuration/extra-specs.html#hw-rng
-    # type: bool
-    "hw_rng:allowed": "True",  # testing showed that it is indeed a string?
-}
-FLAVOR_OPTIONAL = ("hw_rng:rate_bytes", "hw_rng:rate_period")
-
 
 TIMEOUT = 5 * 60  # timeout in seconds after which we no longer wait for the VM to complete the run
 MARKER = '_scs-test-'
@@ -70,38 +58,6 @@
 }
 
 
-def compute_scs_0101_image_property(images, attributes=IMAGE_ATTRIBUTES):
-    """This test ensures that each image has the relevant properties."""
-    candidates = [
-        (image.name, [f"{key}={value}" for key, value in attributes.items() if image.get(key) != value])
-        for image in images
-    ]
-    # drop those candidates that are fine
-    offenders = [candidate for candidate in candidates if candidate[1]]
-    for name, wrong in offenders:
-        logger.error(f"Image '{name}' missing attributes: {', '.join(wrong)}")
-    return not offenders
-
-
-def compute_scs_0101_flavor_property(flavors, attributes=FLAVOR_ATTRIBUTES, optional=FLAVOR_OPTIONAL):
-    """This test ensures that each flavor has the relevant extra_spec."""
-    offenses = 0
-    for flavor in flavors:
-        extra_specs = flavor['extra_specs']
-        wrong = [f"{key}={value}" for key, value in attributes.items() if extra_specs.get(key) != value]
-        miss_opt = [key for key in optional if extra_specs.get(key) is None]
-        if wrong:
-            offenses += 1
-            message = f"Flavor '{flavor.name}' missing attributes: {', '.join(wrong)}"
-            # only report missing optional attributes if main ones are missing as well
-            # reasoning here is that these optional attributes are merely a hint for implementers
-            # and if the main ones are present, we assume that implementers have done their job already
-            if miss_opt:
-                message += f"; additionally, missing optional attributes: {', '.join(miss_opt)}"
-            logger.error(message)
-    return not offenses
-
-
 def compute_scs_0101_entropy_avail(collected_vm_output, image_name):
     """This test ensures that the `entropy_avail` value is correct for a test VM."""
     lines = collected_vm_output['entropy-avail']
@@ -115,15 +71,6 @@ def compute_scs_0101_entropy_avail(collected_vm_output, image_name):
     return True
 
 
-def compute_scs_0101_rngd(collected_vm_output, image_name):
-    """This test ensures that the `rngd` service is running on a test VM."""
-    lines = collected_vm_output['rngd']
-    if "could not be found" in '\n'.join(lines):
-        logger.error(f"VM '{image_name}' doesn't provide service rngd")
-        return False
-    return True
-
-
 def compute_scs_0101_fips_test(collected_vm_output, image_name):
     """This test ensures that the 'fips test' via `rngtest` is passed on a test VM."""
     lines = collected_vm_output['fips-test']