From 23d580836a6639b8df8d520c239a2394e177efd2 Mon Sep 17 00:00:00 2001 From: Astro Date: Wed, 13 Mar 2024 01:10:28 +0100 Subject: [PATCH] checks/extended-next-hop: DRY --- checks/extended-next-hop.nix | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/checks/extended-next-hop.nix b/checks/extended-next-hop.nix index 83b59e2..6e6d129 100644 --- a/checks/extended-next-hop.nix +++ b/checks/extended-next-hop.nix @@ -1,13 +1,25 @@ { pkgs ? import {} }: +let + common = { pkgs, ... }: { + imports = [ ../modules ]; + networking.dn42.enable = true; + virtualisation.interfaces.enp1s0.vlan = 1; + networking.useNetworkd = true; + systemd.network.netdevs.dummy0.netdevConfig = { + Kind = "dummy"; + Name = "dummy0"; + }; + }; + +in pkgs.nixosTest rec { name = "extended-next-hop"; nodes = { foo = { - imports = [ ../modules ]; + imports = [ common ]; networking.dn42 = { - enable = true; as = 64600; addr.v4 = "172.20.0.1"; nets.v4 = [ "172.20.0.0/24" ]; @@ -21,12 +33,6 @@ pkgs.nixosTest rec { interface = "enp1s0"; }; }; - virtualisation.interfaces.enp1s0.vlan = 2; - networking.useNetworkd = true; - systemd.network.netdevs.dummy0.netdevConfig = { - Kind = "dummy"; - Name = "dummy0"; - }; networking.interfaces.enp1s0 = { ipv4.addresses = [ { address = "10.0.0.1"; @@ -49,9 +55,8 @@ pkgs.nixosTest rec { }; }; bar = { - imports = [ ../modules ]; + imports = [ common ]; networking.dn42 = { - enable = true; as = 64601; addr.v4 = "172.20.1.1"; nets.v4 = [ "172.20.1.0/24" ]; @@ -65,12 +70,6 @@ pkgs.nixosTest rec { interface = "enp1s0"; }; }; - virtualisation.interfaces.enp1s0.vlan = 2; - networking.useNetworkd = true; - systemd.network.netdevs.dummy0.netdevConfig = { - Kind = "dummy"; - Name = "dummy0"; - }; networking.interfaces.enp1s0 = { ipv4.addresses = [ { address = "10.0.0.2";