From 22b17f5db0ac32399cf22ec231c07f0561e7d3ba Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Sun, 10 Mar 2024 16:19:41 +0000 Subject: [PATCH] Add babel (commented out), allow RTS_BABEL into ospf, remove hvn2 user key, rebuild --- .../bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bird.conf | 1 + .../vpp0-0/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bird.conf | 1 + .../vpp0-1/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bird.conf | 1 + .../vpp0-2/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bird.conf | 1 + .../vpp0-3/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf | 1 + .../vpp1-0/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf | 1 + .../vpp1-1/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf | 1 + .../vpp1-2/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf | 1 + .../vpp1-3/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf | 1 + .../vpp2-0/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf | 1 + .../vpp2-1/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf | 1 + .../vpp2-2/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf | 1 + .../vpp2-3/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/bird.conf | 1 + .../vpp3-0/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/bird.conf | 1 + .../vpp3-1/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/bird.conf | 1 + .../vpp3-2/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf | 4 ++-- .../bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/bird.conf | 1 + .../vpp3-3/etc/bird/core/babel.conf | 13 +++++++++++++ .../hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf | 4 ++-- config/hvn2.lab.ipng.ch.yaml | 5 ----- overlays/bird/vpp/etc/bird/bird.conf.j2 | 1 + overlays/bird/vpp/etc/bird/core/babel.conf.j2 | 13 +++++++++++++ overlays/bird/vpp/etc/bird/core/ospf.conf.j2 | 4 ++-- 52 files changed, 272 insertions(+), 39 deletions(-) create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/babel.conf create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/babel.conf create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/babel.conf create mode 100644 build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/babel.conf create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/babel.conf create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/babel.conf create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/babel.conf create mode 100644 build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/babel.conf create mode 100644 build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf create mode 100644 build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf create mode 100644 build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf create mode 100644 build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf create mode 100644 build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf create mode 100644 build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf create mode 100644 build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf create mode 100644 build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf create mode 100644 overlays/bird/vpp/etc/bird/core/babel.conf.j2 diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bird.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bird.conf index 80b1a97..fb46a8f 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bird.conf +++ b/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"; diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/babel.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bird.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bird.conf index 762bc37..bb6f6aa 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bird.conf +++ b/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"; diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/babel.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bird.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bird.conf index efcd23a..573eb16 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bird.conf +++ b/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"; diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/babel.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bird.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bird.conf index 6ce4a70..01dd525 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bird.conf +++ b/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"; diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/babel.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf +++ b/build/bird/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf index c5f6987..7165cb5 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf +++ b/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"; diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/babel.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf index d2ebf83..22887b4 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf +++ b/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"; diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/babel.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf index 5dc08cc..6845ea2 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf +++ b/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"; diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/babel.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf index a88d430..78d3417 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf +++ b/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"; diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/babel.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf +++ b/build/bird/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf index d4ee1c8..198e003 100644 --- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf @@ -17,4 +17,5 @@ protocol kernel kernel6 { include "core/static.conf"; include "core/bfd.conf"; include "core/ospf.conf"; +# include "core/babel.conf"; include "manual.conf"; diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf index 4ae72ba..3c2429a 100644 --- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf @@ -17,4 +17,5 @@ protocol kernel kernel6 { include "core/static.conf"; include "core/bfd.conf"; include "core/ospf.conf"; +# include "core/babel.conf"; include "manual.conf"; diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf index 03acf25..8c351a4 100644 --- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf @@ -17,4 +17,5 @@ protocol kernel kernel6 { include "core/static.conf"; include "core/bfd.conf"; include "core/ospf.conf"; +# include "core/babel.conf"; include "manual.conf"; diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf index c0b3c65..b4e509a 100644 --- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf @@ -17,4 +17,5 @@ protocol kernel kernel6 { include "core/static.conf"; include "core/bfd.conf"; include "core/ospf.conf"; +# include "core/babel.conf"; include "manual.conf"; diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf +++ b/build/bird/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/bird.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/bird.conf index 8ec2cc3..56662fa 100644 --- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/bird.conf +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/bird.conf @@ -17,4 +17,5 @@ protocol kernel kernel6 { include "core/static.conf"; include "core/bfd.conf"; include "core/ospf.conf"; +# include "core/babel.conf"; include "manual.conf"; diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-0/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/bird.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/bird.conf index d61b16d..7f682b9 100644 --- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/bird.conf +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/bird.conf @@ -17,4 +17,5 @@ protocol kernel kernel6 { include "core/static.conf"; include "core/bfd.conf"; include "core/ospf.conf"; +# include "core/babel.conf"; include "manual.conf"; diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-1/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/bird.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/bird.conf index 41f7a65..d3349fe 100644 --- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/bird.conf +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/bird.conf @@ -17,4 +17,5 @@ protocol kernel kernel6 { include "core/static.conf"; include "core/bfd.conf"; include "core/ospf.conf"; +# include "core/babel.conf"; include "manual.conf"; diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-2/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/bird.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/bird.conf index cdf32ad..8478195 100644 --- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/bird.conf +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/bird.conf @@ -17,4 +17,5 @@ protocol kernel kernel6 { include "core/static.conf"; include "core/bfd.conf"; include "core/ospf.conf"; +# include "core/babel.conf"; include "manual.conf"; diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf new file mode 100644 index 0000000..30839fe --- /dev/null +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/babel.conf @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} \ No newline at end of file diff --git a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf index 8936aea..5b51784 100644 --- a/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf +++ b/build/bird/hvn3.lab.ipng.ch/vpp3-3/etc/bird/core/ospf.conf @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/config/hvn2.lab.ipng.ch.yaml b/config/hvn2.lab.ipng.ch.yaml index 973809d..2ab7d88 100644 --- a/config/hvn2.lab.ipng.ch.yaml +++ b/config/hvn2.lab.ipng.ch.yaml @@ -5,8 +5,3 @@ lab: nameserver: addresses: [ 192.168.12.4, 2001:678:d78:221::ffff ] hypervisor: hvn2.lab.ipng.ch - ssh: - root: - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess - ipng: - - ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDOjALkp5HC52/kHmwqr8g9V6eUAF2bRu6rQ3ZNW4McIJyhaLMQ5TsJUh7tMQqMUqxGiBLKLehsTasbm3BLWM+I7G57EUvnR24p8gjJACGgmjjjwNzowhDwskASzvWf/ZJ10WITbHJhs2rsNGcZez5ncxuEyp8n3ekl6WiGcXKLI8r61AOliqjemT1kDDsSQNqq2yrEVVEX/PEutL8/3QVGP9ydg9kTfz06cFITjMIyUiu5MnUblr8xoo70aDBFNUh0hr4qrsXzAiLZPzOXwHdtOx5bnxv4KMJ60VMRP3LDb8v6bXPr1C8zd3ez7kefIlXP1XB1iYEVr6MMJCZQW0EAz+RzNp6eMkEWfxQ2C8qG0FQV/uFKIr6FWtcesTrrBJ9ucmiu/nHHSQlP+UkZzCpHciO6jNiown5Ku4+6F/qfplvqKgPICFdLyUDKK5dNz9v7gnDQf18I0Jrz9Z9CDBcASu3kAgTDAgNUx4hiOi4cFw9yXtl4Jjgfnctnrw8oq00= generalaccess diff --git a/overlays/bird/vpp/etc/bird/bird.conf.j2 b/overlays/bird/vpp/etc/bird/bird.conf.j2 index d91479f..d21351c 100644 --- a/overlays/bird/vpp/etc/bird/bird.conf.j2 +++ b/overlays/bird/vpp/etc/bird/bird.conf.j2 @@ -17,5 +17,6 @@ protocol kernel kernel6 { include "core/static.conf"; include "core/bfd.conf"; include "core/ospf.conf"; +# include "core/babel.conf"; include "manual.conf"; diff --git a/overlays/bird/vpp/etc/bird/core/babel.conf.j2 b/overlays/bird/vpp/etc/bird/core/babel.conf.j2 new file mode 100644 index 0000000..15784ee --- /dev/null +++ b/overlays/bird/vpp/etc/bird/core/babel.conf.j2 @@ -0,0 +1,13 @@ +protocol babel { + interface "e*" { + 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; }; +} diff --git a/overlays/bird/vpp/etc/bird/core/ospf.conf.j2 b/overlays/bird/vpp/etc/bird/core/ospf.conf.j2 index 86241cc..d6a7e8f 100644 --- a/overlays/bird/vpp/etc/bird/core/ospf.conf.j2 +++ b/overlays/bird/vpp/etc/bird/core/ospf.conf.j2 @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv4 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; @@ -10,7 +10,7 @@ protocol ospf v2 ospf4 { } protocol ospf v3 ospf6 { - ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + ipv6 { export where (source ~ [ RTS_DEVICE, RTS_STATIC, RTS_BABEL ]); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; };