From 3b9c5635b803af8ce3fad26e2130826426633442 Mon Sep 17 00:00:00 2001
From: Daniel Barlow <dan@telent.net>
Date: Fri, 1 Sep 2023 17:55:08 +0100
Subject: [PATCH] update pppoe and wlan tests

---
 tests/pppoe/configuration.nix | 41 +++++++++++------------------------
 tests/wlan/configuration.nix  | 10 +--------
 2 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/tests/pppoe/configuration.nix b/tests/pppoe/configuration.nix
index a840629..03ac42d 100644
--- a/tests/pppoe/configuration.nix
+++ b/tests/pppoe/configuration.nix
@@ -1,20 +1,22 @@
 { config, pkgs, lib, ... } :
 let
-  inherit (pkgs.liminix.networking) interface address route;
   inherit (pkgs.liminix.services) oneshot longrun bundle target output;
+  svc = config.system.service;
 in rec {
-  services.lan4 =
-    let iface = interface { type = "hardware"; device = "eth1";};
-    in address iface { family = "inet4"; address ="192.168.19.1"; prefixLength = 24;};
+  services.lan4 = svc.network.address.build {
+    interface = config.hardware.networkInterfaces.lan;
+    family = "inet"; address ="192.168.19.1"; prefixLength = 24;
+  };
 
   imports = [
     ../../modules/ppp
     ../../modules/dnsmasq
+    ../../modules/network
   ];
 
   services.pppoe =
-    config.system.service.pppoe.build {
-      interface = interface { type = "hardware"; device = "eth0"; };
+    svc.pppoe.build {
+      interface = config.hardware.networkInterfaces.wan;
       ppp-options = [
         "debug" "+ipv6" "noauth"
         "name" "db123@a.1"
@@ -22,39 +24,22 @@ in rec {
       ];
     };
 
-  services.defaultroute4 = route {
-    name = "defaultroute";
+  services.defaultroute4 = svc.network.route.build {
     via = "$(output ${services.pppoe} address)";
     target = "default";
     dependencies = [ services.pppoe ];
   };
 
-  services.packet_forwarding =
-    let
-      iface = services.pppoe;
-      filename = "/proc/sys/net/ipv4/conf/$(output ${iface} ifname)/forwarding";
-    in oneshot {
-      name = "let-the-ip-flow";
-      up = "echo 1 > ${filename}";
-      down = "echo 0 > ${filename}";
-      dependencies = [iface];
-    };
+  services.packet_forwarding = svc.network.forward.build {
+    dependencies = [services.pppoe];
+  };
 
   services.dns =
-    config.system.service.dnsmasq.build {
+    svc.dnsmasq.build {
       interface = services.lan4;
       ranges = ["192.168.19.10,192.168.19.253"];
       domain = "fake.liminix.org";
     };
 
-  services.default = target {
-    name = "default";
-    contents = with services; [
-      config.hardware.networkInterfaces.lo
-      defaultroute4
-      packet_forwarding
-      dns
-    ];
-  };
   defaultProfile.packages = [ pkgs.hello ] ;
 }
diff --git a/tests/wlan/configuration.nix b/tests/wlan/configuration.nix
index d6d321f..6dc4b44 100644
--- a/tests/wlan/configuration.nix
+++ b/tests/wlan/configuration.nix
@@ -3,11 +3,10 @@ let
   inherit (pkgs.liminix.networking) interface address hostapd route dnsmasq;
   inherit (pkgs.liminix.services) oneshot longrun bundle target;
 in rec {
-  services.loopback = config.hardware.networkInterfaces.lo;
-
   imports = [
     ../../modules/wlan.nix
     ../../modules/hostapd
+    ../../modules/network
   ];
 
   services.hostap = config.system.service.hostapd.build {
@@ -28,12 +27,5 @@ in rec {
     };
   };
 
-  services.default = target {
-    name = "default";
-    contents = with config.services; [
-      loopback
-      hostap
-    ];
-  };
   defaultProfile.packages = with pkgs;  [ tcpdump ] ;
 }