add sflow config

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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 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;
 }

build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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-1/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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-2/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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 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;
 }

build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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-1/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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-2/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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 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;
 }

build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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-1/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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-2/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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 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;
 }

build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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-1/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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-2/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

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

@@ -17,4 +17,5 @@ protocol kernel kernel6 {
 include "core/static.conf";
 include "core/bfd.conf";
 include "core/ospf.conf";
+# include "core/babel.conf";
 include "manual.conf";

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

@@ -0,0 +1,13 @@
+protocol babel {
+  interface "e0", "e1" {
+    type wired;
+    extended next hop on;
+    rtt cost 1000;
+    rtt min 5ms;
+    rtt max 30ms;
+    authentication mac permissive;
+    password "IPng loves bird";
+  };
+  ipv6 { import all; export all; };
+  ipv4 { import all; export all; };
+}

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 || source = RTS_STATIC); 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 || source = RTS_STATIC); 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;
 }

build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/bootstrap.vpp

@@ -4,6 +4,7 @@ exec /etc/vpp/config/loopback.vpp
 exec /etc/vpp/config/interface.vpp
 exec /etc/vpp/config/lcp.vpp
 exec /etc/vpp/config/mpls.vpp
+exec /etc/vpp/config/sflow.vpp
 
 comment { exec /etc/vpp/config/flowprobe.vpp }
 

build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/vpp/config/sflow.vpp

@@ -0,0 +1,8 @@
+sflow header-bytes 128
+sflow sampling-rate 100
+sflow polling-interval 10
+
+sflow enable GigabitEthernet10/0/0
+sflow enable GigabitEthernet10/0/1
+sflow enable GigabitEthernet10/0/2
+sflow enable GigabitEthernet10/0/3

build/freebsd/hvn2.lab.ipng.ch/host2-0/home/ipng/.ssh/authorized_keys

@@ -4,3 +4,4 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess

build/freebsd/hvn2.lab.ipng.ch/host2-0/root/.ssh/authorized_keys

@@ -4,3 +4,4 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess

build/freebsd/hvn2.lab.ipng.ch/host2-0/root/lab-build/sshd

@@ -1,9 +0,0 @@
-
-#!/bin/sh
-
-echo "Fixing SSH permissions"
-chown -R root:wheel /etc/ssh
-chmod 600 /etc/ssh/ssh_host*key
-
-echo "Restarting SSH"
-/etc/rc.d/sshd restart

build/freebsd/hvn2.lab.ipng.ch/host2-1/home/ipng/.ssh/authorized_keys

@@ -4,3 +4,4 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P27
 # pim's M1 macbookpro SeKEY
 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
 
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess