diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf index e8755b3..7fb95e7 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf @@ -7,5 +7,6 @@ protocol static static4 { protocol static static6 { ipv6 { export all; }; route 2001:678:d78:200::/60 unreachable; + route 2001:678:d78:20f::/112 unreachable; # route 2001:db8:cafe::/48 via 2001:db8::1; } diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp +++ b/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp index 2b26986..cfc9c1a 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/srv6.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..b726b53 --- /dev/null +++ b/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 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf index e8755b3..2cb6c51 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf @@ -7,5 +7,6 @@ protocol static static4 { protocol static static6 { ipv6 { export all; }; 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; } diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp +++ b/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp index dbb76d7..2d275be 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/srv6.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..415dc25 --- /dev/null +++ b/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 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf index e8755b3..239a9b1 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf @@ -7,5 +7,6 @@ protocol static static4 { protocol static static6 { ipv6 { export all; }; 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; } diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp +++ b/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp index efb8a14..c77093f 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/srv6.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..a0aef5a --- /dev/null +++ b/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 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf index e8755b3..1e697c5 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf @@ -7,5 +7,6 @@ protocol static static4 { protocol static static6 { ipv6 { export all; }; 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; } diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp +++ b/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp index ba633e8..bc0dc6f 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/srv6.vpp b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..bf8da21 --- /dev/null +++ b/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 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf index 330fa0c..59b3c67 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf @@ -7,5 +7,6 @@ protocol static static4 { protocol static static6 { ipv6 { export all; }; route 2001:678:d78:210::/60 unreachable; + route 2001:678:d78:21f::/112 unreachable; # route 2001:db8:cafe::/48 via 2001:db8::1; } diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp +++ b/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp index 4d39398..008d9e1 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/srv6.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..c4d9152 --- /dev/null +++ b/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 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf index 330fa0c..a211e39 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf @@ -7,5 +7,6 @@ protocol static static4 { protocol static static6 { ipv6 { export all; }; 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; } diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp +++ b/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp index c22db9d..01d239b 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/srv6.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..a45e35d --- /dev/null +++ b/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 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf index 330fa0c..72d7496 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf @@ -7,5 +7,6 @@ protocol static static4 { protocol static static6 { ipv6 { export all; }; 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; } diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp +++ b/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp index 3211182..c45d98c 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/srv6.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..49ef3c5 --- /dev/null +++ b/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 diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf index 330fa0c..9d4b133 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf @@ -7,5 +7,6 @@ protocol static static4 { protocol static static6 { ipv6 { export all; }; 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; } diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp +++ b/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp index bb07712..4968272 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/srv6.vpp b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..034339b --- /dev/null +++ b/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 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/bootstrap.vpp +++ b/build/frr/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp index 2b26986..cfc9c1a 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/srv6.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-0/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..b726b53 --- /dev/null +++ b/build/frr/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 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/bootstrap.vpp +++ b/build/frr/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp index dbb76d7..2d275be 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/srv6.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-1/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..415dc25 --- /dev/null +++ b/build/frr/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 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/bootstrap.vpp +++ b/build/frr/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp index efb8a14..c77093f 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/srv6.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-2/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..a0aef5a --- /dev/null +++ b/build/frr/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 diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/bootstrap.vpp +++ b/build/frr/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp index ba633e8..bc0dc6f 100644 --- a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp +++ b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/srv6.vpp b/build/frr/hvn0.lab.ipng.ch/vpp0-3/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..bf8da21 --- /dev/null +++ b/build/frr/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 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/bootstrap.vpp +++ b/build/frr/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp index 4d39398..008d9e1 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/srv6.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-0/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..c4d9152 --- /dev/null +++ b/build/frr/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 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/bootstrap.vpp +++ b/build/frr/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp index c22db9d..01d239b 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/srv6.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-1/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..a45e35d --- /dev/null +++ b/build/frr/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 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/bootstrap.vpp +++ b/build/frr/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp index 3211182..c45d98c 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/srv6.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-2/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..49ef3c5 --- /dev/null +++ b/build/frr/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 diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp index d1e8885..e2df372 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/bootstrap.vpp +++ b/build/frr/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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp index bb07712..4968272 100644 --- a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp +++ b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/loopback.vpp @@ -2,5 +2,3 @@ comment { Create a loopback interface } 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 - diff --git a/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/srv6.vpp b/build/frr/hvn1.lab.ipng.ch/vpp1-3/etc/vpp/config/srv6.vpp new file mode 100644 index 0000000..034339b --- /dev/null +++ b/build/frr/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 diff --git a/config/hvn0.lab.ipng.ch.yaml b/config/hvn0.lab.ipng.ch.yaml index 144a49a..c02f0ec 100644 --- a/config/hvn0.lab.ipng.ch.yaml +++ b/config/hvn0.lab.ipng.ch.yaml @@ -2,6 +2,7 @@ lab: id: 0 ipv4: 192.168.10.0/24 ipv6: 2001:678:d78:200::/60 + srv6: 2001:678:d78:20f::/64 nameserver: addresses: [ 192.168.10.4, 2001:678:d78:201::ffff ] hypervisor: hvn0.lab.ipng.ch diff --git a/config/hvn1.lab.ipng.ch.yaml b/config/hvn1.lab.ipng.ch.yaml index 2d0250a..aa2af4e 100644 --- a/config/hvn1.lab.ipng.ch.yaml +++ b/config/hvn1.lab.ipng.ch.yaml @@ -2,6 +2,7 @@ lab: id: 1 ipv4: 192.168.11.0/24 ipv6: 2001:678:d78:210::/60 + srv6: 2001:678:d78:21f::/64 nameserver: addresses: [ 192.168.11.4, 2001:678:d78:211::ffff ] hypervisor: hvn1.lab.ipng.ch diff --git a/create b/create index 4f56be4..19b5411 100755 --- a/create +++ b/create @@ -15,7 +15,7 @@ ## * Unmount the staging directories ## * Start the VMs -BASE=${BASE:=vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-trixie-disk0@20250929-release} +BASE=${BASE:=vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-trixie-disk0@20260211-release} BUILD=${BUILD:=frr} ## or bird LAB=${LAB:=0} diff --git a/generate b/generate index cc6fa76..8559a32 100755 --- a/generate +++ b/generate @@ -151,6 +151,7 @@ def create_node(lab, node_id, node_type): v6_base, v6_plen = lab["mgmt"]["ipv6"].split("/") lo4_base = lab["ipv4"].split("/")[0] lo6_base = lab["ipv6"].split("/")[0] + srv6_base = lab["srv6"].split("/")[0] total_nodes = 0 for nt, nc in lab["nodes"].items(): if nt == node_type: @@ -184,6 +185,7 @@ def create_node(lab, node_id, node_type): "ipv4": "%s/32" % (ipaddress.IPv4Address(lo4_base) + node_id), "ipv6": "%s/128" % (ipaddress.IPv6Address(lo6_base) + node_id), }, + "srv6": "%s" % (ipaddress.IPv6Address(srv6_base) + (node_id<<16)), } return ret diff --git a/overlays/_common/vpp/etc/vpp/bootstrap.vpp.j2 b/overlays/_common/vpp/etc/vpp/bootstrap.vpp.j2 index 8a7b359..19dec01 100644 --- a/overlays/_common/vpp/etc/vpp/bootstrap.vpp.j2 +++ b/overlays/_common/vpp/etc/vpp/bootstrap.vpp.j2 @@ -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/srv6.vpp exec /etc/vpp/config/sflow.vpp comment { exec /etc/vpp/config/flowprobe.vpp } diff --git a/overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2 b/overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2 index 827f1f1..d1965c0 100644 --- a/overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2 +++ b/overlays/_common/vpp/etc/vpp/config/loopback.vpp.j2 @@ -2,6 +2,4 @@ comment { Create a loopback interface } create loopback interface instance 0 set interface state loop0 up set interface ip address loop0 {{ node.loopback.ipv4 }} -set interface ip address loop0 {{ node.loopback.ipv6 }} - diff --git a/overlays/_common/vpp/etc/vpp/config/srv6.vpp.j2 b/overlays/_common/vpp/etc/vpp/config/srv6.vpp.j2 new file mode 100644 index 0000000..06402c1 --- /dev/null +++ b/overlays/_common/vpp/etc/vpp/config/srv6.vpp.j2 @@ -0,0 +1,3 @@ +set sr encaps source addr {{ node.loopback.ipv6.split('/')[0] }} +sr localsid address {{ node.srv6 }} behavior end + diff --git a/overlays/bird/vpp/etc/bird/core/static.conf.j2 b/overlays/bird/vpp/etc/bird/core/static.conf.j2 index 8dc31c5..a00603c 100644 --- a/overlays/bird/vpp/etc/bird/core/static.conf.j2 +++ b/overlays/bird/vpp/etc/bird/core/static.conf.j2 @@ -7,6 +7,7 @@ protocol static static4 { protocol static static6 { ipv6 { export all; }; route {{lab.ipv6}} unreachable; + route {{node.srv6}}/112 unreachable; # route 2001:db8:cafe::/48 via 2001:db8::1; }