update simln test

Author: mplsgrant

.github/workflows/test.yml

@@ -50,6 +50,7 @@ jobs:
           - signet_test.py
           - scenarios_test.py
           - namespace_admin_test.py
+          - simln_test.py
     steps:
       - uses: actions/checkout@v4
       - uses: azure/[email protected]

resources/plugins/simln/simln.py

@@ -34,31 +34,38 @@ def deploy_helm():
 def run_simln():
     init_network()
     fund_wallets()
-    wait_for_predicate(everyone_has_a_host)
+    wait_for_everyone_to_have_a_host()
     log.info(warnet("bitcoin rpc tank-0000 -generate 7"))
     # warnet("ln open-all-channels")
     manual_open_channels()
     log.info(warnet("bitcoin rpc tank-0000 -generate 7"))
     wait_for_gossip_sync(2)
     log.info("done waiting")
+    pod_name = prepare_and_launch_activity()
+    log.info(pod_name)
+
+
+def prepare_and_launch_activity() -> str:
     pods = get_pods_with_label(lightning_selector)
     pod_a = pods[0].metadata.name
     pod_b = pods[1].metadata.name
     sample_activity = [
         {"source": pod_a, "destination": pod_b, "interval_secs": 1, "amount_msat": 2000}
     ]
     log.info(f"Activity: {sample_activity}")
-    generate_activity(sample_activity)
+    pod_name = launch_activity(sample_activity)
     log.info("Sent command. Done.")
+    return pod_name
 
 
-def generate_activity(activity: list[dict]):
+def launch_activity(activity: list[dict]) -> str:
     random_digits = "".join(random.choices("0123456789", k=10))
     plugin_dir = get_plugin_directory()
     generate_nodes_file(activity, plugin_dir / Path("simln/charts/simln/files/sim.json"))
     command = f"helm upgrade --install simln-{random_digits} {plugin_dir}/simln/charts/simln"
     log.info(f"generate activity: {command}")
     run_command(command)
+    return f"pod/simln-simln-{random_digits}"
 
 
 def init_network():
@@ -108,6 +115,10 @@ def everyone_has_a_host() -> bool:
     return host_havers == len(pods)
 
 
+def wait_for_everyone_to_have_a_host():
+    wait_for_predicate(everyone_has_a_host)
+
+
 def wait_for_predicate(predicate, timeout=5 * 60, interval=5):
     log.info(
         f"Waiting for predicate ({predicate.__name__}) with timeout {timeout}s and interval {interval}s"
@@ -148,7 +159,7 @@ def check_status():
     wait_for_predicate(check_status, timeout, interval)
 
 
-def wait_for_gossip_sync(expected):
+def wait_for_gossip_sync(expected: int):
     log.info(f"Waiting for sync (expecting {expected})...")
     current = 0
     while current < expected:
@@ -163,7 +174,7 @@ def wait_for_gossip_sync(expected):
     log.info("Synced")
 
 
-def warnet(cmd):
+def warnet(cmd: str = "--help"):
     log.info(f"Executing warnet command: {cmd}")
     command = ["warnet"] + cmd.split()
     proc = run(command, capture_output=True)
@@ -172,7 +183,7 @@ def warnet(cmd):
     return proc.stdout.decode()
 
 
-def generate_nodes_file(activity, output_file: Path = Path("nodes.json")):
+def generate_nodes_file(activity: dict, output_file: Path = Path("nodes.json")):
     nodes = []
 
     for i in get_pods_with_label(lightning_selector):

src/warnet/hooks.py

@@ -176,10 +176,16 @@ def run(plugin: str, function: str, args: tuple[str, ...], json_dict: str):
                 params[name] = user_input
             else:
                 params[name] = cast_to_hint(user_input, hint)
-        click.secho(
-            f"\nwarnet plugin run {plugin} {function} --json-dict '{json.dumps(params)}'\n",
-            fg="green",
-        )
+        if not params:
+            click.secho(
+                f"\nwarnet plugin run {plugin} {function}\n",
+                fg="green",
+            )
+        else:
+            click.secho(
+                f"\nwarnet plugin run {plugin} {function} --json-dict '{json.dumps(params)}'\n",
+                fg="green",
+            )
     else:
         params = json.loads(json_dict)
 

src/warnet/status.py

@@ -8,13 +8,11 @@
 from rich.text import Text
 from urllib3.exceptions import MaxRetryError
 
-from .hooks import api
 from .k8s import get_mission
 from .network import _connected
 
 
 @click.command()
-@api
 def status():
     """Display the unified status of the Warnet network and active scenarios"""
     console = Console()

test/simln_test.py

@@ -2,13 +2,13 @@
 
 import os
 from pathlib import Path
+from subprocess import run
 from time import sleep
 
 import pexpect
 from test_base import TestBase
 
 from warnet.k8s import download, get_pods_with_label
-from warnet.process import run_command
 
 
 class LNTest(TestBase):
@@ -21,7 +21,6 @@ def run_test(self):
             os.chdir(self.tmpdir)
             self.setup_network()
             self.run_plugin()
-            self.check_simln_logs()
             result = self.copy_results()
             assert result
         finally:
@@ -36,32 +35,27 @@ def run_plugin(self):
         self.sut = pexpect.spawn("warnet init")
         self.sut.expect("network", timeout=10)
         self.sut.sendline("n")
+        self.sut.close()
 
-        self.warnet("plugin run simln run_simln")
-
-    def check_simln_logs(self):
-        pod = get_pods_with_label("mission=plugin")
-        self.log.info(run_command(f"kubectl logs pod/{pod.metadata.name}"))
+        self.log.info(run(["warnet", "plugin", "run", "simln", "run_simln"]))
+        sleep(10)
 
     def copy_results(self) -> bool:
         self.log.info("Copying results")
         sleep(20)
         pod = get_pods_with_label("mission=plugin")[0]
 
-        download(
-            pod.metadata.name,
-            pod.metadata.namespace,
-        )
+        download(pod.metadata.name, pod.metadata.namespace, Path("/working/results"), Path("."))
+
+        for root, _dirs, files in os.walk(Path("results")):
+            for file_name in files:
+                file_path = os.path.join(root, file_name)
 
-        # for root, _dirs, files in os.walk(destination_path):
-        #     for file_name in files:
-        #         file_path = os.path.join(root, file_name)
-        #
-        #         with open(file_path) as file:
-        #             content = file.read()
-        #             if "Success" in content:
-        #                 return True
-        # return False
+                with open(file_path) as file:
+                    content = file.read()
+                    if "Success" in content:
+                        return True
+        return False
 
 
 if __name__ == "__main__":