Merge pull request #600 from bitcoin-dev-project/status-fix

use default namespace when checking network connections

Author: m3dwards

src/warnet/bitcoin.py

@@ -10,7 +10,7 @@
 from test_framework.messages import ser_uint256
 from test_framework.p2p import MESSAGEMAP
 
-from .k8s import get_mission
+from .k8s import get_default_namespace, get_mission
 from .process import run_command
 
 
@@ -38,10 +38,11 @@ def rpc(tank: str, method: str, params: str):
 def _rpc(tank: str, method: str, params: str):
     # bitcoin-cli should be able to read bitcoin.conf inside the container
     # so no extra args like port, chain, username or password are needed
+    namespace = get_default_namespace()
     if params:
-        cmd = f"kubectl exec {tank} -- bitcoin-cli {method} {' '.join(map(str, params))}"
+        cmd = f"kubectl -n {namespace} exec {tank} -- bitcoin-cli {method} {' '.join(map(str, params))}"
     else:
-        cmd = f"kubectl exec {tank} -- bitcoin-cli {method}"
+        cmd = f"kubectl -n {namespace} exec {tank} -- bitcoin-cli {method}"
     return run_command(cmd)
 
 

src/warnet/network.py

@@ -62,17 +62,22 @@ def _connected(end="\n"):
     tanks = get_mission("tank")
     for tank in tanks:
         # Get actual
-        peerinfo = json.loads(_rpc(tank.metadata.name, "getpeerinfo", ""))
-        actual = 0
-        for peer in peerinfo:
-            if is_connection_manual(peer):
-                actual += 1
-        expected = int(tank.metadata.annotations["init_peers"])
-        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("\nNetwork not connected")
+        try:
+            peerinfo = json.loads(_rpc(tank.metadata.name, "getpeerinfo", ""))
+            actual = 0
+            for peer in peerinfo:
+                if is_connection_manual(peer):
+                    actual += 1
+            expected = int(tank.metadata.annotations["init_peers"])
+            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("\nNetwork not connected")
+                return False
+        except Exception:
             return False
     print("Network connected                                                           ")
     return True