Add rc.local for host* that explains which vpp:port it is connected to

build/bird/hvn0.lab.ipng.ch/host0-0/etc/rc.local

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for port in 0 1 2 3; do
+  ip link set enp16s0f${port} up mtu 1500 alias "vpp0-${port}:Gi10/0/2"
+done

build/bird/hvn0.lab.ipng.ch/host0-0/root/lab-build/rc-local-perms

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "* Fixing permissions of rc.local"
+chmod 755 /etc/rc.local

build/bird/hvn0.lab.ipng.ch/host0-0/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

build/bird/hvn0.lab.ipng.ch/host0-1/etc/rc.local

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for port in 0 1 2 3; do
+  ip link set enp16s0f${port} up mtu 1500 alias "vpp0-${port}:Gi10/0/3"
+done

build/bird/hvn0.lab.ipng.ch/host0-1/root/lab-build/rc-local-perms

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "* Fixing permissions of rc.local"
+chmod 755 /etc/rc.local

build/bird/hvn0.lab.ipng.ch/host0-1/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

build/bird/hvn0.lab.ipng.ch/tap0-0/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

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,12 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.10.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
-  route 0.0.0.0/0 via 192.168.10.4;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:200::/60 unreachable;
-
+  route 2001:678:d78:20f::/112 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,8 @@ 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/srv6.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/loopback.vpp

@@ -3,4 +3,3 @@ create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.0/32
 set interface ip address loop0 2001:678:d78:200::/128
-

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-0/etc/vpp/config/srv6.vpp

@@ -0,0 +1,2 @@
+set sr encaps source addr 2001:678:d78:200::
+sr localsid address 2001:678:d78:20f:: behavior end

build/bird/hvn0.lab.ipng.ch/vpp0-0/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

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,12 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.10.0/24 unreachable;
-
+#  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:678:d78:20f::1:0/112 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,8 @@ 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/srv6.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/loopback.vpp

@@ -3,4 +3,3 @@ create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.1/32
 set interface ip address loop0 2001:678:d78:200::1/128
-

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-1/etc/vpp/config/srv6.vpp

@@ -0,0 +1,2 @@
+set sr encaps source addr 2001:678:d78:200::1
+sr localsid address 2001:678:d78:20f::1:0 behavior end

build/bird/hvn0.lab.ipng.ch/vpp0-1/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

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,12 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.10.0/24 unreachable;
-
+#  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:678:d78:20f::2:0/112 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,8 @@ 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/srv6.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/loopback.vpp

@@ -3,4 +3,3 @@ create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.2/32
 set interface ip address loop0 2001:678:d78:200::2/128
-

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-2/etc/vpp/config/srv6.vpp

@@ -0,0 +1,2 @@
+set sr encaps source addr 2001:678:d78:200::2
+sr localsid address 2001:678:d78:20f::2:0 behavior end

build/bird/hvn0.lab.ipng.ch/vpp0-2/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

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,12 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.10.0/24 unreachable;
-
+#  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:678:d78:20f::3:0/112 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,8 @@ 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/srv6.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/loopback.vpp

@@ -3,4 +3,3 @@ create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.10.3/32
 set interface ip address loop0 2001:678:d78:200::3/128
-

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/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/srv6.vpp

@@ -0,0 +1,2 @@
+set sr encaps source addr 2001:678:d78:200::3
+sr localsid address 2001:678:d78:20f::3:0 behavior end

build/bird/hvn0.lab.ipng.ch/vpp0-3/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

build/bird/hvn1.lab.ipng.ch/host1-0/etc/rc.local

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for port in 0 1 2 3; do
+  ip link set enp16s0f${port} up mtu 1500 alias "vpp1-${port}:Gi10/0/2"
+done

build/bird/hvn1.lab.ipng.ch/host1-0/root/lab-build/rc-local-perms

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "* Fixing permissions of rc.local"
+chmod 755 /etc/rc.local

build/bird/hvn1.lab.ipng.ch/host1-0/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

build/bird/hvn1.lab.ipng.ch/host1-1/etc/rc.local

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for port in 0 1 2 3; do
+  ip link set enp16s0f${port} up mtu 1500 alias "vpp1-${port}:Gi10/0/3"
+done

