conlink 2.0.0 → 2.0.1

package/examples/test1.dot

@@ -0,0 +1,286 @@
+digraph {
+  splines = true;
+  compound = true;
+  subgraph "cluster_host" {
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    fillcolor = "#f5f5f5";
+    color = "#666666";
+    label = "host system";
+    subgraph "cluster_conlink" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 3;
+      fillcolor = "#c5d1e7";
+      color = "#7396a0";
+      label = "conlink/network";
+      subgraph "cluster_bridge_s1" {
+        shape = "box";
+        fontsize = 14;
+        style = "filled";
+        penwidth = 1;
+        fillcolor = "#c8badc";
+        color = "#6e509f";
+        label = "s1";
+      }
+      subgraph "cluster_bridge_s2" {
+        shape = "box";
+        fontsize = 14;
+        style = "filled";
+        penwidth = 1;
+        fillcolor = "#c8badc";
+        color = "#6e509f";
+        label = "s2";
+      }
+      subgraph "cluster_bridge_s3" {
+        shape = "box";
+        fontsize = 14;
+        style = "filled";
+        penwidth = 1;
+        fillcolor = "#c8badc";
+        color = "#6e509f";
+        label = "s3";
+      }
+      subgraph "cluster_bridge_s1" {
+        shape = "box";
+        fontsize = 14;
+        style = "filled";
+        penwidth = 1;
+        fillcolor = "#c8badc";
+        color = "#6e509f";
+        label = "s1";
+        "out_DASH_r0_1_DASH_eth_DASH_s1" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "r0_1-eth-s1";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+        "out_DASH_h1_1_DASH_eth0" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "h1_1-eth0";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+      }
+      subgraph "cluster_bridge_s2" {
+        shape = "box";
+        fontsize = 14;
+        style = "filled";
+        penwidth = 1;
+        fillcolor = "#c8badc";
+        color = "#6e509f";
+        label = "s2";
+        "out_DASH_r0_1_DASH_eth_DASH_s2" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "r0_1-eth-s2";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+        "out_DASH_h2_1_DASH_eth0" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "h2_1-eth0";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+      }
+      subgraph "cluster_bridge_s3" {
+        shape = "box";
+        fontsize = 14;
+        style = "filled";
+        penwidth = 1;
+        fillcolor = "#c8badc";
+        color = "#6e509f";
+        label = "s3";
+        "out_DASH_r0_1_DASH_eth_DASH_s3" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "r0_1-eth-s3";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+        "out_DASH_h3_1_DASH_eth0" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "h3_1-eth0";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+      }
+    }
+    subgraph "cluster_service_r0" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 2;
+      fillcolor = "#c1d0d7";
+      color = "#7396a6";
+      label = "service 'r0'";
+      "r0_COLON_eth_DASH_s1" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "eth-s1";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+      "r0_COLON_eth_DASH_s2" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "eth-s2";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+      "r0_COLON_eth_DASH_s3" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "eth-s3";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+    subgraph "cluster_service_h1" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 2;
+      fillcolor = "#c1d0d7";
+      color = "#7396a6";
+      label = "service 'h1'";
+      "h1_COLON_eth0" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "eth0";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+    subgraph "cluster_service_h2" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 2;
+      fillcolor = "#c1d0d7";
+      color = "#7396a6";
+      label = "service 'h2'";
+      "h2_COLON_eth0" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "eth0";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+    subgraph "cluster_service_h3" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 2;
+      fillcolor = "#c1d0d7";
+      color = "#7396a6";
+      label = "service 'h3'";
+      "h3_COLON_eth0" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "eth0";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+  }
+  "r0_COLON_eth_DASH_s1" -> "out_DASH_r0_1_DASH_eth_DASH_s1" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "r0_COLON_eth_DASH_s2" -> "out_DASH_r0_1_DASH_eth_DASH_s2" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "r0_COLON_eth_DASH_s3" -> "out_DASH_r0_1_DASH_eth_DASH_s3" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "h1_COLON_eth0" -> "out_DASH_h1_1_DASH_eth0" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "h2_COLON_eth0" -> "out_DASH_h2_1_DASH_eth0" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "h3_COLON_eth0" -> "out_DASH_h3_1_DASH_eth0" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+}

package/examples/test6-cfn.yaml

@@ -88,10 +88,9 @@ Resources:
         # echo "podman ps" | sudo -i -u ubuntu bash
 
         ## Download conlink image and repo
-        docker pull lonocloud/conlink:config-and-cljs-refactor
+        docker pull lonocloud/conlink
         git clone https://github.com/LonoCloud/conlink /root/conlink
         cd /root/conlink
-        git checkout -b config-and-cljs-refactor origin/config-and-cljs-refactor
 
         #cfn-signal -e 0 --stack ${AWS::StackName} --region ${AWS::Region} --resource WaitHandle
         cat > /tmp/signal << EOF

