From b90d0729c453b2e5026d54b0214f81be707b5c01 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Thu, 23 Feb 2023 10:16:29 -0500 Subject: [PATCH] Fix status when connecting to old clusters --- client-cli/pvc/cli_lib/cluster.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client-cli/pvc/cli_lib/cluster.py b/client-cli/pvc/cli_lib/cluster.py index 64e620c2..3429b970 100644 --- a/client-cli/pvc/cli_lib/cluster.py +++ b/client-cli/pvc/cli_lib/cluster.py @@ -125,11 +125,11 @@ def format_info(cluster_information, oformat): return json.dumps(cluster_information, indent=4) # Plain formatting, i.e. human-readable - if cluster_information["maintenance"] == "true": + if cluster_information.get("maintenance") == "true": health_colour = ansiprint.blue() - elif cluster_information["cluster_health"]["health"] > 90: + elif cluster_information.get("cluster_health", {}).get("health", 100) > 90: health_colour = ansiprint.green() - elif cluster_information["cluster_health"]["health"] > 50: + elif cluster_information.get("cluster_health", {}).get("health", 100) > 50: health_colour = ansiprint.yellow() else: health_colour = ansiprint.red() @@ -142,7 +142,7 @@ def format_info(cluster_information, oformat): ainformation.append("") health_text = f"{cluster_information['cluster_health']['health']}%" - if cluster_information["maintenance"] == "true": + if cluster_information.get("maintenance") == "true": health_text += " (maintenance on)" ainformation.append( @@ -154,7 +154,7 @@ def format_info(cluster_information, oformat): ansiprint.end(), ) ) - if cluster_information["cluster_health"]["messages"]: + if cluster_information.get("cluster_health", {}).get("messages"): health_messages = "\n > ".join( sorted(cluster_information["cluster_health"]["messages"]) )