Remove vrf references and clean up tests

Author: felbinger

tests/bgp-extended-nexthop/default.nix

@@ -82,14 +82,12 @@
           }
 
           protocol static static4 {
-            vrf "vrf0";
             ipv4;
 
             route 198.51.100.128/25 unreachable;
           }
 
           protocol static static6 {
-            vrf "vrf0";
             ipv6;
 
             route 2001:db8:c0de::/48 unreachable;
@@ -229,14 +227,13 @@
 
     a.wait_for_unit("network.target")
     b.wait_for_unit("network.target")
+    c.wait_for_unit("network.target")
 
     a.wait_for_unit("frr.service")
     b.wait_for_unit("bird.service")
+    c.wait_for_unit("gobgp.service")
 
     with subtest("ensure bgp sessions are established"):
-      a.sleep(10)
-      print(a.succeed("vtysh -c 'show bgp summary'"))
-      print(c.succeed("gobgp neighbor"))
       a.wait_until_succeeds("vtysh -c 'show bgp ipv4 summary' | grep 'fe80::2.*2\\s*3\\s*N/A'")
       a.wait_until_succeeds("vtysh -c 'show bgp ipv4 summary' | grep 'fe80::3.*1\\s*3\\s*N/A'")
       b.wait_until_succeeds("birdc show protocols | grep 'a.*Established'")
@@ -254,13 +251,13 @@
       b.succeed("ip route show | grep 198.51.100.0/25")
       c.succeed("ip route show | grep 198.51.100.0/25")
       a.succeed("ip route show | grep 198.51.100.128/25")
-      # c.succeed("ip route show | grep 198.51.100.128/25")
+      c.succeed("ip route show | grep 198.51.100.128/25")
       a.succeed("ip route show | grep 203.0.113.0/24")
       b.succeed("ip route show | grep 203.0.113.0/24")
       b.succeed("ip -6 route show | grep 2001:db8:beef::/48")
       c.succeed("ip -6 route show | grep 2001:db8:beef::/48")
       a.succeed("ip -6 route show | grep 2001:db8:c0de::/48")
-      # c.succeed("ip -6 route show | grep 2001:db8:c0de::/48")
+      c.succeed("ip -6 route show | grep 2001:db8:c0de::/48")
       a.succeed("ip -6 route show | grep 2001:db8:dead::/48")
       b.succeed("ip -6 route show | grep 2001:db8:dead::/48")
   '';