add ln nodes and channels along with tanks to commander

Author: pinheadmz

resources/charts/commander/templates/rbac.yaml

@@ -15,7 +15,7 @@ metadata:
     app.kubernetes.io/name: {{ .Chart.Name }}
 rules:
   - apiGroups: [""]
-    resources: ["pods"]
+    resources: ["pods", "configmaps"]
     verbs: ["get", "list", "watch"]
 ---
 apiVersion: rbac.authorization.k8s.io/v1

resources/scenarios/commander.py

@@ -39,22 +39,35 @@
 config.load_incluster_config()
 sclient = client.CoreV1Api()
 pods = sclient.list_namespaced_pod(namespace=NAMESPACE)
+cmaps = sclient.list_namespaced_config_map(namespace=NAMESPACE)
 
-WARNET = []
+WARNET = {"tanks": [], "lightning": [], "channels": []}
 for pod in pods.items:
-    if "mission" not in pod.metadata.labels or pod.metadata.labels["mission"] != "tank":
+    if "mission" not in pod.metadata.labels:
         continue
 
-    WARNET.append(
-        {
-            "tank": pod.metadata.name,
-            "chain": pod.metadata.labels["chain"],
-            "rpc_host": pod.status.pod_ip,
-            "rpc_port": int(pod.metadata.labels["RPCPort"]),
-            "rpc_user": "user",
-            "rpc_password": pod.metadata.labels["rpcpassword"],
-        }
-    )
+    if pod.metadata.labels["mission"] == "tank":
+        WARNET["tanks"].append(
+            {
+                "tank": pod.metadata.name,
+                "chain": pod.metadata.labels["chain"],
+                "rpc_host": pod.status.pod_ip,
+                "rpc_port": int(pod.metadata.labels["RPCPort"]),
+                "rpc_user": "user",
+                "rpc_password": pod.metadata.labels["rpcpassword"],
+            }
+        )
+
+    if pod.metadata.labels["mission"] == "lightning":
+        WARNET["lightning"].append(pod.metadata.name)
+
+for cm in cmaps.items:
+    if not cm.metadata.labels or "channels" not in cm.metadata.labels:
+        continue
+    channel_jsons = json.loads(cm.data["channels"])
+    for channel_json in channel_jsons:
+        channel_json["source"] = cm.data["source"]
+        WARNET["channels"].append(channel_json)
 
 
 # Ensure that all RPC calls are made with brand new http connections
@@ -68,9 +81,9 @@ def auth_proxy_request(self, method, path, postdata):
 
 
 class LND:
-    def __init__(self, tank_name):
+    def __init__(self, pod_name):
         self.conn = http.client.HTTPSConnection(
-            host=f"{tank_name}-ln", port=8080, timeout=5, context=INSECURE_CONTEXT
+            host=pod_name, port=8080, timeout=5, context=INSECURE_CONTEXT
         )
 
     def get(self, uri):
@@ -153,8 +166,10 @@ def setup(self):
 
         # Keep a separate index of tanks by pod name
         self.tanks: Dict[str, TestNode] = {}
+        self.lns: Dict[str, LND] = {}
+        self.channels = WARNET["channels"]
 
-        for i, tank in enumerate(WARNET):
+        for i, tank in enumerate(WARNET["tanks"]):
             self.log.info(
                 f"Adding TestNode #{i} from pod {tank['tank']} with IP {tank['rpc_host']}"
             )
@@ -179,14 +194,12 @@ def setup(self):
             )
             node.rpc_connected = True
 
-            # Tank might not even have an ln node, that's
-            # not our problem, it'll just 404 if scenario tries
-            # to connect to it
-            node.lnd = LND(tank["tank"])
-
             self.nodes.append(node)
             self.tanks[tank["tank"]] = node
 
+        for ln in WARNET["lightning"]:
+            self.lns[ln] = LND(ln)
+
         self.num_nodes = len(self.nodes)
 
         # Set up temp directory and start logging

resources/scenarios/test_scenarios/ln_basic.py

@@ -14,18 +14,18 @@ def add_options(self, parser):
         parser.usage = "warnet run /path/to/ln_init.py"
 
     def run_test(self):
-        info = json.loads(self.tanks["tank-0003"].lnd.get("/v1/getinfo"))
+        info = json.loads(self.lns["tank-0003-ln"].get("/v1/getinfo"))
         uri = info["uris"][0]
         pk3, host = uri.split("@")
 
         print(
-            self.tanks["tank-0002"].lnd.post(
+            self.lns["tank-0002-ln"].post(
                 "/v1/peers", data={"addr": {"pubkey": pk3, "host": host}}
             )
         )
 
         print(
-            self.tanks["tank-0002"].lnd.post(
+            self.lns["tank-0002-ln"].post(
                 "/v1/channels/stream",
                 data={"local_funding_amount": 100000, "node_pubkey": self.hex_to_b64(pk3)},
             )