package/host-build.yaml

@@ -1 +1 @@
-services: {network: {volumes: ["../build:/app/build"]}}
+services: {network: {volumes: ["../:/app/"]}}

package/modes0/a/deps

@@ -0,0 +1 @@
+b,c

package/modes0/b/deps

@@ -0,0 +1 @@
+c,d

package/modes0/c/deps

@@ -0,0 +1 @@
+e

package/modes0/e/deps

@@ -0,0 +1 @@
+f

package/modes1/a/deps

@@ -0,0 +1 @@
+b c|d

package/modes1/b/deps

@@ -0,0 +1 @@
+e f

package/modes1/c/deps

@@ -0,0 +1 @@
+g

package/modes1/d/deps

@@ -0,0 +1 @@
+g h

package/modes2/a/deps

@@ -0,0 +1 @@
+b c

package/modes2/b/deps

@@ -0,0 +1 @@
+c|d

package/modes2/c/deps

@@ -0,0 +1 @@
+e

package/modes2/d/de

@@ -0,0 +1 @@
+e

package/modes2/d/deps

@@ -0,0 +1 @@
+e

package/modes3/ab/deps

@@ -0,0 +1 @@
+base

package/modes3/accel/deps

@@ -0,0 +1 @@
+base mach3|ab

package/modes3/mach3/deps

@@ -0,0 +1 @@
+base

package/modes4/a/deps

@@ -0,0 +1 @@
+b c

package/modes4/b/deps

@@ -0,0 +1 @@
+d|c

package/net2dot

@@ -8,4 +8,4 @@ die() { echo >&2 "${*}"; exit 1; }
 
 [ -e "${NBB}" ] || die "Missing ${NBB}. Maybe run 'npm install' in ${TOP_DIR}?"
 
-exec ${NBB} -cp "${TOP_DIR}/src" -m conlink.net2dot/main "${@}"
+exec ${NBB} "${TOP_DIR}/net2dot.cljs" "${@}"

package/net2dot.cljs

