allow simln to declare its constants

Author: mplsgrant

resources/plugins/simln/simln.py

@@ -10,7 +10,7 @@
 
 # When we want to select pods based on their role in Warnet, we use "mission" tags. The "mission"
 # tag for "lightning" nodes is stored in LIGHTNING_MISSION.
-from warnet.constants import LIGHTNING_MISSION, PLUGIN_DIR_TAG
+from warnet.constants import LIGHTNING_MISSION
 from warnet.k8s import (
     download,
     get_default_namespace,
@@ -30,7 +30,9 @@
 # explicit here using the variable name CONTAINER which Warnet uses internally in its log and status
 # systems.
 # Again, this should match the container name provided in the associated helm file.
-CONTAINER = MISSION
+PRIMARY_CONTAINER = MISSION
+
+PLUGIN_DIR_TAG = "plugin_dir"
 
 
 class SimLNError(Exception):
@@ -173,7 +175,7 @@ def _sh(pod, method: str, params: tuple[str, ...]) -> str:
             sclient.connect_get_namespaced_pod_exec,
             pod,
             namespace,
-            container=CONTAINER,
+            container=PRIMARY_CONTAINER,
             command=cmd,
             stderr=True,
             stdin=False,
@@ -205,5 +207,17 @@ def sh(pod: str, method: str, params: tuple[str, ...]):
     print(_sh(pod, method, params))
 
 
+@simln.command()
+def mission():
+    """Return the SimLN mission name"""
+    click.secho(MISSION)
+
+
+@simln.command()
+def primary_container():
+    """Return the SimLN primary container name."""
+    click.secho(PRIMARY_CONTAINER)
+
+
 if __name__ == "__main__":
     simln()

test/simln_test.py

@@ -11,11 +11,10 @@
 from ln_test import LNTest
 from test_base import TestBase
 
-from warnet.k8s import download, get_pods_with_label, pod_log, wait_for_pod
+from warnet.constants import LIGHTNING_MISSION
+from warnet.k8s import download, get_mission, pod_log, wait_for_pod
 from warnet.process import run_command
 
-lightning_selector = "mission=lightning"
-
 
 class SimLNTest(LNTest, TestBase):
     def __init__(self):
@@ -49,11 +48,11 @@ def init_directory(self):
 
     def copy_results(self):
         self.log.info("Copying results")
-        pod = get_pods_with_label("mission=simln")[0]
+        pod = get_mission(f"{self.simln_exec} mission")[0]
         self.wait_for_gossip_sync(2)
         wait_for_pod(pod.metadata.name, 60)
 
-        log_resp = pod_log(pod.metadata.name, "simln")
+        log_resp = pod_log(pod.metadata.name, f"{self.simln_exec} primary-container")
         self.log.info(log_resp.data.decode("utf-8"))
 
         partial_func = partial(self.found_results_remotely, pod.metadata.name)
@@ -78,7 +77,7 @@ def wait_for_gossip_sync(self, expected: int):
         current = 0
         while current < expected:
             current = 0
-            pods = get_pods_with_label(lightning_selector)
+            pods = get_mission(LIGHTNING_MISSION)
             for v1_pod in pods:
                 node = v1_pod.metadata.name
                 chs = json.loads(run_command(f"warnet ln rpc {node} describegraph"))["edges"]