opensourcerouting / frr

Free Range Routing Protocol Suite
Other
37 stars 14 forks source link

topotato: test_bgp_local_as_private_remove.py #128

Open Chromico opened 1 year ago

Chromico commented 1 year ago

The function bgp_as_path_r4 fails.

eqvinox commented 1 year ago
diff --git a/test_bgp_local_as_private_remove.py b/test_bgp_local_as_private_remove.py
index 9b3529f77d55..2f4c40e054a6 100644
--- a/test_bgp_local_as_private_remove.py
+++ b/test_bgp_local_as_private_remove.py
@@ -19,19 +19,19 @@ from topotato import *
 @topology_fixture()
 def topology(topo):
     """
-            [ r1 ]
-              |
-    [ r4 ]--{ s1 }--[ r2 ]
-      |       |
-    { s2 }--[ r3 ]
+    [ r1 ]--{ s1 }--[ r2 ]
+
+
+
+    [ r4 ]--{ s2 }--[ r3 ]
     """

     topo.router("r1").lo_ip4.append("172.16.255.254/32")
     topo.router("r3").lo_ip4.append("172.16.255.255/32")
     topo.router("r1").iface_to("s1").ip4.append("192.168.255.1/24")
     topo.router("r2").iface_to("s1").ip4.append("192.168.255.2/24")
-    topo.router("r3").iface_to("s1").ip4.append("192.168.255.1/24")
-    topo.router("r4").iface_to("s1").ip4.append("192.168.255.3/24")
+    topo.router("r3").iface_to("s2").ip4.append("192.168.255.1/24")
+    topo.router("r4").iface_to("s2").ip4.append("192.168.255.3/24")

 class Configs(FRRConfigs):
@@ -72,19 +72,19 @@ class Configs(FRRConfigs):
     #%   elif router.name == 'r3'
     router bgp 3000
      no bgp ebgp-requires-policy
-     neighbor {{ routers.r2.iface_to('s1').ip4[0].ip }} remote-as 1000
-     neighbor {{ routers.r2.iface_to('s1').ip4[0].ip }} timers 3 10
-     neighbor {{ routers.r2.iface_to('s1').ip4[0].ip }} local-as 500
+     neighbor {{ routers.r4.iface_to('s2').ip4[0].ip }} remote-as 1000
+     neighbor {{ routers.r4.iface_to('s2').ip4[0].ip }} timers 3 10
+     neighbor {{ routers.r4.iface_to('s2').ip4[0].ip }} local-as 500
      address-family ipv4 unicast
-      neighbor {{ routers.r2.iface_to('s1').ip4[0].ip }} remove-private-AS
+      neighbor {{ routers.r4.iface_to('s2').ip4[0].ip }} remove-private-AS
       redistribute connected
      exit-address-family
     !
     #%   elif router.name == 'r4'
     router bgp 1000
      no bgp ebgp-requires-policy
-     neighbor {{ routers.r1.iface_to('s1').ip4[0].ip }} remote-as 500
-     neighbor {{ routers.r1.iface_to('s1').ip4[0].ip }} timers 3 10
+     neighbor {{ routers.r3.iface_to('s2').ip4[0].ip }} remote-as 500
+     neighbor {{ routers.r3.iface_to('s2').ip4[0].ip }} timers 3 10
     !
     #%   endif
     #% endblock
@@ -142,7 +142,7 @@ class BGPLocalAsPrivateRemove(TestBase, AutoFixture, topo=topology, configs=Conf
         yield from AssertVtysh.make(
             r4,
             "bgpd",
-            f"show ip bgp 172.16.255.254/32 json",
+            f"show ip bgp 172.16.255.255/32 json",
             maxwait=5.0,
             compare=expected,
         )