tests: cleanup infra

Signed-off-by: Christian Hopps <chopps@labn.net>

diff --git a/tests/topotests/lib/micronet_compat.py b/tests/topotests/lib/micronet_compat.py
index 5a69c56d8dde7e259c18a7157e765d39b32d5991..edbd3600848a8497acda760eb443b5fb1738018a 100644 (file)
--- a/tests/topotests/lib/micronet_compat.py
+++ b/tests/topotests/lib/micronet_compat.py
@@ -161,12 +161,10 @@ class Mininet(Micronet):
 
     g_mnet_inst = None
 
-    def __init__(self, controller=None):
+    def __init__(self):
         """
         Create a Micronet.
         """
-        assert not controller
-
         if Mininet.g_mnet_inst is not None:
             Mininet.g_mnet_inst.stop()
         Mininet.g_mnet_inst = self

diff --git a/tests/topotests/lib/topogen.py b/tests/topotests/lib/topogen.py
index f2771789d6fa6cab9e939344e6a3c3bb59a442b9..646b284ef6bff3f740ed864cc5b91b491e9b5320 100644 (file)
--- a/tests/topotests/lib/topogen.py
+++ b/tests/topotests/lib/topogen.py
@@ -212,7 +212,7 @@ class Topogen(object):
         # Mininet(Micronet) to build the actual topology.
         assert not inspect.isclass(topodef)
 
-        self.net = Mininet(controller=None)
+        self.net = Mininet()
 
         # New direct way: Either a dictionary defines the topology or a build function
         # is supplied, or a json filename all of which build the topology by calling