Merge branch 'main' into feat/migrate-scs-compatible-iaas-fine-grained

Author: garloff

.zuul.d/secure.yaml

@@ -157,16 +157,16 @@
           5R+u/2lLoubnjt4U5lhkuzXXCak2V2QHneXfjTmEg68KHGfATLzoOY7S1e+Yi92AFOFSj
           TP+IrsMFqUQ7xq+a3MGnR2zB3srlAfWozgxwBgxzywqGaHFVdXdv00vvweUYnI=
       pco_prod1_ac_secret: !encrypted/pkcs1-oaep
-        - sY/0vmiW/qBnmhtApqmcDePhX1HgzUchzfVFkFCfGf8W6MlEKd2rZztb3U8Q9DrY2Ickb
-          zzU+Pml6MSImb1pBWlA5dIbPUiBgEdeLa6sv/9zDiwmr8Xp53q5u6B1MLDrHQWlR6GSVU
-          XnppbSI2NeaDW4oFnzDMffwejq0PZvrVXXbM/daD5w2jzilxdFh6xT8Ar0qiT8UxrX1Pl
-          8dd/hD0WBIAmLZxVYaIJ8YJfpdoxnAjU75g+L4snghq3IEWLUExoqQWa2AElIcS0TQf9U
-          JoAwBvU8le8FCuCX0mUH/pSBOwPr+ycd4jUBQMNSpbFkPpoClC8JZnqWXiat/HI0vCNsB
-          6vNRxWwvdnA3juP6EW+in3LC5tY2h56zN/btmvJaYvaUWKcEpJEooQxCR53gCemcNsFmE
-          zAGIghGEewRsaYptYVG/4qAOzml2n91tw2bs67oZ7hCTsFpN/jpFceFfK5jvsRhFurs5p
-          HsWBGvTRoii4m060Vf5zcZPh+S2iMt7vJMGVsV+O103WsVbscH4aTBvbpcJSkq2gW6oTI
-          soL5C2TuI1BGJqGaBEstl/1NKMgKr5Xr0itGuBNIp3yOFLC8NmDL4wxKr7zRM2a7igC7w
-          QptFrz+NbYKIOCUcESDN2QyHNQUTkGmF094ROEtOyk7pQ88DTIPEbiDqwkCAxY=
+        - s8UGo8Cbbw7hgndde6c6NzUrWMaqHyUxCb+qDFDlxBQYXZkDmc+i35aSWGl7Ox5V8b03W
+          d/EdVG/fK3Q/DRHFYAbVDbuqx3Q/7OdVpE3QoHI/uKaAsAblGIddkwrd3JHsieh2PN3Kv
+          kwFH5iKjkv5KWRcg9sSJD7y2NJR0sXDjROuD+8JxiPqkEwuXtK+KdcTkGlKgOMV6r8Zch
+          MCM8cxJNV/j9EAFBgZz4ZXHqgJ+4SSosEAU1ld4ikNHN/g90L2zYBX8Gqn7SR5W/s8zaT
+          W6+4HhDzd8R9B+amEaOpFqwOytsaYf5BEvbccAcDhghHbi3rvfFSH5DvdaiHYOw6gTZiC
+          5iNeDw8Ie8VPmh4XmuPqwOxeFxbPmqTV/QvFPrPCu6FGjWaNGmDEqhXKx0zmsPW1E6aw6
+          xSY1jVnHIqR/yxN72/sArWJEDVlUa8wACvabKGP3/zEH/H9yMGO391/54ezzgv3KHyOiO
+          lYq33fZq3ZU7HFTXksZ0qSSH7A9/hqbV1nyV2sXyQVevTBpq7KSuD7b5xXsd4U8Gnaahf
+          nRK6mCX7/rhlG2XXR4G62bc8rt+eoo9VLFOw38YtozVjYTSbBJ4KVphLCLPVahR6mN7bP
+          ezyDKZwHeDIjrSMTgUQuRVan5O2X0xLJIjgci38rRIGsRX1+ClDjWC2BK0nefA=
       pco_prod2_ac_id: !encrypted/pkcs1-oaep
         - spFJenyEj9ppvHKBryGw1TXRcpICwTov7rju9Mss31ctLjffA/r3TXwOnbS5dVIoqi7OH
           Axd8j9mOdDPUTaGVhkyd22XYyPPFN7GNT7eEI+VoRAVrtD9mx2tlOG6n92wLQP8us07fJ

Tests/iaas/scs_0101_entropy/entropy_check.py

@@ -73,7 +73,7 @@ def compute_scs_0101_image_property(images, attributes=IMAGE_ATTRIBUTES):
     # 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 recommended attributes: {', '.join(wrong)}")
+        logger.error(f"Image '{name}' missing attributes: {', '.join(wrong)}")
     return not offenders
 
 
@@ -86,10 +86,10 @@ def compute_scs_0101_flavor_property(flavors, attributes=FLAVOR_ATTRIBUTES, opti
         miss_opt = [key for key in optional if extra_specs.get(key) is None]
         if wrong:
             offenses += 1
-            message = f"Flavor '{flavor.name}' missing recommended attributes: {', '.join(wrong)}"
-            # only report missing optional attributes if recommended are missing as well
+            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 recommended attributes are present, we assume that implementers have done their job already
+            # 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)
@@ -113,7 +113,7 @@ 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 the recommended service rngd")
+        logger.error(f"VM '{image_name}' doesn't provide service rngd")
         return False
     return True
 
@@ -158,7 +158,7 @@ def compute_scs_0101_virtio_rng(collected_vm_output, image_name):
             return False
         return True
     except BaseException:
-        logger.critical(f"Couldn't check VM '{image_name}' recommends", exc_info=True)
+        logger.critical(f"Couldn't check VM '{image_name}' properties", exc_info=True)
 
 
 class TestEnvironment: