conlink 2.0.0 → 2.0.1

package/.env

@@ -0,0 +1,3 @@
+HOST_INTERFACE=eni0
+NODE1_HOST_ADDRESS=192.168.0.32
+NODE2_HOST_ADDRESS=192.168.0.33

package/Dockerfile

@@ -28,7 +28,8 @@ RUN apt-get -y install libpcap-dev tcpdump iproute2 iputils-ping curl \
                        openvswitch-switch openvswitch-testcontroller
 
 COPY --from=build /app/ /app/
-ADD link-add.sh link-del.sh schema.yaml /app/
+ADD link-add.sh link-del.sh /app/
+ADD schema.yaml /app/build/
 
 ENV PATH /app:$PATH
 WORKDIR /app

package/README.md

@@ -453,16 +453,15 @@ python3 -m http.server 8080
 ```
 
 Use the `net2dot` script to transform a network
-configuration into a GraphViz data file (dot language). The `net2dot`
-script supports `--compose-file` and `--network-file` command line
-options. To render the network configuration for example test1, run
-the following in another window:
+configuration into a GraphViz data file (dot language). To render the
+network configuration for example test1, run the following in another
+window:
 
 ```
-./net2dot --compose-file examples/test1-compose.yaml > examples/data.dot
+./conlink --show-config --compose-file examples/test1-compose.yaml | ./net2dot > examples/test1.dot
 ```
 
-Then load `http://localhost:8080` in your browser to see the rendered
+Then load `http://localhost:8080?data=test1.dot` in your browser to see the rendered
 image.
 
 The file `examples/net2dot.yaml` contains a configuration that
@@ -470,10 +469,10 @@ combines many different configuration elements (veth links, dummy
 interfaces, vlan type links, tunnels, etc).
 
 ```
-./net2dot --network-file examples/net2dot.yaml > examples/data.dot
+./conlink --network-file examples/net2dot.yaml --show-config | ./net2dot > examples/net2dot.dot
 ```
 
-Then load `http://localhost:8080` in your browser.
+Then load `http://localhost:8080?data=net2dot.dot` in your browser.
 
 
 ## Copyright & License

package/examples/data.dot

@@ -0,0 +1,457 @@
+digraph {
+  splines = true;
+  compound = true;
+  "10.0.0.1" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    fillcolor = "#a5f5a5";
+    color = "#888888";
+    label = "remote host 10.0.0.1";
+  ];
+  "10.0.0.2" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    fillcolor = "#a5f5a5";
+    color = "#888888";
+    label = "remote host 10.0.0.2";
+  ];
+  subgraph "cluster_host" {
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    fillcolor = "#f5f5f5";
+    color = "#666666";
+    label = "host system";
+    "out_DASH_eni0" [
+      shape = "box";
+      fontsize = 14;
+      style = "filled";
+      penwidth = 1;
+      fillcolor = "#e8e8c8";
+      color = "#af6b4e";
+      label = "eni0";
+    ];
+    "out_DASH_eni1" [
+      shape = "box";
+      fontsize = 14;
+      style = "filled";
+      penwidth = 1;
+      fillcolor = "#e8e8c8";
+      color = "#af6b4e";
+      label = "eni1";
+    ];
+    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";
+        "out_DASH_nodeA_1_DASH_e1" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "nodeA_1-e1";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+        "geneve_DASH_1001" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "geneve-1001";
+          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";
+      }
+      subgraph "cluster_bridge_s3" {
+        shape = "box";
+        fontsize = 14;
+        style = "filled";
+        penwidth = 1;
+        fillcolor = "#c8badc";
+        color = "#6e509f";
+        label = "s3";
+      }
+      subgraph "cluster_bridge_s2" {
+        shape = "box";
+        fontsize = 14;
+        style = "filled";
+        penwidth = 1;
+        fillcolor = "#c8badc";
+        color = "#6e509f";
+        label = "s2";
+        "out_DASH_nodeA_1_DASH_e2" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "nodeA_1-e2";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+        "out_DASH_nodeB_1_DASH_eth0" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "nodeB_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_nodeA_1_DASH_e3" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "nodeA_1-e3";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+        "out_DASH_nodeC_DASH_eth0" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "nodeC-eth0";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+        "geneve_DASH_1002" [
+          color = "#af6b4e";
+          fillcolor = "#e8e8c8";
+          width = 0.1;
+          penwidth = 1;
+          style = "filled";
+          label = "geneve-1002";
+          shape = "box";
+          fontsize = 10;
+          height = 0.1;
+        ];
+      }
+    }
+    subgraph "cluster_service_nodeA" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 2;
+      fillcolor = "#c1d0d7";
+      color = "#7396a6";
+      label = "service ':nodeA'";
+      "nodeA_COLON_e1" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "e1";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+      "nodeA_COLON_e2" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "e2";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+      "nodeA_COLON_e3" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "e3";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+    subgraph "cluster_service_nodeB" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 2;
+      fillcolor = "#c1d0d7";
+      color = "#7396a6";
+      label = "service ':nodeB'";
+      "nodeB_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_nodeE" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 2;
+      fillcolor = "#c1d0d7";
+      color = "#7396a6";
+      label = "service ':nodeE'";
+      "nodeE_COLON_v0" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "v0";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+      "nodeE_COLON_mv0" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "mv0";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+    subgraph "cluster_service_nodeF" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 2;
+      fillcolor = "#c1d0d7";
+      color = "#7396a6";
+      label = "service ':nodeF'";
+      "nodeF_COLON_mv0" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "mv0";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+    subgraph "cluster_service_nodeG" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 2;
+      fillcolor = "#c1d0d7";
+      color = "#7396a6";
+      label = "service ':nodeG'";
+      "nodeG_COLON_iv0" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "iv0";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+    subgraph "cluster_service_nodeH" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 2;
+      fillcolor = "#c1d0d7";
+      color = "#7396a6";
+      label = "service ':nodeH'";
+      "nodeH_COLON_mv0" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "mv0";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+    subgraph "cluster_container_nodeC" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 1;
+      fillcolor = "#dfe8f1";
+      color = "#7396a6";
+      label = "container ':nodeC'";
+      "nodeC_COLON_eth0" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "eth0";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+    subgraph "cluster_container_nodeD" {
+      shape = "box";
+      fontsize = 14;
+      style = "rounded,filled";
+      penwidth = 1;
+      fillcolor = "#dfe8f1";
+      color = "#7396a6";
+      label = "container ':nodeD'";
+      "nodeD_COLON_dummy0" [
+        color = "#af6b4e";
+        fillcolor = "#e8e8c8";
+        width = 0.1;
+        penwidth = 1;
+        style = "filled";
+        label = "dummy0";
+        shape = "box";
+        fontsize = 10;
+        height = 0.1;
+      ];
+    }
+  }
+  "nodeA_COLON_e1" -> "out_DASH_nodeA_1_DASH_e1" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "nodeA_COLON_e2" -> "out_DASH_nodeA_1_DASH_e2" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "nodeA_COLON_e3" -> "out_DASH_nodeA_1_DASH_e3" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "nodeB_COLON_eth0" -> "out_DASH_nodeB_1_DASH_eth0" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "nodeC_COLON_eth0" -> "out_DASH_nodeC_DASH_eth0" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "nodeE_COLON_v0" -> "out_DASH_eni0" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "vlan 5";
+  ];
+  "nodeE_COLON_mv0" -> "out_DASH_eni0" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "macvlan";
+  ];
+  "nodeF_COLON_mv0" -> "out_DASH_eni0" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "macvlan";
+  ];
+  "nodeG_COLON_iv0" -> "out_DASH_eni1" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "ipvlan";
+  ];
+  "nodeH_COLON_mv0" -> "out_DASH_eni1" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "macvlan";
+  ];
+  "geneve_DASH_1001" -> "10.0.0.1" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+  "geneve_DASH_1002" -> "10.0.0.2" [
+    shape = "box";
+    fontsize = 14;
+    style = "filled";
+    penwidth = 1;
+    label = "";
+  ];
+}

package/examples/net2dot-data.dot

@@ -0,0 +1,123 @@
+digraph D {
+  splines = true;
+  compound = true;
+  node [shape=box fontsize=12 style=filled penwidth=1];
+
+ // host system
+  subgraph cluster_host {
+    label = "host system";
+    style=filled fillcolor="#f5f5f5" color="#666666";
+
+    // main link nodes
+    S_nodeA_COLON_e1 [label="e1" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+    S_nodeA_COLON_e2 [label="e2" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+    S_nodeA_COLON_e3 [label="e3" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+    S_nodeB_COLON_eth0 [label="eth0" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+    nodeC_COLON_eth0 [label="eth0" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+    nodeD_COLON_dummy0 [label="dummy0" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+    S_nodeE_COLON_v0 [label="v0" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+    S_nodeE_COLON_mv0 [label="mv0" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+    S_nodeF_COLON_mv0 [label="mv0" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+    S_nodeG_COLON_iv0 [label="iv0" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+    S_nodeH_COLON_mv0 [label="mv0" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+
+    // containers and their links/interfaces
+    subgraph cluster_S_nodeA {
+      label = "service 'nodeA'";
+      style="rounded,filled" fillcolor = "#e1d5e7" color = "#9673a6" fillcolor = "#d1c5e7" penwidth = 2;
+      S_nodeA_COLON_e1
+      S_nodeA_COLON_e2
+      S_nodeA_COLON_e3
+    }
+    subgraph cluster_S_nodeB {
+      label = "service 'nodeB'";
+      style="rounded,filled" fillcolor = "#e1d5e7" color = "#9673a6" fillcolor = "#d1c5e7" penwidth = 2;
+      S_nodeB_COLON_eth0
+    }
+    subgraph cluster_nodeC {
+      label = "container 'nodeC'";
+      style="rounded,filled" fillcolor = "#e1d5e7" color = "#9673a6";
+      nodeC_COLON_eth0
+    }
+    subgraph cluster_nodeD {
+      label = "container 'nodeD'";
+      style="rounded,filled" fillcolor = "#e1d5e7" color = "#9673a6";
+      nodeD_COLON_dummy0
+    }
+    subgraph cluster_S_nodeE {
+      label = "service 'nodeE'";
+      style="rounded,filled" fillcolor = "#e1d5e7" color = "#9673a6" fillcolor = "#d1c5e7" penwidth = 2;
+      S_nodeE_COLON_v0
+      S_nodeE_COLON_mv0
+    }
+    subgraph cluster_S_nodeF {
+      label = "service 'nodeF'";
+      style="rounded,filled" fillcolor = "#e1d5e7" color = "#9673a6" fillcolor = "#d1c5e7" penwidth = 2;
+      S_nodeF_COLON_mv0
+    }
+    subgraph cluster_S_nodeG {
+      label = "service 'nodeG'";
+      style="rounded,filled" fillcolor = "#e1d5e7" color = "#9673a6" fillcolor = "#d1c5e7" penwidth = 2;
+      S_nodeG_COLON_iv0
+    }
+    subgraph cluster_S_nodeH {
+      label = "service 'nodeH'";
+      style="rounded,filled" fillcolor = "#e1d5e7" color = "#9673a6" fillcolor = "#d1c5e7" penwidth = 2;
+      S_nodeH_COLON_mv0
+    }
+
+    // bridges, tunnels, veth connections
+    subgraph cluster_conlink {
+      label = "conlink/network";
+      style="rounded,filled" fillcolor = "#c1b5c7" color = "#9673a6";
+      subgraph cluster_bridge_s1 {
+        label = "s1";
+        style= filled fillcolor="#dae8fc" color="#6c8ebf";
+        bridge_s1 [shape=point style=invis];
+        nodeA_1_DASH_e1 [label="nodeA_1-e1" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+        S_nodeA_COLON_e1 -> nodeA_1_DASH_e1
+        geneve_DASH_1001 [label="geneve-1001" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+        geneve_DASH_1002 [label="geneve-1002" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+      }
+      subgraph cluster_bridge_s2 {
+        label = "s2";
+        style= filled fillcolor="#dae8fc" color="#6c8ebf";
+        bridge_s2 [shape=point style=invis];
+        nodeA_1_DASH_e2 [label="nodeA_1-e2" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+        S_nodeA_COLON_e2 -> nodeA_1_DASH_e2
+        nodeB_1_DASH_eth0 [label="nodeB_1-eth0" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+        S_nodeB_COLON_eth0 -> nodeB_1_DASH_eth0
+        geneve_DASH_1001 [label="geneve-1001" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+        geneve_DASH_1002 [label="geneve-1002" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+      }
+      subgraph cluster_bridge_s3 {
+        label = "s3";
+        style= filled fillcolor="#dae8fc" color="#6c8ebf";
+        bridge_s3 [shape=point style=invis];
+        nodeA_1_DASH_e3 [label="nodeA_1-e3" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+        S_nodeA_COLON_e3 -> nodeA_1_DASH_e3
+        nodeC_DASH_eth0 [label="nodeC-eth0" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+        nodeC_COLON_eth0 -> nodeC_DASH_eth0
+        geneve_DASH_1001 [label="geneve-1001" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+        geneve_DASH_1002 [label="geneve-1002" width=0.1 height=0.1 fontsize=10 fillcolor="#ffbb9e" color="#d7db00"];
+      }
+    }
+
+    // vlan/vtap links
+    eni0 [label="eni0" fontsize=12 fillcolor="#ffbb9e" color="#d7db00"];
+    S_nodeE_COLON_v0 -> eni0 [label="vlan 5"];
+    S_nodeE_COLON_mv0 -> eni0 [label="macvlan"];
+    S_nodeF_COLON_mv0 -> eni0 [label="macvlan"];
+    eni1 [label="eni1" fontsize=12 fillcolor="#ffbb9e" color="#d7db00"];
+    S_nodeG_COLON_iv0 -> eni1 [label="ipvlan"];
+    S_nodeH_COLON_mv0 -> eni1 [label="macvlan"];
+  // end of host system
+  }
+
+  // remote hosts and tunnels links
+  _DOLLAR__LCURLY_REMOTE1_LCURLY_ [label="remote host '${REMOTE1}'" fillcolor="#a5a5a5" color="#888888"];
+  geneve_DASH_1001 -> _DOLLAR__LCURLY_REMOTE1_LCURLY_
+  _DOLLAR__LCURLY_REMOTE2_LCURLY_ [label="remote host '${REMOTE2}'" fillcolor="#a5a5a5" color="#888888"];
+  geneve_DASH_1002 -> _DOLLAR__LCURLY_REMOTE2_LCURLY_
+}
+