scenario commander: save ln pod namespace and add domain to URI

Author: pinheadmz

resources/scenarios/commander.py

@@ -92,6 +92,7 @@
         WARNET["tanks"].append(
             {
                 "tank": pod.metadata.name,
+                "namespace": pod.metadata.namespace,
                 "chain": pod.metadata.labels["chain"],
                 "rpc_host": pod.status.pod_ip,
                 "rpc_port": int(pod.metadata.labels["RPCPort"]),
@@ -104,10 +105,13 @@
     if pod.metadata.labels["mission"] == "lightning":
         if "lnd" in pod.metadata.labels["app.kubernetes.io/name"]:
             lnnode = LND(
-                pod.metadata.name, pod.status.pod_ip, pod.metadata.annotations["adminMacaroon"]
+                pod.metadata.name,
+                pod.metadata.namespace,
+                pod.status.pod_ip,
+                pod.metadata.annotations["adminMacaroon"],
             )
         if "cln" in pod.metadata.labels["app.kubernetes.io/name"]:
-            lnnode = CLN(pod.metadata.name, pod.status.pod_ip)
+            lnnode = CLN(pod.metadata.name, pod.metadata.namespace, pod.status.pod_ip)
         assert lnnode
         WARNET["lightning"].append(lnnode)
 

resources/scenarios/ln_framework/ln.py

@@ -101,8 +101,9 @@ def to_lnd_chanpolicy(self, capacity):
 
 class LNNode(ABC):
     @abstractmethod
-    def __init__(self, pod_name, ip_address):
+    def __init__(self, pod_name, pod_namespace, ip_address):
         self.name = pod_name
+        self.namespace = pod_namespace
         self.ip_address = ip_address
         self.log = logging.getLogger(pod_name)
         handler = logging.StreamHandler()
@@ -152,16 +153,16 @@ def update(self, txid_hex: str, policy: dict, capacity: int) -> dict:
 
 
 class CLN(LNNode):
-    def __init__(self, pod_name, ip_address):
-        super().__init__(pod_name, ip_address)
+    def __init__(self, pod_name, pod_namespace, ip_address):
+        super().__init__(pod_name, pod_namespace, ip_address)
         self.conn = None
         self.headers = {}
         self.impl = "cln"
         self.reset_connection()
 
     def reset_connection(self):
         self.conn = http.client.HTTPSConnection(
-            host=self.name, port=3010, timeout=60, context=INSECURE_CONTEXT
+            host=f"{self.name}.{self.namespace}", port=3010, timeout=60, context=INSECURE_CONTEXT
         )
 
     def setRune(self, rune):
@@ -285,11 +286,9 @@ def update(self, txid_hex: str, policy: dict, capacity: int) -> dict:
 
 
 class LND(LNNode):
-    def __init__(self, pod_name, ip_address, admin_macaroon_hex):
-        super().__init__(pod_name, ip_address)
-        self.conn = http.client.HTTPSConnection(
-            host=pod_name, port=8080, timeout=5, context=INSECURE_CONTEXT
-        )
+    def __init__(self, pod_name, pod_namespace, ip_address, admin_macaroon_hex):
+        super().__init__(pod_name, pod_namespace, ip_address)
+        self.conn = None
         self.admin_macaroon_hex = admin_macaroon_hex
         self.headers = {
             "Grpc-Metadata-macaroon": admin_macaroon_hex,
@@ -299,7 +298,7 @@ def __init__(self, pod_name, ip_address, admin_macaroon_hex):
 
     def reset_connection(self):
         self.conn = http.client.HTTPSConnection(
-            host=self.name, port=8080, timeout=60, context=INSECURE_CONTEXT
+            host=f"{self.name}.{self.namespace}", port=8080, timeout=60, context=INSECURE_CONTEXT
         )
 
     def get(self, uri):