build/bird/hvn1.lab.ipng.ch/host1-1/root/lab-build/rc-local-perms

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+echo "* Fixing permissions of rc.local"
+chmod 755 /etc/rc.local

build/bird/hvn1.lab.ipng.ch/host1-1/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

build/bird/hvn1.lab.ipng.ch/tap1-0/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

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,12 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.11.0/24 unreachable;
-
+#  route 192.0.2.0/24 via 10.0.0.1;
-  route 0.0.0.0/0 via 192.168.11.4;
 }
 
 protocol static static6 {
   ipv6 { export all; };
-#  route 2001:db8:cafe::/48 via 2001:db8::1;;
   route 2001:678:d78:210::/60 unreachable;
-
+  route 2001:678:d78:21f::/112 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,8 @@ 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/srv6.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/loopback.vpp

@@ -3,4 +3,3 @@ create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.0/32
 set interface ip address loop0 2001:678:d78:210::/128
-

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-0/etc/vpp/config/srv6.vpp

@@ -0,0 +1,2 @@
+set sr encaps source addr 2001:678:d78:210::
+sr localsid address 2001:678:d78:21f:: behavior end

build/bird/hvn1.lab.ipng.ch/vpp1-0/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

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,12 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.11.0/24 unreachable;
-
+#  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:678:d78:21f::1:0/112 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,8 @@ 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/srv6.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/loopback.vpp

@@ -3,4 +3,3 @@ create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.1/32
 set interface ip address loop0 2001:678:d78:210::1/128
-

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-1/etc/vpp/config/srv6.vpp

@@ -0,0 +1,2 @@
+set sr encaps source addr 2001:678:d78:210::1
+sr localsid address 2001:678:d78:21f::1:0 behavior end

build/bird/hvn1.lab.ipng.ch/vpp1-1/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

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,12 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.11.0/24 unreachable;
-
+#  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:678:d78:21f::2:0/112 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,8 @@ 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/srv6.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/loopback.vpp

@@ -3,4 +3,3 @@ create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.2/32
 set interface ip address loop0 2001:678:d78:210::2/128
-

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-2/etc/vpp/config/srv6.vpp

@@ -0,0 +1,2 @@
+set sr encaps source addr 2001:678:d78:210::2
+sr localsid address 2001:678:d78:21f::2:0 behavior end

build/bird/hvn1.lab.ipng.ch/vpp1-2/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

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,12 @@
 protocol static static4 {
   ipv4 { export all; };
-#  route 192.0.2.0/24 via 10.0.0.1;
   route 192.168.11.0/24 unreachable;
-
+#  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:678:d78:21f::3:0/112 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,8 @@ 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/srv6.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/loopback.vpp

@@ -3,4 +3,3 @@ create loopback interface instance 0
 set interface state loop0 up
 set interface ip address loop0 192.168.11.3/32
 set interface ip address loop0 2001:678:d78:210::3/128
-

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/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/srv6.vpp

@@ -0,0 +1,2 @@
+set sr encaps source addr 2001:678:d78:210::3
+sr localsid address 2001:678:d78:21f::3:0 behavior end

build/bird/hvn1.lab.ipng.ch/vpp1-3/root/libvirt.xml

@@ -21,30 +21,7 @@
     <apic/>
     <vmport state='off'/>
   </features>
-  <cpu mode='custom' match='exact' check='full'>
+  <cpu mode='host-passthrough'/>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
   <clock offset='utc'>
     <timer name='rtc' tickpolicy='catchup'/>
     <timer name='pit' tickpolicy='delay'/>

build/bird/hvn2.lab.ipng.ch/host2-0/etc/hostname

@@ -1 +0,0 @@
-host2-0

build/bird/hvn2.lab.ipng.ch/host2-0/etc/hosts

@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       host2-0.lab.ipng.ch  host2-0
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters

build/bird/hvn2.lab.ipng.ch/host2-0/etc/motd

@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.

build/bird/hvn2.lab.ipng.ch/host2-0/etc/netns/dataplane/resolv.conf

@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff

build/bird/hvn2.lab.ipng.ch/host2-0/etc/netplan/01-netcfg.yaml

@@ -1,15 +0,0 @@
-network:
-  version: 2
-  renderer: networkd
-  ethernets:
-    enp1s0:
-      optional: true
-      accept-ra: false
-      dhcp4: false
-      mtu: 9000
-      addresses: [ 198.19.5.34/24, 2001:678:d78:50b::22/64 ]
-      routes:
-       - to: 0.0.0.0/0
-         via: 198.19.5.1
-       - to: ::/0
-         via: 2001:678:d78:50b::1

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

@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 194.1.163.3
-nameserver 194.1.163.4

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

@@ -1,6 +0,0 @@
-# pim@ipng.nl - absynth, bfib, gripe, spongebob, homenet
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC8X6oRdLn7PckWIRL+Fgp46qN+fglQLBJIvPHJ2P277v4tx/qlELaT8w45YyEPrUZ4XbbNIB4P59H63wPxIpk/d15k0C7Zx3kTESaEQuts3fne3ZFmrWm0dLD2yDTiB0zCraiQ5a0w++xuGEC3wdWPV+FHZh5Ea+WCd91g2xXPHJeosAQzBBBBaC9Shhx91h6lbCm4evvgqLnwt7JgnI2N4w2qr13lDDaRD4BXfyFrtLSTdhBgYEaFnUd6Afz5ilfDYXQW/yTSHZOIQ/vNVFpFxYrtmwHDdrSMiDpz0FE/4LLBG/rFl2VvRTmTEyjvwpGpEVaivMOLo/jRc3TA7jKB pim@ipng.nl
-
-# pim's M1 macbookpro SeKEY
-ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKDP/hLZusPNfKTy3t9bbbOHyczX+UACc4rYstc3QEDBDfxBnCZcMKN5Mv10o+q/+ap7wyFhONlz/qcUhEMbI1k=
-

build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/disable-vpp

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-echo " * Disabling VPP, Bird and FRR"
-for i in vpp vppcfg bird-dataplane frr; do
-  rm -f /etc/systemd/system/multi-user.target.wants/${i}.service
-  ln -sf /dev/null /etc/systemd/system/${i}.service
-done

build/bird/hvn2.lab.ipng.ch/host2-0/root/lab-build/perms

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-echo " * Fixing permissions"
-chown -R root:root /root/
-chown -R ipng:ipng /home/ipng/
-
-[ -r /etc/rc.local ] && chmod 755 /etc/rc.local

build/bird/hvn2.lab.ipng.ch/host2-0/root/libvirt.xml

@@ -1,254 +0,0 @@
-<domain type='kvm'>
-  <name>host2-0</name>
-  <uuid>ea424fc6-763c-6113-39f1-4f1b97ba3de3</uuid>
-  <metadata>
-    <libosinfo:libosinfo xmlns:libosinfo="http://libosinfo.org/xmlns/libvirt/domain/1.0">
-      <libosinfo:os id="http://debian.org/debian/10"/>
-    </libosinfo:libosinfo>
-  </metadata>
-  <memory unit='KiB'>8388608</memory>
-  <currentMemory unit='KiB'>8388608</currentMemory>
-  <vcpu placement='static'>2</vcpu>
-  <resource>
-    <partition>/machine</partition>
-  </resource>
-  <os>
-    <type arch='x86_64' machine='pc-q35-5.2'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <features>
-    <acpi/>
-    <apic/>
-    <vmport state='off'/>
-  </features>
-  <cpu mode='custom' match='exact' check='full'>
-    <model fallback='forbid'>SandyBridge-IBRS</model>
-    <vendor>Intel</vendor>
-    <feature policy='require' name='vme'/>
-    <feature policy='require' name='ss'/>
-    <feature policy='require' name='vmx'/>
-    <feature policy='require' name='pdcm'/>
-    <feature policy='require' name='pcid'/>
-    <feature policy='require' name='hypervisor'/>
-    <feature policy='require' name='arat'/>
-    <feature policy='require' name='tsc_adjust'/>
-    <feature policy='require' name='umip'/>
-    <feature policy='require' name='md-clear'/>
-    <feature policy='require' name='stibp'/>
-    <feature policy='require' name='arch-capabilities'/>
-    <feature policy='require' name='ssbd'/>
-    <feature policy='require' name='xsaveopt'/>
-    <feature policy='require' name='pdpe1gb'/>
-    <feature policy='require' name='ibpb'/>
-    <feature policy='require' name='amd-stibp'/>
-    <feature policy='require' name='amd-ssbd'/>
-    <feature policy='require' name='skip-l1dfl-vmentry'/>
-    <feature policy='require' name='pschange-mc-no'/>
-  </cpu>
-  <clock offset='utc'>
-    <timer name='rtc' tickpolicy='catchup'/>
-    <timer name='pit' tickpolicy='delay'/>
-    <timer name='hpet' present='no'/>
-  </clock>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <pm>
-    <suspend-to-mem enabled='no'/>
-    <suspend-to-disk enabled='no'/>
-  </pm>
-  <devices>
-    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-    <disk type='block' device='disk'>
-      <driver name='qemu' type='raw'/>
-      <source dev='/dev/zvol/vol0/host2-0'/>
-      <backingStore/>
-      <target dev='vda' bus='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
-    </disk>
-    <controller type='usb' index='0' model='qemu-xhci' ports='15'>
-      <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
-    </controller>
-    <controller type='sata' index='0'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1f' function='0x2'/>
-    </controller>
-    <controller type='pci' index='0' model='pcie-root'/>
-    <controller type='pci' index='1' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='1' port='0x10'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='2' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='2' port='0x11'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x1'/>
-    </controller>
-    <controller type='pci' index='3' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='3' port='0x12'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x2'/>
-    </controller>
-    <controller type='pci' index='4' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='4' port='0x13'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x3'/>
-    </controller>
-    <controller type='pci' index='5' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='5' port='0x14'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x4'/>
-    </controller>
-    <controller type='pci' index='6' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='6' port='0x15'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x5'/>
-    </controller>
-    <controller type='pci' index='7' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='7' port='0x16'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x6'/>
-    </controller>
-    <controller type='pci' index='8' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='8' port='0x17'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x7'/>
-    </controller>
-    <controller type='pci' index='9' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='9' port='0x18'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0' multifunction='on'/>
-    </controller>
-    <controller type='pci' index='10' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='10' port='0x19'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x1'/>
-    </controller>
-    <controller type='pci' index='11' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='11' port='0x1a'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x2'/>
-    </controller>
-    <controller type='pci' index='12' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='12' port='0x1b'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x3'/>
-    </controller>
-    <controller type='pci' index='13' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='13' port='0x1c'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x4'/>
-    </controller>
-    <controller type='pci' index='14' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='14' port='0x1d'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x5'/>
-    </controller>
-    <controller type='pci' index='15' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='15' port='0x1e'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x6'/>
-    </controller>
-    <controller type='pci' index='16' model='pcie-root-port'>
-      <model name='pcie-root-port'/>
-      <target chassis='16' port='0x1f'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x7'/>
-    </controller>
-    <controller type='virtio-serial' index='0'>
-      <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
-    </controller>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:00:00'/>
-      <source bridge='mgmt'/>
-      <target dev='host2-0-mgmt'/>
-      <model type='virtio'/>
-      <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:00'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-0'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x0' multifunction='on'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:01'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-1'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x1'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:02'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-2'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x2'/>
-    </interface>
-    <interface type='bridge'>
-      <mac address='52:54:00:F2:10:03'/>
-      <source bridge='vpplan'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='host2-0-3'/>
-      <model type='virtio'/>
-      <mtu size='9216'/>
-      <address type='pci' domain='0x0000' bus='0x10' slot='0x00' function='0x3'/>
-    </interface>
-    <serial type='pty'>
-      <target type='isa-serial' port='0'>
-        <model name='isa-serial'/>
-      </target>
-    </serial>
-    <console type='pty'>
-      <target type='serial' port='0'/>
-    </console>
-    <channel type='unix'>
-      <target type='virtio' name='org.qemu.guest_agent.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='1'/>
-    </channel>
-    <channel type='spicevmc'>
-      <target type='virtio' name='com.redhat.spice.0'/>
-      <address type='virtio-serial' controller='0' bus='0' port='2'/>
-    </channel>
-    <input type='tablet' bus='usb'>
-      <address type='usb' bus='0' port='1'/>
-    </input>
-    <input type='mouse' bus='ps2'/>
-    <input type='keyboard' bus='ps2'/>
-    <graphics type='spice' autoport='yes' listen='127.0.0.1'>
-      <listen type='address' address='127.0.0.1'/>
-      <image compression='off'/>
-    </graphics>
-    <sound model='ich9'>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
-    </sound>
-    <video>
-      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
-    </video>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='2'/>
-    </redirdev>
-    <redirdev bus='usb' type='spicevmc'>
-      <address type='usb' bus='0' port='3'/>
-    </redirdev>
-    <memballoon model='virtio'>
-      <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
-    </memballoon>
-    <rng model='virtio'>
-      <backend model='random'>/dev/urandom</backend>
-      <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
-    </rng>
-  </devices>
-  <seclabel type='dynamic' model='apparmor' relabel='yes'/>
-  <seclabel type='dynamic' model='dac' relabel='yes'/>
-</domain>

build/bird/hvn2.lab.ipng.ch/host2-1/etc/hostname

@@ -1 +0,0 @@
-host2-1

build/bird/hvn2.lab.ipng.ch/host2-1/etc/hosts

@@ -1,7 +0,0 @@
-127.0.0.1       localhost
-127.0.1.1       host2-1.lab.ipng.ch  host2-1
-
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters

build/bird/hvn2.lab.ipng.ch/host2-1/etc/motd

@@ -1,27 +0,0 @@
-                                               -*%%=                           
-                                              =%@@@@@:                          
-                                            :%@@@@@@@*                          
-                                          :*@@@@@@@@@@     .=+-                 
-                                    :=*#%@@@@@@@@@@@@@+  .+@@@@#                
-                                 .+@@@@@@@@@@@@@@@@@@@@##@@@@@@@=               
-                                +@@@@@@@@@@@%*+@@@@@@@@@@@@@@@@@*               
-                              =@@@@@@@@@#=:    *@@@@%#*+*@@@@@@@#               
-                            -%@@@@@@@*-         ::.   :*@@@@@@@@@               
-                          =%@@@@@@@+                 *@@@@@@@@@@@*              
-                       :*@@@@@@@@+                  %@@@@@@@@@@@@@@+.           
-                    -*@@@@@@@@@+                    +%@@@@@@@@@@@@@@@*.         
-               .-+%@@@@@@@@@#-                         =@@@@@@@@@@@@@@@+        
-           :=*%@@@@@@@@%*=:                             @@@@@@@@@@@@@@@@#       
-       :+#@@@@@@@#*+-:                       :*%@@@@@@%%@@@@@@@@@@@@@@@@@#      
-   .=#@@%#*+=-.                             :##%%@@@@@@@@@@@@@@@@@@@@@@@@@#     
- .-=-:                                               ..:-=+*#%@@@@@@@@@@@@@@-   
-       ..::--==++***##%%%%@@@@@@@@@@@@@@@@%%%##***+==-::.       .-=*#@@@@@@@@*  
- .:=+*#%%%@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@%#*+-:      :=+#@@@% 
-             ..:--=+**#%@@@@@@@@@@@@@@@@@@@@@@%#*##%@@@@@@@@@@@@@@@#+-.     .-+-
-                          .:=+*#%@@@@@@@@@@@@@@@@#+=:..-=+#%@@@@@@@@@@@@#+-.    
-                                  .:=+#%@@@@@@@@@@@@@@@#+-.  :-+#@@@@@@@@@@@%=  
-   https://ipng.ch/                      :-+#@@@@@@@@@@@@@@@#+-.  .-+*%@%*-.    
-  IPng Networks GmbH                           :=*%@@@@@@@@@@@@@%*-             
-                                                    :=*%@@@@@@@#+-.             
-Restricted access. Authorized users only.                :=+-.                  
-All connections are monitored and recorded. Contact <noc@ipng.ch> for details.

build/bird/hvn2.lab.ipng.ch/host2-1/etc/netns/dataplane/resolv.conf

@@ -1,4 +0,0 @@
-domain lab.ipng.ch
-search lab.ipng.ch net.ipng.ch ipng.ch
-nameserver 192.168.12.4
-nameserver 2001:678:d78:221::ffff