Bump version to 20221128; Install default into OSPF; Refactor bird file structure

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

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp0-0
 router id 192.168.10.0;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -1,5 +1,5 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
@@ -10,7 +10,7 @@ protocol ospf v2 ospf4 {
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where source = RTS_DEVICE; import all; };
+  ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };

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

@@ -2,10 +2,14 @@ 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 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 ::/0 via 2001:678:d78:201::ffff;
 }

build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp0-0

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

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp0-1
 router id 192.168.10.1;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -1,5 +1,5 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
@@ -10,7 +10,7 @@ protocol ospf v2 ospf4 {
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where source = RTS_DEVICE; import all; };
+  ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };

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

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

build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp0-1

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

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp0-2
 router id 192.168.10.2;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -1,5 +1,5 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
@@ -10,7 +10,7 @@ protocol ospf v2 ospf4 {
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where source = RTS_DEVICE; import all; };
+  ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };

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

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

build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp0-2

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

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp0-3
 router id 192.168.10.3;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -1,5 +1,5 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
@@ -10,7 +10,7 @@ protocol ospf v2 ospf4 {
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where source = RTS_DEVICE; import all; };
+  ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };

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

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

build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp0-3

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

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp1-0
 router id 192.168.11.0;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -0,0 +1,21 @@
+protocol ospf v2 ospf4 {
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
+  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 || source = RTS_STATIC); import all; };
+  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/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf

@@ -2,10 +2,14 @@ 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 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 ::/0 via 2001:678:d78:211::ffff;
 }

build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp1-0

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

@@ -1,21 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
-  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; import all; };
-  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/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp1-1
 router id 192.168.11.1;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -0,0 +1,21 @@
+protocol ospf v2 ospf4 {
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
+  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 || source = RTS_STATIC); import all; };
+  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/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf

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

build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp1-1

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

@@ -1,21 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
-  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; import all; };
-  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/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp1-2
 router id 192.168.11.2;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -0,0 +1,21 @@
+protocol ospf v2 ospf4 {
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
+  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 || source = RTS_STATIC); import all; };
+  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/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf

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

build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp1-2

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

@@ -1,21 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
-  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; import all; };
-  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/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp1-3
 router id 192.168.11.3;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -0,0 +1,21 @@
+protocol ospf v2 ospf4 {
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
+  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 || source = RTS_STATIC); import all; };
+  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/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf

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

build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp1-3

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

@@ -1,21 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
-  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; import all; };
-  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/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp2-0
 router id 192.168.12.0;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -0,0 +1,21 @@
+protocol ospf v2 ospf4 {
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
+  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 || source = RTS_STATIC); import all; };
+  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/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf

@@ -2,10 +2,14 @@ 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 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 ::/0 via 2001:678:d78:221::ffff;
 }

build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp2-0

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

@@ -1,21 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
-  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; import all; };
-  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/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp2-1
 router id 192.168.12.1;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -0,0 +1,21 @@
+protocol ospf v2 ospf4 {
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
+  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 || source = RTS_STATIC); import all; };
+  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/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf

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

build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp2-1

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

@@ -1,21 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
-  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; import all; };
-  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/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp2-2
 router id 192.168.12.2;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -0,0 +1,21 @@
+protocol ospf v2 ospf4 {
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
+  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 || source = RTS_STATIC); import all; };
+  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/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf

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

build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp2-2

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

@@ -1,21 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
-  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; import all; };
-  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/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf

@@ -1,3 +1,4 @@
+## Bird2 configuration for vpp2-3
 router id 192.168.12.3;
 
 protocol device { scan time 30; }
@@ -13,7 +14,7 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";

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

@@ -0,0 +1,21 @@
+protocol ospf v2 ospf4 {
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
+  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 || source = RTS_STATIC); import all; };
+  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/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf

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

build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/ibgp.conf

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/manual.conf

@@ -0,0 +1 @@
+## Manual configuration for vpp2-3

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

@@ -1,21 +0,0 @@
-protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
-  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; import all; };
-  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; };
-  };
-}

create

@@ -15,7 +15,7 @@
 ##     *  Unmount the staging directories
 ##     *  Start the VMs
 
-BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20221127-release}
+BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20221128-release}
 BUILD=${BUILD:=default}
 LAB=${LAB:=0}
 

overlays/bird/common/etc/bird/bird.conf.j2

@@ -1,3 +1,4 @@
+## Bird2 configuration for {{ node.hostname }}
 router id {{ node.loopback.ipv4.split("/")[0] }};
 
 protocol device { scan time 30; }
@@ -13,7 +14,8 @@ protocol kernel kernel6 {
   scan time 300;
 }
 
-include "static.conf";
+include "core/static.conf";
-include "bfd.conf";
+include "core/bfd.conf";
-include "ospf.conf";
+include "core/ospf.conf";
-include "ibgp.conf";
+include "manual.conf";
+

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

@@ -1,5 +1,5 @@
 protocol ospf v2 ospf4 {
-  ipv4 { export where source = RTS_DEVICE; import all; };
+  ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };
@@ -10,7 +10,7 @@ protocol ospf v2 ospf4 {
 }
 
 protocol ospf v3 ospf6 {
-  ipv6 { export where source = RTS_DEVICE; import all; };
+  ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; };
   area 0 {
     interface "loop0" { stub yes; };
     interface "e0" { type pointopoint; cost 5; bfd off; };

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

@@ -2,10 +2,19 @@ protocol static static4 {
   ipv4 { export all; };
 #  route 192.0.2.0/24 via 10.0.0.1;
   route {{lab.ipv4}} unreachable;
+
+{% 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;
+
+{% if node.id == 0 %}
+  route ::/0 via 2001:678:d78:2{{lab.id}}1::ffff;
+{% endif %}
 }
+

overlays/bird/common/etc/bird/ibgp.conf.j2

@@ -1 +0,0 @@
-# NOTE(ipng): Not created yet

overlays/bird/common/etc/bird/manual.conf.j2

@@ -0,0 +1 @@
+## Manual configuration for {{ node.hostname }}