hasAttr expects attr first

This commit is contained in:
niten 2023-11-03 12:53:57 -07:00
parent 23b62ed61d
commit db38ba91af

View File

@ -14,8 +14,7 @@ let
if base == top then [ ] else [ base ] ++ (rangeFun (base + 1) top); if base == top then [ ] else [ base ] ++ (rangeFun (base + 1) top);
in rangeFun base top; in rangeFun base top;
getNetworkHosts = network: getNetworkHosts = network: filterAttrs (ip: _: ipv4OnNetwork ip network);
filterAttrs (ip: _: ipv4OnNetwork ip (trace "NETWORK: ${network}" network));
getLastIpComponent = ip: head (reverseList (splitString "." ip)); getLastIpComponent = ip: head (reverseList (splitString "." ip));
@ -38,7 +37,7 @@ let
(getNetworkHosts network ipHostMap); (getNetworkHosts network ipHostMap);
ptrEntry = ip: hostname: "#{ip} IN PTR ${hostname}."; ptrEntry = ip: hostname: "#{ip} IN PTR ${hostname}.";
getHostname = n: getHostname = n:
if hasAttr networkHostsByComponent n then if hasAttr n networkHostsByComponent then
networkHostByComponent n networkHostByComponent n
else else
"unassigned-${n}.${domain}"; "unassigned-${n}.${domain}";