topotato: convert tests to role-based setup

The basic MLD & OSPF6 PtMP tests benefit from this.

Signed-off-by: David Lamparter <[email protected]>

Author: eqvinox

test_mld_basic.py

@@ -29,7 +29,7 @@ def topology(topo):
     """
 
 
-class Configs(FRRConfigs):
+class FRRConfigured(RouterFRR):
     routers = ["dut"]
 
     zebra = """
@@ -57,14 +57,24 @@ class Configs(FRRConfigs):
     #% endblock
     """
 
+    def requirements(self):
+        self.require_defun("interface_ipv6_mld_cmd")
+
+
+class Setup(TopotatoNetwork, topo=topology):
+    dut: FRRConfigured
+    h1: Host
+    h2: Host
+    src: Host
+
 
 def iter_mld_records(report):
     for record in report.records:
         while isinstance(record, ICMPv6MLDMultAddrRec):
             yield record
             record = record.payload
 
-class MLDBasic(TestBase, AutoFixture, topo=topology, configs=Configs):
+class MLDBasic(TestBase, AutoFixture, setup=Setup):
     @topotatofunc(include_startup=True)
     def prepare(self, topo, dut, h1, h2, src):
         self.receiver = MulticastReceiver(h1, h1.iface_to('dut'))

test_ospf6_p2xp.py

@@ -19,7 +19,7 @@ def topology(topo):
     """
 
 
-class Configs(FRRConfigs):
+class Configs(RouterFRR):
     zebra = """
     #% extends "boilerplate.conf"
     #% block main
@@ -58,8 +58,18 @@ class Configs(FRRConfigs):
     #% endblock
     """
 
+    def requirements(self):
+        self.require_defun("ipv6_ospf6_network_cmd", "point-to-multipoint")
 
-class PtMPBasic(TestBase, AutoFixture, topo=topology, configs=Configs):
+
+class Setup(TopotatoNetwork, topo=topology):
+    r1: Configs
+    r2: Configs
+    r3: Configs
+    lsdb: Configs
+
+
+class PtMPBasic(TestBase, AutoFixture, setup=Setup):
     # intra_64 = connected-prefix include/exclude
     def lsdb_reference(self, routers, intra_64=set()):
         lsas = [