Merge pull request #284 from amdfxlucas/fix-tests

Fix tests

Author: kevin-w-du

seedemu/layers/Ebgp.py

@@ -83,7 +83,8 @@ def __createPeer(self, nodeA: Router, nodeB: Router, addrA: str, addrB: str, rel
 
         # for both nodes
         for node in [nodeA, nodeB]:
-            if node.getRole() == NodeRole.RouteServer:
+            if node.getRegistryInfo()[1] == 'rs':
+                # getRole() would be BorderRouter not RouteServer here
                 rsNode = node
                 continue
 

seedemu/layers/Routing.py

@@ -6,6 +6,7 @@
 
 RoutingFileTemplates["rs_bird"] = """\
 router id {routerId};
+ipv4 table t_direct;
 protocol device {{
 }}
 """
@@ -94,11 +95,10 @@ def _configure_rs(self, rs_node: Node):
 
         rs_iface = rs_ifaces[0]
 
-        if not issubclass(rs_node.__class__, Router):
-            rs_node.__class__ = Router
-            rs_node.setBorderRouter(True)
+        assert issubclass(rs_node.__class__, Router)
+        rs_node.setBorderRouter(True)
         rs_node.setFile("/etc/bird/bird.conf", RoutingFileTemplates["rs_bird"].format(
-                    routerId = rs_iface.getAddress()
+            routerId = rs_iface.getAddress()
         ))
 
     def _configure_bird_router(self, rnode: Router):
@@ -129,7 +129,7 @@ def configure(self, emulator: Emulator):
                 self._configure_rs(rs_node)
             if type == 'rnode':
                 rnode: Router = obj
-                if not issubclass(rnode.__class__, Router): rnode.__class__ = Router
+                assert issubclass(rnode.__class__, Router)
 
                 self._log("Setting up loopback interface for AS{} Router {}...".format(scope, name))
 

tests/internet/ip_anycast/IPAnyCastTestCase.py

@@ -15,9 +15,9 @@ def setUpClass(cls) -> None:
         for container in cls.containers:
             if "10.150.0.71" in container.name:
                 cls.source_host = container
-            if "as180r-router0" in container.name:
+            if "as180brd-router0" in container.name:
                 cls.router0_180 = container
-            if "as180r-router1" in container.name:
+            if "as180brd-router1" in container.name:
                 cls.router1_180 = container
         return