From 491987d90c038a10dbe05bde1ae855591e9e76ca Mon Sep 17 00:00:00 2001
From: Pim van Pelt <pim@ipng.nl>
Date: Sun, 7 Apr 2024 09:51:45 +0000
Subject: [PATCH] Rewrite bird configs: include babel.conf; Restrict OSPF to
 its own lab net + defaults

---
 .../hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/babel.conf |  2 +-
 .../hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp0-0/etc/bird/core/static.conf                 |  8 ++------
 .../hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/babel.conf |  2 +-
 .../hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp0-1/etc/bird/core/static.conf                 |  6 ++----
 .../hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/babel.conf |  2 +-
 .../hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp0-2/etc/bird/core/static.conf                 |  6 ++----
 .../hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/babel.conf |  2 +-
 .../hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp0-3/etc/bird/core/static.conf                 |  6 ++----
 .../hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/babel.conf |  2 +-
 .../hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp1-0/etc/bird/core/static.conf                 |  8 ++------
 .../hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/babel.conf |  2 +-
 .../hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp1-1/etc/bird/core/static.conf                 |  6 ++----
 .../hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/babel.conf |  2 +-
 .../hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp1-2/etc/bird/core/static.conf                 |  6 ++----
 .../hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/babel.conf |  2 +-
 .../hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp1-3/etc/bird/core/static.conf                 |  6 ++----
 .../hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf |  2 +-
 .../hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp2-0/etc/bird/core/static.conf                 |  8 ++------
 .../hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf |  2 +-
 .../hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp2-1/etc/bird/core/static.conf                 |  6 ++----
 .../hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf |  2 +-
 .../hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp2-2/etc/bird/core/static.conf                 |  6 ++----
 .../hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf |  2 +-
 .../hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp2-3/etc/bird/core/static.conf                 |  6 ++----
 .../hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf |  2 +-
 .../hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp3-0/etc/bird/core/static.conf                 |  8 ++------
 .../hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf |  2 +-
 .../hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp3-1/etc/bird/core/static.conf                 |  6 ++----
 .../hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf |  2 +-
 .../hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp3-2/etc/bird/core/static.conf                 |  6 ++----
 .../hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf |  2 +-
 .../hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf  |  8 ++------
 .../vpp3-3/etc/bird/core/static.conf                 |  6 ++----
 overlays/bird/vpp/etc/bird/core/babel.conf.j2        |  2 +-
 overlays/bird/vpp/etc/bird/core/ospf.conf.j2         |  8 ++------
 overlays/bird/vpp/etc/bird/core/static.conf.j2       | 12 ++----------
 51 files changed, 85 insertions(+), 201 deletions(-)

diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/babel.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf
index 5b51784..5eacdba 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf
index b3736f1..e8755b3 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf
+++ b/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 0.0.0.0/0 via 192.168.10.4;
+#  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 ::/0 via 2001:678:d78:201::ffff;
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/babel.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf
index 5b51784..5eacdba 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf
index 4bbdd97..e8755b3 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/babel.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf
index 5b51784..5eacdba 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf
index 4bbdd97..e8755b3 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/babel.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf
index 5b51784..5eacdba 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf
index 4bbdd97..e8755b3 100644
--- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/babel.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf
index 5b51784..1055a64 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf
index 0f8d5a8..330fa0c 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf
+++ b/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 0.0.0.0/0 via 192.168.11.4;
+#  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 ::/0 via 2001:678:d78:211::ffff;
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/babel.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf
index 5b51784..1055a64 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf
index 5b2d1d8..330fa0c 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/babel.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf
index 5b51784..1055a64 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf
index 5b2d1d8..330fa0c 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/babel.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf
index 5b51784..1055a64 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf
index 5b2d1d8..330fa0c 100644
--- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf
index 5b51784..25d349d 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf
index 2f6c5e8..9f6c523 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf
+++ b/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 0.0.0.0/0 via 192.168.12.4;
+#  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 ::/0 via 2001:678:d78:221::ffff;
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf
index 5b51784..25d349d 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf
index bc4846e..9f6c523 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf
index 5b51784..25d349d 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf
index bc4846e..9f6c523 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf
index 5b51784..25d349d 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf
index bc4846e..9f6c523 100644
--- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf
index 5b51784..2acb48a 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/static.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/static.conf
index 8c2075f..89928d5 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/static.conf
+++ b/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 0.0.0.0/0 via 192.168.13.4;
+#  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 ::/0 via 2001:678:d78:231::ffff;
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf
index 5b51784..2acb48a 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/static.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/static.conf
index 17b15b5..89928d5 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf
index 5b51784..2acb48a 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/static.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/static.conf
index 17b15b5..89928d5 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf
index 30839fe..7652fde 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf
+++ b/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;
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf
index 5b51784..2acb48a 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf
+++ b/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; };
   };
 }
\ No newline at end of file
diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/static.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/static.conf
index 17b15b5..89928d5 100644
--- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/static.conf
+++ b/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;
 }
diff --git a/overlays/bird/vpp/etc/bird/core/babel.conf.j2 b/overlays/bird/vpp/etc/bird/core/babel.conf.j2
index 15784ee..1db04dc 100644
--- a/overlays/bird/vpp/etc/bird/core/babel.conf.j2
+++ b/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;
diff --git a/overlays/bird/vpp/etc/bird/core/ospf.conf.j2 b/overlays/bird/vpp/etc/bird/core/ospf.conf.j2
index d6a7e8f..a1e564d 100644
--- a/overlays/bird/vpp/etc/bird/core/ospf.conf.j2
+++ b/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; };
   };
 }
diff --git a/overlays/bird/vpp/etc/bird/core/static.conf.j2 b/overlays/bird/vpp/etc/bird/core/static.conf.j2
index 6b3b133..8dc31c5 100644
--- a/overlays/bird/vpp/etc/bird/core/static.conf.j2
+++ b/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;
-
-{% if node.id == 0 %}
-  route 0.0.0.0/0 via 192.168.{{10+lab.id}}.4;
-{% endif %}
+#  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 {{lab.ipv6}} unreachable;
-
-{% if node.id == 0 %}
-  route ::/0 via 2001:678:d78:2{{lab.id}}1::ffff;
-{% endif %}
+#  route 2001:db8:cafe::/48 via 2001:db8::1;
 }