From 371c2be5106346452ce422f6e89b1095fbb69192 Mon Sep 17 00:00:00 2001 From: Matthew Zipkin Date: Mon, 9 Sep 2024 12:45:36 -0400 Subject: [PATCH] status: check connections --- src/warnet/network.py | 8 ++++---- src/warnet/status.py | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/warnet/network.py b/src/warnet/network.py index 8d32781e5..92e5cda16 100644 --- a/src/warnet/network.py +++ b/src/warnet/network.py @@ -63,7 +63,7 @@ def copy_scenario_defaults(directory: Path): ) -def _connected(): +def _connected(end="\n"): tanks = get_mission("tank") for tank in tanks: # Get actual @@ -73,11 +73,11 @@ def _connected(): if peer["connection_type"] == "manual": actual += 1 expected = int(tank.metadata.annotations["init_peers"]) - print(f"Tank {tank.metadata.name} peers expected: {expected}, actual: {actual}") + print(f"Tank {tank.metadata.name} peers expected: {expected}, actual: {actual}", end=end) # Even if more edges are specified, bitcoind only allows # 8 manual outbound connections if min(8, expected) > actual: - print("Network not connected") + print("\nNetwork not connected") return False - print("Network connected") + print("Network connected ") return True diff --git a/src/warnet/status.py b/src/warnet/status.py index 8aa5c95b0..beb4de6f9 100644 --- a/src/warnet/status.py +++ b/src/warnet/status.py @@ -5,6 +5,7 @@ from rich.text import Text from .k8s import get_mission +from .network import _connected @click.command() @@ -53,6 +54,7 @@ def status(): summary.append(f"\nTotal Tanks: {len(tanks)}", style="bold cyan") summary.append(f" | Active Scenarios: {len(scenarios)}", style="bold green") console.print(summary) + _connected(end="\r") def _get_tank_status():