fix: empty access-lists, prefix-lists and route-maps

Author: felbinger

checks/frr.nix

@@ -99,8 +99,8 @@ pkgs.testers.nixosTest {
     machine.wait_for_unit("frr.service")
     print(machine.succeed("vtysh -c 'show run'"))
     # TODO validate
-    machine.succeed("vtysh -c 'show ipv6 prefix-list own-6 json' | ${lib.getExe pkgs.jq}")
-    machine.succeed("vtysh -c 'show route-map import json' | ${lib.getExe pkgs.jq}")
-    machine.succeed("vtysh -c 'show route-map export json' | ${lib.getExe pkgs.jq}")
+    print(machine.succeed("vtysh -c 'show ipv6 prefix-list own-6 json' | ${lib.getExe pkgs.jq}"))
+    print(machine.succeed("vtysh -c 'show route-map import json' | ${lib.getExe pkgs.jq}"))
+    print(machine.succeed("vtysh -c 'show route-map export json' | ${lib.getExe pkgs.jq}"))
   '';
 }

modules/access-list.nix

@@ -59,20 +59,22 @@ let
 in
 {
   options.services.frr.settings.access-list = mkOption {
-    type = types.submodule ({
-      options = {
-        ip = alOption "ipv4";
-        ipv6 = alOption "ipv6";
-        bgp_as-path = alOption "bgp as-path";
-      };
-    });
+    type = types.nullOr (
+      types.submodule ({
+        options = {
+          ip = alOption "ipv4";
+          ipv6 = alOption "ipv6";
+          bgp_as-path = alOption "bgp as-path";
+        };
+      })
+    );
     default = null;
     description = ''
       [docs.frrouting.org/en/latest/filter.html#ip-access-list](https://docs.frrouting.org/en/latest/filter.html#ip-access-list).
     '';
   };
 
-  config = {
+  config = lib.mkIf (cfg != null) {
     assertions =
       let
         names = (getAttrsKeyWithoutNullValues cfg.ip) ++ (getAttrsKeyWithoutNullValues cfg.ipv6);

modules/prefix-list.nix

@@ -74,12 +74,14 @@ let
 in
 {
   options.services.frr.settings.prefix-list = mkOption {
-    type = types.submodule ({
-      options = {
-        ip = plOption;
-        ipv6 = plOption;
-      };
-    });
+    type = types.nullOr (
+      types.submodule ({
+        options = {
+          ip = plOption;
+          ipv6 = plOption;
+        };
+      })
+    );
     default = null;
     description = ''
       ip prefix-list provides the most powerful prefix based filtering mechanism. In addition to access-list
@@ -90,7 +92,7 @@ in
     '';
   };
 
-  config = {
+  config = lib.mkIf (cfg != null) {
     assertions =
       let
         names = (getAttrsKeyWithoutNullValues cfg.ip) ++ (getAttrsKeyWithoutNullValues cfg.ipv6);

modules/route-maps.nix

@@ -98,15 +98,17 @@ let
 in
 {
   options.services.frr.settings.route-maps = mkOption {
-    type = attrsWith' "name" (
-      with types;
-      nullOr (submodule {
-        options = {
-          permit = rmOption;
-          optimization = rmOption;
-          deny = rmOption;
-        };
-      })
+    type = types.nullOr (
+      attrsWith' "name" (
+        with types;
+        nullOr (submodule {
+          options = {
+            permit = rmOption;
+            optimization = rmOption;
+            deny = rmOption;
+          };
+        })
+      )
     );
     default = null;
     description = ''
@@ -115,7 +117,7 @@ in
     '';
   };
 
-  config = {
+  config = lib.mkIf (cfg != null) {
     assertions =
       let
         names = builtins.attrNames cfg;