Rewrite bird configs: include babel.conf; Restrict OSPF to its own lab net + defaults

build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.10.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.10.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:200::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:200::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf

@@ -1,15 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.10.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
-  route 0.0.0.0/0 via 192.168.10.4;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:200::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
-  route ::/0 via 2001:678:d78:201::ffff;
 }

build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.10.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.10.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:200::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:200::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.10.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:200::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.10.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.10.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:200::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:200::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.10.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:200::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.10.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.10.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:200::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:200::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.10.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:200::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.11.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.11.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:210::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:210::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf

@@ -1,15 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.11.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
-  route 0.0.0.0/0 via 192.168.11.4;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:210::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
-  route ::/0 via 2001:678:d78:211::ffff;
 }

build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.11.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.11.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:210::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:210::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.11.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:210::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.11.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.11.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:210::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:210::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.11.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:210::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.11.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.11.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:210::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:210::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.11.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:210::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:220::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:220::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf

@@ -1,15 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.12.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
-  route 0.0.0.0/0 via 192.168.12.4;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:220::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
-  route ::/0 via 2001:678:d78:221::ffff;
 }

build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:220::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:220::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.12.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:220::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:220::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:220::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.12.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:220::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.12.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:220::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:220::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.12.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:220::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:230::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:230::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/static.conf

@@ -1,15 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.13.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
-  route 0.0.0.0/0 via 192.168.13.4;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:230::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
-  route ::/0 via 2001:678:d78:231::ffff;
 }

build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:230::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:230::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.13.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:230::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:230::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:230::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.13.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:230::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; import where net ~ [ 192.168.13.0/24+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ 2001:678:d78:230::/60+, ::/0 ]; import where net ~ [ 2001:678:d78:230::/60+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/static.conf

@@ -1,13 +1,11 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.13.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:230::/60 unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }

overlays/bird/vpp/etc/bird/core/babel.conf.j2

@@ -1,5 +1,5 @@
 protocol babel {
-  interface "e*" {
+  interface "e0", "e1" {
     type wired;
     extended next hop on;
     rtt cost 1000;

overlays/bird/vpp/etc/bird/core/ospf.conf.j2

@@ -1,21 +1,17 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv4 { export where net ~ [ {{ lab.ipv4 }}+, 0.0.0.0/0 ]; import where net ~ [ {{ lab.ipv4 }}+, 0.0.0.0/0 ]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; };
+  ipv6 { export where net ~ [ {{ lab.ipv6 }}+, ::/0 ]; import where net ~ [ {{ lab.ipv6 }}+, ::/0]; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
     interface "e1" { type pointopoint; cost 5; bfd off; };
-    interface "e2" { type pointopoint; cost 5; bfd off; };
-    interface "e3" { type pointopoint; cost 5; bfd off; };
   };
 }

overlays/bird/vpp/etc/bird/core/static.conf.j2

@@ -1,20 +1,12 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route {{lab.ipv4}} unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
-{% if node.id == 0 %}
-  route 0.0.0.0/0 via 192.168.{{10+lab.id}}.4;
-{% endif %}
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route {{lab.ipv6}} unreachable;
-
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
-{% if node.id == 0 %}
-  route ::/0 via 2001:678:d78:2{{lab.id}}1::ffff;
-{% endif %}
 }