Bugfix: volume-types-check not mandatory

mbuechse · mbuechse · commit f9b887e1ab89 · 2025-04-29T13:57:59.000+02:00
resolves #907 Signed-off-by: Matthias Büchse <matthias.buechse@alasca.cloud>
diff --git a/Tests/iaas/volume-types/volume-types-check.py b/Tests/iaas/volume-types/volume-types-check.py
@@ -142,7 +142,7 @@ def main(argv):
         f"{c[logging.CRITICAL]} / {c[logging.ERROR]} / {c[logging.WARNING]}"
     )
     if not c[logging.CRITICAL]:
-        print("volume-types-check: " + ('PASS', 'FAIL')[min(1, c[logging.ERROR])])
+        print("volume-types-check: " + ('PASS', 'FAIL')[min(1, c[logging.ERROR] + c[logging.WARNING])])
     return min(127, c[logging.CRITICAL] + c[logging.ERROR])  # cap at 127 due to OS restrictions
 
 
diff --git a/Tests/scs-compatible-iaas.yaml b/Tests/scs-compatible-iaas.yaml
@@ -162,7 +162,7 @@ modules:
         args: -c {os_cloud} -d
     testcases:
       - id: volume-types-check
-        tags: [mandatory]
+        tags: [volume-types-check]
         description: >
           Must fulfill all requirements of <https://docs.scs.community/standards/scs-0114-v1-volume-type-standard>
   - id: scs-0115-v1

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ def main(argv):`
`142`	`142`	`f"{c[logging.CRITICAL]} / {c[logging.ERROR]} / {c[logging.WARNING]}"`
`143`	`143`	`)`
`144`	`144`	`if not c[logging.CRITICAL]:`
`145`		`- print("volume-types-check: " + ('PASS', 'FAIL')[min(1, c[logging.ERROR])])`
	`145`	`+ print("volume-types-check: " + ('PASS', 'FAIL')[min(1, c[logging.ERROR] + c[logging.WARNING])])`
`146`	`146`	`return min(127, c[logging.CRITICAL] + c[logging.ERROR]) # cap at 127 due to OS restrictions`
`147`	`147`
`148`	`148`