Skip to content

Commit 5ff4bda

Browse files
committed
successfully tested csi-provider function
Signed-off-by: Katharina Trentau <[email protected]>
1 parent 78872c5 commit 5ff4bda

File tree

1 file changed

+6
-9
lines changed

1 file changed

+6
-9
lines changed

Tests/kaas/k8s-default-storage-class/k8s-default-storage-class-check.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -202,16 +202,16 @@ def check_csi_provider(k8s_core_api, allowed_csi_prov=ALLOWED_CSI_PROV):
202202
csi_list = []
203203
for pod in pods.items:
204204
if "csi" in pod.metadata.name:
205-
if pod.metadata.name in allowed_csi_prov:
205+
if any(provider in pod.metadata.name for provider in allowed_csi_prov):
206206
csi_list.append(pod.metadata.name)
207207
logger.info(f"CSI-Provider: {pod.metadata.name}")
208208
else:
209209
raise SCSTestException(
210210
f"CSI-Provider: {pod.metadata.name} not recommended",
211211
return_code=33,
212212
)
213-
else:
214-
logger.info("CSI-Provider: No CSI Provider found.")
213+
if not csi_list:
214+
logger.info("CSI-Provider: No CSI Provider found.")
215215
return 0
216216

217217

@@ -297,26 +297,24 @@ def __enter__(self):
297297
return self
298298

299299
def __exit__(self, exc_type, exc_value, traceback):
300-
logger.debug("exiting")
301300
if self.cleanup:
302301
self.clean()
303302
if self.return_code == 0:
304303
self.return_message = "all tests passed"
305304
if isinstance(exc_value, SCSTestException):
306305
self.return_message = exc_value.args[0]
307306
self.return_code = exc_value.return_code
308-
logger.debug(
307+
logger.info(
309308
f"SCSTestException occurred with return_code: {self.return_code}"
310309
)
311310
else:
312311
# No specific exception, handle normally returnmessage aus exception übernehmen, dann kann return_code
313-
logger.debug(f"Exiting the context with return_code: {self.return_code}")
314-
logger.debug(f"{self.return_message}")
312+
logger.info(f"Exiting the context with return_code: {self.return_code}")
313+
logger.info(f"{self.return_message}")
315314

316315
gen_sonobuoy_result_file(
317316
self.return_code, self.return_message, os.path.basename(__file__)
318317
)
319-
logger.debug(f"Exiting the context {self.k8s_core_api}")
320318
if exc_type:
321319
logger.error(f"An exception occurred: {exc_value}")
322320
# Return True if the exception should be suppressed, otherwise False
@@ -382,7 +380,6 @@ def main(argv):
382380
)
383381

384382
env.return_code = check_csi_provider(env.k8s_core_api)
385-
logger.debug(f"CSI Provider check: {env.return_code}")
386383
return env.return_code
387384

388385

0 commit comments

Comments
 (0)