From 71a9e700c7024f49863dc3bee525d3d64d92030f Mon Sep 17 00:00:00 2001 From: vavuthu Date: Wed, 29 May 2024 16:03:59 +0530 Subject: [PATCH] refactor environmental check Signed-off-by: vavuthu --- ocs_ci/utility/environment_check.py | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/ocs_ci/utility/environment_check.py b/ocs_ci/utility/environment_check.py index e998cf14eb0f..372109b10370 100644 --- a/ocs_ci/utility/environment_check.py +++ b/ocs_ci/utility/environment_check.py @@ -73,14 +73,21 @@ def assign_get_values(env_status_dict, key, kind=None, exclude_labels=None): for item in items: ns = item.get("metadata", {}).get("namespace") if item.get("kind") == constants.PV: - ns = item.get("spec").get("claimRef").get("namespace") + ns = item.get("spec").get("claimRef", {}).get("namespace") item_labels = item.get("metadata", {}).get("labels", {}) - excluded_item_labels = [ - f"{key}={value}" - for key, value in item_labels.items() - if f"{key}={value}" in exclude_labels - ] + if exclude_labels: + excluded_item_labels = [ + f"{key}={value}" + for key, value in item_labels.items() + if f"{key}={value}" in exclude_labels + ] + + if excluded_item_labels: + log.debug( + "ignoring item with app label %s: %s", excluded_item_labels[0], item + ) + continue if ( ns is not None @@ -89,11 +96,6 @@ def assign_get_values(env_status_dict, key, kind=None, exclude_labels=None): ): log.debug("ignoring item in %s namespace: %s", ns, item) continue - if excluded_item_labels: - log.debug( - "ignoring item with app label %s: %s", excluded_item_labels[0], item - ) - continue if item.get("kind") == constants.POD: name = item.get("metadata", {}).get("name", "") if name.endswith("-debug") or "-debug-" in name: