topotato: pass node ID into TopotatoNetwork

Allow identifying what test class a network was created for, both for debugging as well as special-casing. Signed-off-by: David Lamparter <[email protected]>
opensourcerouting · Sep 5, 2024 · 7c3b1ae · 7c3b1ae
1 parent a337fa6
commit 7c3b1ae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/topotato/base.py b/topotato/base.py
@@ -441,7 +441,7 @@ def setup(self):
         tcls = self.getparent(TopotatoClass)
         # pylint: disable=protected-access
         try:
-            tcls.netinst = tcls.obj._setup(self.session).prepare()
+            tcls.netinst = tcls.obj._setup(self.session, tcls.nodeid).prepare()
         except Exception as e:
             e.topotato_node = self
             self.parent.skipall = e

diff --git a/topotato/network.py b/topotato/network.py
@@ -56,6 +56,7 @@ class TestSetup(TopotatoNetwork, topo=topology):
 
     timeline: Timeline
     session: "ISession"
+    nodeid: str
 
     _network: ClassVar["toponom.Network"]
 
@@ -75,10 +76,14 @@ class TestSetup(TopotatoNetwork, topo=topology):
     instances, which matches the behavior implied by the type annotations.
     """
 
+    def __repr__(self):
+        return f"{self.__class__.__name__}(..., {self.nodeid!r})"
+
     def make(self, name: str) -> NetworkInstance.RouterNS:
         return self._params[name].instantiate()
 
-    def __init__(self, session: "ISession"):
+    def __init__(self, session: "ISession", nodeid: str):
+        self.nodeid = nodeid
         super().__init__(self.__class__._network)
         self.session = session
         self.timeline = Timeline()