Skip to content

[READY] - nixos-modules.routers.*: frr updates and ipv6 tests #1104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kylerisse merged 9 commits into from
Feb 27, 2026
Merged

[READY] - nixos-modules.routers.*: frr updates and ipv6 tests #1104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8cfc851
nixos-modules.router.*: router vlan ipv6 addresses
sarcasticadmin Feb 26, 2026
2b01c21
nixos-modules.services.frr: ospfv6
sarcasticadmin Feb 26, 2026
3fe720d
nixos-modules.routers{expo,conf}: param trunks
kylerisse Feb 26, 2026
eebaba6
nix.tests.routers: add wait_until_succeeds to wait on learned routes
sarcasticadmin Feb 27, 2026
90f7980
nix.tests.routers: check direct links
sarcasticadmin Feb 27, 2026
96abece
nix.tests.routers: check additional services
sarcasticadmin Feb 27, 2026
b4fac7a
nix.test.routeres: check ipv6 links that require routing
sarcasticadmin Feb 27, 2026
5a30c13
nixos-modules.routers.border: interpolate WANInterface for systemd-ne…
sarcasticadmin Feb 27, 2026
22836aa
nixos-modules.routers.expo: interpolate WANInterface for systemd-netw…
sarcasticadmin Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nix/nixos-configurations/router-conf/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
enable = true;
frrBorderInterface = "fiber0";
frrExpoInterface = "fiber1";
trunkInterfaces = [ "copper0" ];
};
services.ssh.enable = true;
services.alloy = {
Expand Down
1 change: 1 addition & 0 deletions nix/nixos-configurations/router-expo/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
enable = true;
frrBorderInterface = "fiber0";
frrConferenceInterface = "fiber1";
trunkInterfaces = [ "copper0" ];
};
services.ssh.enable = true;
services.alloy = {
Expand Down
7 changes: 5 additions & 2 deletions nix/nixos-modules/routers/border.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,20 +129,22 @@ in
networkConfig.DHCP = false;
address = [
"172.20.1.1/24"
"2001:470:f026:901::1/64"
];
};
"50-bridge902" = {
matchConfig.Name = "bridge902";
networkConfig.DHCP = false;
address = [
"172.20.2.1/24"
"2001:470:f026:902::1/64"
];
};
}
(mkIf (!cfg.staticWANEnable) {
# temporary for testing at various sites
# will be static for show
"10-nat-dhcp" = {
"10-${cfg.WANInterface}" = {
matchConfig.Name = cfg.WANInterface;
enable = true;
networkConfig = {
Expand All @@ -155,7 +157,7 @@ in
})

(mkIf cfg.staticWANEnable {
"10-nat-static" = {
"10-${cfg.WANInterface}" = {
matchConfig.Name = cfg.WANInterface;
networkConfig.DHCP = false;
address = [
Expand Down Expand Up @@ -195,6 +197,7 @@ in
"bridge901" # cf
"bridge902" # expo
];
# service.frr.passive-interface add 103 and 104 later
};
};
}
Loading
Loading