From 9b9961e40c4d35236fb7a0eafa703ca23f8f5895 Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Sun, 27 Nov 2022 15:33:25 +0000 Subject: [PATCH] Bump version to 20221128; Install default into OSPF; Refactor bird file structure --- .../vpp0-0/etc/bird/bird.conf | 9 ++++---- .../vpp0-0/etc/bird/{ => core}/bfd.conf | 0 .../bird => vpp0-0/etc/bird/core}/ospf.conf | 4 ++-- .../bird => vpp0-0/etc/bird/core}/static.conf | 6 +++++- .../vpp0-0/etc/bird/ibgp.conf | 1 - .../vpp0-0/etc/bird/manual.conf | 1 + .../vpp0-1/etc/bird/bird.conf | 9 ++++---- .../vpp0-1/etc/bird/{ => core}/bfd.conf | 0 .../bird => vpp0-1/etc/bird/core}/ospf.conf | 4 ++-- .../vpp0-1/etc/bird/{ => core}/static.conf | 4 +++- .../vpp0-1/etc/bird/ibgp.conf | 1 - .../vpp0-1/etc/bird/manual.conf | 1 + .../vpp0-2/etc/bird/bird.conf | 9 ++++---- .../vpp0-2/etc/bird/{ => core}/bfd.conf | 0 .../vpp0-2/etc/bird/{ => core}/ospf.conf | 4 ++-- .../vpp0-2/etc/bird/{ => core}/static.conf | 4 +++- .../vpp0-2/etc/bird/ibgp.conf | 1 - .../vpp0-2/etc/bird/manual.conf | 1 + .../vpp0-3/etc/bird/bird.conf | 9 ++++---- .../vpp0-3/etc/bird/{ => core}/bfd.conf | 0 .../vpp0-3/etc/bird/{ => core}/ospf.conf | 4 ++-- .../bird => vpp0-3/etc/bird/core}/static.conf | 4 +++- .../vpp0-3/etc/bird/ibgp.conf | 1 - .../vpp0-3/etc/bird/manual.conf | 1 + .../vpp1-0/etc/bird/bird.conf | 9 ++++---- .../vpp1-0/etc/bird/{ => core}/bfd.conf | 0 .../vpp1-0/etc/bird/core/ospf.conf | 21 +++++++++++++++++++ .../bird => vpp1-0/etc/bird/core}/static.conf | 6 +++++- .../vpp1-0/etc/bird/ibgp.conf | 1 - .../vpp1-0/etc/bird/manual.conf | 1 + .../vpp1-0/etc/bird/ospf.conf | 21 ------------------- .../vpp1-1/etc/bird/bird.conf | 9 ++++---- .../vpp1-1/etc/bird/{ => core}/bfd.conf | 0 .../vpp1-1/etc/bird/core/ospf.conf | 21 +++++++++++++++++++ .../bird => vpp1-1/etc/bird/core}/static.conf | 4 +++- .../vpp1-1/etc/bird/ibgp.conf | 1 - .../vpp1-1/etc/bird/manual.conf | 1 + .../vpp1-1/etc/bird/ospf.conf | 21 ------------------- .../vpp1-2/etc/bird/bird.conf | 9 ++++---- .../vpp1-2/etc/bird/{ => core}/bfd.conf | 0 .../vpp1-2/etc/bird/core/ospf.conf | 21 +++++++++++++++++++ .../bird => vpp1-2/etc/bird/core}/static.conf | 4 +++- .../vpp1-2/etc/bird/ibgp.conf | 1 - .../vpp1-2/etc/bird/manual.conf | 1 + .../vpp1-2/etc/bird/ospf.conf | 21 ------------------- .../vpp1-3/etc/bird/bird.conf | 9 ++++---- .../vpp1-3/etc/bird/{ => core}/bfd.conf | 0 .../vpp1-3/etc/bird/core/ospf.conf | 21 +++++++++++++++++++ .../bird => vpp1-3/etc/bird/core}/static.conf | 4 +++- .../vpp1-3/etc/bird/ibgp.conf | 1 - .../vpp1-3/etc/bird/manual.conf | 1 + .../vpp1-3/etc/bird/ospf.conf | 21 ------------------- .../vpp2-0/etc/bird/bird.conf | 9 ++++---- .../vpp2-0/etc/bird/{ => core}/bfd.conf | 0 .../vpp2-0/etc/bird/core/ospf.conf | 21 +++++++++++++++++++ .../bird => vpp2-0/etc/bird/core}/static.conf | 6 +++++- .../vpp2-0/etc/bird/ibgp.conf | 1 - .../vpp2-0/etc/bird/manual.conf | 1 + .../vpp2-0/etc/bird/ospf.conf | 21 ------------------- .../vpp2-1/etc/bird/bird.conf | 9 ++++---- .../vpp2-1/etc/bird/{ => core}/bfd.conf | 0 .../vpp2-1/etc/bird/core/ospf.conf | 21 +++++++++++++++++++ .../bird => vpp2-1/etc/bird/core}/static.conf | 4 +++- .../vpp2-1/etc/bird/ibgp.conf | 1 - .../vpp2-1/etc/bird/manual.conf | 1 + .../vpp2-1/etc/bird/ospf.conf | 21 ------------------- .../vpp2-2/etc/bird/bird.conf | 9 ++++---- .../vpp2-2/etc/bird/{ => core}/bfd.conf | 0 .../vpp2-2/etc/bird/core/ospf.conf | 21 +++++++++++++++++++ .../bird => vpp2-2/etc/bird/core}/static.conf | 4 +++- .../vpp2-2/etc/bird/ibgp.conf | 1 - .../vpp2-2/etc/bird/manual.conf | 1 + .../vpp2-2/etc/bird/ospf.conf | 21 ------------------- .../vpp2-3/etc/bird/bird.conf | 9 ++++---- .../vpp2-3/etc/bird/{ => core}/bfd.conf | 0 .../vpp2-3/etc/bird/core/ospf.conf | 21 +++++++++++++++++++ .../bird => vpp2-3/etc/bird/core}/static.conf | 4 +++- .../vpp2-3/etc/bird/ibgp.conf | 1 - .../vpp2-3/etc/bird/manual.conf | 1 + .../vpp2-3/etc/bird/ospf.conf | 21 ------------------- create | 2 +- overlays/bird/common/etc/bird/bird.conf.j2 | 10 +++++---- .../common/etc/bird/{ => core}/bfd.conf.j2 | 0 .../common/etc/bird/{ => core}/ospf.conf.j2 | 4 ++-- .../common/etc/bird/{ => core}/static.conf.j2 | 9 ++++++++ overlays/bird/common/etc/bird/ibgp.conf.j2 | 1 - overlays/bird/common/etc/bird/manual.conf.j2 | 1 + 87 files changed, 309 insertions(+), 256 deletions(-) rename build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/{ => core}/bfd.conf (100%) rename build/default/hvn0.lab.ipng.ch/{vpp0-1/etc/bird => vpp0-0/etc/bird/core}/ospf.conf (79%) rename build/default/hvn0.lab.ipng.ch/{vpp0-3/etc/bird => vpp0-0/etc/bird/core}/static.conf (76%) delete mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ibgp.conf create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/manual.conf rename build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/{ => core}/bfd.conf (100%) rename build/default/hvn0.lab.ipng.ch/{vpp0-0/etc/bird => vpp0-1/etc/bird/core}/ospf.conf (79%) rename build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/{ => core}/static.conf (98%) delete mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ibgp.conf create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/manual.conf rename build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/{ => core}/bfd.conf (100%) rename build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/{ => core}/ospf.conf (79%) rename build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/{ => core}/static.conf (98%) delete mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ibgp.conf create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/manual.conf rename build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/{ => core}/bfd.conf (100%) rename build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/{ => core}/ospf.conf (79%) rename build/default/hvn0.lab.ipng.ch/{vpp0-0/etc/bird => vpp0-3/etc/bird/core}/static.conf (98%) delete mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ibgp.conf create mode 100644 build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/manual.conf rename build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/{ => core}/bfd.conf (100%) create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf rename build/default/hvn1.lab.ipng.ch/{vpp1-3/etc/bird => vpp1-0/etc/bird/core}/static.conf (76%) delete mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/ibgp.conf create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/manual.conf delete mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/ospf.conf rename build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/{ => core}/bfd.conf (100%) create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf rename build/default/hvn1.lab.ipng.ch/{vpp1-0/etc/bird => vpp1-1/etc/bird/core}/static.conf (98%) delete mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/ibgp.conf create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/manual.conf delete mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/ospf.conf rename build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/{ => core}/bfd.conf (100%) create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf rename build/default/hvn1.lab.ipng.ch/{vpp1-1/etc/bird => vpp1-2/etc/bird/core}/static.conf (98%) delete mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/ibgp.conf create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/manual.conf delete mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/ospf.conf rename build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/{ => core}/bfd.conf (100%) create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf rename build/default/hvn1.lab.ipng.ch/{vpp1-2/etc/bird => vpp1-3/etc/bird/core}/static.conf (98%) delete mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/ibgp.conf create mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/manual.conf delete mode 100644 build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/ospf.conf rename build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/{ => core}/bfd.conf (100%) create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf rename build/default/hvn2.lab.ipng.ch/{vpp2-3/etc/bird => vpp2-0/etc/bird/core}/static.conf (76%) delete mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/ibgp.conf create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/manual.conf delete mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/ospf.conf rename build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/{ => core}/bfd.conf (100%) create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf rename build/default/hvn2.lab.ipng.ch/{vpp2-0/etc/bird => vpp2-1/etc/bird/core}/static.conf (98%) delete mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/ibgp.conf create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/manual.conf delete mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/ospf.conf rename build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/{ => core}/bfd.conf (100%) create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf rename build/default/hvn2.lab.ipng.ch/{vpp2-1/etc/bird => vpp2-2/etc/bird/core}/static.conf (98%) delete mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/ibgp.conf create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/manual.conf delete mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/ospf.conf rename build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/{ => core}/bfd.conf (100%) create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf rename build/default/hvn2.lab.ipng.ch/{vpp2-2/etc/bird => vpp2-3/etc/bird/core}/static.conf (98%) delete mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/ibgp.conf create mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/manual.conf delete mode 100644 build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/ospf.conf rename overlays/bird/common/etc/bird/{ => core}/bfd.conf.j2 (100%) rename overlays/bird/common/etc/bird/{ => core}/ospf.conf.j2 (79%) rename overlays/bird/common/etc/bird/{ => core}/static.conf.j2 (60%) delete mode 100644 overlays/bird/common/etc/bird/ibgp.conf.j2 create mode 100644 overlays/bird/common/etc/bird/manual.conf.j2 diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bird.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bird.conf index c6cd170..80b1a97 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bird.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp0-0 router id 192.168.10.0; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bfd.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/bfd.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/bfd.conf diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ospf.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf similarity index 79% rename from build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ospf.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/ospf.conf index 98a97f1..8936aea 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ospf.conf +++ b/build/default/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; import all; }; + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); 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; import all; }; + ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/static.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf similarity index 76% rename from build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/static.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf index 6ec5480..b3736f1 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/static.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/core/static.conf @@ -2,10 +2,14 @@ protocol static static4 { ipv4 { export all; }; # route 192.0.2.0/24 via 10.0.0.1; route 192.168.10.0/24 unreachable; + + route 0.0.0.0/0 via 192.168.10.4; } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:200::/60 unreachable; -} \ No newline at end of file + + route ::/0 via 2001:678:d78:201::ffff; +} diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ibgp.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/manual.conf b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/manual.conf new file mode 100644 index 0000000..b0e3f24 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp0-0 \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bird.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bird.conf index 0aaa7dd..762bc37 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bird.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp0-1 router id 192.168.10.1; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bfd.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/bfd.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/bfd.conf diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ospf.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf similarity index 79% rename from build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ospf.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/ospf.conf index 98a97f1..8936aea 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/ospf.conf +++ b/build/default/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; import all; }; + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); 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; import all; }; + ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/static.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf similarity index 98% rename from build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/static.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf index 6ec5480..4bbdd97 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/static.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/core/static.conf @@ -2,10 +2,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; + } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:200::/60 unreachable; -} \ No newline at end of file + +} diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ibgp.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/manual.conf b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/manual.conf new file mode 100644 index 0000000..4fbb194 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-1/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp0-1 \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bird.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bird.conf index 7609eed..efcd23a 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bird.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp0-2 router id 192.168.10.2; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bfd.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/bfd.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/bfd.conf diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ospf.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf similarity index 79% rename from build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ospf.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/ospf.conf index 98a97f1..8936aea 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ospf.conf +++ b/build/default/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; import all; }; + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); 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; import all; }; + ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/static.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf similarity index 98% rename from build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/static.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf index 6ec5480..4bbdd97 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/static.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/core/static.conf @@ -2,10 +2,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; + } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:200::/60 unreachable; -} \ No newline at end of file + +} diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ibgp.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/manual.conf b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/manual.conf new file mode 100644 index 0000000..c70e464 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-2/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp0-2 \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bird.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bird.conf index c4e463e..6ce4a70 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bird.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp0-3 router id 192.168.10.3; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bfd.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/bfd.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/bfd.conf diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ospf.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf similarity index 79% rename from build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ospf.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/ospf.conf index 98a97f1..8936aea 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ospf.conf +++ b/build/default/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; import all; }; + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); 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; import all; }; + ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/static.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf similarity index 98% rename from build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/static.conf rename to build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf index 6ec5480..4bbdd97 100644 --- a/build/default/hvn0.lab.ipng.ch/vpp0-0/etc/bird/static.conf +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/core/static.conf @@ -2,10 +2,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; + } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:200::/60 unreachable; -} \ No newline at end of file + +} diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ibgp.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/manual.conf b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/manual.conf new file mode 100644 index 0000000..259e668 --- /dev/null +++ b/build/default/hvn0.lab.ipng.ch/vpp0-3/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp0-3 \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf index e605ed7..c5f6987 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp1-0 router id 192.168.11.0; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bfd.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/bfd.conf rename to build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/bfd.conf diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf new file mode 100644 index 0000000..8936aea --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/ospf.conf @@ -0,0 +1,21 @@ +protocol ospf v2 ospf4 { + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + 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; }; + area 0 { + interface "loop0" { stub yes; }; + interface "e0" { type pointopoint; cost 5; bfd off; }; + interface "e1" { type pointopoint; cost 5; bfd off; }; + interface "e2" { type pointopoint; cost 5; bfd off; }; + interface "e3" { type pointopoint; cost 5; bfd off; }; + }; +} \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/static.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf similarity index 76% rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/static.conf rename to build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf index be1b865..0f8d5a8 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/static.conf +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/core/static.conf @@ -2,10 +2,14 @@ protocol static static4 { ipv4 { export all; }; # route 192.0.2.0/24 via 10.0.0.1; route 192.168.11.0/24 unreachable; + + route 0.0.0.0/0 via 192.168.11.4; } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:210::/60 unreachable; -} \ No newline at end of file + + route ::/0 via 2001:678:d78:211::ffff; +} diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/ibgp.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/manual.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/manual.conf new file mode 100644 index 0000000..7147ca3 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp1-0 \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/ospf.conf b/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/ospf.conf deleted file mode 100644 index 98a97f1..0000000 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/ospf.conf +++ /dev/null @@ -1,21 +0,0 @@ -protocol ospf v2 ospf4 { - ipv4 { export where source = RTS_DEVICE; import all; }; - 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; import all; }; - area 0 { - interface "loop0" { stub yes; }; - interface "e0" { type pointopoint; cost 5; bfd off; }; - interface "e1" { type pointopoint; cost 5; bfd off; }; - interface "e2" { type pointopoint; cost 5; bfd off; }; - interface "e3" { type pointopoint; cost 5; bfd off; }; - }; -} \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf index b890e25..d2ebf83 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp1-1 router id 192.168.11.1; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bfd.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/bfd.conf rename to build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/bfd.conf diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf new file mode 100644 index 0000000..8936aea --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/ospf.conf @@ -0,0 +1,21 @@ +protocol ospf v2 ospf4 { + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + 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; }; + area 0 { + interface "loop0" { stub yes; }; + interface "e0" { type pointopoint; cost 5; bfd off; }; + interface "e1" { type pointopoint; cost 5; bfd off; }; + interface "e2" { type pointopoint; cost 5; bfd off; }; + interface "e3" { type pointopoint; cost 5; bfd off; }; + }; +} \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/static.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf similarity index 98% rename from build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/static.conf rename to build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf index be1b865..5b2d1d8 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-0/etc/bird/static.conf +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/core/static.conf @@ -2,10 +2,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; + } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:210::/60 unreachable; -} \ No newline at end of file + +} diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/ibgp.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/manual.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/manual.conf new file mode 100644 index 0000000..2f6b36f --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp1-1 \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/ospf.conf b/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/ospf.conf deleted file mode 100644 index 98a97f1..0000000 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/ospf.conf +++ /dev/null @@ -1,21 +0,0 @@ -protocol ospf v2 ospf4 { - ipv4 { export where source = RTS_DEVICE; import all; }; - 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; import all; }; - area 0 { - interface "loop0" { stub yes; }; - interface "e0" { type pointopoint; cost 5; bfd off; }; - interface "e1" { type pointopoint; cost 5; bfd off; }; - interface "e2" { type pointopoint; cost 5; bfd off; }; - interface "e3" { type pointopoint; cost 5; bfd off; }; - }; -} \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf index 244b194..5dc08cc 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp1-2 router id 192.168.11.2; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bfd.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/bfd.conf rename to build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/bfd.conf diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf new file mode 100644 index 0000000..8936aea --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/ospf.conf @@ -0,0 +1,21 @@ +protocol ospf v2 ospf4 { + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + 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; }; + area 0 { + interface "loop0" { stub yes; }; + interface "e0" { type pointopoint; cost 5; bfd off; }; + interface "e1" { type pointopoint; cost 5; bfd off; }; + interface "e2" { type pointopoint; cost 5; bfd off; }; + interface "e3" { type pointopoint; cost 5; bfd off; }; + }; +} \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/static.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf similarity index 98% rename from build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/static.conf rename to build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf index be1b865..5b2d1d8 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-1/etc/bird/static.conf +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/core/static.conf @@ -2,10 +2,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; + } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:210::/60 unreachable; -} \ No newline at end of file + +} diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/ibgp.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/manual.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/manual.conf new file mode 100644 index 0000000..a9a43e8 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp1-2 \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/ospf.conf b/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/ospf.conf deleted file mode 100644 index 98a97f1..0000000 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/ospf.conf +++ /dev/null @@ -1,21 +0,0 @@ -protocol ospf v2 ospf4 { - ipv4 { export where source = RTS_DEVICE; import all; }; - 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; import all; }; - area 0 { - interface "loop0" { stub yes; }; - interface "e0" { type pointopoint; cost 5; bfd off; }; - interface "e1" { type pointopoint; cost 5; bfd off; }; - interface "e2" { type pointopoint; cost 5; bfd off; }; - interface "e3" { type pointopoint; cost 5; bfd off; }; - }; -} \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf index 1958044..a88d430 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp1-3 router id 192.168.11.3; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bfd.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/bfd.conf rename to build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/bfd.conf diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf new file mode 100644 index 0000000..8936aea --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/ospf.conf @@ -0,0 +1,21 @@ +protocol ospf v2 ospf4 { + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + 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; }; + area 0 { + interface "loop0" { stub yes; }; + interface "e0" { type pointopoint; cost 5; bfd off; }; + interface "e1" { type pointopoint; cost 5; bfd off; }; + interface "e2" { type pointopoint; cost 5; bfd off; }; + interface "e3" { type pointopoint; cost 5; bfd off; }; + }; +} \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/static.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf similarity index 98% rename from build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/static.conf rename to build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf index be1b865..5b2d1d8 100644 --- a/build/default/hvn1.lab.ipng.ch/vpp1-2/etc/bird/static.conf +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/core/static.conf @@ -2,10 +2,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; + } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:210::/60 unreachable; -} \ No newline at end of file + +} diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/ibgp.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/manual.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/manual.conf new file mode 100644 index 0000000..f7b6725 --- /dev/null +++ b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp1-3 \ No newline at end of file diff --git a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/ospf.conf b/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/ospf.conf deleted file mode 100644 index 98a97f1..0000000 --- a/build/default/hvn1.lab.ipng.ch/vpp1-3/etc/bird/ospf.conf +++ /dev/null @@ -1,21 +0,0 @@ -protocol ospf v2 ospf4 { - ipv4 { export where source = RTS_DEVICE; import all; }; - 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; import all; }; - area 0 { - interface "loop0" { stub yes; }; - interface "e0" { type pointopoint; cost 5; bfd off; }; - interface "e1" { type pointopoint; cost 5; bfd off; }; - interface "e2" { type pointopoint; cost 5; bfd off; }; - interface "e3" { type pointopoint; cost 5; bfd off; }; - }; -} \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf index b9d931f..d4ee1c8 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp2-0 router id 192.168.12.0; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bfd.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/bfd.conf rename to build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/bfd.conf diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf new file mode 100644 index 0000000..8936aea --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/ospf.conf @@ -0,0 +1,21 @@ +protocol ospf v2 ospf4 { + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + 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; }; + area 0 { + interface "loop0" { stub yes; }; + interface "e0" { type pointopoint; cost 5; bfd off; }; + interface "e1" { type pointopoint; cost 5; bfd off; }; + interface "e2" { type pointopoint; cost 5; bfd off; }; + interface "e3" { type pointopoint; cost 5; bfd off; }; + }; +} \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/static.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf similarity index 76% rename from build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/static.conf rename to build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf index 40d8b69..2f6c5e8 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/static.conf +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/core/static.conf @@ -2,10 +2,14 @@ protocol static static4 { ipv4 { export all; }; # route 192.0.2.0/24 via 10.0.0.1; route 192.168.12.0/24 unreachable; + + route 0.0.0.0/0 via 192.168.12.4; } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:220::/60 unreachable; -} \ No newline at end of file + + route ::/0 via 2001:678:d78:221::ffff; +} diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/ibgp.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/manual.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/manual.conf new file mode 100644 index 0000000..6c480b1 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp2-0 \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/ospf.conf b/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/ospf.conf deleted file mode 100644 index 98a97f1..0000000 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/ospf.conf +++ /dev/null @@ -1,21 +0,0 @@ -protocol ospf v2 ospf4 { - ipv4 { export where source = RTS_DEVICE; import all; }; - 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; import all; }; - area 0 { - interface "loop0" { stub yes; }; - interface "e0" { type pointopoint; cost 5; bfd off; }; - interface "e1" { type pointopoint; cost 5; bfd off; }; - interface "e2" { type pointopoint; cost 5; bfd off; }; - interface "e3" { type pointopoint; cost 5; bfd off; }; - }; -} \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf index 09c06b3..4ae72ba 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp2-1 router id 192.168.12.1; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bfd.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/bfd.conf rename to build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/bfd.conf diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf new file mode 100644 index 0000000..8936aea --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/ospf.conf @@ -0,0 +1,21 @@ +protocol ospf v2 ospf4 { + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + 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; }; + area 0 { + interface "loop0" { stub yes; }; + interface "e0" { type pointopoint; cost 5; bfd off; }; + interface "e1" { type pointopoint; cost 5; bfd off; }; + interface "e2" { type pointopoint; cost 5; bfd off; }; + interface "e3" { type pointopoint; cost 5; bfd off; }; + }; +} \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/static.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf similarity index 98% rename from build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/static.conf rename to build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf index 40d8b69..bc4846e 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-0/etc/bird/static.conf +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/core/static.conf @@ -2,10 +2,12 @@ protocol static static4 { ipv4 { export all; }; # route 192.0.2.0/24 via 10.0.0.1; route 192.168.12.0/24 unreachable; + } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:220::/60 unreachable; -} \ No newline at end of file + +} diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/ibgp.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/manual.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/manual.conf new file mode 100644 index 0000000..71c6837 --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp2-1 \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/ospf.conf b/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/ospf.conf deleted file mode 100644 index 98a97f1..0000000 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/ospf.conf +++ /dev/null @@ -1,21 +0,0 @@ -protocol ospf v2 ospf4 { - ipv4 { export where source = RTS_DEVICE; import all; }; - 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; import all; }; - area 0 { - interface "loop0" { stub yes; }; - interface "e0" { type pointopoint; cost 5; bfd off; }; - interface "e1" { type pointopoint; cost 5; bfd off; }; - interface "e2" { type pointopoint; cost 5; bfd off; }; - interface "e3" { type pointopoint; cost 5; bfd off; }; - }; -} \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf index cdbfdbe..03acf25 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp2-2 router id 192.168.12.2; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bfd.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/bfd.conf rename to build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/bfd.conf diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf new file mode 100644 index 0000000..8936aea --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/ospf.conf @@ -0,0 +1,21 @@ +protocol ospf v2 ospf4 { + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + 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; }; + area 0 { + interface "loop0" { stub yes; }; + interface "e0" { type pointopoint; cost 5; bfd off; }; + interface "e1" { type pointopoint; cost 5; bfd off; }; + interface "e2" { type pointopoint; cost 5; bfd off; }; + interface "e3" { type pointopoint; cost 5; bfd off; }; + }; +} \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/static.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf similarity index 98% rename from build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/static.conf rename to build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf index 40d8b69..bc4846e 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-1/etc/bird/static.conf +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/core/static.conf @@ -2,10 +2,12 @@ protocol static static4 { ipv4 { export all; }; # route 192.0.2.0/24 via 10.0.0.1; route 192.168.12.0/24 unreachable; + } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:220::/60 unreachable; -} \ No newline at end of file + +} diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/ibgp.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/manual.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/manual.conf new file mode 100644 index 0000000..a66d4fa --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp2-2 \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/ospf.conf b/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/ospf.conf deleted file mode 100644 index 98a97f1..0000000 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/ospf.conf +++ /dev/null @@ -1,21 +0,0 @@ -protocol ospf v2 ospf4 { - ipv4 { export where source = RTS_DEVICE; import all; }; - 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; import all; }; - area 0 { - interface "loop0" { stub yes; }; - interface "e0" { type pointopoint; cost 5; bfd off; }; - interface "e1" { type pointopoint; cost 5; bfd off; }; - interface "e2" { type pointopoint; cost 5; bfd off; }; - interface "e3" { type pointopoint; cost 5; bfd off; }; - }; -} \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf index 6df3a7e..c0b3c65 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bird.conf @@ -1,3 +1,4 @@ +## Bird2 configuration for vpp2-3 router id 192.168.12.3; protocol device { scan time 30; } @@ -13,7 +14,7 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; \ No newline at end of file +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bfd.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/bfd.conf similarity index 100% rename from build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/bfd.conf rename to build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/bfd.conf diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf new file mode 100644 index 0000000..8936aea --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/ospf.conf @@ -0,0 +1,21 @@ +protocol ospf v2 ospf4 { + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; + 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; }; + area 0 { + interface "loop0" { stub yes; }; + interface "e0" { type pointopoint; cost 5; bfd off; }; + interface "e1" { type pointopoint; cost 5; bfd off; }; + interface "e2" { type pointopoint; cost 5; bfd off; }; + interface "e3" { type pointopoint; cost 5; bfd off; }; + }; +} \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/static.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf similarity index 98% rename from build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/static.conf rename to build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf index 40d8b69..bc4846e 100644 --- a/build/default/hvn2.lab.ipng.ch/vpp2-2/etc/bird/static.conf +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/core/static.conf @@ -2,10 +2,12 @@ protocol static static4 { ipv4 { export all; }; # route 192.0.2.0/24 via 10.0.0.1; route 192.168.12.0/24 unreachable; + } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route 2001:678:d78:220::/60 unreachable; -} \ No newline at end of file + +} diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/ibgp.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/ibgp.conf deleted file mode 100644 index 69dd4d0..0000000 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/ibgp.conf +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/manual.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/manual.conf new file mode 100644 index 0000000..cc694dc --- /dev/null +++ b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/manual.conf @@ -0,0 +1 @@ +## Manual configuration for vpp2-3 \ No newline at end of file diff --git a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/ospf.conf b/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/ospf.conf deleted file mode 100644 index 98a97f1..0000000 --- a/build/default/hvn2.lab.ipng.ch/vpp2-3/etc/bird/ospf.conf +++ /dev/null @@ -1,21 +0,0 @@ -protocol ospf v2 ospf4 { - ipv4 { export where source = RTS_DEVICE; import all; }; - 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; import all; }; - area 0 { - interface "loop0" { stub yes; }; - interface "e0" { type pointopoint; cost 5; bfd off; }; - interface "e1" { type pointopoint; cost 5; bfd off; }; - interface "e2" { type pointopoint; cost 5; bfd off; }; - interface "e3" { type pointopoint; cost 5; bfd off; }; - }; -} \ No newline at end of file diff --git a/create b/create index d6bf729..65c31a9 100755 --- a/create +++ b/create @@ -15,7 +15,7 @@ ## * Unmount the staging directories ## * Start the VMs -BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20221127-release} +BASE=${BASE:=ssd-vol0/hvn0.chbtl0.ipng.ch/ssd-vol0/vpp-proto-disk0@20221128-release} BUILD=${BUILD:=default} LAB=${LAB:=0} diff --git a/overlays/bird/common/etc/bird/bird.conf.j2 b/overlays/bird/common/etc/bird/bird.conf.j2 index 083d5ca..d91479f 100644 --- a/overlays/bird/common/etc/bird/bird.conf.j2 +++ b/overlays/bird/common/etc/bird/bird.conf.j2 @@ -1,3 +1,4 @@ +## Bird2 configuration for {{ node.hostname }} router id {{ node.loopback.ipv4.split("/")[0] }}; protocol device { scan time 30; } @@ -13,7 +14,8 @@ protocol kernel kernel6 { scan time 300; } -include "static.conf"; -include "bfd.conf"; -include "ospf.conf"; -include "ibgp.conf"; +include "core/static.conf"; +include "core/bfd.conf"; +include "core/ospf.conf"; +include "manual.conf"; + diff --git a/overlays/bird/common/etc/bird/bfd.conf.j2 b/overlays/bird/common/etc/bird/core/bfd.conf.j2 similarity index 100% rename from overlays/bird/common/etc/bird/bfd.conf.j2 rename to overlays/bird/common/etc/bird/core/bfd.conf.j2 diff --git a/overlays/bird/common/etc/bird/ospf.conf.j2 b/overlays/bird/common/etc/bird/core/ospf.conf.j2 similarity index 79% rename from overlays/bird/common/etc/bird/ospf.conf.j2 rename to overlays/bird/common/etc/bird/core/ospf.conf.j2 index f29d79f..86241cc 100644 --- a/overlays/bird/common/etc/bird/ospf.conf.j2 +++ b/overlays/bird/common/etc/bird/core/ospf.conf.j2 @@ -1,5 +1,5 @@ protocol ospf v2 ospf4 { - ipv4 { export where source = RTS_DEVICE; import all; }; + ipv4 { export where (source = RTS_DEVICE || source = RTS_STATIC); 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; import all; }; + ipv6 { export where (source = RTS_DEVICE || source = RTS_STATIC); import all; }; area 0 { interface "loop0" { stub yes; }; interface "e0" { type pointopoint; cost 5; bfd off; }; diff --git a/overlays/bird/common/etc/bird/static.conf.j2 b/overlays/bird/common/etc/bird/core/static.conf.j2 similarity index 60% rename from overlays/bird/common/etc/bird/static.conf.j2 rename to overlays/bird/common/etc/bird/core/static.conf.j2 index 4dc7334..6b3b133 100644 --- a/overlays/bird/common/etc/bird/static.conf.j2 +++ b/overlays/bird/common/etc/bird/core/static.conf.j2 @@ -2,10 +2,19 @@ protocol static static4 { ipv4 { export all; }; # route 192.0.2.0/24 via 10.0.0.1; route {{lab.ipv4}} unreachable; + +{% if node.id == 0 %} + route 0.0.0.0/0 via 192.168.{{10+lab.id}}.4; +{% endif %} } protocol static static6 { ipv6 { export all; }; # route 2001:db8:cafe::/48 via 2001:db8::1;; route {{lab.ipv6}} unreachable; + +{% if node.id == 0 %} + route ::/0 via 2001:678:d78:2{{lab.id}}1::ffff; +{% endif %} } + diff --git a/overlays/bird/common/etc/bird/ibgp.conf.j2 b/overlays/bird/common/etc/bird/ibgp.conf.j2 deleted file mode 100644 index 4f17e36..0000000 --- a/overlays/bird/common/etc/bird/ibgp.conf.j2 +++ /dev/null @@ -1 +0,0 @@ -# NOTE(ipng): Not created yet diff --git a/overlays/bird/common/etc/bird/manual.conf.j2 b/overlays/bird/common/etc/bird/manual.conf.j2 new file mode 100644 index 0000000..fcd77f3 --- /dev/null +++ b/overlays/bird/common/etc/bird/manual.conf.j2 @@ -0,0 +1 @@ +## Manual configuration for {{ node.hostname }}