test: cover simln service in both compose and k8s

Author: pinheadmz

src/cli/network.py

@@ -143,9 +143,11 @@ def connected(network: str):
 
 @network.command()
 @click.option("--network", default="warnet", show_default=True)
-def export(network: str):
+@click.option("--activity", type=str)
+def export(network: str, activity: str):
     """
     Export all [network] data for a "simln" service running in a container
-    on the network. Returns True on success.
+    on the network. Optionally add JSON string [activity] to simln config.
+    Returns True on success.
     """
-    print(rpc_call("network_export", {"network": network}))
+    print(rpc_call("network_export", {"network": network, "activity": activity}))

src/warnet/server.py

@@ -270,7 +270,7 @@ def tank_messages(self, network: str, node_a: int, node_b: int) -> str:
             self.logger.error(msg)
             raise ServerError(message=msg) from e
 
-    def network_export(self, network: str) -> bool:
+    def network_export(self, network: str, activity: str) -> bool:
         """
         Export all data for a simln container running on the network
         """
@@ -280,6 +280,8 @@ def network_export(self, network: str) -> bool:
 
         # JSON object that will eventually be written to simln config file
         config = {"nodes": []}
+        if activity:
+            config["activity"] = json.loads(activity)
         # In-memory file to build tar archive
         tar_buffer = io.BytesIO()
         with tarfile.open(fileobj=tar_buffer, mode="w") as tar_file:

test/data/services.graphml

@@ -15,7 +15,7 @@
   <key id="source_policy"   attr.name="source_policy"    attr.type="string"   for="edge" />
   <key id="target_policy"   attr.name="target_policy"    attr.type="string"   for="edge" />
   <graph edgedefault="directed">
-    <data key="services">cadvisor forkobserver grafana nodeexporter prometheus simln</data>
+    <data key="services">cadvisor forkobserver grafana nodeexporter prometheus</data>
     <node id="0">
         <data key="version">26.0</data>
         <data key="bitcoin_config">-uacomment=w0 -debug=validation</data>

test/ln_test.py

@@ -25,20 +25,6 @@ def get_cb_forwards(index):
 base.wait_for_all_tanks_status(target="running")
 base.wait_for_all_edges()
 
-if base.backend != "compose":
-    print("\nSkipping network export test, only supported with compose backend")
-else:
-    print("\nTesting warcli network export")
-    path = Path(base.warcli("network export")) / "sim.json"
-    with open(path) as file:
-        data = json.load(file)
-        print(json.dumps(data, indent=4))
-        assert len(data["nodes"]) == 3
-        for node in data["nodes"]:
-            assert os.path.exists(node["macaroon"])
-            assert os.path.exists(node["cert"])
-
-
 print("\nRunning LN Init scenario")
 base.warcli("rpc 0 getblockcount")
 base.warcli("scenarios run ln_init")
@@ -86,17 +72,27 @@ def check_invoices():
 print(base.warcli(f"lncli 2 payinvoice -f {inv}"))
 
 print("Waiting for payment success")
-def check_invoices():
-    invs = json.loads(base.warcli("lncli 0 listinvoices"))["invoices"]
-    if len(invs) > 0 and invs[0]["state"] == "SETTLED":
-        print("\nSettled!")
-        return True
-    else:
-        return False
-base.wait_for_predicate(check_invoices)
+def check_invoices(index):
+    invs = json.loads(base.warcli(f"lncli {index} listinvoices"))["invoices"]
+    settled = 0
+    for inv in invs:
+        if inv["state"] == "SETTLED":
+            settled += 1
+    return settled
+base.wait_for_predicate(lambda: check_invoices(0) == 1)
 
 print("\nEnsuring channel-level channel policy settings: target")
 payment = json.loads(base.warcli("lncli 2 listpayments"))["payments"][0]
 assert payment["fee_msat"] == "2213"
 
+print("\nEngaging simln")
+activity = [{
+  "source": "ln-0",
+  "destination": chan["node1_pub"],
+  "interval_secs": 1,
+  "amount_msat": 2000
+}]
+base.warcli(f"network export --activity={json.dumps(activity).replace(' ', '')}")
+base.wait_for_predicate(lambda: check_invoices(0) > 1 or check_invoices(1) > 1 or check_invoices(2) > 1)
+
 base.stop_server()