topotests: bgp_vrf_route_leak_basic, add r2 peering

Signed-off-by: Philippe Guibert <[email protected]>

Author: pguibert6WIND

tests/topotests/bgp_vrf_route_leak_basic/r1/bgpd.conf

@@ -1,6 +1,6 @@
 hostname r1
 
-router bgp 99 vrf DONNA
+router bgp 65500 vrf DONNA
   no bgp ebgp-requires-policy
   address-family ipv4 unicast
     redistribute connected
@@ -9,25 +9,30 @@ router bgp 99 vrf DONNA
     import vrf default
   !
 !
-router bgp 99 vrf EVA
+router bgp 65500 vrf EVA
   no bgp ebgp-requires-policy
   address-family ipv4 unicast
     redistribute connected
     import vrf DONNA
     import vrf ZITA
   !
 !
-router bgp 99 vrf ZITA
+router bgp 65500 vrf ZITA
   no bgp ebgp-requires-policy
   no bgp network import-check
   address-family ipv4 unicast
     network 172.16.101.0/24
   !
 !
-router bgp 99
+router bgp 65500
+  bgp router-id 192.0.2.1
   no bgp ebgp-requires-policy
+  neighbor 192.0.2.2 remote-as 65501
   address-family ipv4 unicast
+    no neighbor 192.0.2.2 activate
     redistribute connected
     import vrf DONNA
   !
+  address-family ipv4 vpn
+   neighbor 192.0.2.2 activate
 !

tests/topotests/bgp_vrf_route_leak_basic/r1/zebra.conf

@@ -1,5 +1,8 @@
 hostname r1
 
+int r1-eth0
+  ip address 192.0.2.1/24
+!
 int dummy0
   ip address 10.0.4.1/24
   no shut

tests/topotests/bgp_vrf_route_leak_basic/r2/bgpd.conf

@@ -0,0 +1,12 @@
+hostname r2
+
+router bgp 65501
+  bgp router-id 192.0.2.2
+  no bgp ebgp-requires-policy
+  neighbor 192.0.2.1 remote-as 65500
+  address-family ipv4 unicast
+    no neighbor 192.0.2.1 activate
+  !
+  address-family ipv4 vpn
+   neighbor 192.0.2.1 activate
+!

tests/topotests/bgp_vrf_route_leak_basic/r2/zebra.conf

@@ -0,0 +1,5 @@
+hostname r1
+
+int r2-eth0
+  ip address 192.0.2.2/24
+!

tests/topotests/bgp_vrf_route_leak_basic/test_bgp-vrf-route-leak-basic.py

@@ -33,9 +33,13 @@
 def build_topo(tgen):
     "Build function"
 
-    for routern in range(1, 2):
+    for routern in range(1, 3):
         tgen.add_router("r{}".format(routern))
 
+    switch = tgen.add_switch("s1")
+    switch.add_link(tgen.gears["r1"])
+    switch.add_link(tgen.gears["r2"])
+
 
 def setup_module(mod):
     "Sets up the pytest environment"
@@ -72,7 +76,7 @@ def test_router_bgp_as_pretty():
         pytest.skip(tgen.errors)
 
     output = tgen.gears["r1"].vtysh_cmd("show run")
-    assert "router bgp 99\n" in output, "router bgp 99 not found in show run"
+    assert "router bgp 65500\n" in output, "router bgp 65500 not found in show run"
 
 
 def test_vrf_route_leak_donna():