topotato: test_bgp_local_as_dotplus_private_remove.py

[Chromico]

bgp_as_path_r2 and bgp_as_path_r4 don't work yet. This test is still a work in progress.

[eqvinox]

it's one of those "2 at once" tests again

diff --git a/test_bgp_local_as_dotplus_private_remove.py b/test_bgp_local_as_dotplus_private_remove.py
index f557d850e231..a2a585573978 100644
--- a/test_bgp_local_as_dotplus_private_remove.py
+++ b/test_bgp_local_as_dotplus_private_remove.py
@@ -22,11 +22,11 @@ def topology(topo):
     """
     [ r1 ]
       |
-    { s1 }  [ r3 ]
-      |       |
-    [ r2 ]--{ s2 }
-              |
-            [ r4 ]
+    { s1 }     [ r3 ]
+      |          |
+    [ r2 ]     { s2 }
+                 |
+               [ r4 ]
     """

@@ -68,19 +68,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 0.1000 as-notation dot+
      no bgp ebgp-requires-policy
-     neighbor {{ routers.r1.iface_to('s1').ip4[0].ip }} remote-as 0.500
-     neighbor {{ routers.r1.iface_to('s1').ip4[0].ip }} timers 3 10
+     neighbor {{ routers.r3.iface_to('s2').ip4[0].ip }} remote-as 0.500
+     neighbor {{ routers.r3.iface_to('s2').ip4[0].ip }} timers 3 10
     !
     #%   endif
     #% endblock
@@ -106,7 +106,7 @@ class BGPLocalASDotplusPrivateRemove(
         )

     @topotatofunc
-    def bgp_as_path_r2(self, r2, r3):
+    def bgp_as_path_r2(self, r2, r1):
         expected = {
             "paths": [
                 {
@@ -120,7 +120,7 @@ class BGPLocalASDotplusPrivateRemove(
         yield from AssertVtysh.make(
             r2,
             "bgpd",
-            f"show ip bgp {r3.lo_ip4[0].ip} json",
+            f"show ip bgp {r1.lo_ip4[0].ip} json",
             maxwait=5.0,
             compare=expected,
         )