@@ -0,0 +1,113 @@
+#!/usr/bin/env nbb
+
+;; Copyright (c) 2023, Viasat, Inc
+;; Licensed under MPL 2.0
+
+(ns net2dot
+  (:require [clojure.string :as S]
+            [clojure.pprint :refer [pprint]]
+            [cljs-bean.core :refer [->clj ->js]]
+            ["fs" :as fs]
+            ["ts-graphviz" :refer [Digraph Subgraph toDot Node Edge]]))
+
+;; Reads JSON network config from stdin and outputs to dot (GraphViz)
+
+(def DEFAULT-PROPS {:shape "box" :fontsize 14 :style "filled" :penwidth 1})
+(def CONLINK-PROPS {:fillcolor "#c5d1e7" :color "#7396a0" :style "rounded,filled" :penwidth 3})
+(def CON-PROPS     {:fillcolor "#dfe8f1" :color "#7396a6" :style "rounded,filled"})
+(def SVC-PROPS     {:fillcolor "#c1d0d7" :color "#7396a6" :style "rounded,filled" :penwidth 2})
+(def BRIDGE-PROPS  {:fillcolor "#c8badc" :color "#6e509f"})
+(def HOST-PROPS    {:fillcolor "#f5f5f5" :color "#666666"})
+(def INTF-PROPS    {:fillcolor "#e8e8c8" :color "#af6b4e" :fontsize 10 :width 0.1 :height 0.1})
+(def NIC-PROPS     {:fillcolor "#e8e8c8" :color "#af6b4e" :fontsize 14})
+(def TUN-PROPS     {:fillcolor "#a5f5a5" :color "#888888"})
+
+(defn dot-id [n]
+  (-> (name n)
+      (S/replace #"[:]" "_COLON_")
+      (S/replace #"[-]" "_DASH_")
+      (S/replace #"[*]" "_STAR_")
+      (S/replace #"[$]" "_DOLLAR_")
+      (S/replace #"[{]" "_LCURLY_")
+      (S/replace #"[}]" "_LCURLY_")
+      (S/replace #"[ ]" "_SPACE_")))
+
+(defn node-props [label props]
+  (merge DEFAULT-PROPS props {:label label}))
+
+(defn digraph [props]
+  (Digraph. (->js {:splines true :compound true})))
+
+(defn subgraph [parent id label props]
+  (let [n (Subgraph. id (->js (node-props label props)))]
+    ^obj (.addSubgraph parent n)
+    n))
+
+(defn node [parent id label props]
+  (let [n (Node. id (->js (node-props label props)))]
+    ^obj (.addNode parent n)
+    n))
+
+(defn edge [parent idA idB label props] 
+  (let [n (Edge. #js [idA idB] (->js (node-props label props)))]
+    ^obj (.addEdge parent n)
+    n))
+
+(defn render [network-config]
+  (let [graph (digraph {:splines true :compound true})
+        host (subgraph graph "cluster_host" "host system" HOST-PROPS)
+        conlink (subgraph host "cluster_conlink" "conlink/network" CONLINK-PROPS)
+        bridges (reduce
+                  #(->> (subgraph conlink (str "cluster_bridge_" %2)
+                                  %2 BRIDGE-PROPS)
+                        (assoc %1 %2))
+                  {} (keep :bridge (:links network-config)))
+        services (reduce
+                   #(->> (subgraph host (str "cluster_service_" (dot-id %2))
+                                   (str "service '" (name %2) "'") SVC-PROPS)
+                         (assoc %1 %2))
+                   {} (keys (:services network-config)))
+        containers (reduce
+                     #(->> (subgraph host (str "cluster_container_" (dot-id %2))
+                                     (str "container '" (name %2) "'") CON-PROPS)
+                           (assoc %1 %2))
+                     {} (keys (:containers network-config)))]
+
+    (doseq [link (:links network-config)]
+      (let [{:keys [service container dev outer-dev bridge base]} link
+            cname (or service container)
+            cnode (get (if service services containers) (keyword cname))
+            dev-id (str cname ":" (name dev))
+            in-intf (node cnode (dot-id dev-id) dev INTF-PROPS)]
+        (when (#{:conlink :host} (keyword base))
+          (let [outer-dev (or outer-dev
+                              (str (if service (str service "_1") container)
+                                   "-" (name dev)))
+                out-id (str "out-" outer-dev)
+                out-parent (condp = (keyword base)
+                             :conlink (get bridges bridge)
+                             :host host)
+                {:keys [type vlanid]} link
+                [elabel iprops] (if (= "host" base)
+                                  [(str (name type) (when vlanid
+                                                      (str " " vlanid)))
+                                   NIC-PROPS]
+                                  ["" INTF-PROPS])
+                out-intf (node out-parent (dot-id out-id) outer-dev iprops)
+                edge (edge graph in-intf out-intf elabel {})]
+            true))))
+
+    (doseq [{:keys [type remote bridge vni]} (:tunnels network-config)]
+      (let [br (get bridges bridge)
+            rt (node graph (dot-id remote)
+                     (str "remote host " remote) TUN-PROPS)
+            intf (node br (dot-id (str type "-" vni))
+                       (str type "-" vni) INTF-PROPS)]
+        (edge graph intf rt "" {})))
+
+    (toDot graph)))
+    
+(let [stdin (fs/readFileSync "/dev/stdin" "utf8")
+      network-config (->clj (js/JSON.parse stdin))
+      dot-graph (render network-config)]
+  (println dot-graph))

package/net2dot.mjs

@@ -0,0 +1,21 @@
+import { attribute as _, Digraph, Subgraph, Node, Edge, toDot } from 'ts-graphviz';
+
+const G = new Digraph();
+const A = new Subgraph('A');
+const node1 = new Node('node1', {
+  color: 'red'
+});
+const node2 = new Node('node2', {
+  color: 'blue'
+});
+const edge = new Edge([node1, node2], {
+  label: 'Edge Label',
+  color: 'pink'
+});
+G.addSubgraph(A);
+A.addNode(node1);
+A.addNode(node2);
+A.addEdge(edge);
+const dot = toDot(G);
+
+console.log(dot)

package/old/graphviz.cljs

@@ -0,0 +1,14 @@
+(ns conlink.net2dot
+  (:require ["ts-graphviz" :refer [Digraph, Subgraph, Node, Edge, toDot]]))
+
+(let [node1 (Node. "node1" #js {:color "red"})
+      node2 (Node. "node2" #js {:color "blue"})
+      edge (Edge. #js [node1 node2] #js {:color "pink"
+                                         :label "Edge Label"})
+      A (doto (Subgraph. "A")
+          (.addNode node1)
+          (.addNode node2)
+          (.addEdge edge))
+      G (doto (Digraph.)
+          (.addSubgraph A))]
+  (println (toDot G)))

package/old/net2dot.cljs

@@ -0,0 +1,114 @@
+#!/usr/bin/env nbb
+
+(ns net2dot
+  (:require [clojure.string :as S]
+            [clojure.pprint :refer [pprint]]
+            [cljs-bean.core :refer [->clj ->js]]
+            ["fs" :as fs]
+            ["ts-graphviz" :refer [Digraph Subgraph toDot Node Edge]]))
+
+;; Reads JSON network config from stdin and outputs to dot (GraphViz)
+
+(def DEFAULT-PROPS {:shape "box" :fontsize 14 :style "filled" :penwidth 1})
+(def CONLINK-PROPS {:style "rounded,filled" :fillcolor "#c1b5c7" :color "#9673a6"})
+(def BRIDGE-PROPS {:style "filled" :fillcolor "#dae8fc" :color "#6c8ebf"})
+(def HOST-PROPS {:style "filled" :fillcolor "#f5f5f5" :color "#666666"})
+(def TUN-PROPS {:fillcolor "#a5a5a5" :color "#888888"})
+(def INTF-PROPS {:width 0.1 :height 0.1 :fontsize 10 :fillcolor "#ffbb9e" :color "#d7db00"})
+(def NIC-PROPS {:fontsize 14 :fillcolor "#ffbb9e" :color "#d7db00"})
+(def CONTAINER-PROPS {:style "rounded,filled" :fillcolor "#e1d5e7" :color "#9673a6"})
+(def SERVICE-PROPS (merge CONTAINER-PROPS {:fillcolor "#d1c5e7" :penwidth 2}))
+
+(defn dot-id [n]
+  (-> (name n)
+      (S/replace #"[:]" "_COLON_")
+      (S/replace #"[-]" "_DASH_")
+      (S/replace #"[*]" "_STAR_")
+      (S/replace #"[$]" "_DOLLAR_")
+      (S/replace #"[{]" "_LCURLY_")
+      (S/replace #"[}]" "_LCURLY_")
+      (S/replace #"[ ]" "_SPACE_")))
+
+(defn node-props [label props]
+  (merge DEFAULT-PROPS props {:label label}))
+
+(defn digraph [props]
+  (Digraph. (->js {:splines true :compound true})))
+
+(defn subgraph [parent id label props]
+  (let [n (Subgraph. id (->js (node-props label props)))]
+    ^obj (.addSubgraph parent n)
+    n))
+
+(defn node [parent id label props]
+  (let [n (Node. id (->js (node-props label props)))]
+    ^obj (.addNode parent n)
+    n))
+
+(defn edge [parent idA idB label props] 
+  (let [n (Edge. #js [idA idB] (->js (node-props label props)))]
+    ^obj (.addEdge parent n)
+    n))
+
+(defn render [network-config]
+  (let [graph (digraph {:splines true :compound true})
+        host (subgraph graph "cluster_host" "host system" HOST-PROPS)
+        conlink (subgraph host "cluster_conlink" "conlink/network" CONLINK-PROPS)
+        bridges (reduce
+                  #(assoc %1 %2
+                          (subgraph conlink (str "cluster_bridge_" %2)
+                                    %2 BRIDGE-PROPS))
+                  {} (keep :bridge (:links network-config)))
+        services (reduce
+                   #(assoc %1 %2
+                           (subgraph host
+                                     (str "cluster_service_" (dot-id %2))
+                                     (str "service '" %2 "'") SERVICE-PROPS))
+                   {} (keys (:services network-config)))
+        containers (reduce
+                     #(assoc %1 %2
+                             (subgraph host
+                                       (str "cluster_container_" (dot-id %2))
+                                       (str "container '" %2 "'") CONTAINER-PROPS))
+                     {} (keys (:services network-config)))
+        ]
+
+    (doseq [link links]
+      (let [{:keys [service container dev outer-dev bridge base]} link
+            cname (or service container)
+            cn (get (if service services containers) cname)
+            dev-id (str cname ":" (name dev))
+            in-intf (node cn (dot-id dev-id) dev INTF-PROPS)]
+        (when (#{:conlink :host} (keyword base))
+          (let [outer-dev (or outer-dev
+                              (str (if service (str service "_1") container)
+                                   "-" (name dev)))
+                out-id (str "out-" outer-dev)
+                out-parent (condp = (keyword base)
+                             :conlink (get bridges bridge)
+                             :host host)
+                {:keys [type vlanid]} link
+                [elabel iprops] (if (= "host" base)
+                                  [(str (name type) (when vlanid
+                                                      (str " " vlanid)))
+                                   NIC-PROPS]
+                                  ["" INTF-PROPS])
+                out-intf (node out-parent (dot-id out-id) outer-dev iprops)
+                edge (edge graph in-intf out-intf elabel {})]
+            true))))
+
+    (doseq [{:keys [type remote bridge vni]} (:tunnels network-config)]
+      (let [br (get bridges bridge)
+            rt (node graph (dot-id remote)
+                     (str "remote host " remote) TUN-PROPS)
+            intf (node br (dot-id (str type "-" vni))
+                       (str type "-" vni) INTF-PROPS)]
+        (edge graph intf rt "" {})))
+
+    (toDot graph)))
+    
+(defn main []
+  (let [stdin (fs/readFileSync "/dev/stdin" "utf8")
+        network-config (->clj (js/JSON.parse stdin))
+        dot-graph (render network-config)]
+    (println dot-graph)))