pkgs/network-graphs: add up* to physical-graph

nix/pkgs/network-graphs.nix

@@ -7,13 +7,10 @@ let
     then "grey"
     else if net == "mgmt"
     then "brown"
-    else if net == "c3d2"
+    else if builtins.elem net [ "c3d2" "serv" "cluster" ]
-    then "orange"
-    else if net == "serv"
-    then "orange2"
-    else if net == "pub"
     then "green"
-    else if builtins.match "up.+" net != null
+    else if builtins.match "up.+" net != null ||
+            builtins.match "anon.+" net != null
     then "red"
     else if builtins.match "priv.+" net != null
     then "blue"
@@ -108,16 +105,25 @@ in rec {
         lib.filterAttrs (_: { links, ... }:
           links != {}
         ) config.site.hosts
+      ) // builtins.mapAttrs (_: _: {
+        shape = "circle";
+      }) (
+        lib.filterAttrs (net: _:
+          builtins.match "up.*" net != null
+        ) config.site.net
       );
     links =
       builtins.concatMap (hostName:
         map (link: {
           pair = [ hostName link ];
-          startLabel = lib.concatStringsSep ","
+          startLabel = ( #lib.optionalString (config.site.hosts.${hostName}.links ? ${link}) (
-            config.site.hosts.${hostName}.links.${link}.ports;
+            lib.concatStringsSep ","
+              config.site.hosts.${hostName}.links.${link}.ports
+          );
         }) (
           builtins.filter (link:
-            config.site.hosts ? ${link}
+            config.site.hosts ? ${link} ||
+            builtins.trace "link ${hostName} ${link}" (builtins.match "up.*" link != null)
           ) (builtins.attrNames config.site.hosts.${hostName}.links)
         )
       ) (builtins.attrNames config.site.hosts);

salt-pillar/vlans/init.sls

@@ -12,7 +12,7 @@ vlans:
   cluster: 6
   bmx: 7
   # Modems
-{%- for i in range(1, 9) %}
+{%- for i in range(1, 5) %}
   up{{ i }}: {{ i + 9 }}
 {%- endfor %}
   # Neighbor subnets